Merge remote-tracking branch 'origin/develop' into dbkr/attended_transfer

2021-03-31 10:14:48 +01:00
parent 989d69ba16 b68fabb44b
commit 299467c515
116 changed files with 6088 additions and 1613 deletions
@@ -417,6 +417,7 @@
    "Other": "Other",
    "Command error": "Command error",
    "Usage": "Usage",
+    "Sends the given message as a spoiler": "Sends the given message as a spoiler",
    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Prepends ¯\\_(ツ)_/¯ to a plain-text message",
    "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message",
    "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message",
@@ -723,13 +724,15 @@
    "Common names and surnames are easy to guess": "Common names and surnames are easy to guess",
    "Straight rows of keys are easy to guess": "Straight rows of keys are easy to guess",
    "Short keyboard patterns are easy to guess": "Short keyboard patterns are easy to guess",
+    "Invite to %(spaceName)s": "Invite to %(spaceName)s",
+    "Share your public space": "Share your public space",
    "Unknown App": "Unknown App",
    "Help us improve %(brand)s": "Help us improve %(brand)s",
    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.",
    "Yes": "Yes",
    "No": "No",
    "You have unverified logins": "You have unverified logins",
-    "Verify all your sessions to ensure your account & messages are safe": "Verify all your sessions to ensure your account & messages are safe",
+    "Review to ensure your account is safe": "Review to ensure your account is safe",
    "Review": "Review",
    "Later": "Later",
    "Don't miss a reply": "Don't miss a reply",
@@ -753,7 +756,7 @@
    "Safeguard against losing access to encrypted messages & data": "Safeguard against losing access to encrypted messages & data",
    "Other users may not trust it": "Other users may not trust it",
    "New login. Was this you?": "New login. Was this you?",
-    "A new login is accessing your account: %(name)s (%(deviceID)s) at %(ip)s": "A new login is accessing your account: %(name)s (%(deviceID)s) at %(ip)s",
+    "%(deviceId)s from %(ip)s": "%(deviceId)s from %(ip)s",
    "Check your devices": "Check your devices",
    "What's new?": "What's new?",
    "What's New": "What's New",
@@ -783,6 +786,7 @@
    "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
    "Change notification settings": "Change notification settings",
    "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.",
+    "Send and receive voice messages (in development)": "Send and receive voice messages (in development)",
    "Render LaTeX maths in messages": "Render LaTeX maths in messages",
    "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.",
    "New spinner design": "New spinner design",
@@ -796,6 +800,7 @@
    "Show message previews for reactions in DMs": "Show message previews for reactions in DMs",
    "Show message previews for reactions in all rooms": "Show message previews for reactions in all rooms",
    "Offline encrypted messaging using dehydrated devices": "Offline encrypted messaging using dehydrated devices",
+    "Share decryption keys for room history when inviting users": "Share decryption keys for room history when inviting users",
    "Enable advanced debugging for the room list": "Enable advanced debugging for the room list",
    "Show info about bridges in room settings": "Show info about bridges in room settings",
    "Font size": "Font size",
@@ -983,7 +988,6 @@
    "Folder": "Folder",
    "Pin": "Pin",
    "Your server isn't responding to some <a>requests</a>.": "Your server isn't responding to some <a>requests</a>.",
-    "From %(deviceName)s (%(deviceId)s) at %(ip)s": "From %(deviceName)s (%(deviceId)s) at %(ip)s",
    "Decline (%(counter)s)": "Decline (%(counter)s)",
    "Accept <policyLink /> to continue:": "Accept <policyLink /> to continue:",
    "Delete": "Delete",
@@ -1013,13 +1017,12 @@
    "Share invite link": "Share invite link",
    "Invite people": "Invite people",
    "Invite with email or username": "Invite with email or username",
-    "Invite members": "Invite members",
-    "Share your public space": "Share your public space",
    "Settings": "Settings",
    "Leave space": "Leave space",
-    "New room": "New room",
-    "Space Home": "Space Home",
+    "Create new room": "Create new room",
+    "Add existing room": "Add existing room",
    "Members": "Members",
+    "Manage & explore rooms": "Manage & explore rooms",
    "Explore rooms": "Explore rooms",
    "Space options": "Space options",
    "Remove": "Remove",
@@ -1083,6 +1086,7 @@
    "Securely cache encrypted messages locally for them to appear in search results.": "Securely cache encrypted messages locally for them to appear in search results.",
    "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.": "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.",
    "%(brand)s can't securely cache encrypted messages locally while running in a web browser. Use <desktopLink>%(brand)s Desktop</desktopLink> for encrypted messages to appear in search results.": "%(brand)s can't securely cache encrypted messages locally while running in a web browser. Use <desktopLink>%(brand)s Desktop</desktopLink> for encrypted messages to appear in search results.",
+    "Message search initilisation failed": "Message search initilisation failed",
    "Connecting to integration manager...": "Connecting to integration manager...",
    "Cannot connect to integration manager": "Cannot connect to integration manager",
    "The integration manager is offline or it cannot reach your homeserver.": "The integration manager is offline or it cannot reach your homeserver.",
@@ -1286,6 +1290,7 @@
    "Room ID or address of ban list": "Room ID or address of ban list",
    "Subscribe": "Subscribe",
    "Start automatically after system login": "Start automatically after system login",
+    "Warn before quitting": "Warn before quitting",
    "Always show the window menu bar": "Always show the window menu bar",
    "Show tray icon and minimize window to it on close": "Show tray icon and minimize window to it on close",
    "Preferences": "Preferences",
@@ -1480,6 +1485,7 @@
    "<a>Add a topic</a> to help people know what it is about.": "<a>Add a topic</a> to help people know what it is about.",
    "You created this room.": "You created this room.",
    "%(displayName)s created this room.": "%(displayName)s created this room.",
+    "Invite to just this room": "Invite to just this room",
    "Add a photo, so people can easily spot your room.": "Add a photo, so people can easily spot your room.",
    "This is the start of <roomName/>.": "This is the start of <roomName/>.",
    "No pinned messages.": "No pinned messages.",
@@ -1526,11 +1532,8 @@
    "Start chat": "Start chat",
    "Rooms": "Rooms",
    "Add room": "Add room",
-    "Create new room": "Create new room",
    "You do not have permissions to create new rooms in this space": "You do not have permissions to create new rooms in this space",
-    "Add existing room": "Add existing room",
    "You do not have permissions to add rooms to this space": "You do not have permissions to add rooms to this space",
-    "Explore space rooms": "Explore space rooms",
    "Explore community rooms": "Explore community rooms",
    "Explore public rooms": "Explore public rooms",
    "Low priority": "Low priority",
@@ -1542,6 +1545,7 @@
    "Can't see what you’re looking for?": "Can't see what you’re looking for?",
    "Start a new chat": "Start a new chat",
    "Explore all public rooms": "Explore all public rooms",
+    "Quick actions": "Quick actions",
    "Use the + to make a new room or explore existing ones below": "Use the + to make a new room or explore existing ones below",
    "%(count)s results|other": "%(count)s results",
    "%(count)s results|one": "%(count)s result",
@@ -1638,6 +1642,8 @@
    "Invited by %(sender)s": "Invited by %(sender)s",
    "Jump to first unread message.": "Jump to first unread message.",
    "Mark all as read": "Mark all as read",
+    "Record a voice message": "Record a voice message",
+    "Stop & send recording": "Stop & send recording",
    "Error updating main address": "Error updating main address",
    "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.",
    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.",
@@ -1676,7 +1682,7 @@
    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.",
    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.",
    "Back": "Back",
-    "Waiting for you to accept on your other session…": "Waiting for you to accept on your other session…",
+    "Accept on your other login…": "Accept on your other login…",
    "Waiting for %(displayName)s to accept…": "Waiting for %(displayName)s to accept…",
    "Accepting…": "Accepting…",
    "Start Verification": "Start Verification",
@@ -1908,6 +1914,8 @@
    "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.",
    "collapse": "collapse",
    "expand": "expand",
+    "%(count)s people you know have already joined|other": "%(count)s people you know have already joined",
+    "%(count)s people you know have already joined|one": "%(count)s person you know has already joined",
    "You cannot delete this image. (%(code)s)": "You cannot delete this image. (%(code)s)",
    "Uploaded on %(date)s by %(user)s": "Uploaded on %(date)s by %(user)s",
    "Rotate Left": "Rotate Left",
@@ -2003,14 +2011,13 @@
    "%(networkName)s rooms": "%(networkName)s rooms",
    "Matrix rooms": "Matrix rooms",
    "Space selection": "Space selection",
-    "Add existing spaces/rooms": "Add existing spaces/rooms",
+    "Add existing rooms": "Add existing rooms",
    "Filter your rooms and spaces": "Filter your rooms and spaces",
    "Spaces": "Spaces",
    "Don't want to add an existing room?": "Don't want to add an existing room?",
    "Create a new room": "Create a new room",
-    "Applying...": "Applying...",
-    "Apply": "Apply",
    "Failed to add rooms to space": "Failed to add rooms to space",
+    "Adding...": "Adding...",
    "Matrix ID": "Matrix ID",
    "Matrix Room ID": "Matrix Room ID",
    "email address": "email address",
@@ -2186,7 +2193,7 @@
    "Click the button below to confirm your identity.": "Click the button below to confirm your identity.",
    "Invite by email": "Invite by email",
    "Failed to invite the following users to chat: %(csvUsers)s": "Failed to invite the following users to chat: %(csvUsers)s",
-    "We couldn't create your DM. Please check the users you want to invite and try again.": "We couldn't create your DM. Please check the users you want to invite and try again.",
+    "We couldn't create your DM.": "We couldn't create your DM.",
    "Something went wrong trying to invite the users.": "Something went wrong trying to invite the users.",
    "We couldn't invite those users. Please check the users you want to invite and try again.": "We couldn't invite those users. Please check the users you want to invite and try again.",
    "A call can only be transferred to a single user.": "A call can only be transferred to a single user.",
@@ -2202,13 +2209,13 @@
    "Start a conversation with someone using their name or username (like <userId/>).": "Start a conversation with someone using their name or username (like <userId/>).",
    "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>": "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>",
    "Go": "Go",
-    "Invite to %(spaceName)s": "Invite to %(spaceName)s",
    "Unnamed Space": "Unnamed Space",
    "Invite to %(roomName)s": "Invite to %(roomName)s",
    "Invite someone using their name, email address, username (like <userId/>) or <a>share this space</a>.": "Invite someone using their name, email address, username (like <userId/>) or <a>share this space</a>.",
    "Invite someone using their name, username (like <userId/>) or <a>share this space</a>.": "Invite someone using their name, username (like <userId/>) or <a>share this space</a>.",
    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.",
    "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.": "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.",
+    "Invited people will be able to read old messages.": "Invited people will be able to read old messages.",
    "Transfer": "Transfer",
    "Consult first": "Consult first",
    "a new master key signature": "a new master key signature",
@@ -2351,7 +2358,7 @@
    "Upload %(count)s other files|one": "Upload %(count)s other file",
    "Cancel All": "Cancel All",
    "Upload Error": "Upload Error",
-    "Verify other session": "Verify other session",
+    "Verify other login": "Verify other login",
    "Verification Request": "Verification Request",
    "Approve widget permissions": "Approve widget permissions",
    "This widget would like to:": "This widget would like to:",
@@ -2433,6 +2440,7 @@
    "Revoke permissions": "Revoke permissions",
    "Move left": "Move left",
    "Move right": "Move right",
+    "Avatar": "Avatar",
    "This room is public": "This room is public",
    "Away": "Away",
    "User Status": "User Status",
@@ -2552,7 +2560,7 @@
    "Review terms and conditions": "Review terms and conditions",
    "Old cryptography data detected": "Old cryptography data detected",
    "Data from an older version of %(brand)s has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Data from an older version of %(brand)s has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.",
-    "Self-verification request": "Self-verification request",
+    "Verification requested": "Verification requested",
    "Logout": "Logout",
    "%(creator)s created this DM.": "%(creator)s created this DM.",
    "%(creator)s created and configured the room.": "%(creator)s created and configured the room.",
@@ -2610,7 +2618,6 @@
    "Drop file here to upload": "Drop file here to upload",
    "You have %(count)s unread notifications in a prior version of this room.|other": "You have %(count)s unread notifications in a prior version of this room.",
    "You have %(count)s unread notifications in a prior version of this room.|one": "You have %(count)s unread notification in a prior version of this room.",
-    "Open": "Open",
    "You don't have permission": "You don't have permission",
    "%(count)s members|other": "%(count)s members",
    "%(count)s members|one": "%(count)s member",
@@ -2618,7 +2625,6 @@
    "%(count)s rooms|one": "%(count)s room",
    "This room is suggested as a good one to join": "This room is suggested as a good one to join",
    "Suggested": "Suggested",
-    "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.": "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.",
    "%(count)s rooms and %(numSpaces)s spaces|other": "%(count)s rooms and %(numSpaces)s spaces",
    "%(count)s rooms and %(numSpaces)s spaces|one": "%(count)s room and %(numSpaces)s spaces",
    "%(count)s rooms and 1 space|other": "%(count)s rooms and 1 space",
@@ -2629,16 +2635,14 @@
    "Mark as suggested": "Mark as suggested",
    "No results found": "No results found",
    "You may want to try a different search or check for typos.": "You may want to try a different search or check for typos.",
-    "Create room": "Create room",
+    "Your server does not support showing space hierarchies.": "Your server does not support showing space hierarchies.",
    "Search names and description": "Search names and description",
-    "<inviter/> invites you": "<inviter/> invites you",
+    "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.": "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.",
+    "Create room": "Create room",
    "Public space": "Public space",
    "Private space": "Private space",
+    "<inviter/> invites you": "<inviter/> invites you",
    "Add existing rooms & spaces": "Add existing rooms & spaces",
-    "Default Rooms": "Default Rooms",
-    "Your server does not support showing space hierarchies.": "Your server does not support showing space hierarchies.",
-    "Your public space <name/>": "Your public space <name/>",
-    "Your private space <name/>": "Your private space <name/>",
    "Welcome to <name/>": "Welcome to <name/>",
    "Random": "Random",
    "Support": "Support",
@@ -2660,8 +2664,9 @@
    "Invite your teammates": "Invite your teammates",
    "Make sure the right people have access. You can invite more later.": "Make sure the right people have access. You can invite more later.",
    "Invite by username": "Invite by username",
-    "What are some things you want to discuss?": "What are some things you want to discuss?",
-    "Let's create a room for each of them. You can add more later too, including already existing ones.": "Let's create a room for each of them. You can add more later too, including already existing ones.",
+    "What are some things you want to discuss in %(spaceName)s?": "What are some things you want to discuss in %(spaceName)s?",
+    "Let's create a room for each of them.": "Let's create a room for each of them.",
+    "You can add more later too, including already existing ones.": "You can add more later too, including already existing ones.",
    "What projects are you working on?": "What projects are you working on?",
    "We'll create rooms for each of them. You can add more later too, including already existing ones.": "We'll create rooms for each of them. You can add more later too, including already existing ones.",
    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.",
@@ -2742,11 +2747,11 @@
    "Decide where your account is hosted": "Decide where your account is hosted",
    "Use Security Key or Phrase": "Use Security Key or Phrase",
    "Use Security Key": "Use Security Key",
-    "Verify with another session": "Verify with another session",
-    "Verify this login to access your encrypted messages and prove to others that this login is really you.": "Verify this login to access your encrypted messages and prove to others that this login is really you.",
+    "Use another login": "Use another login",
+    "Verify your identity to access encrypted messages and prove your identity to others.": "Verify your identity to access encrypted messages and prove your identity to others.",
    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.",
    "Your new session is now verified. Other users will see it as trusted.": "Your new session is now verified. Other users will see it as trusted.",
-    "Without completing security on this session, it won’t have access to encrypted messages.": "Without completing security on this session, it won’t have access to encrypted messages.",
+    "Without verifying, you won’t have access to all your messages and may appear as untrusted to others.": "Without verifying, you won’t have access to all your messages and may appear as untrusted to others.",
    "Failed to re-authenticate due to a homeserver problem": "Failed to re-authenticate due to a homeserver problem",
    "Incorrect password": "Incorrect password",
    "Failed to re-authenticate": "Failed to re-authenticate",