Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
31680e6f27
3 changed files with 92 additions and 107 deletions
|
@ -218,13 +218,15 @@
|
|||
"Change Password": "Change Password",
|
||||
"Your home server does not support device management.": "Your home server does not support device management.",
|
||||
"Unable to load device list": "Unable to load device list",
|
||||
"Authentication": "Authentication",
|
||||
"Failed to delete device": "Failed to delete device",
|
||||
"Delete %(count)s devices|one": "Delete device",
|
||||
"Delete %(count)s devices|other": "Delete %(count)s devices",
|
||||
"Device ID": "Device ID",
|
||||
"Device Name": "Device Name",
|
||||
"Last seen": "Last seen",
|
||||
"Select devices": "Select devices",
|
||||
"Failed to set display name": "Failed to set display name",
|
||||
"Authentication": "Authentication",
|
||||
"Failed to delete device": "Failed to delete device",
|
||||
"Delete": "Delete",
|
||||
"Disable Notifications": "Disable Notifications",
|
||||
"Enable Notifications": "Enable Notifications",
|
||||
"Cannot add any more widgets": "Cannot add any more widgets",
|
||||
|
@ -537,7 +539,6 @@
|
|||
"Something went wrong when trying to get your communities.": "Something went wrong when trying to get your communities.",
|
||||
"Display your community flair in rooms configured to show it.": "Display your community flair in rooms configured to show it.",
|
||||
"You're not currently a member of any communities.": "You're not currently a member of any communities.",
|
||||
"Flair": "Flair",
|
||||
"Unknown Address": "Unknown Address",
|
||||
"NOTE: Apps are not end-to-end encrypted": "NOTE: Apps are not end-to-end encrypted",
|
||||
"Do you want to load widget from URL:": "Do you want to load widget from URL:",
|
||||
|
@ -553,6 +554,7 @@
|
|||
"Unverify": "Unverify",
|
||||
"Verify...": "Verify...",
|
||||
"No results": "No results",
|
||||
"Delete": "Delete",
|
||||
"Communities": "Communities",
|
||||
"Home": "Home",
|
||||
"Integrations Error": "Integrations Error",
|
||||
|
@ -870,10 +872,10 @@
|
|||
"Please note you are logging into the %(hs)s server, not matrix.org.": "Please note you are logging into the %(hs)s server, not matrix.org.",
|
||||
"Guest access is disabled on this Home Server.": "Guest access is disabled on this Home Server.",
|
||||
"The phone number entered looks invalid": "The phone number entered looks invalid",
|
||||
"This homeserver doesn't offer any login flows which are supported by this client.": "This homeserver doesn't offer any login flows which are supported by this client.",
|
||||
"Error: Problem communicating with the given homeserver.": "Error: Problem communicating with the given homeserver.",
|
||||
"Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.",
|
||||
"Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.",
|
||||
"This homeserver doesn't offer any login flows which are supported by this client.": "This homeserver doesn't offer any login flows which are supported by this client.",
|
||||
"Login as guest": "Login as guest",
|
||||
"Sign in to get started": "Sign in to get started",
|
||||
"Failed to fetch avatar URL": "Failed to fetch avatar URL",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue