Merge branch 'experimental' into travis/rsettings/tab/security
This commit is contained in:
Travis Ralston
commit
f86e224db6
6 changed files with 498 additions and 54 deletions
|
|
@ -430,6 +430,15 @@
|
|||
"Upload profile picture": "Upload profile picture",
|
||||
"Display Name": "Display Name",
|
||||
"Save": "Save",
|
||||
"This room is not accessible by remote Matrix servers": "This room is not accessible by remote Matrix servers",
|
||||
"Upgrade room to version %(ver)s": "Upgrade room to version %(ver)s",
|
||||
"Advanced": "Advanced",
|
||||
"Room information": "Room information",
|
||||
"Internal room ID:": "Internal room ID:",
|
||||
"Room version": "Room version",
|
||||
"Room version:": "Room version:",
|
||||
"Developer options": "Developer options",
|
||||
"Open Devtools": "Open Devtools",
|
||||
"Flair": "Flair",
|
||||
"General": "General",
|
||||
"Room Addresses": "Room Addresses",
|
||||
|
|
@ -466,7 +475,6 @@
|
|||
"matrix-react-sdk version:": "matrix-react-sdk version:",
|
||||
"riot-web version:": "riot-web version:",
|
||||
"olm version:": "olm version:",
|
||||
"Advanced": "Advanced",
|
||||
"Homeserver is": "Homeserver is",
|
||||
"Identity Server is": "Identity Server is",
|
||||
"Access Token:": "Access Token:",
|
||||
|
|
@ -481,28 +489,32 @@
|
|||
"Room list": "Room list",
|
||||
"Timeline": "Timeline",
|
||||
"Autocomplete delay (ms)": "Autocomplete delay (ms)",
|
||||
"End-to-end encryption is in beta and may not be reliable": "End-to-end encryption is in beta and may not be reliable",
|
||||
"You should not yet trust it to secure data": "You should not yet trust it to secure data",
|
||||
"Devices will not yet be able to decrypt history from before they joined the room": "Devices will not yet be able to decrypt history from before they joined the room",
|
||||
"Once encryption is enabled for a room it cannot be turned off again (for now)": "Once encryption is enabled for a room it cannot be turned off again (for now)",
|
||||
"Encrypted messages will not be visible on clients that do not yet implement encryption": "Encrypted messages will not be visible on clients that do not yet implement encryption",
|
||||
"Guests cannot join this room even if explicitly invited.": "Guests cannot join this room even if explicitly invited.",
|
||||
"Click here to fix": "Click here to fix",
|
||||
"To link to this room, please add an alias.": "To link to this room, please add an alias.",
|
||||
"Only people who have been invited": "Only people who have been invited",
|
||||
"Anyone who knows the room's link, apart from guests": "Anyone who knows the room's link, apart from guests",
|
||||
"Anyone who knows the room's link, including guests": "Anyone who knows the room's link, including guests",
|
||||
"Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.",
|
||||
"Anyone": "Anyone",
|
||||
"Members only (since the point in time of selecting this option)": "Members only (since the point in time of selecting this option)",
|
||||
"Members only (since they were invited)": "Members only (since they were invited)",
|
||||
"Members only (since they joined)": "Members only (since they joined)",
|
||||
"Once enabled, encryption cannot be disabled.": "Once enabled, encryption cannot be disabled.",
|
||||
"Encrypted": "Encrypted",
|
||||
"Security & Privacy": "Security & Privacy",
|
||||
"Encryption": "Encryption",
|
||||
"Who can access this room?": "Who can access this room?",
|
||||
"Who can read history?": "Who can read history?",
|
||||
"To change the room's avatar, you must be a": "To change the room's avatar, you must be a",
|
||||
"To change the room's name, you must be a": "To change the room's name, you must be a",
|
||||
"To change the room's main address, you must be a": "To change the room's main address, you must be a",
|
||||
"To change the room's history visibility, you must be a": "To change the room's history visibility, you must be a",
|
||||
"To change the permissions in the room, you must be a": "To change the permissions in the room, you must be a",
|
||||
"To change the topic, you must be a": "To change the topic, you must be a",
|
||||
"To modify widgets in the room, you must be a": "To modify widgets in the room, you must be a",
|
||||
"Failed to unban": "Failed to unban",
|
||||
"Unban": "Unban",
|
||||
"Banned by %(displayName)s": "Banned by %(displayName)s",
|
||||
"The default role for new room members is": "The default role for new room members is",
|
||||
"To send messages, you must be a": "To send messages, you must be a",
|
||||
"To invite users into the room, you must be a": "To invite users into the room, you must be a",
|
||||
"To configure the room, you must be a": "To configure the room, you must be a",
|
||||
"To kick users, you must be a": "To kick users, you must be a",
|
||||
"To ban users, you must be a": "To ban users, you must be a",
|
||||
"To remove other users' messages, you must be a": "To remove other users' messages, you must be a",
|
||||
"To notify everyone in the room, you must be a": "To notify everyone in the room, you must be a",
|
||||
"No users have specific privileges in this room": "No users have specific privileges in this room",
|
||||
"%(user)s is a %(userRole)s": "%(user)s is a %(userRole)s",
|
||||
"Privileged Users": "Privileged Users",
|
||||
"Muted Users": "Muted Users",
|
||||
"Banned users": "Banned users",
|
||||
"To send events of type <eventType/>, you must be a": "To send events of type <eventType/>, you must be a",
|
||||
"Roles & Permissions": "Roles & Permissions",
|
||||
"Permissions": "Permissions",
|
||||
"Unignore": "Unignore",
|
||||
"<not supported>": "<not supported>",
|
||||
"Import E2E room keys": "Import E2E room keys",
|
||||
|
|
@ -564,7 +576,6 @@
|
|||
"Disinvite this user?": "Disinvite this user?",
|
||||
"Kick this user?": "Kick this user?",
|
||||
"Failed to kick": "Failed to kick",
|
||||
"Unban": "Unban",
|
||||
"Ban": "Ban",
|
||||
"Unban this user?": "Unban this user?",
|
||||
"Ban this user?": "Ban this user?",
|
||||
|
|
@ -707,15 +718,6 @@
|
|||
"If you log out or use another device, you'll lose your secure message history. To prevent this, set up Secure Message Recovery.": "If you log out or use another device, you'll lose your secure message history. To prevent this, set up Secure Message Recovery.",
|
||||
"Secure Message Recovery": "Secure Message Recovery",
|
||||
"Don't ask again": "Don't ask again",
|
||||
"To change the room's avatar, you must be a": "To change the room's avatar, you must be a",
|
||||
"To change the room's name, you must be a": "To change the room's name, you must be a",
|
||||
"To change the room's main address, you must be a": "To change the room's main address, you must be a",
|
||||
"To change the room's history visibility, you must be a": "To change the room's history visibility, you must be a",
|
||||
"To change the permissions in the room, you must be a": "To change the permissions in the room, you must be a",
|
||||
"To change the topic, you must be a": "To change the topic, you must be a",
|
||||
"To modify widgets in the room, you must be a": "To modify widgets in the room, you must be a",
|
||||
"Failed to unban": "Failed to unban",
|
||||
"Banned by %(displayName)s": "Banned by %(displayName)s",
|
||||
"Privacy warning": "Privacy warning",
|
||||
"Changes to who can read history will only apply to future messages in this room": "Changes to who can read history will only apply to future messages in this room",
|
||||
"The visibility of existing history will be unchanged": "The visibility of existing history will be unchanged",
|
||||
|
|
@ -725,28 +727,21 @@
|
|||
"(warning: cannot be disabled again!)": "(warning: cannot be disabled again!)",
|
||||
"Encryption is enabled in this room": "Encryption is enabled in this room",
|
||||
"Encryption is not enabled in this room": "Encryption is not enabled in this room",
|
||||
"The default role for new room members is": "The default role for new room members is",
|
||||
"To send messages, you must be a": "To send messages, you must be a",
|
||||
"To invite users into the room, you must be a": "To invite users into the room, you must be a",
|
||||
"To configure the room, you must be a": "To configure the room, you must be a",
|
||||
"To kick users, you must be a": "To kick users, you must be a",
|
||||
"To ban users, you must be a": "To ban users, you must be a",
|
||||
"To remove other users' messages, you must be a": "To remove other users' messages, you must be a",
|
||||
"To notify everyone in the room, you must be a": "To notify everyone in the room, you must be a",
|
||||
"No users have specific privileges in this room": "No users have specific privileges in this room",
|
||||
"%(user)s is a %(userRole)s": "%(user)s is a %(userRole)s",
|
||||
"Privileged Users": "Privileged Users",
|
||||
"Muted Users": "Muted Users",
|
||||
"Banned users": "Banned users",
|
||||
"This room is not accessible by remote Matrix servers": "This room is not accessible by remote Matrix servers",
|
||||
"Favourite": "Favourite",
|
||||
"Tagged as: ": "Tagged as: ",
|
||||
"To link to a room it must have <a>an address</a>.": "To link to a room it must have <a>an address</a>.",
|
||||
"To send events of type <eventType/>, you must be a": "To send events of type <eventType/>, you must be a",
|
||||
"Upgrade room to version %(ver)s": "Upgrade room to version %(ver)s",
|
||||
"Open Devtools": "Open Devtools",
|
||||
"Guests cannot join this room even if explicitly invited.": "Guests cannot join this room even if explicitly invited.",
|
||||
"Click here to fix": "Click here to fix",
|
||||
"Who can access this room?": "Who can access this room?",
|
||||
"Only people who have been invited": "Only people who have been invited",
|
||||
"Anyone who knows the room's link, apart from guests": "Anyone who knows the room's link, apart from guests",
|
||||
"Anyone who knows the room's link, including guests": "Anyone who knows the room's link, including guests",
|
||||
"Publish this room to the public in %(domain)s's room directory?": "Publish this room to the public in %(domain)s's room directory?",
|
||||
"Permissions": "Permissions",
|
||||
"Who can read history?": "Who can read history?",
|
||||
"Anyone": "Anyone",
|
||||
"Members only (since the point in time of selecting this option)": "Members only (since the point in time of selecting this option)",
|
||||
"Members only (since they were invited)": "Members only (since they were invited)",
|
||||
"Members only (since they joined)": "Members only (since they joined)",
|
||||
"Internal room ID: ": "Internal room ID: ",
|
||||
"Room version number: ": "Room version number: ",
|
||||
"Add a topic": "Add a topic",
|
||||
|
|
@ -1068,7 +1063,6 @@
|
|||
"To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.",
|
||||
"Report bugs & give feedback": "Report bugs & give feedback",
|
||||
"Go back": "Go back",
|
||||
"Roles & Permissions": "Roles & Permissions",
|
||||
"Visit old settings": "Visit old settings",
|
||||
"Failed to upgrade room": "Failed to upgrade room",
|
||||
"The room upgrade could not be completed": "The room upgrade could not be completed",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue