Merge branch 'develop' into florianduros/tooltip-update

src/components/views/messages/DecryptionFailureBody.tsx

@@ -22,8 +22,8 @@ import { IBodyProps } from "./IBodyProps";
 
 function getErrorMessage(mxEvent?: MatrixEvent): string {
     return mxEvent?.isEncryptedDisabledForUnverifiedDevices
-        ? _t("timeline|decryption_failure_blocked")
-        : _t("threads|unable_to_decrypt");
+        ? _t("timeline|decryption_failure|blocked")
+        : _t("timeline|decryption_failure|unable_to_decrypt");
 }
 
 // A placeholder element for messages that could not be decrypted

src/components/views/rooms/ThreadSummary.tsx

@@ -120,9 +120,11 @@ export const ThreadMessagePreview: React.FC<IPreviewProps> = ({ thread, showDisp
             {lastReply.isDecryptionFailure() ? (
                 <div
                     className="mx_ThreadSummary_content mx_DecryptionFailureBody"
-                    title={_t("threads|unable_to_decrypt")}
+                    title={_t("timeline|decryption_failure|unable_to_decrypt")}
                 >
-                    <span className="mx_ThreadSummary_message-preview">{_t("threads|unable_to_decrypt")}</span>
+                    <span className="mx_ThreadSummary_message-preview">
+                        {_t("timeline|decryption_failure|unable_to_decrypt")}
+                    </span>
                 </div>
             ) : (
                 <div className="mx_ThreadSummary_content" title={preview}>

src/i18n/strings/en_EN.json

@@ -3162,8 +3162,7 @@
         "my_threads_description": "Shows all threads you've participated in",
         "open_thread": "Open thread",
         "show_all_threads": "Show all threads",
-        "show_thread_filter": "Show:",
-        "unable_to_decrypt": "Unable to decrypt message"
+        "show_thread_filter": "Show:"
     },
     "threads_activity_centre": {
         "header": "Threads activity",
@@ -3213,7 +3212,10 @@
         },
         "creation_summary_dm": "%(creator)s created this DM.",
         "creation_summary_room": "%(creator)s created and configured the room.",
-        "decryption_failure_blocked": "The sender has blocked you from receiving this message",
+        "decryption_failure": {
+            "blocked": "The sender has blocked you from receiving this message",
+            "unable_to_decrypt": "Unable to decrypt message"
+        },
         "disambiguated_profile": "%(displayName)s (%(matrixId)s)",
         "download_action_decrypting": "Decrypting",
         "download_action_downloading": "Downloading",