Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into pr/only-member-warning

2021-04-19 12:01:32 +01:00
parent 71d5f03a25 50dd9da913
commit c953b1b6bb
153 changed files with 4650 additions and 1535 deletions
@@ -786,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.",
+    "Show options to enable 'Do not disturb' mode": "Show options to enable 'Do not disturb' mode",
    "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.",
@@ -800,7 +801,6 @@
    "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",
@@ -881,6 +881,8 @@
    "sends fireworks": "sends fireworks",
    "Sends the given message with snowfall": "Sends the given message with snowfall",
    "sends snowfall": "sends snowfall",
+    "unknown person": "unknown person",
+    "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>": "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>",
    "You held the call <a>Switch</a>": "You held the call <a>Switch</a>",
    "You held the call <a>Resume</a>": "You held the call <a>Resume</a>",
    "%(peerName)s held the call": "%(peerName)s held the call",
@@ -1084,7 +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 initialisation failed": "Message search initialisation failed",
+    "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.",
@@ -1359,6 +1361,7 @@
    "Change topic": "Change topic",
    "Upgrade the room": "Upgrade the room",
    "Enable room encryption": "Enable room encryption",
+    "Change server ACLs": "Change server ACLs",
    "Modify widgets": "Modify widgets",
    "Failed to unban": "Failed to unban",
    "Unban": "Unban",
@@ -1913,15 +1916,13 @@
    "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",
-    "Rotate counter-clockwise": "Rotate counter-clockwise",
    "Rotate Right": "Rotate Right",
-    "Rotate clockwise": "Rotate clockwise",
-    "Download this file": "Download this file",
+    "Rotate Left": "Rotate Left",
+    "Zoom out": "Zoom out",
+    "Zoom in": "Zoom in",
+    "Download": "Download",
    "Information": "Information",
+    "View message": "View message",
    "Language Dropdown": "Language Dropdown",
    "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)sjoined %(count)s times",
@@ -2215,6 +2216,7 @@
    "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",
    "a new cross-signing key signature": "a new cross-signing key signature",
    "a device cross-signing signature": "a device cross-signing signature",
@@ -2305,6 +2307,10 @@
    "Use your preferred Matrix homeserver if you have one, or host your own.": "Use your preferred Matrix homeserver if you have one, or host your own.",
    "Learn more": "Learn more",
    "About homeservers": "About homeservers",
+    "Reset event store?": "Reset event store?",
+    "You most likely do not want to reset your event index store": "You most likely do not want to reset your event index store",
+    "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few momentswhilst the index is recreated": "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few momentswhilst the index is recreated",
+    "Reset event store": "Reset event store",
    "Sign out and remove encryption keys?": "Sign out and remove encryption keys?",
    "Clear Storage and Sign Out": "Clear Storage and Sign Out",
    "Send Logs": "Send Logs",
@@ -2369,6 +2375,10 @@
    "Looks good!": "Looks good!",
    "Wrong Security Key": "Wrong Security Key",
    "Invalid Security Key": "Invalid Security Key",
+    "Forgotten or lost all recovery methods? <a>Reset all</a>": "Forgotten or lost all recovery methods? <a>Reset all</a>",
+    "Reset everything": "Reset everything",
+    "Only do this if you have no other device to complete verification with.": "Only do this if you have no other device to complete verification with.",
+    "If you reset everything, you will restart with no trusted sessions, no trusted users, and might not be able to see past messages.": "If you reset everything, you will restart with no trusted sessions, no trusted users, and might not be able to see past messages.",
    "Security Phrase": "Security Phrase",
    "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "Unable to access secret storage. Please verify that you entered the correct Security Phrase.",
    "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "Enter your Security Phrase or <button>Use your Security Key</button> to continue.",
@@ -2694,6 +2704,7 @@
    "Failed to send email": "Failed to send email",
    "The email address linked to your account must be entered.": "The email address linked to your account must be entered.",
    "A new password must be entered.": "A new password must be entered.",
+    "Please choose a strong password": "Please choose a strong password",
    "New passwords must match each other.": "New passwords must match each other.",
    "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.",
    "New Password": "New Password",
@@ -2788,7 +2799,6 @@
    "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.",
    "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Keep a copy of it somewhere secure, like a password manager or even a safe.",
    "Your Security Key": "Your Security Key",
-    "Download": "Download",
    "Your Security Key has been <b>copied to your clipboard</b>, paste it to:": "Your Security Key has been <b>copied to your clipboard</b>, paste it to:",
    "Your Security Key is in your <b>Downloads</b> folder.": "Your Security Key is in your <b>Downloads</b> folder.",
    "<b>Print it</b> and store it somewhere safe": "<b>Print it</b> and store it somewhere safe",