Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
f887369a54
6 changed files with 202 additions and 151 deletions
|
@ -33,8 +33,8 @@
|
|||
"VoIP is unsupported": "VoIP is unsupported",
|
||||
"You cannot place VoIP calls in this browser.": "You cannot place VoIP calls in this browser.",
|
||||
"You cannot place a call with yourself.": "You cannot place a call with yourself.",
|
||||
"Conference calls are not supported in this client": "Conference calls are not supported in this client",
|
||||
"Conference calls are not supported in encrypted rooms": "Conference calls are not supported in encrypted rooms",
|
||||
"Conference calls are not supported in this client": "Conference calls are not supported in this client",
|
||||
"Warning!": "Warning!",
|
||||
"Conference calling is in development and may not be reliable.": "Conference calling is in development and may not be reliable.",
|
||||
"Failed to set up conference call": "Failed to set up conference call",
|
||||
|
@ -114,19 +114,36 @@
|
|||
"Room %(roomId)s not visible": "Room %(roomId)s not visible",
|
||||
"Missing user_id in request": "Missing user_id in request",
|
||||
"Usage": "Usage",
|
||||
"Searches DuckDuckGo for results": "Searches DuckDuckGo for results",
|
||||
"/ddg is not a command": "/ddg is not a command",
|
||||
"To use it, just wait for autocomplete results to load and tab through them.": "To use it, just wait for autocomplete results to load and tab through them.",
|
||||
"Changes your display nickname": "Changes your display nickname",
|
||||
"Changes colour scheme of current room": "Changes colour scheme of current room",
|
||||
"Sets the room topic": "Sets the room topic",
|
||||
"Invites user with given id to current room": "Invites user with given id to current room",
|
||||
"Joins room with given alias": "Joins room with given alias",
|
||||
"Leave room": "Leave room",
|
||||
"Unrecognised room alias:": "Unrecognised room alias:",
|
||||
"Kicks user with given id": "Kicks user with given id",
|
||||
"Bans user with given id": "Bans user with given id",
|
||||
"Unbans user with given id": "Unbans user with given id",
|
||||
"Ignores a user, hiding their messages from you": "Ignores a user, hiding their messages from you",
|
||||
"Ignored user": "Ignored user",
|
||||
"You are now ignoring %(userId)s": "You are now ignoring %(userId)s",
|
||||
"Stops ignoring a user, showing their messages going forward": "Stops ignoring a user, showing their messages going forward",
|
||||
"Unignored user": "Unignored user",
|
||||
"You are no longer ignoring %(userId)s": "You are no longer ignoring %(userId)s",
|
||||
"Define the power level of a user": "Define the power level of a user",
|
||||
"Deops user with given id": "Deops user with given id",
|
||||
"Opens the Developer Tools dialog": "Opens the Developer Tools dialog",
|
||||
"Verifies a user, device, and pubkey tuple": "Verifies a user, device, and pubkey tuple",
|
||||
"Unknown (user, device) pair:": "Unknown (user, device) pair:",
|
||||
"Device already verified!": "Device already verified!",
|
||||
"WARNING: Device already verified, but keys do NOT MATCH!": "WARNING: Device already verified, but keys do NOT MATCH!",
|
||||
"WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!",
|
||||
"Verified key": "Verified key",
|
||||
"The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.",
|
||||
"Displays action": "Displays action",
|
||||
"Unrecognised command:": "Unrecognised command:",
|
||||
"Reason": "Reason",
|
||||
"%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepted the invitation for %(displayName)s.",
|
||||
|
@ -187,6 +204,7 @@
|
|||
"Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",
|
||||
"Failed to join room": "Failed to join room",
|
||||
"Message Pinning": "Message Pinning",
|
||||
"Jitsi Conference Calling": "Jitsi Conference Calling",
|
||||
"Disable Emoji suggestions while typing": "Disable Emoji suggestions while typing",
|
||||
"Use compact timeline layout": "Use compact timeline layout",
|
||||
"Hide removed messages": "Hide removed messages",
|
||||
|
@ -497,7 +515,6 @@
|
|||
"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",
|
||||
"Leave room": "Leave room",
|
||||
"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>.",
|
||||
|
@ -748,8 +765,8 @@
|
|||
"Matrix ID": "Matrix ID",
|
||||
"Matrix Room ID": "Matrix Room ID",
|
||||
"email address": "email address",
|
||||
"Try using one of the following valid address types: %(validTypesList)s.": "Try using one of the following valid address types: %(validTypesList)s.",
|
||||
"You have entered an invalid address.": "You have entered an invalid address.",
|
||||
"Try using one of the following valid address types: %(validTypesList)s.": "Try using one of the following valid address types: %(validTypesList)s.",
|
||||
"Preparing to send logs": "Preparing to send logs",
|
||||
"Logs sent": "Logs sent",
|
||||
"Thank you!": "Thank you!",
|
||||
|
@ -1142,22 +1159,6 @@
|
|||
"You need to enter a user name.": "You need to enter a user name.",
|
||||
"An unknown error occurred.": "An unknown error occurred.",
|
||||
"I already have an account": "I already have an account",
|
||||
"Displays action": "Displays action",
|
||||
"Bans user with given id": "Bans user with given id",
|
||||
"Unbans user with given id": "Unbans user with given id",
|
||||
"Define the power level of a user": "Define the power level of a user",
|
||||
"Deops user with given id": "Deops user with given id",
|
||||
"Invites user with given id to current room": "Invites user with given id to current room",
|
||||
"Joins room with given alias": "Joins room with given alias",
|
||||
"Sets the room topic": "Sets the room topic",
|
||||
"Kicks user with given id": "Kicks user with given id",
|
||||
"Changes your display nickname": "Changes your display nickname",
|
||||
"Searches DuckDuckGo for results": "Searches DuckDuckGo for results",
|
||||
"Changes colour scheme of current room": "Changes colour scheme of current room",
|
||||
"Verifies a user, device, and pubkey tuple": "Verifies a user, device, and pubkey tuple",
|
||||
"Ignores a user, hiding their messages from you": "Ignores a user, hiding their messages from you",
|
||||
"Stops ignoring a user, showing their messages going forward": "Stops ignoring a user, showing their messages going forward",
|
||||
"Opens the Developer Tools dialog": "Opens the Developer Tools dialog",
|
||||
"Commands": "Commands",
|
||||
"Results from DuckDuckGo": "Results from DuckDuckGo",
|
||||
"Emoji": "Emoji",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue