Merge branch 'develop' into feed

src/@types/global.d.ts

@@ -39,7 +39,7 @@ import {ModalWidgetStore} from "../stores/ModalWidgetStore";
 import { WidgetLayoutStore } from "../stores/widgets/WidgetLayoutStore";
 import VoipUserMapper from "../VoipUserMapper";
 import {SpaceStoreClass} from "../stores/SpaceStore";
-import {VoiceRecorder} from "../voice/VoiceRecorder";
+import {VoiceRecording} from "../voice/VoiceRecording";
 
 declare global {
     interface Window {
@@ -71,7 +71,7 @@ declare global {
         mxModalWidgetStore: ModalWidgetStore;
         mxVoipUserMapper: VoipUserMapper;
         mxSpaceStore: SpaceStoreClass;
-        mxVoiceRecorder: typeof VoiceRecorder;
+        mxVoiceRecorder: typeof VoiceRecording;
     }
 
     interface Document {
@@ -139,4 +139,30 @@ declare global {
         // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error/columnNumber
         columnNumber?: number;
     }
+
+    // https://github.com/microsoft/TypeScript/issues/28308#issuecomment-650802278
+    interface AudioWorkletProcessor {
+        readonly port: MessagePort;
+        process(
+            inputs: Float32Array[][],
+            outputs: Float32Array[][],
+            parameters: Record<string, Float32Array>
+        ): boolean;
+    }
+
+    // https://github.com/microsoft/TypeScript/issues/28308#issuecomment-650802278
+    const AudioWorkletProcessor: {
+        prototype: AudioWorkletProcessor;
+        new (options?: AudioWorkletNodeOptions): AudioWorkletProcessor;
+    };
+
+    // https://github.com/microsoft/TypeScript/issues/28308#issuecomment-650802278
+    function registerProcessor(
+        name: string,
+        processorCtor: (new (
+            options?: AudioWorkletNodeOptions
+        ) => AudioWorkletProcessor) & {
+            parameterDescriptors?: AudioParamDescriptor[];
+        }
+    );
 }

src/DateUtils.ts

@@ -97,7 +97,7 @@ export function formatFullDateNoTime(date: Date): string {
     });
 }
 
-export function formatFullDate(date: Date, showTwelveHour = false): string {
+export function formatFullDate(date: Date, showTwelveHour = false, showSeconds = true): string {
     const days = getDaysArray();
     const months = getMonthsArray();
     return _t('%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s', {
@@ -105,7 +105,7 @@ export function formatFullDate(date: Date, showTwelveHour = false): string {
         monthName: months[date.getMonth()],
         day: date.getDate(),
         fullYear: date.getFullYear(),
-        time: formatFullTime(date, showTwelveHour),
+        time: showSeconds ? formatFullTime(date, showTwelveHour) : formatTime(date, showTwelveHour),
     });
 }
 

src/Modal.tsx

@@ -36,6 +36,7 @@ export interface IModal<T extends any[]> {
     onBeforeClose?(reason?: string): Promise<boolean>;
     onFinished(...args: T): void;
     close(...args: T): void;
+    hidden?: boolean;
 }
 
 export interface IHandle<T extends any[]> {
@@ -93,6 +94,12 @@ export class ModalManager {
         return container;
     }
 
+    public toggleCurrentDialogVisibility() {
+        const modal = this.getCurrentModal();
+        if (!modal) return;
+        modal.hidden = !modal.hidden;
+    }
+
     public hasDialogs() {
         return this.priorityModal || this.staticModal || this.modals.length > 0;
     }
@@ -364,7 +371,7 @@ export class ModalManager {
         }
 
         const modal = this.getCurrentModal();
-        if (modal !== this.staticModal) {
+        if (modal !== this.staticModal && !modal.hidden) {
             const classes = classNames("mx_Dialog_wrapper", modal.className, {
                 mx_Dialog_wrapperWithStaticUnder: this.staticModal,
             });

src/NodeAnimator.js

@@ -1,16 +1,15 @@
 import React from "react";
 import ReactDom from "react-dom";
-import Velocity from "velocity-animate";
 import PropTypes from 'prop-types';
 
 /**
- * The Velociraptor contains components and animates transitions with velocity.
+ * The NodeAnimator contains components and animates transitions.
  * It will only pick up direct changes to properties ('left', currently), and so
  * will not work for animating positional changes where the position is implicit
  * from DOM order. This makes it a lot simpler and lighter: if you need fully
  * automatic positional animation, look at react-shuffle or similar libraries.
  */
-export default class Velociraptor extends React.Component {
+export default class NodeAnimator extends React.Component {
     static propTypes = {
         // either a list of child nodes, or a single child.
         children: PropTypes.any,
@@ -20,14 +19,10 @@ export default class Velociraptor extends React.Component {
 
         // a list of state objects to apply to each child node in turn
         startStyles: PropTypes.array,
-
-        // a list of transition options from the corresponding startStyle
-        enterTransitionOpts: PropTypes.array,
     };
 
     static defaultProps = {
         startStyles: [],
-        enterTransitionOpts: [],
     };
 
     constructor(props) {
@@ -41,6 +36,18 @@ export default class Velociraptor extends React.Component {
         this._updateChildren(this.props.children);
     }
 
+    /**
+     *
+     * @param {HTMLElement} node element to apply styles to
+     * @param {object} styles a key/value pair of CSS properties
+     * @returns {void}
+     */
+    _applyStyles(node, styles) {
+        Object.entries(styles).forEach(([property, value]) => {
+            node.style[property] = value;
+        });
+    }
+
     _updateChildren(newChildren) {
         const oldChildren = this.children || {};
         this.children = {};
@@ -50,17 +57,8 @@ export default class Velociraptor extends React.Component {
                 const oldNode = ReactDom.findDOMNode(this.nodes[old.key]);
 
                 if (oldNode && oldNode.style.left !== c.props.style.left) {
-                    Velocity(oldNode, { left: c.props.style.left }, this.props.transition).then(() => {
-                        // special case visibility because it's nonsensical to animate an invisible element
-                        // so we always hidden->visible pre-transition and visible->hidden after
-                        if (oldNode.style.visibility === 'visible' && c.props.style.visibility === 'hidden') {
-                            oldNode.style.visibility = c.props.style.visibility;
-                        }
-                    });
-                    //console.log("translation: "+oldNode.style.left+" -> "+c.props.style.left);
-                }
-                if (oldNode && oldNode.style.visibility === 'hidden' && c.props.style.visibility === 'visible') {
-                    oldNode.style.visibility = c.props.style.visibility;
+                    this._applyStyles(oldNode, { left: c.props.style.left });
+                    // console.log("translation: "+oldNode.style.left+" -> "+c.props.style.left);
                 }
                 // clone the old element with the props (and children) of the new element
                 // so prop updates are still received by the children.
@@ -94,33 +92,22 @@ export default class Velociraptor extends React.Component {
             this.props.startStyles.length > 0
         ) {
             const startStyles = this.props.startStyles;
-            const transitionOpts = this.props.enterTransitionOpts;
             const domNode = ReactDom.findDOMNode(node);
             // start from startStyle 1: 0 is the one we gave it
             // to start with, so now we animate 1 etc.
-            for (var i = 1; i < startStyles.length; ++i) {
-                Velocity(domNode, startStyles[i], transitionOpts[i-1]);
-                /*
-                console.log("start:",
-                            JSON.stringify(transitionOpts[i-1]),
-                            "->",
-                            JSON.stringify(startStyles[i]),
-                            );
-                */
+            for (let i = 1; i < startStyles.length; ++i) {
+                this._applyStyles(domNode, startStyles[i]);
+                // console.log("start:"
+                //             JSON.stringify(startStyles[i]),
+                //             );
             }
 
             // and then we animate to the resting state
-            Velocity(domNode, restingStyle,
-                transitionOpts[i-1])
-                .then(() => {
-                    // once we've reached the resting state, hide the element if
-                    // appropriate
-                    domNode.style.visibility = restingStyle.visibility;
-                });
+            setTimeout(() => {
+                this._applyStyles(domNode, restingStyle);
+            }, 0);
 
             // console.log("enter:",
-            //             JSON.stringify(transitionOpts[i-1]),
-            //             "->",
             //             JSON.stringify(restingStyle));
         }
         this.nodes[k] = node;
@@ -128,9 +115,7 @@ export default class Velociraptor extends React.Component {
 
     render() {
         return (
-            <span>
-                { Object.values(this.children) }
-            </span>
+            <>{ Object.values(this.children) }</>
         );
     }
 }

src/Notifier.ts

@@ -383,6 +383,10 @@ export const Notifier = {
                 // don't bother notifying as user was recently active in this room
                 return;
             }
+            if (SettingsStore.getValue("doNotDisturb")) {
+                // Don't bother the user if they didn't ask to be bothered
+                return;
+            }
 
             if (this.isEnabled()) {
                 this._displayPopupNotification(ev, room);

src/SlashCommands.tsx

@@ -20,7 +20,7 @@ limitations under the License.
 
 import * as React from 'react';
 
-import { ContentHelpers } from 'matrix-js-sdk';
+import * as ContentHelpers from 'matrix-js-sdk/src/content-helpers';
 import {MatrixClientPeg} from './MatrixClientPeg';
 import dis from './dispatcher/dispatcher';
 import * as sdk from './index';
@@ -1222,4 +1222,5 @@ export function getCommand(input: string) {
             args,
         };
     }
+    return {};
 }

src/TextForEvent.js

@@ -95,9 +95,10 @@ function textForMemberEvent(ev) {
                     senderName,
                     targetName,
                 }) + ' ' + reason;
-            } else {
-                // sender is not target and made the target leave, if not from invite/ban then this is a kick
+            } else if (prevContent.membership === "join") {
                 return _t('%(senderName)s kicked %(targetName)s.', {senderName, targetName}) + ' ' + reason;
+            } else {
+                return "";
             }
     }
 }

src/VelocityBounce.js

@@ -1,17 +0,0 @@
-import Velocity from "velocity-animate";
-
-// courtesy of https://github.com/julianshapiro/velocity/issues/283
-// We only use easeOutBounce (easeInBounce is just sort of nonsensical)
-function bounce( p ) {
-    let pow2;
-    let bounce = 4;
-
-    while ( p < ( ( pow2 = Math.pow( 2, --bounce ) ) - 1 ) / 11 ) {
-        // just sets pow2
-    }
-    return 1 / Math.pow( 4, 3 - bounce ) - 7.5625 * Math.pow( ( pow2 * 3 - 2 ) / 22 - p, 2 );
-}
-
-Velocity.Easings.easeOutBounce = function(p) {
-    return 1 - bounce(1 - p);
-};

src/components/structures/LeftPanel.tsx

@@ -154,7 +154,7 @@ export default class LeftPanel extends React.Component<IProps, IState> {
     private doStickyHeaders(list: HTMLDivElement) {
         const topEdge = list.scrollTop;
         const bottomEdge = list.offsetHeight + list.scrollTop;
-        const sublists = list.querySelectorAll<HTMLDivElement>(".mx_RoomSublist");
+        const sublists = list.querySelectorAll<HTMLDivElement>(".mx_RoomSublist:not(.mx_RoomSublist_hidden)");
 
         const headerRightMargin = 15; // calculated from margins and widths to align with non-sticky tiles
         const headerStickyWidth = list.clientWidth - headerRightMargin;

src/components/structures/MatrixChat.tsx

@@ -84,6 +84,7 @@ import {replaceableComponent} from "../../utils/replaceableComponent";
 import RoomListStore from "../../stores/room-list/RoomListStore";
 import {RoomUpdateCause} from "../../stores/room-list/models";
 import defaultDispatcher from "../../dispatcher/dispatcher";
+import SecurityCustomisations from "../../customisations/Security";
 
 /** constants for MatrixChat.state.view */
 export enum Views {
@@ -395,7 +396,11 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
 
         const crossSigningIsSetUp = cli.getStoredCrossSigningForUser(cli.getUserId());
         if (crossSigningIsSetUp) {
-            this.setStateForNewView({ view: Views.COMPLETE_SECURITY });
+            if (SecurityCustomisations.SHOW_ENCRYPTION_SETUP_UI === false) {
+                this.onLoggedIn();
+            } else {
+                this.setStateForNewView({view: Views.COMPLETE_SECURITY});
+            }
         } else if (await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing")) {
             this.setStateForNewView({ view: Views.E2E_SETUP });
         } else {
@@ -1091,8 +1096,22 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         const roomToLeave = MatrixClientPeg.get().getRoom(roomId);
         const isSpace = roomToLeave?.isSpaceRoom();
         // Show a warning if there are additional complications.
-        const joinRules = roomToLeave.currentState.getStateEvents('m.room.join_rules', '');
         const warnings = [];
+
+        const memberCount = roomToLeave.currentState.getJoinedMemberCount();
+        if (memberCount === 1) {
+            warnings.push((
+                <span className="warning" key="only_member_warning">
+                    {' '/* Whitespace, otherwise the sentences get smashed together */ }
+                    { _t("You are the only person here. " +
+                        "If you leave, no one will be able to join in the future, including you.") }
+                </span>
+            ));
+
+            return warnings;
+        }
+
+        const joinRules = roomToLeave.currentState.getStateEvents('m.room.join_rules', '');
         if (joinRules) {
             const rule = joinRules.getContent().join_rule;
             if (rule !== "public") {

src/components/structures/MessagePanel.js

@@ -659,6 +659,7 @@ export default class MessagePanel extends React.Component {
                         showReactions={this.props.showReactions}
                         layout={this.props.layout}
                         enableFlair={this.props.enableFlair}
+                        showReadReceipts={this.props.showReadReceipts}
                     />
                 </TileErrorBoundary>
             </li>,

src/components/structures/UserMenu.tsx

@@ -74,6 +74,7 @@ interface IState {
 export default class UserMenu extends React.Component<IProps, IState> {
     private dispatcherRef: string;
     private themeWatcherRef: string;
+    private dndWatcherRef: string;
     private buttonRef: React.RefObject<HTMLButtonElement> = createRef();
     private tagStoreRef: fbEmitter.EventSubscription;
 
@@ -89,6 +90,9 @@ export default class UserMenu extends React.Component<IProps, IState> {
         if (SettingsStore.getValue("feature_spaces")) {
             SpaceStore.instance.on(UPDATE_SELECTED_SPACE, this.onSelectedSpaceUpdate);
         }
+
+        // Force update is the easiest way to trigger the UI update (we don't store state for this)
+        this.dndWatcherRef = SettingsStore.watchSetting("doNotDisturb", null, () => this.forceUpdate());
     }
 
     private get hasHomePage(): boolean {
@@ -103,6 +107,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
 
     public componentWillUnmount() {
         if (this.themeWatcherRef) SettingsStore.unwatchSetting(this.themeWatcherRef);
+        if (this.dndWatcherRef) SettingsStore.unwatchSetting(this.dndWatcherRef);
         if (this.dispatcherRef) defaultDispatcher.unregister(this.dispatcherRef);
         OwnProfileStore.instance.off(UPDATE_EVENT, this.onProfileUpdate);
         this.tagStoreRef.remove();
@@ -288,6 +293,12 @@ export default class UserMenu extends React.Component<IProps, IState> {
         this.setState({contextMenuPosition: null}); // also close the menu
     };
 
+    private onDndToggle = (ev) => {
+        ev.stopPropagation();
+        const current = SettingsStore.getValue("doNotDisturb");
+        SettingsStore.setValue("doNotDisturb", null, SettingLevel.DEVICE, !current);
+    };
+
     private renderContextMenu = (): React.ReactNode => {
         if (!this.state.contextMenuPosition) return null;
 
@@ -534,6 +545,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
                 {/* masked image in CSS */}
             </span>
         );
+        let dnd;
         if (this.state.selectedSpace) {
             name = (
                 <div className="mx_UserMenu_doubleName">
@@ -560,6 +572,16 @@ export default class UserMenu extends React.Component<IProps, IState> {
                 </div>
             );
             isPrototype = true;
+        } else if (SettingsStore.getValue("feature_dnd")) {
+            const isDnd = SettingsStore.getValue("doNotDisturb");
+            dnd = <AccessibleButton
+                onClick={this.onDndToggle}
+                className={classNames({
+                    "mx_UserMenu_dnd": true,
+                    "mx_UserMenu_dnd_noisy": !isDnd,
+                    "mx_UserMenu_dnd_muted": isDnd,
+                })}
+            />;
         }
         if (this.props.isMinimized) {
             name = null;
@@ -595,6 +617,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
                             />
                         </span>
                         {name}
+                        {dnd}
                         {buttons}
                     </div>
                 </ContextMenuButton>

src/components/structures/auth/Registration.tsx

@@ -436,6 +436,8 @@ export default class Registration extends React.Component<IProps, IState> {
             // ok fine, there's still no session: really go to the login page
             this.props.onLoginClick();
         }
+
+        return sessionLoaded;
     };
 
     private renderRegisterComponent() {
@@ -557,7 +559,12 @@ export default class Registration extends React.Component<IProps, IState> {
                             loggedInUserId: this.state.differentLoggedInUserId,
                         },
                     )}</p>
-                    <p><AccessibleButton element="span" className="mx_linkButton" onClick={this.onLoginClickWithCheck}>
+                    <p><AccessibleButton element="span" className="mx_linkButton" onClick={async event => {
+                        const sessionLoaded = await this.onLoginClickWithCheck(event);
+                        if (sessionLoaded) {
+                            dis.dispatch({action: "view_welcome_page"});
+                        }
+                    }}>
                         {_t("Continue with previous account")}
                     </AccessibleButton></p>
                 </div>;

src/components/views/avatars/RoomAvatar.tsx

@@ -129,7 +129,7 @@ export default class RoomAvatar extends React.Component<IProps, IState> {
             name: this.props.room.name,
         };
 
-        Modal.createDialog(ImageView, params, "mx_Dialog_lightbox");
+        Modal.createDialog(ImageView, params, "mx_Dialog_lightbox", null, true);
     };
 
     public render() {

src/components/views/context_menus/MessageContextMenu.js

@@ -52,6 +52,9 @@ export default class MessageContextMenu extends React.Component {
 
         /* callback called when the menu is dismissed */
         onFinished: PropTypes.func,
+
+        /* if the menu is inside a dialog, we sometimes need to close that dialog after click (forwarding) */
+        onCloseDialog: PropTypes.func,
     };
 
     state = {
@@ -141,6 +144,7 @@ export default class MessageContextMenu extends React.Component {
 
                 const cli = MatrixClientPeg.get();
                 try {
+                    if (this.props.onCloseDialog) this.props.onCloseDialog();
                     await cli.redactEvent(
                         this.props.mxEvent.getRoomId(),
                         this.props.mxEvent.getId(),
@@ -190,6 +194,7 @@ export default class MessageContextMenu extends React.Component {
     };
 
     onForwardClick = () => {
+        if (this.props.onCloseDialog) this.props.onCloseDialog();
         dis.dispatch({
             action: 'forward_event',
             event: this.props.mxEvent,

src/components/views/dialogs/AddExistingToSpaceDialog.tsx

@@ -57,21 +57,23 @@ const AddExistingToSpaceDialog: React.FC<IProps> = ({ matrixClient: cli, space,
 
     const existingSubspaces = SpaceStore.instance.getChildSpaces(space.roomId);
     const existingSubspacesSet = new Set(existingSubspaces);
-    const spaces = SpaceStore.instance.getSpaces().filter(s => {
-        return !existingSubspacesSet.has(s) // not already in space
-            && space !== s // not the top-level space
-            && selectedSpace !== s // not the selected space
-            && s.name.toLowerCase().includes(lcQuery); // contains query
-    });
+    const existingRoomsSet = new Set(SpaceStore.instance.getChildRooms(space.roomId));
 
-    const existingRooms = SpaceStore.instance.getChildRooms(space.roomId);
-    const existingRoomsSet = new Set(existingRooms);
-    const rooms = cli.getVisibleRooms().filter(room => {
-        return !existingRoomsSet.has(room) // not already in space
-            && !room.isSpaceRoom() // not a space itself
-            && room.name.toLowerCase().includes(lcQuery) // contains query
-            && !DMRoomMap.shared().getUserIdForRoomId(room.roomId); // not a DM
-    });
+    const joinRule = selectedSpace.getJoinRule();
+    const [spaces, rooms, dms] = cli.getVisibleRooms().reduce((arr, room) => {
+        if (room.getMyMembership() !== "join") return arr;
+        if (!room.name.toLowerCase().includes(lcQuery)) return arr;
+
+        if (room.isSpaceRoom()) {
+            if (room !== space && room !== selectedSpace && !existingSubspacesSet.has(room)) {
+                arr[0].push(room);
+            }
+        } else if (!existingRoomsSet.has(room) && joinRule !== "public") {
+            // Only show DMs for non-public spaces as they make very little sense in spaces other than "Just Me" ones.
+            arr[DMRoomMap.shared().getUserIdForRoomId(room.roomId) ? 2 : 1].push(room);
+        }
+        return arr;
+    }, [[], [], []]);
 
     const [busy, setBusy] = useState(false);
     const [error, setError] = useState("");
@@ -172,7 +174,28 @@ const AddExistingToSpaceDialog: React.FC<IProps> = ({ matrixClient: cli, space,
                 </div>
             ) : null }
 
-            { spaces.length + rooms.length < 1 ? <span className="mx_AddExistingToSpaceDialog_noResults">
+            { dms.length > 0 ? (
+                <div className="mx_AddExistingToSpaceDialog_section">
+                    <h3>{ _t("Direct Messages") }</h3>
+                    { dms.map(space => {
+                        return <Entry
+                            key={space.roomId}
+                            room={space}
+                            checked={selectedToAdd.has(space)}
+                            onChange={(checked) => {
+                                if (checked) {
+                                    selectedToAdd.add(space);
+                                } else {
+                                    selectedToAdd.delete(space);
+                                }
+                                setSelectedToAdd(new Set(selectedToAdd));
+                            }}
+                        />;
+                    }) }
+                </div>
+            ) : null }
+
+            { spaces.length + rooms.length + dms.length < 1 ? <span className="mx_AddExistingToSpaceDialog_noResults">
                 { _t("No results") }
             </span> : undefined }
         </AutoHideScrollbar>

src/components/views/dialogs/InviteDialog.tsx

@@ -31,6 +31,7 @@ import Modal from "../../../Modal";
 import {humanizeTime} from "../../../utils/humanize";
 import createRoom, {
     canEncryptToAllUsers, ensureDMExists, findDMForUser, privateShouldBeEncrypted,
+    IInvite3PID,
 } from "../../../createRoom";
 import {inviteMultipleToRoom, showCommunityInviteDialog} from "../../../RoomInvite";
 import {Key} from "../../../Keyboard";
@@ -618,13 +619,14 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
 
     _startDm = async () => {
         this.setState({busy: true});
+        const client = MatrixClientPeg.get();
         const targets = this._convertFilter();
         const targetIds = targets.map(t => t.userId);
 
         // Check if there is already a DM with these people and reuse it if possible.
         let existingRoom: Room;
         if (targetIds.length === 1) {
-            existingRoom = findDMForUser(MatrixClientPeg.get(), targetIds[0]);
+            existingRoom = findDMForUser(client, targetIds[0]);
         } else {
             existingRoom = DMRoomMap.shared().getDMRoomForIdentifiers(targetIds);
         }
@@ -646,7 +648,6 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
             // If so, enable encryption in the new room.
             const has3PidMembers = targets.some(t => t instanceof ThreepidMember);
             if (!has3PidMembers) {
-                const client = MatrixClientPeg.get();
                 const allHaveDeviceKeys = await canEncryptToAllUsers(client, targetIds);
                 if (allHaveDeviceKeys) {
                     createRoomOptions.encryption = true;
@@ -656,35 +657,41 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
 
         // Check if it's a traditional DM and create the room if required.
         // TODO: [Canonical DMs] Remove this check and instead just create the multi-person DM
-        let createRoomPromise = Promise.resolve(null) as Promise<string | null | boolean>;
-        const isSelf = targetIds.length === 1 && targetIds[0] === MatrixClientPeg.get().getUserId();
-        if (targetIds.length === 1 && !isSelf) {
-            createRoomOptions.dmUserId = targetIds[0];
-            createRoomPromise = createRoom(createRoomOptions);
-        } else if (isSelf) {
-            createRoomPromise = createRoom(createRoomOptions);
-        } else {
-            // Create a boring room and try to invite the targets manually.
-            createRoomPromise = createRoom(createRoomOptions).then(roomId => {
-                return inviteMultipleToRoom(roomId, targetIds);
-            }).then(result => {
-                if (this._shouldAbortAfterInviteError(result)) {
-                    return true; // abort
-                }
-            });
-        }
+        try {
+            const isSelf = targetIds.length === 1 && targetIds[0] === client.getUserId();
+            if (targetIds.length === 1 && !isSelf) {
+                createRoomOptions.dmUserId = targetIds[0];
+            }
 
-        // the createRoom call will show the room for us, so we don't need to worry about that.
-        createRoomPromise.then(abort => {
-            if (abort === true) return; // only abort on true booleans, not roomIds or something
+            if (targetIds.length > 1) {
+                createRoomOptions.createOpts = targetIds.reduce(
+                    (roomOptions, address) => {
+                        const type = getAddressType(address);
+                        if (type === 'email') {
+                            const invite: IInvite3PID = {
+                                id_server: client.getIdentityServerUrl(true),
+                                medium: 'email',
+                                address,
+                            };
+                            roomOptions.invite_3pid.push(invite);
+                        } else if (type === 'mx-user-id') {
+                            roomOptions.invite.push(address);
+                        }
+                        return roomOptions;
+                    },
+                    { invite: [], invite_3pid: [] },
+                )
+            }
+
+            await createRoom(createRoomOptions);
             this.props.onFinished();
-        }).catch(err => {
+        } catch (err) {
             console.error(err);
             this.setState({
                 busy: false,
                 errorText: _t("We couldn't create your DM."),
             });
-        });
+        }
     };
 
     _inviteUsers = async () => {
@@ -712,8 +719,7 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
                 this.props.onFinished();
             }
 
-            if (cli.isRoomEncrypted(this.props.roomId) &&
-                SettingsStore.getValue("feature_room_history_key_sharing")) {
+            if (cli.isRoomEncrypted(this.props.roomId)) {
                 const visibilityEvent = room.currentState.getStateEvents(
                     "m.room.history_visibility", "",
                 );
@@ -1344,8 +1350,7 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
             buttonText = _t("Invite");
             goButtonFn = this._inviteUsers;
 
-            if (SettingsStore.getValue("feature_room_history_key_sharing") &&
-                cli.isRoomEncrypted(this.props.roomId)) {
+            if (cli.isRoomEncrypted(this.props.roomId)) {
                 const room = cli.getRoom(this.props.roomId);
                 const visibilityEvent = room.currentState.getStateEvents(
                     "m.room.history_visibility", "",

src/components/views/dialogs/SeshatResetDialog.tsx

@@ -36,7 +36,7 @@ export default class SeshatResetDialog extends React.PureComponent<IDialogProps>
                         {_t("You most likely do not want to reset your event index store")}
                         <br />
                         {_t("If you do, please note that none of your messages will be deleted, " +
-                            "but the search experience might be degraded for a few moments" +
+                            "but the search experience might be degraded for a few moments " +
                             "whilst the index is recreated",
                         )}
                     </p>

src/components/views/dialogs/security/AccessSecretStorageDialog.tsx

@@ -25,6 +25,8 @@ import Field from '../../elements/Field';
 import AccessibleButton from '../../elements/AccessibleButton';
 import {_t} from '../../../../languageHandler';
 import {IDialogProps} from "../IDialogProps";
+import {accessSecretStorage} from "../../../../SecurityManager";
+import Modal from "../../../../Modal";
 
 // Maximum acceptable size of a key file. It's 59 characters including the spaces we encode,
 // so this should be plenty and allow for people putting extra whitespace in the file because
@@ -47,6 +49,7 @@ interface IState {
     forceRecoveryKey: boolean;
     passPhrase: string;
     keyMatches: boolean | null;
+    resetting: boolean;
 }
 
 /*
@@ -66,10 +69,14 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
             forceRecoveryKey: false,
             passPhrase: '',
             keyMatches: null,
+            resetting: false,
         };
     }
 
     private onCancel = () => {
+        if (this.state.resetting) {
+            this.setState({resetting: false});
+        }
         this.props.onFinished(false);
     };
 
@@ -201,6 +208,55 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
         });
     };
 
+    private onResetAllClick = (ev: React.MouseEvent<HTMLAnchorElement>) => {
+        ev.preventDefault();
+        this.setState({resetting: true});
+    };
+
+    private onConfirmResetAllClick = async () => {
+        // Hide ourselves so the user can interact with the reset dialogs.
+        // We don't conclude the promise chain (onFinished) yet to avoid confusing
+        // any upstream code flows.
+        //
+        // Note: this will unmount us, so don't call `setState` or anything in the
+        // rest of this function.
+        Modal.toggleCurrentDialogVisibility();
+
+        try {
+            // Force reset secret storage (which resets the key backup)
+            await accessSecretStorage(async () => {
+                // Now reset cross-signing so everything Just Works™ again.
+                const cli = MatrixClientPeg.get();
+                await cli.bootstrapCrossSigning({
+                    authUploadDeviceSigningKeys: async (makeRequest) => {
+                        // XXX: Making this an import breaks the app.
+                        const InteractiveAuthDialog = sdk.getComponent("views.dialogs.InteractiveAuthDialog");
+                        const {finished} = Modal.createTrackedDialog(
+                            'Cross-signing keys dialog', '', InteractiveAuthDialog,
+                            {
+                                title: _t("Setting up keys"),
+                                matrixClient: cli,
+                                makeRequest,
+                            },
+                        );
+                        const [confirmed] = await finished;
+                        if (!confirmed) {
+                            throw new Error("Cross-signing key upload auth canceled");
+                        }
+                    },
+                    setupNewCrossSigning: true,
+                });
+
+                // Now we can indicate that the user is done pressing buttons, finally.
+                // Upstream flows will detect the new secret storage, key backup, etc and use it.
+                this.props.onFinished(true);
+            }, true);
+        } catch (e) {
+            console.error(e);
+            this.props.onFinished(false);
+        }
+    };
+
     private getKeyValidationText(): string {
         if (this.state.recoveryKeyFileError) {
             return _t("Wrong file type");
@@ -216,8 +272,9 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
     }
 
     render() {
-        // Caution: Making this an import will break tests.
+        // Caution: Making these an import will break tests.
         const BaseDialog = sdk.getComponent("views.dialogs.BaseDialog");
+        const DialogButtons = sdk.getComponent("views.elements.DialogButtons");
 
         const hasPassphrase = (
             this.props.keyInfo &&
@@ -226,11 +283,36 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
             this.props.keyInfo.passphrase.iterations
         );
 
+        const resetButton = (
+            <div className="mx_AccessSecretStorageDialog_reset">
+                {_t("Forgotten or lost all recovery methods? <a>Reset all</a>", null, {
+                    a: (sub) => <a
+                        href="" onClick={this.onResetAllClick}
+                        className="mx_AccessSecretStorageDialog_reset_link">{sub}</a>,
+                })}
+            </div>
+        );
+
         let content;
         let title;
         let titleClass;
-        if (hasPassphrase && !this.state.forceRecoveryKey) {
-            const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+        if (this.state.resetting) {
+            title = _t("Reset everything");
+            titleClass = ['mx_AccessSecretStorageDialog_titleWithIcon mx_AccessSecretStorageDialog_resetBadge'];
+            content = <div>
+                <p>{_t("Only do this if you have no other device to complete verification with.")}</p>
+                <p>{_t("If you reset everything, you will restart with no trusted sessions, no trusted users, and "
+                    + "might not be able to see past messages.")}</p>
+                <DialogButtons
+                    primaryButton={_t('Reset')}
+                    onPrimaryButtonClick={this.onConfirmResetAllClick}
+                    hasCancel={true}
+                    onCancel={this.onCancel}
+                    focus={false}
+                    primaryButtonClass="danger"
+                />
+            </div>;
+        } else if (hasPassphrase && !this.state.forceRecoveryKey) {
             const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
             title = _t("Security Phrase");
             titleClass = ['mx_AccessSecretStorageDialog_titleWithIcon mx_AccessSecretStorageDialog_securePhraseTitle'];
@@ -278,13 +360,13 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
                         onCancel={this.onCancel}
                         focus={false}
                         primaryDisabled={this.state.passPhrase.length === 0}
+                        additive={resetButton}
                     />
                 </form>
             </div>;
         } else {
             title = _t("Security Key");
             titleClass = ['mx_AccessSecretStorageDialog_titleWithIcon mx_AccessSecretStorageDialog_secureBackupTitle'];
-            const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
 
             const feedbackClasses = classNames({
                 'mx_AccessSecretStorageDialog_recoveryKeyFeedback': true,
@@ -339,6 +421,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
                         onCancel={this.onCancel}
                         focus={false}
                         primaryDisabled={!this.state.recoveryKeyValid}
+                        additive={resetButton}
                     />
                 </form>
             </div>;

src/components/views/elements/EventTilePreview.tsx

@@ -55,22 +55,10 @@ interface IProps {
      * The mxc:// avatar URL of the displayed user
      */
     avatarUrl?: string;
-
-    /**
-     * Whether the EventTile should appear faded
-     */
-    faded?: boolean;
-
-    /**
-     * Callback for when the component is clicked
-     */
-    onClick?: () => void;
 }
 
 interface IState {
     message: string;
-    faded: boolean;
-    eventTileKey: number;
 }
 
 const AVATAR_SIZE = 32;
@@ -81,23 +69,9 @@ export default class EventTilePreview extends React.Component<IProps, IState> {
         super(props);
         this.state = {
             message: props.message,
-            faded: !!props.faded,
-            eventTileKey: 0,
         };
     }
 
-    changeMessage(message: string) {
-        this.setState({
-            message,
-            // Change the EventTile key to force React to create a new instance
-            eventTileKey: this.state.eventTileKey + 1,
-        });
-    }
-
-    unfade() {
-        this.setState({ faded: false });
-    }
-
     private fakeEvent({message}: IState) {
         // Fake it till we make it
         /* eslint-disable quote-props */
@@ -147,12 +121,10 @@ export default class EventTilePreview extends React.Component<IProps, IState> {
         const className = classnames(this.props.className, {
             "mx_IRCLayout": this.props.layout == Layout.IRC,
             "mx_GroupLayout": this.props.layout == Layout.Group,
-            "mx_EventTilePreview_faded": this.state.faded,
         });
 
-        return <div className={className} onClick={this.props.onClick}>
+        return <div className={className}>
             <EventTile
-                key={this.state.eventTileKey}
                 mxEvent={event}
                 layout={this.props.layout}
                 enableFlair={SettingsStore.getValue(UIFeature.Flair)}

src/components/views/elements/FacePile.tsx

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { HTMLAttributes } from "react";
+import React, { HTMLAttributes, ReactNode, useContext } from "react";
 import { Room } from "matrix-js-sdk/src/models/room";
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 import { sortBy } from "lodash";
@@ -24,6 +24,7 @@ import { _t } from "../../../languageHandler";
 import DMRoomMap from "../../../utils/DMRoomMap";
 import TextWithTooltip from "../elements/TextWithTooltip";
 import { useRoomMembers } from "../../../hooks/useRoomMembers";
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
 const DEFAULT_NUM_FACES = 5;
 
@@ -36,6 +37,7 @@ interface IProps extends HTMLAttributes<HTMLSpanElement> {
 const isKnownMember = (member: RoomMember) => !!DMRoomMap.shared().getDMRoomsForUserId(member.userId)?.length;
 
 const FacePile = ({ room, onlyKnownUsers = true, numShown = DEFAULT_NUM_FACES, ...props }: IProps) => {
+    const cli = useContext(MatrixClientContext);
     let members = useRoomMembers(room);
 
     // sort users with an explicit avatar first
@@ -46,21 +48,42 @@ const FacePile = ({ room, onlyKnownUsers = true, numShown = DEFAULT_NUM_FACES, .
         // sort known users first
         iteratees.unshift(member => isKnownMember(member));
     }
-    if (members.length < 1) return null;
 
-    const shownMembers = sortBy(members, iteratees).slice(0, numShown);
+    // exclude ourselves from the shown members list
+    const shownMembers = sortBy(members.filter(m => m.userId !== cli.getUserId()), iteratees).slice(0, numShown);
+    if (shownMembers.length < 1) return null;
+
+    // We reverse the order of the shown faces in CSS to simplify their visual overlap,
+    // reverse members in tooltip order to make the order between the two match up.
+    const commaSeparatedMembers = shownMembers.map(m => m.rawDisplayName).reverse().join(", ");
+
+    let tooltip: ReactNode;
+    if (props.onClick) {
+        tooltip = <div>
+            <div className="mx_Tooltip_title">
+                { _t("View all %(count)s members", { count: members.length }) }
+            </div>
+            <div className="mx_Tooltip_sub">
+                { _t("Including %(commaSeparatedMembers)s", { commaSeparatedMembers }) }
+            </div>
+        </div>;
+    } else {
+        tooltip = _t("%(count)s members including %(commaSeparatedMembers)s", {
+            count: members.length,
+            commaSeparatedMembers,
+        });
+    }
+
     return <div {...props} className="mx_FacePile">
-        <div className="mx_FacePile_faces">
-            { shownMembers.map(member => {
-                return <TextWithTooltip key={member.userId} tooltip={member.name}>
-                    <MemberAvatar member={member} width={28} height={28} />
-                </TextWithTooltip>;
-            }) }
-        </div>
-        { onlyKnownUsers && <span>
+        <TextWithTooltip class="mx_FacePile_faces" tooltip={tooltip} tooltipProps={{ yOffset: 32 }}>
+            { members.length > numShown ? <span className="mx_FacePile_face mx_FacePile_more" /> : null }
+            { shownMembers.map(m =>
+                <MemberAvatar key={m.userId} member={m} width={28} height={28} className="mx_FacePile_face" /> )}
+        </TextWithTooltip>
+        { onlyKnownUsers && <span className="mx_FacePile_summary">
             { _t("%(count)s people you know have already joined", { count: members.length }) }
         </span> }
-    </div>
+    </div>;
 };
 
 export default FacePile;

src/components/views/elements/Field.tsx

@@ -262,7 +262,7 @@ export default class Field extends React.PureComponent<PropShapes, IState> {
                 tooltipClassName={classNames("mx_Field_tooltip", tooltipClassName)}
                 visible={(this.state.focused && this.props.forceTooltipVisible) || this.state.feedbackVisible}
                 label={tooltipContent || this.state.feedback}
-                forceOnRight
+                alignment={Tooltip.Alignment.Right}
             />;
         }
 

src/components/views/elements/ImageView.js

@@ -1,235 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import {formatDate} from '../../../DateUtils';
-import { _t } from '../../../languageHandler';
-import filesize from "filesize";
-import AccessibleButton from "./AccessibleButton";
-import Modal from "../../../Modal";
-import * as sdk from "../../../index";
-import {Key} from "../../../Keyboard";
-import FocusLock from "react-focus-lock";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
-
-@replaceableComponent("views.elements.ImageView")
-export default class ImageView extends React.Component {
-    static propTypes = {
-        src: PropTypes.string.isRequired, // the source of the image being displayed
-        name: PropTypes.string, // the main title ('name') for the image
-        link: PropTypes.string, // the link (if any) applied to the name of the image
-        width: PropTypes.number, // width of the image src in pixels
-        height: PropTypes.number, // height of the image src in pixels
-        fileSize: PropTypes.number, // size of the image src in bytes
-        onFinished: PropTypes.func.isRequired, // callback when the lightbox is dismissed
-
-        // the event (if any) that the Image is displaying. Used for event-specific stuff like
-        // redactions, senders, timestamps etc.  Other descriptors are taken from the explicit
-        // properties above, which let us use lightboxes to display images which aren't associated
-        // with events.
-        mxEvent: PropTypes.object,
-    };
-
-    constructor(props) {
-        super(props);
-        this.state = { rotationDegrees: 0 };
-    }
-
-    onKeyDown = (ev) => {
-        if (ev.key === Key.ESCAPE) {
-            ev.stopPropagation();
-            ev.preventDefault();
-            this.props.onFinished();
-        }
-    };
-
-    onRedactClick = () => {
-        const ConfirmRedactDialog = sdk.getComponent("dialogs.ConfirmRedactDialog");
-        Modal.createTrackedDialog('Confirm Redact Dialog', 'Image View', ConfirmRedactDialog, {
-            onFinished: (proceed) => {
-                if (!proceed) return;
-                this.props.onFinished();
-                MatrixClientPeg.get().redactEvent(
-                    this.props.mxEvent.getRoomId(), this.props.mxEvent.getId(),
-                ).catch(function(e) {
-                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                    // display error message stating you couldn't delete this.
-                    const code = e.errcode || e.statusCode;
-                    Modal.createTrackedDialog('You cannot delete this image.', '', ErrorDialog, {
-                        title: _t('Error'),
-                        description: _t('You cannot delete this image. (%(code)s)', {code: code}),
-                    });
-                });
-            },
-        });
-    };
-
-    getName() {
-        let name = this.props.name;
-        if (name && this.props.link) {
-            name = <a href={ this.props.link } target="_blank" rel="noreferrer noopener">{ name }</a>;
-        }
-        return name;
-    }
-
-    rotateCounterClockwise = () => {
-        const cur = this.state.rotationDegrees;
-        const rotationDegrees = (cur - 90) % 360;
-        this.setState({ rotationDegrees });
-    };
-
-    rotateClockwise = () => {
-        const cur = this.state.rotationDegrees;
-        const rotationDegrees = (cur + 90) % 360;
-        this.setState({ rotationDegrees });
-    };
-
-    render() {
-/*
-        // In theory max-width: 80%, max-height: 80% on the CSS should work
-        // but in practice, it doesn't, so do it manually:
-
-        var width = this.props.width || 500;
-        var height = this.props.height || 500;
-
-        var maxWidth = document.documentElement.clientWidth * 0.8;
-        var maxHeight = document.documentElement.clientHeight * 0.8;
-
-        var widthFrac = width / maxWidth;
-        var heightFrac = height / maxHeight;
-
-        var displayWidth;
-        var displayHeight;
-        if (widthFrac > heightFrac) {
-            displayWidth = Math.min(width, maxWidth);
-            displayHeight = (displayWidth / width) * height;
-        } else {
-            displayHeight = Math.min(height, maxHeight);
-            displayWidth = (displayHeight / height) * width;
-        }
-
-        var style = {
-            width: displayWidth,
-            height: displayHeight
-        };
-*/
-        let style = {};
-        let res;
-
-        if (this.props.width && this.props.height) {
-            style = {
-                width: this.props.width,
-                height: this.props.height,
-            };
-            res = style.width + "x" + style.height + "px";
-        }
-
-        let size;
-        if (this.props.fileSize) {
-            size = filesize(this.props.fileSize);
-        }
-
-        let sizeRes;
-        if (size && res) {
-            sizeRes = size + ", " + res;
-        } else {
-            sizeRes = size || res;
-        }
-
-        let mayRedact = false;
-        const showEventMeta = !!this.props.mxEvent;
-
-        let eventMeta;
-        if (showEventMeta) {
-            // Figure out the sender, defaulting to mxid
-            let sender = this.props.mxEvent.getSender();
-            const cli = MatrixClientPeg.get();
-            const room = cli.getRoom(this.props.mxEvent.getRoomId());
-            if (room) {
-                mayRedact = room.currentState.maySendRedactionForEvent(this.props.mxEvent, cli.credentials.userId);
-                const member = room.getMember(sender);
-                if (member) sender = member.name;
-            }
-
-            eventMeta = (<div className="mx_ImageView_metadata">
-                { _t('Uploaded on %(date)s by %(user)s', {
-                    date: formatDate(new Date(this.props.mxEvent.getTs())),
-                    user: sender,
-                }) }
-            </div>);
-        }
-
-        let eventRedact;
-        if (mayRedact) {
-            eventRedact = (<div className="mx_ImageView_button" onClick={this.onRedactClick}>
-                { _t('Remove') }
-            </div>);
-        }
-
-        const rotationDegrees = this.state.rotationDegrees;
-        const effectiveStyle = {transform: `rotate(${rotationDegrees}deg)`, ...style};
-
-        return (
-            <FocusLock
-                returnFocus={true}
-                lockProps={{
-                    onKeyDown: this.onKeyDown,
-                    role: "dialog",
-                }}
-                className="mx_ImageView"
-            >
-                <div className="mx_ImageView_lhs">
-                </div>
-                <div className="mx_ImageView_content">
-                    <img src={this.props.src} title={this.props.name} style={effectiveStyle} className="mainImage" />
-                    <div className="mx_ImageView_labelWrapper">
-                        <div className="mx_ImageView_label">
-                            <AccessibleButton className="mx_ImageView_rotateCounterClockwise" title={_t("Rotate Left")} onClick={ this.rotateCounterClockwise }>
-                                <img src={require("../../../../res/img/rotate-ccw.svg")} alt={ _t('Rotate counter-clockwise') } width="18" height="18" />
-                            </AccessibleButton>
-                            <AccessibleButton className="mx_ImageView_rotateClockwise" title={_t("Rotate Right")} onClick={ this.rotateClockwise }>
-                                <img src={require("../../../../res/img/rotate-cw.svg")} alt={ _t('Rotate clockwise') } width="18" height="18" />
-                            </AccessibleButton>
-                            <AccessibleButton className="mx_ImageView_cancel" title={_t("Close")} onClick={ this.props.onFinished }>
-                              <img src={require("../../../../res/img/cancel-white.svg")} width="18" height="18" alt={ _t('Close') } />
-                            </AccessibleButton>
-                            <div className="mx_ImageView_shim">
-                            </div>
-                            <div className="mx_ImageView_name">
-                                { this.getName() }
-                            </div>
-                            { eventMeta }
-                            <a className="mx_ImageView_link" href={ this.props.src } download={ this.props.name } target="_blank" rel="noopener">
-                                <div className="mx_ImageView_download">
-                                        { _t('Download this file') }<br />
-                                         <span className="mx_ImageView_size">{ sizeRes }</span>
-                                </div>
-                            </a>
-                            { eventRedact }
-                            <div className="mx_ImageView_shim">
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div className="mx_ImageView_rhs">
-                </div>
-            </FocusLock>
-        );
-    }
-}

src/components/views/elements/ImageView.tsx

@@ -0,0 +1,446 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
+Copyright 2020, 2021 Šimon Brandner <simon.bra.ag@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { createRef } from 'react';
+import { _t } from '../../../languageHandler';
+import AccessibleTooltipButton from "./AccessibleTooltipButton";
+import {Key} from "../../../Keyboard";
+import FocusLock from "react-focus-lock";
+import MemberAvatar from "../avatars/MemberAvatar";
+import {ContextMenuTooltipButton} from "../../../accessibility/context_menu/ContextMenuTooltipButton";
+import MessageContextMenu from "../context_menus/MessageContextMenu";
+import {aboveLeftOf, ContextMenu} from '../../structures/ContextMenu';
+import MessageTimestamp from "../messages/MessageTimestamp";
+import SettingsStore from "../../../settings/SettingsStore";
+import {formatFullDate} from "../../../DateUtils";
+import dis from '../../../dispatcher/dispatcher';
+import {replaceableComponent} from "../../../utils/replaceableComponent";
+import {RoomPermalinkCreator} from "../../../utils/permalinks/Permalinks"
+import {MatrixEvent} from "matrix-js-sdk/src/models/event";
+import {normalizeWheelEvent} from "../../../utils/Mouse";
+
+const MIN_ZOOM = 100;
+const MAX_ZOOM = 300;
+// This is used for the buttons
+const ZOOM_STEP = 10;
+// This is used for mouse wheel events
+const ZOOM_COEFFICIENT = 0.5;
+// If we have moved only this much we can zoom
+const ZOOM_DISTANCE = 10;
+
+
+interface IProps {
+    src: string, // the source of the image being displayed
+    name?: string, // the main title ('name') for the image
+    link?: string, // the link (if any) applied to the name of the image
+    width?: number, // width of the image src in pixels
+    height?: number, // height of the image src in pixels
+    fileSize?: number, // size of the image src in bytes
+    onFinished(): void, // callback when the lightbox is dismissed
+
+    // the event (if any) that the Image is displaying. Used for event-specific stuff like
+    // redactions, senders, timestamps etc.  Other descriptors are taken from the explicit
+    // properties above, which let us use lightboxes to display images which aren't associated
+    // with events.
+    mxEvent: MatrixEvent,
+    permalinkCreator: RoomPermalinkCreator,
+}
+
+interface IState {
+    rotation: number,
+    zoom: number,
+    translationX: number,
+    translationY: number,
+    moving: boolean,
+    contextMenuDisplayed: boolean,
+}
+
+@replaceableComponent("views.elements.ImageView")
+export default class ImageView extends React.Component<IProps, IState> {
+    constructor(props) {
+        super(props);
+        this.state = {
+            rotation: 0,
+            zoom: MIN_ZOOM,
+            translationX: 0,
+            translationY: 0,
+            moving: false,
+            contextMenuDisplayed: false,
+        };
+    }
+
+    // XXX: Refs to functional components
+    private contextMenuButton = createRef<any>();
+    private focusLock = createRef<any>();
+
+    private initX = 0;
+    private initY = 0;
+    private lastX = 0;
+    private lastY = 0;
+    private previousX = 0;
+    private previousY = 0;
+
+    componentDidMount() {
+        // We have to use addEventListener() because the listener
+        // needs to be passive in order to work with Chromium
+        this.focusLock.current.addEventListener('wheel', this.onWheel, { passive: false });
+    }
+
+    componentWillUnmount() {
+        this.focusLock.current.removeEventListener('wheel', this.onWheel);
+    }
+
+    private onKeyDown = (ev: KeyboardEvent) => {
+        if (ev.key === Key.ESCAPE) {
+            ev.stopPropagation();
+            ev.preventDefault();
+            this.props.onFinished();
+        }
+    };
+
+    private onWheel = (ev: WheelEvent) => {
+        ev.stopPropagation();
+        ev.preventDefault();
+
+        const {deltaY} = normalizeWheelEvent(ev);
+        const newZoom = this.state.zoom - (deltaY * ZOOM_COEFFICIENT);
+
+        if (newZoom <= MIN_ZOOM) {
+            this.setState({
+                zoom: MIN_ZOOM,
+                translationX: 0,
+                translationY: 0,
+            });
+            return;
+        }
+        if (newZoom >= MAX_ZOOM) {
+            this.setState({zoom: MAX_ZOOM});
+            return;
+        }
+
+        this.setState({
+            zoom: newZoom,
+        });
+    };
+
+    private onRotateCounterClockwiseClick = () => {
+        const cur = this.state.rotation;
+        const rotationDegrees = cur - 90;
+        this.setState({ rotation: rotationDegrees });
+    };
+
+    private onRotateClockwiseClick = () => {
+        const cur = this.state.rotation;
+        const rotationDegrees = cur + 90;
+        this.setState({ rotation: rotationDegrees });
+    };
+
+    private onZoomInClick = () => {
+        if (this.state.zoom >= MAX_ZOOM) {
+            this.setState({zoom: MAX_ZOOM});
+            return;
+        }
+
+        this.setState({
+            zoom: this.state.zoom + ZOOM_STEP,
+        });
+    };
+
+    private onZoomOutClick = () => {
+        if (this.state.zoom <= MIN_ZOOM) {
+            this.setState({
+                zoom: MIN_ZOOM,
+                translationX: 0,
+                translationY: 0,
+            });
+            return;
+        }
+        this.setState({
+            zoom: this.state.zoom - ZOOM_STEP,
+        });
+    };
+
+    private onDownloadClick = () => {
+        const a = document.createElement("a");
+        a.href = this.props.src;
+        a.download = this.props.name;
+        a.target = "_blank";
+        a.click();
+    };
+
+    private onOpenContextMenu = () => {
+        this.setState({
+            contextMenuDisplayed: true,
+        });
+    };
+
+    private onCloseContextMenu = () => {
+        this.setState({
+            contextMenuDisplayed: false,
+        });
+    };
+
+    private onPermalinkClicked = (ev: React.MouseEvent) => {
+        // This allows the permalink to be opened in a new tab/window or copied as
+        // matrix.to, but also for it to enable routing within Element when clicked.
+        ev.preventDefault();
+        dis.dispatch({
+            action: 'view_room',
+            event_id: this.props.mxEvent.getId(),
+            highlighted: true,
+            room_id: this.props.mxEvent.getRoomId(),
+        });
+        this.props.onFinished();
+    };
+
+    private onStartMoving = (ev: React.MouseEvent) => {
+        ev.stopPropagation();
+        ev.preventDefault();
+
+        // Don't do anything if we pressed any
+        // other button than the left one
+        if (ev.button !== 0) return;
+
+        // Zoom in if we are completely zoomed out
+        if (this.state.zoom === MIN_ZOOM) {
+            this.setState({zoom: MAX_ZOOM});
+            return;
+        }
+
+        this.setState({moving: true});
+        this.previousX = this.state.translationX;
+        this.previousY = this.state.translationY;
+        this.initX = ev.pageX - this.lastX;
+        this.initY = ev.pageY - this.lastY;
+    };
+
+    private onMoving = (ev: React.MouseEvent) => {
+        ev.stopPropagation();
+        ev.preventDefault();
+
+        if (!this.state.moving) return;
+
+        this.lastX = ev.pageX - this.initX;
+        this.lastY = ev.pageY - this.initY;
+        this.setState({
+            translationX: this.lastX,
+            translationY: this.lastY,
+        });
+    };
+
+    private onEndMoving = () => {
+        // Zoom out if we haven't moved much
+        if (
+            this.state.moving === true &&
+            Math.abs(this.state.translationX - this.previousX) < ZOOM_DISTANCE &&
+            Math.abs(this.state.translationY - this.previousY) < ZOOM_DISTANCE
+        ) {
+            this.setState({
+                zoom: MIN_ZOOM,
+                translationX: 0,
+                translationY: 0,
+            });
+        }
+        this.setState({moving: false});
+    };
+
+    private renderContextMenu() {
+        let contextMenu = null;
+        if (this.state.contextMenuDisplayed) {
+            contextMenu = (
+                <ContextMenu
+                    {...aboveLeftOf(this.contextMenuButton.current.getBoundingClientRect())}
+                    onFinished={this.onCloseContextMenu}
+                >
+                    <MessageContextMenu
+                        mxEvent={this.props.mxEvent}
+                        permalinkCreator={this.props.permalinkCreator}
+                        onFinished={this.onCloseContextMenu}
+                        onCloseDialog={this.props.onFinished}
+                    />
+                </ContextMenu>
+            );
+        }
+
+        return (
+            <React.Fragment>
+                { contextMenu }
+            </React.Fragment>
+        );
+    }
+
+    render() {
+        const showEventMeta = !!this.props.mxEvent;
+
+        let cursor;
+        if (this.state.moving) {
+            cursor= "grabbing";
+        } else if (this.state.zoom === MIN_ZOOM) {
+            cursor = "zoom-in";
+        } else {
+            cursor = "zoom-out";
+        }
+        const rotationDegrees = this.state.rotation + "deg";
+        const zoomPercentage = this.state.zoom/100;
+        const translatePixelsX = this.state.translationX + "px";
+        const translatePixelsY = this.state.translationY + "px";
+        // The order of the values is important!
+        // First, we translate and only then we rotate, otherwise
+        // we would apply the translation to an already rotated
+        // image causing it translate in the wrong direction.
+        const style = {
+            cursor: cursor,
+            transition: this.state.moving ? null : "transform 200ms ease 0s",
+            transform: `translateX(${translatePixelsX})
+                        translateY(${translatePixelsY})
+                        scale(${zoomPercentage})
+                        rotate(${rotationDegrees})`,
+        };
+
+        let info;
+        if (showEventMeta) {
+            const mxEvent = this.props.mxEvent;
+            const showTwelveHour = SettingsStore.getValue("showTwelveHourTimestamps");
+            let permalink = "#";
+            if (this.props.permalinkCreator) {
+                permalink = this.props.permalinkCreator.forEvent(this.props.mxEvent.getId());
+            }
+
+            const senderName = mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender();
+            const sender = (
+                <div className="mx_ImageView_info_sender">
+                    {senderName}
+                </div>
+            );
+            const messageTimestamp = (
+                <a
+                    href={permalink}
+                    onClick={this.onPermalinkClicked}
+                    aria-label={formatFullDate(new Date(this.props.mxEvent.getTs()), showTwelveHour, false)}
+                >
+                    <MessageTimestamp
+                        showFullDate={true}
+                        showTwelveHour={showTwelveHour}
+                        ts={mxEvent.getTs()}
+                        showSeconds={false}
+                    />
+                </a>
+            );
+            const avatar = (
+                <MemberAvatar
+                    member={mxEvent.sender}
+                    width={32} height={32}
+                    viewUserOnClick={true}
+                />
+            );
+
+            info = (
+                <div className="mx_ImageView_info_wrapper">
+                    {avatar}
+                    <div className="mx_ImageView_info">
+                        {sender}
+                        {messageTimestamp}
+                    </div>
+                </div>
+            );
+        } else {
+            // If there is no event - we're viewing an avatar, we set
+            // an empty div here, since the panel uses space-between
+            // and we want the same placement of elements
+            info = (
+                <div></div>
+            );
+        }
+
+        let contextMenuButton;
+        if (this.props.mxEvent) {
+            contextMenuButton = (
+                <ContextMenuTooltipButton
+                    className="mx_ImageView_button mx_ImageView_button_more"
+                    title={_t("Options")}
+                    onClick={this.onOpenContextMenu}
+                    inputRef={this.contextMenuButton}
+                    isExpanded={this.state.contextMenuDisplayed}
+                />
+            );
+        }
+
+        return (
+            <FocusLock
+                returnFocus={true}
+                lockProps={{
+                    onKeyDown: this.onKeyDown,
+                    role: "dialog",
+                }}
+                className="mx_ImageView"
+                ref={this.focusLock}
+            >
+                <div className="mx_ImageView_panel">
+                    {info}
+                    <div className="mx_ImageView_toolbar">
+                        <AccessibleTooltipButton
+                            className="mx_ImageView_button mx_ImageView_button_rotateCW"
+                            title={_t("Rotate Right")}
+                            onClick={this.onRotateClockwiseClick}>
+                        </AccessibleTooltipButton>
+                        <AccessibleTooltipButton
+                            className="mx_ImageView_button mx_ImageView_button_rotateCCW"
+                            title={_t("Rotate Left")}
+                            onClick={ this.onRotateCounterClockwiseClick }>
+                        </AccessibleTooltipButton>
+                        <AccessibleTooltipButton
+                            className="mx_ImageView_button mx_ImageView_button_zoomOut"
+                            title={_t("Zoom out")}
+                            onClick={ this.onZoomOutClick }>
+                        </AccessibleTooltipButton>
+                        <AccessibleTooltipButton
+                            className="mx_ImageView_button mx_ImageView_button_zoomIn"
+                            title={_t("Zoom in")}
+                            onClick={ this.onZoomInClick }>
+                        </AccessibleTooltipButton>
+                        <AccessibleTooltipButton
+                            className="mx_ImageView_button mx_ImageView_button_download"
+                            title={_t("Download")}
+                            onClick={ this.onDownloadClick }>
+                        </AccessibleTooltipButton>
+                        {contextMenuButton}
+                        <AccessibleTooltipButton
+                            className="mx_ImageView_button mx_ImageView_button_close"
+                            title={_t("Close")}
+                            onClick={ this.props.onFinished }>
+                        </AccessibleTooltipButton>
+                        {this.renderContextMenu()}
+                    </div>
+                </div>
+                <div className="mx_ImageView_image_wrapper">
+                    <img
+                        src={this.props.src}
+                        title={this.props.name}
+                        style={style}
+                        className="mx_ImageView_image"
+                        draggable={true}
+                        onMouseDown={this.onStartMoving}
+                        onMouseMove={this.onMoving}
+                        onMouseUp={this.onEndMoving}
+                        onMouseLeave={this.onEndMoving}
+                    />
+                </div>
+            </FocusLock>
+        );
+    }
+}

src/components/views/elements/InfoTooltip.tsx

@@ -18,8 +18,8 @@ limitations under the License.
 import React from 'react';
 import classNames from 'classnames';
 
-import Tooltip from './Tooltip';
-import { _t } from "../../../languageHandler";
+import Tooltip, {Alignment} from './Tooltip';
+import {_t} from "../../../languageHandler";
 import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 interface ITooltipProps {
@@ -61,7 +61,7 @@ export default class InfoTooltip extends React.PureComponent<ITooltipProps, ISta
             className="mx_InfoTooltip_container"
             tooltipClassName={classNames("mx_InfoTooltip_tooltip", tooltipClassName)}
             label={tooltip || title}
-            forceOnRight={true}
+            alignment={Alignment.Right}
         /> : <div />;
         return (
             <div onMouseOver={this.onMouseOver} onMouseLeave={this.onMouseLeave} className="mx_InfoTooltip">

src/components/views/elements/InviteReason.tsx

@@ -0,0 +1,62 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import classNames from "classnames";
+import React from "react";
+import { _t } from "../../../languageHandler";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+
+interface IProps {
+    reason: string;
+}
+
+interface IState {
+    hidden: boolean;
+}
+
+@replaceableComponent("views.elements.InviteReason")
+export default class InviteReason extends React.PureComponent<IProps, IState> {
+    constructor(props) {
+        super(props);
+        this.state = {
+            // We hide the reason for invitation by default, since it can be a
+            // vector for spam/harassment.
+            hidden: true,
+        };
+    }
+
+    onViewClick = () => {
+        this.setState({
+            hidden: false,
+        });
+    }
+
+    render() {
+        const classes = classNames({
+            "mx_InviteReason": true,
+            "mx_InviteReason_hidden": this.state.hidden,
+        });
+
+        return <div className={classes}>
+            <div className="mx_InviteReason_reason">{this.props.reason}</div>
+            <div className="mx_InviteReason_view"
+                onClick={this.onViewClick}
+            >
+                {_t("View message")}
+            </div>
+        </div>;
+    }
+}

src/components/views/elements/PersistedElement.js

@@ -139,6 +139,8 @@ export default class PersistedElement extends React.Component {
     _onAction(payload) {
         if (payload.action === 'timeline_resize') {
             this._repositionChild();
+        } else if (payload.action === 'logout') {
+            PersistedElement.destroyElement(this.props.persistKey);
         }
     }
 

src/components/views/elements/TextWithTooltip.js

@@ -25,6 +25,7 @@ export default class TextWithTooltip extends React.Component {
         class: PropTypes.string,
         tooltipClass: PropTypes.string,
         tooltip: PropTypes.node.isRequired,
+        tooltipProps: PropTypes.object,
     };
 
     constructor() {
@@ -46,15 +47,17 @@ export default class TextWithTooltip extends React.Component {
     render() {
         const Tooltip = sdk.getComponent("elements.Tooltip");
 
-        const {class: className, children, tooltip, tooltipClass, ...props} = this.props;
+        const {class: className, children, tooltip, tooltipClass, tooltipProps, ...props} = this.props;
 
         return (
             <span {...props} onMouseOver={this.onMouseOver} onMouseLeave={this.onMouseLeave} className={className}>
                 {children}
                 {this.state.hover && <Tooltip
+                    {...tooltipProps}
                     label={tooltip}
                     tooltipClassName={tooltipClass}
-                    className={"mx_TextWithTooltip_tooltip"} /> }
+                    className={"mx_TextWithTooltip_tooltip"}
+                /> }
             </span>
         );
     }

src/components/views/elements/Tooltip.tsx

@@ -25,6 +25,14 @@ import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 const MIN_TOOLTIP_HEIGHT = 25;
 
+export enum Alignment {
+    Natural, // Pick left or right
+    Left,
+    Right,
+    Top, // Centered
+    Bottom, // Centered
+}
+
 interface IProps {
         // Class applied to the element used to position the tooltip
         className?: string;
@@ -36,7 +44,7 @@ interface IProps {
         visible?: boolean;
         // the react element to put into the tooltip
         label: React.ReactNode;
-        forceOnRight?: boolean;
+        alignment?: Alignment; // defaults to Natural
         yOffset?: number;
 }
 
@@ -46,10 +54,14 @@ export default class Tooltip extends React.Component<IProps> {
     private tooltip: void | Element | Component<Element, any, any>;
     private parent: Element;
 
+    // XXX: This is because some components (Field) are unable to `import` the Tooltip class,
+    // so we expose the Alignment options off of us statically.
+    public static readonly Alignment = Alignment;
 
     public static readonly defaultProps = {
         visible: true,
         yOffset: 0,
+        alignment: Alignment.Natural,
     };
 
     // Create a wrapper for the tooltip outside the parent and attach it to the body element
@@ -86,11 +98,35 @@ export default class Tooltip extends React.Component<IProps> {
             offset = Math.floor(parentBox.height - MIN_TOOLTIP_HEIGHT);
         }
 
-        style.top = (parentBox.top - 2 + this.props.yOffset) + window.pageYOffset + offset;
-        if (!this.props.forceOnRight && parentBox.right > window.innerWidth / 2) {
-            style.right = window.innerWidth - parentBox.right - window.pageXOffset - 16;
-        } else {
-            style.left = parentBox.right + window.pageXOffset + 6;
+        const baseTop = (parentBox.top - 2 + this.props.yOffset) + window.pageYOffset;
+        const top = baseTop + offset;
+        const right = window.innerWidth - parentBox.right - window.pageXOffset - 16;
+        const left = parentBox.right + window.pageXOffset + 6;
+        const horizontalCenter = parentBox.right - window.pageXOffset - (parentBox.width / 2);
+        switch (this.props.alignment) {
+            case Alignment.Natural:
+                if (parentBox.right > window.innerWidth / 2) {
+                    style.right = right;
+                    style.top = top;
+                    break;
+                }
+                // fall through to Right
+            case Alignment.Right:
+                style.left = left;
+                style.top = top;
+                break;
+            case Alignment.Left:
+                style.right = right;
+                style.top = top;
+                break;
+            case Alignment.Top:
+                style.top = baseTop - 16;
+                style.left = horizontalCenter;
+                break;
+            case Alignment.Bottom:
+                style.top = baseTop + parentBox.height;
+                style.left = horizontalCenter;
+                break;
         }
 
         return style;

src/components/views/messages/MImageBody.js

@@ -41,6 +41,9 @@ export default class MImageBody extends React.Component {
 
         /* the maximum image height to use */
         maxImageHeight: PropTypes.number,
+
+        /* the permalinkCreator */
+        permalinkCreator: PropTypes.object,
     };
 
     static contextType = MatrixClientContext;
@@ -106,6 +109,7 @@ export default class MImageBody extends React.Component {
                 src: httpUrl,
                 name: content.body && content.body.length > 0 ? content.body : _t('Attachment'),
                 mxEvent: this.props.mxEvent,
+                permalinkCreator: this.props.permalinkCreator,
             };
 
             if (content.info) {
@@ -114,7 +118,7 @@ export default class MImageBody extends React.Component {
                 params.fileSize = content.info.size;
             }
 
-            Modal.createDialog(ImageView, params, "mx_Dialog_lightbox");
+            Modal.createDialog(ImageView, params, "mx_Dialog_lightbox", null, true);
         }
     }
 

src/components/views/messages/MessageEvent.js

@@ -46,6 +46,9 @@ export default class MessageEvent extends React.Component {
 
         /* the maximum image height to use, if the event is an image */
         maxImageHeight: PropTypes.number,
+
+        /* the permalinkCreator */
+        permalinkCreator: PropTypes.object,
     };
 
     constructor(props) {
@@ -126,6 +129,7 @@ export default class MessageEvent extends React.Component {
             editState={this.props.editState}
             onHeightChanged={this.props.onHeightChanged}
             onMessageAllowed={this.onTileUpdate}
+            permalinkCreator={this.props.permalinkCreator}
         />;
     }
 }

src/components/views/messages/MessageTimestamp.js

@@ -17,7 +17,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import {formatFullDate, formatTime} from '../../../DateUtils';
+import {formatFullDate, formatTime, formatFullTime} from '../../../DateUtils';
 import {replaceableComponent} from "../../../utils/replaceableComponent";
 
 @replaceableComponent("views.messages.MessageTimestamp")
@@ -25,13 +25,24 @@ export default class MessageTimestamp extends React.Component {
     static propTypes = {
         ts: PropTypes.number.isRequired,
         showTwelveHour: PropTypes.bool,
+        showFullDate: PropTypes.bool,
+        showSeconds: PropTypes.bool,
     };
 
     render() {
         const date = new Date(this.props.ts);
+        let timestamp;
+        if (this.props.showFullDate) {
+            timestamp = formatFullDate(date, this.props.showTwelveHour, this.props.showSeconds);
+        } else if (this.props.showSeconds) {
+            timestamp = formatFullTime(date, this.props.showTwelveHour);
+        } else {
+            timestamp = formatTime(date, this.props.showTwelveHour);
+        }
+
         return (
             <span className="mx_MessageTimestamp" title={formatFullDate(date, this.props.showTwelveHour)} aria-hidden={true}>
-                { formatTime(date, this.props.showTwelveHour) }
+                {timestamp}
             </span>
         );
     }

src/components/views/messages/RoomAvatarEvent.js

@@ -49,7 +49,7 @@ export default class RoomAvatarEvent extends React.Component {
             src: httpUrl,
             name: text,
         };
-        Modal.createDialog(ImageView, params, "mx_Dialog_lightbox");
+        Modal.createDialog(ImageView, params, "mx_Dialog_lightbox", null, true);
     };
 
     render() {

src/components/views/right_panel/UserInfo.tsx

@@ -24,6 +24,7 @@ import {RoomMember} from 'matrix-js-sdk/src/models/room-member';
 import {User} from 'matrix-js-sdk/src/models/user';
 import {Room} from 'matrix-js-sdk/src/models/room';
 import {EventTimeline} from 'matrix-js-sdk/src/models/event-timeline';
+import {MatrixEvent} from 'matrix-js-sdk/src/models/event';
 
 import dis from '../../../dispatcher/dispatcher';
 import Modal from '../../../Modal';
@@ -496,11 +497,11 @@ const isMuted = (member: RoomMember, powerLevelContent: IPowerLevelsContent) =>
 export const useRoomPowerLevels = (cli: MatrixClient, room: Room) => {
     const [powerLevels, setPowerLevels] = useState<IPowerLevelsContent>({});
 
-    const update = useCallback(() => {
-        if (!room) {
-            return;
-        }
-        const event = room.currentState.getStateEvents("m.room.power_levels", "");
+    const update = useCallback((ev?: MatrixEvent) => {
+        if (!room) return;
+        if (ev && ev.getType() !== EventType.RoomPowerLevels) return;
+
+        const event = room.currentState.getStateEvents(EventType.RoomPowerLevels, "");
         if (event) {
             setPowerLevels(event.getContent());
         } else {
@@ -511,7 +512,7 @@ export const useRoomPowerLevels = (cli: MatrixClient, room: Room) => {
         };
     }, [room]);
 
-    useEventEmitter(cli, "RoomState.members", update);
+    useEventEmitter(cli, "RoomState.events", update);
     useEffect(() => {
         update();
         return () => {
@@ -1431,7 +1432,7 @@ const UserInfoHeader: React.FC<{
             name: member.name,
         };
 
-        Modal.createDialog(ImageView, params, "mx_Dialog_lightbox");
+        Modal.createDialog(ImageView, params, "mx_Dialog_lightbox", null, true);
     }, [member]);
 
     const avatarElement = (
@@ -1494,7 +1495,7 @@ const UserInfoHeader: React.FC<{
         e2eIcon = <E2EIcon size={18} status={e2eStatus} isUser={true} />;
     }
 
-    const displayName = member.name || member.displayname;
+    const displayName = member.rawDisplayName || member.displayname;
     return <React.Fragment>
         { avatarElement }
 

src/components/views/rooms/BasicMessageComposer.tsx

@@ -140,7 +140,12 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
     }
 
     public componentDidUpdate(prevProps: IProps) {
-        if (this.props.placeholder !== prevProps.placeholder && this.props.placeholder) {
+        // We need to re-check the placeholder when the enabled state changes because it causes the
+        // placeholder element to remount, which gets rid of the `::before` class. Re-evaluating the
+        // placeholder means we get a proper `::before` with the placeholder.
+        const enabledChange = this.props.disabled !== prevProps.disabled;
+        const placeholderChanged = this.props.placeholder !== prevProps.placeholder;
+        if (this.props.placeholder && (placeholderChanged || enabledChange)) {
             const {isEmpty} = this.props.model;
             if (isEmpty) {
                 this.showPlaceholder();
@@ -670,8 +675,6 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
         });
         const classes = classNames("mx_BasicMessageComposer_input", {
             "mx_BasicMessageComposer_input_shouldShowPillAvatar": this.state.showPillAvatar,
-
-            // TODO: @@ TravisR: This doesn't work properly. The composer resets in a strange way.
             "mx_BasicMessageComposer_input_disabled": this.props.disabled,
         });
 

src/components/views/rooms/EventTile.js

@@ -1,8 +1,6 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 New Vector Ltd
 Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
-Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
+Copyright 2019 - 2021 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,18 +15,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import ReplyThread from "../elements/ReplyThread";
 import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 import classNames from "classnames";
 import {EventType} from "matrix-js-sdk/src/@types/event";
+import {EventStatus} from 'matrix-js-sdk/src/models/event';
+
+import ReplyThread from "../elements/ReplyThread";
 import { _t } from '../../../languageHandler';
 import * as TextForEvent from "../../../TextForEvent";
 import * as sdk from "../../../index";
 import dis from '../../../dispatcher/dispatcher';
 import SettingsStore from "../../../settings/SettingsStore";
 import {Layout, LayoutPropType} from "../../../settings/Layout";
-import {EventStatus} from 'matrix-js-sdk/src/models/event';
 import {formatTime} from "../../../DateUtils";
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import {ALL_RULE_TYPES} from "../../../mjolnir/BanList";
@@ -43,39 +42,56 @@ import {replaceableComponent} from "../../../utils/replaceableComponent";
 import Tooltip from "../elements/Tooltip";
 
 const eventTileTypes = {
-    'm.room.message': 'messages.MessageEvent',
-    'm.sticker': 'messages.MessageEvent',
-    'm.key.verification.cancel': 'messages.MKeyVerificationConclusion',
-    'm.key.verification.done': 'messages.MKeyVerificationConclusion',
-    'm.room.encryption': 'messages.EncryptionEvent',
-    'm.call.invite': 'messages.TextualEvent',
-    'm.call.answer': 'messages.TextualEvent',
-    'm.call.hangup': 'messages.TextualEvent',
-    'm.call.reject': 'messages.TextualEvent',
+    [EventType.RoomMessage]: 'messages.MessageEvent',
+    [EventType.Sticker]: 'messages.MessageEvent',
+    [EventType.KeyVerificationCancel]: 'messages.MKeyVerificationConclusion',
+    [EventType.KeyVerificationDone]: 'messages.MKeyVerificationConclusion',
+    [EventType.CallInvite]: 'messages.TextualEvent',
+    [EventType.CallAnswer]: 'messages.TextualEvent',
+    [EventType.CallHangup]: 'messages.TextualEvent',
+    [EventType.CallReject]: 'messages.TextualEvent',
 };
 
 const stateEventTileTypes = {
-    'm.room.encryption': 'messages.EncryptionEvent',
-    'm.room.canonical_alias': 'messages.TextualEvent',
-    'm.room.create': 'messages.RoomCreate',
-    'm.room.member': 'messages.TextualEvent',
-    'm.room.name': 'messages.TextualEvent',
-    'm.room.avatar': 'messages.RoomAvatarEvent',
-    'm.room.third_party_invite': 'messages.TextualEvent',
-    'm.room.history_visibility': 'messages.TextualEvent',
-    'm.room.topic': 'messages.TextualEvent',
-    'm.room.power_levels': 'messages.TextualEvent',
-    'm.room.pinned_events': 'messages.TextualEvent',
-    'm.room.server_acl': 'messages.TextualEvent',
+    [EventType.RoomEncryption]: 'messages.EncryptionEvent',
+    [EventType.RoomCanonicalAlias]: 'messages.TextualEvent',
+    [EventType.RoomCreate]: 'messages.RoomCreate',
+    [EventType.RoomMember]: 'messages.TextualEvent',
+    [EventType.RoomName]: 'messages.TextualEvent',
+    [EventType.RoomAvatar]: 'messages.RoomAvatarEvent',
+    [EventType.RoomThirdPartyInvite]: 'messages.TextualEvent',
+    [EventType.RoomHistoryVisibility]: 'messages.TextualEvent',
+    [EventType.RoomTopic]: 'messages.TextualEvent',
+    [EventType.RoomPowerLevels]: 'messages.TextualEvent',
+    [EventType.RoomPinnedEvents]: 'messages.TextualEvent',
+    [EventType.RoomServerAcl]: 'messages.TextualEvent',
     // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
     'im.vector.modular.widgets': 'messages.TextualEvent',
     [WIDGET_LAYOUT_EVENT_TYPE]: 'messages.TextualEvent',
-    'm.room.tombstone': 'messages.TextualEvent',
-    'm.room.join_rules': 'messages.TextualEvent',
-    'm.room.guest_access': 'messages.TextualEvent',
-    'm.room.related_groups': 'messages.TextualEvent',
+    [EventType.RoomTombstone]: 'messages.TextualEvent',
+    [EventType.RoomJoinRules]: 'messages.TextualEvent',
+    [EventType.RoomGuestAccess]: 'messages.TextualEvent',
+    'm.room.related_groups': 'messages.TextualEvent', // legacy communities flair
 };
 
+const stateEventSingular = new Set([
+    EventType.RoomEncryption,
+    EventType.RoomCanonicalAlias,
+    EventType.RoomCreate,
+    EventType.RoomName,
+    EventType.RoomAvatar,
+    EventType.RoomHistoryVisibility,
+    EventType.RoomTopic,
+    EventType.RoomPowerLevels,
+    EventType.RoomPinnedEvents,
+    EventType.RoomServerAcl,
+    WIDGET_LAYOUT_EVENT_TYPE,
+    EventType.RoomTombstone,
+    EventType.RoomJoinRules,
+    EventType.RoomGuestAccess,
+    'm.room.related_groups',
+]);
+
 // Add all the Mjolnir stuff to the renderer
 for (const evType of ALL_RULE_TYPES) {
     stateEventTileTypes[evType] = 'messages.TextualEvent';
@@ -132,7 +148,12 @@ export function getHandlerTile(ev) {
         }
     }
 
-    return ev.isState() ? stateEventTileTypes[type] : eventTileTypes[type];
+    if (ev.isState()) {
+        if (stateEventSingular.has(type) && ev.getStateKey() !== "") return undefined;
+        return stateEventTileTypes[type];
+    }
+
+    return eventTileTypes[type];
 }
 
 const MAX_READ_AVATARS = 5;
@@ -239,6 +260,9 @@ export default class EventTile extends React.Component {
 
         // whether or not to show flair at all
         enableFlair: PropTypes.bool,
+
+        // whether or not to show read receipts
+        showReadReceipts: PropTypes.bool,
     };
 
     static defaultProps = {
@@ -837,8 +861,6 @@ export default class EventTile extends React.Component {
             permalink = this.props.permalinkCreator.forEvent(this.props.mxEvent.getId());
         }
 
-        const readAvatars = this.getReadAvatars();
-
         let avatar;
         let sender;
         let avatarSize;
@@ -967,6 +989,16 @@ export default class EventTile extends React.Component {
         const groupPadlock = !useIRCLayout && !isBubbleMessage && this._renderE2EPadlock();
         const ircPadlock = useIRCLayout && !isBubbleMessage && this._renderE2EPadlock();
 
+        let msgOption;
+        if (this.props.showReadReceipts) {
+            const readAvatars = this.getReadAvatars();
+            msgOption = (
+                <div className="mx_EventTile_msgOption">
+                    { readAvatars }
+                </div>
+            );
+        }
+
         switch (this.props.tileShape) {
             case 'notif': {
                 const room = this.context.getRoom(this.props.mxEvent.getRoomId());
@@ -1080,14 +1112,13 @@ export default class EventTile extends React.Component {
                                            highlights={this.props.highlights}
                                            highlightLink={this.props.highlightLink}
                                            showUrlPreview={this.props.showUrlPreview}
+                                           permalinkCreator={this.props.permalinkCreator}
                                            onHeightChanged={this.props.onHeightChanged} />
                             { keyRequestInfo }
                             { reactionsRow }
                             { actionBar }
                         </div>
-                        <div className="mx_EventTile_msgOption">
-                            { readAvatars }
-                        </div>
+                        {msgOption}
                         {
                             // The avatar goes after the event tile as it's absolutely positioned to be over the
                             // event tile line, so needs to be later in the DOM so it appears on top (this avoids

src/components/views/rooms/LinkPreviewWidget.js

@@ -96,7 +96,7 @@ export default class LinkPreviewWidget extends React.Component {
             link: this.props.link,
         };
 
-        Modal.createDialog(ImageView, params, "mx_Dialog_lightbox");
+        Modal.createDialog(ImageView, params, "mx_Dialog_lightbox", null, true);
     };
 
     render() {

src/components/views/rooms/MessageComposer.js

@@ -29,11 +29,12 @@ import {aboveLeftOf, ContextMenu, ContextMenuTooltipButton, useContextMenu} from
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
 import ReplyPreview from "./ReplyPreview";
 import {UIFeature} from "../../../settings/UIFeature";
-import WidgetStore from "../../../stores/WidgetStore";
 import {UPDATE_EVENT} from "../../../stores/AsyncStore";
-import ActiveWidgetStore from "../../../stores/ActiveWidgetStore";
 import {replaceableComponent} from "../../../utils/replaceableComponent";
 import VoiceRecordComposerTile from "./VoiceRecordComposerTile";
+import {VoiceRecordingStore} from "../../../stores/VoiceRecordingStore";
+import {RecordingState} from "../../../voice/VoiceRecording";
+import Tooltip, {Alignment} from "../elements/Tooltip";
 
 function ComposerAvatar(props) {
     const MemberStatusMessageAvatar = sdk.getComponent('avatars.MemberStatusMessageAvatar');
@@ -178,17 +179,15 @@ export default class MessageComposer extends React.Component {
         this._onRoomStateEvents = this._onRoomStateEvents.bind(this);
         this._onTombstoneClick = this._onTombstoneClick.bind(this);
         this.renderPlaceholderText = this.renderPlaceholderText.bind(this);
-        WidgetStore.instance.on(UPDATE_EVENT, this._onWidgetUpdate);
-        ActiveWidgetStore.on('update', this._onActiveWidgetUpdate);
+        VoiceRecordingStore.instance.on(UPDATE_EVENT, this._onVoiceStoreUpdate);
         this._dispatcherRef = null;
 
         this.state = {
             tombstone: this._getRoomTombstone(),
             canSendMessages: this.props.room.maySendMessage(),
-            hasConference: WidgetStore.instance.doesRoomHaveConference(this.props.room),
-            joinedConference: WidgetStore.instance.isJoinedToConferenceIn(this.props.room),
             isComposerEmpty: true,
             haveRecording: false,
+            recordingTimeLeftSeconds: null, // when set to a number, shows a toast
         };
     }
 
@@ -204,14 +203,6 @@ export default class MessageComposer extends React.Component {
         }
     };
 
-    _onWidgetUpdate = () => {
-        this.setState({hasConference: WidgetStore.instance.doesRoomHaveConference(this.props.room)});
-    };
-
-    _onActiveWidgetUpdate = () => {
-        this.setState({joinedConference: WidgetStore.instance.isJoinedToConferenceIn(this.props.room)});
-    };
-
     componentDidMount() {
         this.dispatcherRef = dis.register(this.onAction);
         MatrixClientPeg.get().on("RoomState.events", this._onRoomStateEvents);
@@ -238,8 +229,7 @@ export default class MessageComposer extends React.Component {
         if (MatrixClientPeg.get()) {
             MatrixClientPeg.get().removeListener("RoomState.events", this._onRoomStateEvents);
         }
-        WidgetStore.instance.removeListener(UPDATE_EVENT, this._onWidgetUpdate);
-        ActiveWidgetStore.removeListener('update', this._onActiveWidgetUpdate);
+        VoiceRecordingStore.instance.off(UPDATE_EVENT, this._onVoiceStoreUpdate);
         dis.unregister(this.dispatcherRef);
     }
 
@@ -327,8 +317,18 @@ export default class MessageComposer extends React.Component {
         });
     }
 
-    onVoiceUpdate = (haveRecording: boolean) => {
-        this.setState({haveRecording});
+    _onVoiceStoreUpdate = () => {
+        const recording = VoiceRecordingStore.instance.activeRecording;
+        this.setState({haveRecording: !!recording});
+        if (recording) {
+            // We show a little heads up that the recording is about to automatically end soon. The 3s
+            // display time is completely arbitrary. Note that we don't need to deregister the listener
+            // because the recording instance will clean that up for us.
+            recording.on(RecordingState.EndingSoon, ({secondsLeft}) => {
+                this.setState({recordingTimeLeftSeconds: secondsLeft});
+                setTimeout(() => this.setState({recordingTimeLeftSeconds: null}), 3000);
+            });
+        }
     };
 
     render() {
@@ -352,7 +352,6 @@ export default class MessageComposer extends React.Component {
                     permalinkCreator={this.props.permalinkCreator}
                     replyToEvent={this.props.replyToEvent}
                     onChange={this.onChange}
-                    // TODO: @@ TravisR - Disabling the composer doesn't work
                     disabled={this.state.haveRecording}
                 />,
             );
@@ -373,8 +372,7 @@ export default class MessageComposer extends React.Component {
             if (SettingsStore.getValue("feature_voice_messages")) {
                 controls.push(<VoiceRecordComposerTile
                     key="controls_voice_record"
-                    room={this.props.room}
-                    onRecording={this.onVoiceUpdate} />);
+                    room={this.props.room} />);
             }
 
             if (!this.state.isComposerEmpty || this.state.haveRecording) {
@@ -411,8 +409,18 @@ export default class MessageComposer extends React.Component {
             );
         }
 
+        let recordingTooltip;
+        const secondsLeft = Math.round(this.state.recordingTimeLeftSeconds);
+        if (secondsLeft) {
+            recordingTooltip = <Tooltip
+                label={_t("%(seconds)ss left", {seconds: secondsLeft})}
+                alignment={Alignment.Top} yOffset={-50}
+            />;
+        }
+
         return (
             <div className="mx_MessageComposer mx_GroupLayout">
+                {recordingTooltip}
                 <div className="mx_MessageComposer_wrapper">
                     <ReplyPreview permalinkCreator={this.props.permalinkCreator} />
                     <div className="mx_MessageComposer_row">

src/components/views/rooms/ReadReceiptMarker.js

@@ -17,22 +17,13 @@ limitations under the License.
 
 import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
-import '../../../VelocityBounce';
 import { _t } from '../../../languageHandler';
 import {formatDate} from '../../../DateUtils';
-import Velociraptor from "../../../Velociraptor";
+import NodeAnimator from "../../../NodeAnimator";
 import * as sdk from "../../../index";
 import {toPx} from "../../../utils/units";
 import {replaceableComponent} from "../../../utils/replaceableComponent";
 
-let bounce = false;
-try {
-    if (global.localStorage) {
-        bounce = global.localStorage.getItem('avatar_bounce') == 'true';
-    }
-} catch (e) {
-}
-
 @replaceableComponent("views.rooms.ReadReceiptMarker")
 export default class ReadReceiptMarker extends React.PureComponent {
     static propTypes = {
@@ -115,7 +106,18 @@ export default class ReadReceiptMarker extends React.PureComponent {
             // we've already done our display - nothing more to do.
             return;
         }
+        this._animateMarker();
+    }
 
+    componentDidUpdate(prevProps) {
+        const differentLeftOffset = prevProps.leftOffset !== this.props.leftOffset;
+        const visibilityChanged = prevProps.hidden !== this.props.hidden;
+        if (differentLeftOffset || visibilityChanged) {
+            this._animateMarker();
+        }
+    }
+
+    _animateMarker() {
         // treat new RRs as though they were off the top of the screen
         let oldTop = -15;
 
@@ -139,42 +141,18 @@ export default class ReadReceiptMarker extends React.PureComponent {
         }
 
         const startStyles = [];
-        const enterTransitionOpts = [];
 
         if (oldInfo && oldInfo.left) {
             // start at the old height and in the old h pos
-
             startStyles.push({ top: startTopOffset+"px",
                                left: toPx(oldInfo.left) });
-
-            const reorderTransitionOpts = {
-                duration: 100,
-                easing: 'easeOut',
-            };
-
-            enterTransitionOpts.push(reorderTransitionOpts);
         }
 
-        // then shift to the rightmost column,
-        // and then it will drop down to its resting position
-        //
-        // XXX: We use a small left value to trick velocity-animate into actually animating.
-        // This is a very annoying bug where if it thinks there's no change to `left` then it'll
-        // skip applying it, thus making our read receipt at +14px instead of +0px like it
-        // should be. This does cause a tiny amount of drift for read receipts, however with a
-        // value so small it's not perceived by a user.
-        // Note: Any smaller values (or trying to interchange units) might cause read receipts to
-        // fail to fall down or cause gaps.
-        startStyles.push({ top: startTopOffset+'px', left: '1px' });
-        enterTransitionOpts.push({
-            duration: bounce ? Math.min(Math.log(Math.abs(startTopOffset)) * 200, 3000) : 300,
-            easing: bounce ? 'easeOutBounce' : 'easeOutCubic',
-        });
+        startStyles.push({ top: startTopOffset+'px', left: '0' });
 
         this.setState({
             suppressDisplay: false,
             startStyles: startStyles,
-            enterTransitionOpts: enterTransitionOpts,
         });
     }
 
@@ -187,7 +165,6 @@ export default class ReadReceiptMarker extends React.PureComponent {
         const style = {
             left: toPx(this.props.leftOffset),
             top: '0px',
-            visibility: this.props.hidden ? 'hidden' : 'visible',
         };
 
         let title;
@@ -210,9 +187,8 @@ export default class ReadReceiptMarker extends React.PureComponent {
         }
 
         return (
-            <Velociraptor
-                    startStyles={this.state.startStyles}
-                    enterTransitionOpts={this.state.enterTransitionOpts} >
+            <NodeAnimator
+                    startStyles={this.state.startStyles} >
                 <MemberAvatar
                     member={this.props.member}
                     fallbackUserId={this.props.fallbackUserId}
@@ -223,7 +199,7 @@ export default class ReadReceiptMarker extends React.PureComponent {
                     onClick={this.props.onClick}
                     inputRef={this._avatar}
                 />
-            </Velociraptor>
+            </NodeAnimator>
         );
     }
 }

src/components/views/rooms/RoomList.tsx

@@ -289,12 +289,11 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
         // shallow-copy from the template as we need to make modifications to it
         this.tagAesthetics = objectShallowClone(TAG_AESTHETICS);
         this.updateDmAddRoomAction();
-
-        this.dispatcherRef = defaultDispatcher.register(this.onAction);
-        this.roomStoreToken = RoomViewStore.addListener(this.onRoomViewStoreUpdate);
     }
 
     public componentDidMount(): void {
+        this.dispatcherRef = defaultDispatcher.register(this.onAction);
+        this.roomStoreToken = RoomViewStore.addListener(this.onRoomViewStoreUpdate);
         SpaceStore.instance.on(SUGGESTED_ROOMS, this.updateSuggestedRooms);
         RoomListStore.instance.on(LISTS_UPDATE_EVENT, this.updateLists);
         this.customTagStoreRef = CustomRoomTagStore.addListener(this.updateLists);
@@ -502,62 +501,56 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
     }
 
     private renderSublists(): React.ReactElement[] {
-        const components: React.ReactElement[] = [];
-
-        const tagOrder = TAG_ORDER.reduce((p, c) => {
-            if (c === CUSTOM_TAGS_BEFORE_TAG) {
-                const customTags = Object.keys(this.state.sublists)
-                    .filter(t => isCustomTag(t));
-                p.push(...customTags);
-            }
-            p.push(c);
-            return p;
-        }, [] as TagID[]);
-
         // show a skeleton UI if the user is in no rooms and they are not filtering
         const showSkeleton = !this.state.isNameFiltering &&
             Object.values(RoomListStore.instance.unfilteredLists).every(list => !list?.length);
 
-        for (const orderedTagId of tagOrder) {
-            const orderedRooms = this.state.sublists[orderedTagId] || [];
-
-            let extraTiles = null;
-            if (orderedTagId === DefaultTagID.Invite) {
-                extraTiles = this.renderCommunityInvites();
-            } else if (orderedTagId === DefaultTagID.Suggested) {
-                extraTiles = this.renderSuggestedRooms();
+        return TAG_ORDER.reduce((tags, tagId) => {
+            if (tagId === CUSTOM_TAGS_BEFORE_TAG) {
+                const customTags = Object.keys(this.state.sublists)
+                    .filter(tagId => isCustomTag(tagId));
+                tags.push(...customTags);
             }
+            tags.push(tagId);
+            return tags;
+        }, [] as TagID[])
+            .map(orderedTagId => {
+                let extraTiles = null;
+                if (orderedTagId === DefaultTagID.Invite) {
+                    extraTiles = this.renderCommunityInvites();
+                } else if (orderedTagId === DefaultTagID.Suggested) {
+                    extraTiles = this.renderSuggestedRooms();
+                }
 
-            const totalTiles = orderedRooms.length + (extraTiles ? extraTiles.length : 0);
-            if (totalTiles === 0 && !ALWAYS_VISIBLE_TAGS.includes(orderedTagId)) {
-                continue; // skip tag - not needed
-            }
+                const aesthetics: ITagAesthetics = isCustomTag(orderedTagId)
+                    ? customTagAesthetics(orderedTagId)
+                    : this.tagAesthetics[orderedTagId];
+                if (!aesthetics) throw new Error(`Tag ${orderedTagId} does not have aesthetics`);
 
-            const aesthetics: ITagAesthetics = isCustomTag(orderedTagId)
-                ? customTagAesthetics(orderedTagId)
-                : this.tagAesthetics[orderedTagId];
-            if (!aesthetics) throw new Error(`Tag ${orderedTagId} does not have aesthetics`);
-
-            components.push(<RoomSublist
-                key={`sublist-${orderedTagId}`}
-                tagId={orderedTagId}
-                forRooms={true}
-                startAsHidden={aesthetics.defaultHidden}
-                label={aesthetics.sectionLabelRaw ? aesthetics.sectionLabelRaw : _t(aesthetics.sectionLabel)}
-                onAddRoom={aesthetics.onAddRoom}
-                addRoomLabel={aesthetics.addRoomLabel ? _t(aesthetics.addRoomLabel) : aesthetics.addRoomLabel}
-                addRoomContextMenu={aesthetics.addRoomContextMenu}
-                isMinimized={this.props.isMinimized}
-                onResize={this.props.onResize}
-                showSkeleton={showSkeleton}
-                extraTiles={extraTiles}
-            />);
-        }
-
-        return components;
+                // The cost of mounting/unmounting this component offsets the cost
+                // of keeping it in the DOM and hiding it when it is not required
+                return <RoomSublist
+                    key={`sublist-${orderedTagId}`}
+                    tagId={orderedTagId}
+                    forRooms={true}
+                    startAsHidden={aesthetics.defaultHidden}
+                    label={aesthetics.sectionLabelRaw ? aesthetics.sectionLabelRaw : _t(aesthetics.sectionLabel)}
+                    onAddRoom={aesthetics.onAddRoom}
+                    addRoomLabel={aesthetics.addRoomLabel ? _t(aesthetics.addRoomLabel) : aesthetics.addRoomLabel}
+                    addRoomContextMenu={aesthetics.addRoomContextMenu}
+                    isMinimized={this.props.isMinimized}
+                    onResize={this.props.onResize}
+                    showSkeleton={showSkeleton}
+                    extraTiles={extraTiles}
+                    alwaysVisible={ALWAYS_VISIBLE_TAGS.includes(orderedTagId)}
+                />
+            });
     }
 
     public render() {
+        const cli = MatrixClientPeg.get();
+        const userId = cli.getUserId();
+
         let explorePrompt: JSX.Element;
         if (!this.props.isMinimized) {
             if (this.state.isNameFiltering) {
@@ -578,21 +571,23 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
                         { this.props.activeSpace ? _t("Explore rooms") : _t("Explore all public rooms") }
                     </AccessibleButton>
                 </div>;
-            } else if (this.props.activeSpace) {
+            } else if (
+                this.props.activeSpace?.canInvite(userId) || this.props.activeSpace?.getMyMembership() === "join"
+            ) {
                 explorePrompt = <div className="mx_RoomList_explorePrompt">
                     <div>{ _t("Quick actions") }</div>
-                    { this.props.activeSpace.canInvite(MatrixClientPeg.get().getUserId()) && <AccessibleButton
+                    { this.props.activeSpace.canInvite(userId) && <AccessibleButton
                         className="mx_RoomList_explorePrompt_spaceInvite"
                         onClick={this.onSpaceInviteClick}
                     >
                         {_t("Invite people")}
                     </AccessibleButton> }
-                    <AccessibleButton
+                    { this.props.activeSpace.getMyMembership() === "join" && <AccessibleButton
                         className="mx_RoomList_explorePrompt_spaceExplore"
                         onClick={this.onExplore}
                     >
                         {_t("Explore rooms")}
-                    </AccessibleButton>
+                    </AccessibleButton> }
                 </div>;
             } else if (Object.values(this.state.sublists).some(list => list.length > 0)) {
                 const unfilteredLists = RoomListStore.instance.unfilteredLists

src/components/views/rooms/RoomPreviewBar.js

@@ -1,7 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 Vector Creations Ltd
-Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
+Copyright 2015-2021 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -25,10 +23,10 @@ import classNames from 'classnames';
 import { _t } from '../../../languageHandler';
 import SdkConfig from "../../../SdkConfig";
 import IdentityAuthClient from '../../../IdentityAuthClient';
-import SettingsStore from "../../../settings/SettingsStore";
 import {CommunityPrototypeStore} from "../../../stores/CommunityPrototypeStore";
 import {UPDATE_EVENT} from "../../../stores/AsyncStore";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import InviteReason from "../elements/InviteReason";
 
 const MessageCase = Object.freeze({
     NotLoggedIn: "NotLoggedIn",
@@ -303,7 +301,6 @@ export default class RoomPreviewBar extends React.Component {
         const brand = SdkConfig.get().brand;
         const Spinner = sdk.getComponent('elements.Spinner');
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-        const EventTilePreview = sdk.getComponent('elements.EventTilePreview');
 
         let showSpinner = false;
         let title;
@@ -497,24 +494,7 @@ export default class RoomPreviewBar extends React.Component {
                 const myUserId = MatrixClientPeg.get().getUserId();
                 const reason = this.props.room.currentState.getMember(myUserId).events.member.event.content.reason;
                 if (reason) {
-                    this.reasonElement = React.createRef();
-                    // We hide the reason for invitation by default, since it can be a
-                    // vector for spam/harassment.
-                    const showReason = () => {
-                        this.reasonElement.current.unfade();
-                        this.reasonElement.current.changeMessage(reason);
-                    };
-                    reasonElement = <EventTilePreview
-                        ref={this.reasonElement}
-                        onClick={showReason}
-                        className="mx_RoomPreviewBar_reason"
-                        message={_t("Invite messages are hidden by default. Click to show the message.")}
-                        layout={SettingsStore.getValue("layout")}
-                        userId={inviteMember.userId}
-                        displayName={inviteMember.rawDisplayName}
-                        avatarUrl={inviteMember.events.member.event.content.avatar_url}
-                        faded={true}
-                    />;
+                    reasonElement = <InviteReason reason={reason} />;
                 }
 
                 primaryActionHandler = this.props.onJoinClick;

src/components/views/rooms/RoomSublist.tsx

@@ -74,6 +74,7 @@ interface IProps {
     tagId: TagID;
     onResize: () => void;
     showSkeleton?: boolean;
+    alwaysVisible?: boolean;
 
     extraTiles?: ReactComponentElement<typeof ExtraTile>[];
 
@@ -125,8 +126,6 @@ export default class RoomSublist extends React.Component<IProps, IState> {
         };
         // Why Object.assign() and not this.state.height? Because TypeScript says no.
         this.state = Object.assign(this.state, {height: this.calculateInitialHeight()});
-        this.dispatcherRef = defaultDispatcher.register(this.onAction);
-        RoomListStore.instance.on(LISTS_UPDATE_EVENT, this.onListsUpdated);
     }
 
     private calculateInitialHeight() {
@@ -242,6 +241,11 @@ export default class RoomSublist extends React.Component<IProps, IState> {
         return false;
     }
 
+    public componentDidMount() {
+        this.dispatcherRef = defaultDispatcher.register(this.onAction);
+        RoomListStore.instance.on(LISTS_UPDATE_EVENT, this.onListsUpdated);
+    }
+
     public componentWillUnmount() {
         defaultDispatcher.unregister(this.dispatcherRef);
         RoomListStore.instance.off(LISTS_UPDATE_EVENT, this.onListsUpdated);
@@ -759,6 +763,7 @@ export default class RoomSublist extends React.Component<IProps, IState> {
             'mx_RoomSublist': true,
             'mx_RoomSublist_hasMenuOpen': !!this.state.contextMenuPosition,
             'mx_RoomSublist_minimized': this.props.isMinimized,
+            'mx_RoomSublist_hidden': !this.state.rooms.length && this.props.alwaysVisible !== true,
         });
 
         let content = null;

src/components/views/rooms/RoomTile.tsx

@@ -97,22 +97,8 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
             // generatePreview() will return nothing if the user has previews disabled
             messagePreview: this.generatePreview(),
         };
-
-        ActiveRoomObserver.addListener(this.props.room.roomId, this.onActiveRoomUpdate);
-        this.dispatcherRef = defaultDispatcher.register(this.onAction);
-        MessagePreviewStore.instance.on(
-            MessagePreviewStore.getPreviewChangedEventName(this.props.room),
-            this.onRoomPreviewChanged,
-        );
         this.notificationState = RoomNotificationStateStore.instance.getRoomState(this.props.room);
-        this.notificationState.on(NOTIFICATION_STATE_UPDATE, this.onNotificationUpdate);
         this.roomProps = EchoChamber.forRoom(this.props.room);
-        this.roomProps.on(PROPERTY_UPDATED, this.onRoomPropertyUpdate);
-        CommunityPrototypeStore.instance.on(
-            CommunityPrototypeStore.getUpdateEventName(this.props.room.roomId),
-            this.onCommunityUpdate,
-        );
-        this.props.room.on("Room.name", this.onRoomNameUpdate);
     }
 
     private onRoomNameUpdate = (room) => {
@@ -167,6 +153,20 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
         if (this.state.selected) {
             this.scrollIntoView();
         }
+
+        ActiveRoomObserver.addListener(this.props.room.roomId, this.onActiveRoomUpdate);
+        this.dispatcherRef = defaultDispatcher.register(this.onAction);
+        MessagePreviewStore.instance.on(
+            MessagePreviewStore.getPreviewChangedEventName(this.props.room),
+            this.onRoomPreviewChanged,
+        );
+        this.notificationState.on(NOTIFICATION_STATE_UPDATE, this.onNotificationUpdate);
+        this.roomProps.on(PROPERTY_UPDATED, this.onRoomPropertyUpdate);
+        this.roomProps.on("Room.name", this.onRoomNameUpdate);
+        CommunityPrototypeStore.instance.on(
+            CommunityPrototypeStore.getUpdateEventName(this.props.room.roomId),
+            this.onCommunityUpdate,
+        );
     }
 
     public componentWillUnmount() {
@@ -182,8 +182,15 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
             );
             this.props.room.off("Room.name", this.onRoomNameUpdate);
         }
+        ActiveRoomObserver.removeListener(this.props.room.roomId, this.onActiveRoomUpdate);
         defaultDispatcher.unregister(this.dispatcherRef);
         this.notificationState.off(NOTIFICATION_STATE_UPDATE, this.onNotificationUpdate);
+        this.roomProps.off(PROPERTY_UPDATED, this.onRoomPropertyUpdate);
+        this.roomProps.off("Room.name", this.onRoomNameUpdate);
+        CommunityPrototypeStore.instance.off(
+            CommunityPrototypeStore.getUpdateEventName(this.props.room.roomId),
+            this.onCommunityUpdate,
+        );
     }
 
     private onAction = (payload: ActionPayload) => {
@@ -547,7 +554,7 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
         />;
 
         let badge: React.ReactNode;
-        if (!this.props.isMinimized) {
+        if (!this.props.isMinimized && this.notificationState) {
             // aria-hidden because we summarise the unread count/highlight status in a manual aria-label below
             badge = (
                 <div className="mx_RoomTile_badgeContainer" aria-hidden="true">
@@ -563,7 +570,11 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
         let messagePreview = null;
         if (this.showMessagePreview && this.state.messagePreview) {
             messagePreview = (
-                <div className="mx_RoomTile_messagePreview" id={messagePreviewId(this.props.room.roomId)}>
+                <div
+                    className="mx_RoomTile_messagePreview"
+                    id={messagePreviewId(this.props.room.roomId)}
+                    title={this.state.messagePreview}
+                >
                     {this.state.messagePreview}
                 </div>
             );

src/components/views/rooms/SendMessageComposer.js

@@ -477,6 +477,10 @@ export default class SendMessageComposer extends React.Component {
     }
 
     onAction = (payload) => {
+        // don't let the user into the composer if it is disabled - all of these branches lead
+        // to the cursor being in the composer
+        if (this.props.disabled) return;
+
         switch (payload.action) {
             case 'reply_to_event':
             case Action.FocusComposer:

src/components/views/rooms/VoiceRecordComposerTile.tsx

@@ -17,21 +17,21 @@ limitations under the License.
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
 import {_t} from "../../../languageHandler";
 import React from "react";
-import {VoiceRecorder} from "../../../voice/VoiceRecorder";
+import {VoiceRecording} from "../../../voice/VoiceRecording";
 import {Room} from "matrix-js-sdk/src/models/room";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import classNames from "classnames";
 import LiveRecordingWaveform from "../voice_messages/LiveRecordingWaveform";
 import {replaceableComponent} from "../../../utils/replaceableComponent";
 import LiveRecordingClock from "../voice_messages/LiveRecordingClock";
+import {VoiceRecordingStore} from "../../../stores/VoiceRecordingStore";
 
 interface IProps {
     room: Room;
-    onRecording: (haveRecording: boolean) => void;
 }
 
 interface IState {
-    recorder?: VoiceRecorder;
+    recorder?: VoiceRecording;
 }
 
 /**
@@ -53,17 +53,45 @@ export default class VoiceRecordComposerTile extends React.PureComponent<IProps,
             await this.state.recorder.stop();
             const mxc = await this.state.recorder.upload();
             MatrixClientPeg.get().sendMessage(this.props.room.roomId, {
-                body: "Voice message",
-                msgtype: "org.matrix.msc2516.voice",
-                url: mxc,
+                "body": "Voice message",
+                "msgtype": "org.matrix.msc2516.voice",
+                //"msgtype": MsgType.Audio,
+                "url": mxc,
+                "info": {
+                    duration: Math.round(this.state.recorder.durationSeconds * 1000),
+                    mimetype: this.state.recorder.contentType,
+                    size: this.state.recorder.contentLength,
+                },
+
+                // MSC1767 experiment
+                "org.matrix.msc1767.text": "Voice message",
+                "org.matrix.msc1767.file": {
+                    url: mxc,
+                    name: "Voice message.ogg",
+                    mimetype: this.state.recorder.contentType,
+                    size: this.state.recorder.contentLength,
+                },
+                "org.matrix.msc1767.audio": {
+                    duration: Math.round(this.state.recorder.durationSeconds * 1000),
+                    // TODO: @@ TravisR: Waveform? (MSC1767 decision)
+                },
+                "org.matrix.experimental.msc2516.voice": { // MSC2516+MSC1767 experiment
+                    duration: Math.round(this.state.recorder.durationSeconds * 1000),
+
+                    // Events can't have floats, so we try to maintain resolution by using 1024
+                    // as a maximum value. The waveform contains values between zero and 1, so this
+                    // should come out largely sane.
+                    //
+                    // We're expecting about one data point per second of audio.
+                    waveform: this.state.recorder.finalWaveform.map(v => Math.round(v * 1024)),
+                },
             });
+            await VoiceRecordingStore.instance.disposeRecording();
             this.setState({recorder: null});
-            this.props.onRecording(false);
             return;
         }
-        const recorder = new VoiceRecorder(MatrixClientPeg.get());
+        const recorder = VoiceRecordingStore.instance.startRecording();
         await recorder.start();
-        this.props.onRecording(true);
         this.setState({recorder});
     };
 

src/components/views/settings/tabs/room/RolesRoomSettingsTab.js

@@ -1,5 +1,5 @@
 /*
-Copyright 2019 New Vector Ltd
+Copyright 2019, 2021 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -22,17 +22,19 @@ import * as sdk from "../../../../..";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import Modal from "../../../../../Modal";
 import {replaceableComponent} from "../../../../../utils/replaceableComponent";
+import {EventType} from "matrix-js-sdk/src/@types/event";
 
 const plEventsToLabels = {
     // These will be translated for us later.
-    "m.room.avatar": _td("Change room avatar"),
-    "m.room.name": _td("Change room name"),
-    "m.room.canonical_alias": _td("Change main address for the room"),
-    "m.room.history_visibility": _td("Change history visibility"),
-    "m.room.power_levels": _td("Change permissions"),
-    "m.room.topic": _td("Change topic"),
-    "m.room.tombstone": _td("Upgrade the room"),
-    "m.room.encryption": _td("Enable room encryption"),
+    [EventType.RoomAvatar]: _td("Change room avatar"),
+    [EventType.RoomName]: _td("Change room name"),
+    [EventType.RoomCanonicalAlias]: _td("Change main address for the room"),
+    [EventType.RoomHistoryVisibility]: _td("Change history visibility"),
+    [EventType.RoomPowerLevels]: _td("Change permissions"),
+    [EventType.RoomTopic]: _td("Change topic"),
+    [EventType.RoomTombstone]: _td("Upgrade the room"),
+    [EventType.RoomEncryption]: _td("Enable room encryption"),
+    [EventType.RoomServerAcl]: _td("Change server ACLs"),
 
     // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
     "im.vector.modular.widgets": _td("Modify widgets"),
@@ -40,14 +42,15 @@ const plEventsToLabels = {
 
 const plEventsToShow = {
     // If an event is listed here, it will be shown in the PL settings. Defaults will be calculated.
-    "m.room.avatar": {isState: true},
-    "m.room.name": {isState: true},
-    "m.room.canonical_alias": {isState: true},
-    "m.room.history_visibility": {isState: true},
-    "m.room.power_levels": {isState: true},
-    "m.room.topic": {isState: true},
-    "m.room.tombstone": {isState: true},
-    "m.room.encryption": {isState: true},
+    [EventType.RoomAvatar]: {isState: true},
+    [EventType.RoomName]: {isState: true},
+    [EventType.RoomCanonicalAlias]: {isState: true},
+    [EventType.RoomHistoryVisibility]: {isState: true},
+    [EventType.RoomPowerLevels]: {isState: true},
+    [EventType.RoomTopic]: {isState: true},
+    [EventType.RoomTombstone]: {isState: true},
+    [EventType.RoomEncryption]: {isState: true},
+    [EventType.RoomServerAcl]: {isState: true},
 
     // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
     "im.vector.modular.widgets": {isState: true},

src/components/views/spaces/SpacePanel.tsx

@@ -25,7 +25,12 @@ import SpaceCreateMenu from "./SpaceCreateMenu";
 import {SpaceItem} from "./SpaceTreeLevel";
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
 import {useEventEmitter} from "../../../hooks/useEventEmitter";
-import SpaceStore, {HOME_SPACE, UPDATE_SELECTED_SPACE, UPDATE_TOP_LEVEL_SPACES} from "../../../stores/SpaceStore";
+import SpaceStore, {
+    HOME_SPACE,
+    UPDATE_INVITED_SPACES,
+    UPDATE_SELECTED_SPACE,
+    UPDATE_TOP_LEVEL_SPACES,
+} from "../../../stores/SpaceStore";
 import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
 import {SpaceNotificationState} from "../../../stores/notifications/SpaceNotificationState";
 import NotificationBadge from "../rooms/NotificationBadge";
@@ -105,19 +110,21 @@ const SpaceButton: React.FC<IButtonProps> = ({
     </li>;
 }
 
-const useSpaces = (): [Room[], Room | null] => {
+const useSpaces = (): [Room[], Room[], Room | null] => {
+    const [invites, setInvites] = useState<Room[]>(SpaceStore.instance.invitedSpaces);
+    useEventEmitter(SpaceStore.instance, UPDATE_INVITED_SPACES, setInvites);
     const [spaces, setSpaces] = useState<Room[]>(SpaceStore.instance.spacePanelSpaces);
     useEventEmitter(SpaceStore.instance, UPDATE_TOP_LEVEL_SPACES, setSpaces);
     const [activeSpace, setActiveSpace] = useState<Room>(SpaceStore.instance.activeSpace);
     useEventEmitter(SpaceStore.instance, UPDATE_SELECTED_SPACE, setActiveSpace);
-    return [spaces, activeSpace];
+    return [invites, spaces, activeSpace];
 };
 
 const SpacePanel = () => {
     // We don't need the handle as we position the menu in a constant location
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const [menuDisplayed, handle, openMenu, closeMenu] = useContextMenu<void>();
-    const [spaces, activeSpace] = useSpaces();
+    const [invites, spaces, activeSpace] = useSpaces();
     const [isPanelCollapsed, setPanelCollapsed] = useState(true);
 
     const newClasses = classNames("mx_SpaceButton_new", {
@@ -209,6 +216,13 @@ const SpacePanel = () => {
                             notificationState={SpaceStore.instance.getNotificationState(HOME_SPACE)}
                             isNarrow={isPanelCollapsed}
                         />
+                        { invites.map(s => <SpaceItem
+                            key={s.roomId}
+                            space={s}
+                            activeSpaces={activeSpaces}
+                            isPanelCollapsed={isPanelCollapsed}
+                            onExpand={() => setPanelCollapsed(false)}
+                        />) }
                         { spaces.map(s => <SpaceItem
                             key={s.roomId}
                             space={s}

src/components/views/spaces/SpaceTreeLevel.tsx

@@ -45,6 +45,8 @@ import RoomViewStore from "../../../stores/RoomViewStore";
 import {SetRightPanelPhasePayload} from "../../../dispatcher/payloads/SetRightPanelPhasePayload";
 import {RightPanelPhases} from "../../../stores/RightPanelStorePhases";
 import {EventType} from "matrix-js-sdk/src/@types/event";
+import {StaticNotificationState} from "../../../stores/notifications/StaticNotificationState";
+import {NotificationColor} from "../../../stores/notifications/NotificationColor";
 
 interface IItemProps {
     space?: Room;
@@ -67,7 +69,7 @@ export class SpaceItem extends React.PureComponent<IItemProps, IItemState> {
         super(props);
 
         this.state = {
-            collapsed: !props.isNested,   // default to collapsed for root items
+            collapsed: !props.isNested, // default to collapsed for root items
             contextMenuPosition: null,
         };
     }
@@ -83,6 +85,7 @@ export class SpaceItem extends React.PureComponent<IItemProps, IItemState> {
     }
 
     private onContextMenu = (ev: React.MouseEvent) => {
+        if (this.props.space.getMyMembership() !== "join") return;
         ev.preventDefault();
         ev.stopPropagation();
         this.setState({
@@ -185,6 +188,8 @@ export class SpaceItem extends React.PureComponent<IItemProps, IItemState> {
     };
 
     private renderContextMenu(): React.ReactElement {
+        if (this.props.space.getMyMembership() !== "join") return null;
+
         let contextMenu = null;
         if (this.state.contextMenuPosition) {
             const userId = this.context.getUserId();
@@ -300,7 +305,9 @@ export class SpaceItem extends React.PureComponent<IItemProps, IItemState> {
             mx_SpaceButton_hasMenuOpen: !!this.state.contextMenuPosition,
             mx_SpaceButton_narrow: isNarrow,
         });
-        const notificationState = SpaceStore.instance.getNotificationState(space.roomId);
+        const notificationState = space.getMyMembership() === "invite"
+            ? StaticNotificationState.forSymbol("!", NotificationColor.Red)
+            : SpaceStore.instance.getNotificationState(space.roomId);
 
         let childItems;
         if (childSpaces && !collapsed) {

src/components/views/voice_messages/LiveRecordingClock.tsx

@@ -15,12 +15,12 @@ limitations under the License.
 */
 
 import React from "react";
-import {IRecordingUpdate, VoiceRecorder} from "../../../voice/VoiceRecorder";
+import {IRecordingUpdate, VoiceRecording} from "../../../voice/VoiceRecording";
 import {replaceableComponent} from "../../../utils/replaceableComponent";
 import Clock from "./Clock";
 
 interface IProps {
-    recorder: VoiceRecorder;
+    recorder: VoiceRecording;
 }
 
 interface IState {

src/components/views/voice_messages/LiveRecordingWaveform.tsx

@@ -15,14 +15,14 @@ limitations under the License.
 */
 
 import React from "react";
-import {IRecordingUpdate, VoiceRecorder} from "../../../voice/VoiceRecorder";
+import {IRecordingUpdate, VoiceRecording} from "../../../voice/VoiceRecording";
 import {replaceableComponent} from "../../../utils/replaceableComponent";
 import {arrayFastResample, arraySeed} from "../../../utils/arrays";
 import {percentageOf} from "../../../utils/numbers";
 import Waveform from "./Waveform";
 
 interface IProps {
-    recorder: VoiceRecorder;
+    recorder: VoiceRecording;
 }
 
 interface IState {

src/createRoom.ts

@@ -90,6 +90,12 @@ export interface IOpts {
     parentSpace?: Room;
 }
 
+export interface IInvite3PID {
+    id_server: string,
+    medium: 'email',
+    address: string,
+}
+
 /**
  * Create a new room, and switch to it.
  *

src/customisations/Security.ts

@@ -74,8 +74,20 @@ export interface ISecurityCustomisations {
     catchAccessSecretStorageError?: typeof catchAccessSecretStorageError,
     setupEncryptionNeeded?: typeof setupEncryptionNeeded,
     getDehydrationKey?: typeof getDehydrationKey,
+
+    /**
+     * When false, disables the post-login UI from showing. If there's
+     * an error during setup, that will be shown to the user.
+     *
+     * Note: when this is set to false then the app will assume the user's
+     * encryption is set up some other way which would circumvent the default
+     * UI, such as by presenting alternative UI.
+     */
+    SHOW_ENCRYPTION_SETUP_UI?: boolean, // default true
 }
 
 // A real customisation module will define and export one or more of the
 // customisation points that make up `ISecurityCustomisations`.
-export default {} as ISecurityCustomisations;
+export default {
+    SHOW_ENCRYPTION_SETUP_UI: true,
+} as ISecurityCustomisations;

src/editor/deserialize.ts

@@ -143,11 +143,11 @@ function parseElement(n: HTMLElement, partCreator: PartCreator, lastNode: HTMLEl
             // math nodes are translated back into delimited latex strings
             if (n.hasAttribute("data-mx-maths")) {
                 const delimLeft = (n.nodeName == "SPAN") ?
-                    (SdkConfig.get()['latex_maths_delims'] || {})['inline_left'] || "$" :
-                    (SdkConfig.get()['latex_maths_delims'] || {})['display_left'] || "$$";
+                    ((SdkConfig.get()['latex_maths_delims'] || {})['inline'] || {})['left'] || "\\(" :
+                    ((SdkConfig.get()['latex_maths_delims'] || {})['display'] || {})['left'] || "\\[";
                 const delimRight = (n.nodeName == "SPAN") ?
-                    (SdkConfig.get()['latex_maths_delims'] || {})['inline_right'] || "$" :
-                    (SdkConfig.get()['latex_maths_delims'] || {})['display_right'] || "$$";
+                    ((SdkConfig.get()['latex_maths_delims'] || {})['inline'] || {})['right'] || "\\)" :
+                    ((SdkConfig.get()['latex_maths_delims'] || {})['display'] || {})['right'] || "\\]";
                 const tex = n.getAttribute("data-mx-maths");
                 return partCreator.plain(delimLeft + tex + delimRight);
             } else if (!checkDescendInto(n)) {

src/editor/serialize.ts

@@ -47,21 +47,65 @@ export function mdSerialize(model: EditorModel) {
 
 export function htmlSerializeIfNeeded(model: EditorModel, {forceHTML = false} = {}) {
     let md = mdSerialize(model);
+    // copy of raw input to remove unwanted math later
+    const orig = md;
 
     if (SettingsStore.getValue("feature_latex_maths")) {
-        const displayPattern = (SdkConfig.get()['latex_maths_delims'] || {})['display_pattern'] ||
-            "\\$\\$(([^$]|\\\\\\$)*)\\$\\$";
-        const inlinePattern = (SdkConfig.get()['latex_maths_delims'] || {})['inline_pattern'] ||
-            "\\$(([^$]|\\\\\\$)*)\\$";
+        const patternNames = ['tex', 'latex'];
+        const patternTypes = ['display', 'inline'];
+        const patternDefaults = {
+            "tex": {
+                // detect math with tex delimiters, inline: $...$, display $$...$$
+                // preferably use negative lookbehinds, not supported in all major browsers:
+                // const displayPattern = "^(?<!\\\\)\\$\\$(?![ \\t])(([^$]|\\\\\\$)+?)\\$\\$$";
+                // const inlinePattern = "(?:^|\\s)(?<!\\\\)\\$(?!\\s)(([^$]|\\\\\\$)+?)(?<!\\\\|\\s)\\$";
 
-        md = md.replace(RegExp(displayPattern, "gm"), function(m, p1) {
-            const p1e = AllHtmlEntities.encode(p1);
-            return `<div data-mx-maths="${p1e}">\n\n</div>\n\n`;
-        });
+                // conditions for display math detection $$...$$:
+                // - pattern starts at beginning of line or is not prefixed with backslash or dollar
+                // - left delimiter ($$) is not escaped by backslash
+                "display": "(^|[^\\\\$])\\$\\$(([^$]|\\\\\\$)+?)\\$\\$",
 
-        md = md.replace(RegExp(inlinePattern, "gm"), function(m, p1) {
-            const p1e = AllHtmlEntities.encode(p1);
-            return `<span data-mx-maths="${p1e}"></span>`;
+                // conditions for inline math detection $...$:
+                // - pattern starts at beginning of line, follows whitespace character or punctuation
+                // - pattern is on a single line
+                // - left and right delimiters ($) are not escaped by backslashes
+                // - left delimiter is not followed by whitespace character
+                // - right delimiter is not prefixed with whitespace character
+                "inline":
+                    "(^|\\s|[.,!?:;])(?!\\\\)\\$(?!\\s)(([^$\\n]|\\\\\\$)*([^\\\\\\s\\$]|\\\\\\$)(?:\\\\\\$)?)\\$",
+            },
+            "latex": {
+                // detect math with latex delimiters, inline: \(...\), display \[...\]
+
+                // conditions for display math detection \[...\]:
+                // - pattern starts at beginning of line or is not prefixed with backslash
+                // - pattern is not empty
+                "display": "(^|[^\\\\])\\\\\\[(?!\\\\\\])(.*?)\\\\\\]",
+
+                // conditions for inline math detection \(...\):
+                // - pattern starts at beginning of line or is not prefixed with backslash
+                // - pattern is not empty
+                "inline": "(^|[^\\\\])\\\\\\((?!\\\\\\))(.*?)\\\\\\)",
+            },
+        };
+
+        patternNames.forEach(function(patternName) {
+            patternTypes.forEach(function(patternType) {
+                // get the regex replace pattern from config or use the default
+                const pattern = (((SdkConfig.get()["latex_maths_delims"] ||
+                    {})[patternType] || {})["pattern"] || {})[patternName] ||
+                    patternDefaults[patternName][patternType];
+
+                md = md.replace(RegExp(pattern, "gms"), function(m, p1, p2) {
+                    const p2e = AllHtmlEntities.encode(p2);
+                    switch (patternType) {
+                        case "display":
+                            return `${p1}<div data-mx-maths="${p2e}">\n\n</div>\n\n`;
+                        case "inline":
+                            return `${p1}<span data-mx-maths="${p2e}"></span>`;
+                    }
+                });
+            });
         });
 
         // make sure div tags always start on a new line, otherwise it will confuse
@@ -73,15 +117,29 @@ export function htmlSerializeIfNeeded(model: EditorModel, {forceHTML = false} =
     if (!parser.isPlainText() || forceHTML) {
         // feed Markdown output to HTML parser
         const phtml = cheerio.load(parser.toHTML(),
-            { _useHtmlParser2: true, decodeEntities: false })
+            { _useHtmlParser2: true, decodeEntities: false });
 
-        // add fallback output for latex math, which should not be interpreted as markdown
-        phtml('div, span').each(function(i, e) {
-            const tex = phtml(e).attr('data-mx-maths')
-            if (tex) {
-                phtml(e).html(`<code>${tex}</code>`)
-            }
-        });
+        if (SettingsStore.getValue("feature_latex_maths")) {
+            // original Markdown without LaTeX replacements
+            const parserOrig = new Markdown(orig);
+            const phtmlOrig = cheerio.load(parserOrig.toHTML(),
+                { _useHtmlParser2: true, decodeEntities: false });
+
+            // since maths delimiters are handled before Markdown,
+            // code blocks could contain mangled content.
+            // replace code blocks with original content
+            phtmlOrig('code').each(function(i) {
+                phtml('code').eq(i).text(phtmlOrig('code').eq(i).text());
+            });
+
+            // add fallback output for latex math, which should not be interpreted as markdown
+            phtml('div, span').each(function(i, e) {
+                const tex = phtml(e).attr('data-mx-maths')
+                if (tex) {
+                    phtml(e).html(`<code>${tex}</code>`)
+                }
+            });
+        }
         return phtml.html();
     }
     // ensure removal of escape backslashes in non-Markdown messages

src/email.ts

@@ -14,7 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-const EMAIL_ADDRESS_REGEX = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i;
+// Regexp based on Simpler Version from https://gist.github.com/gregseth/5582254 - matches RFC2822
+const EMAIL_ADDRESS_REGEX = new RegExp(
+    "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*" + // localpart
+    "@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$", "i");
 
 export function looksValid(email: string): boolean {
     return EMAIL_ADDRESS_REGEX.test(email);

src/i18n/strings/ar.json

@@ -1551,5 +1551,6 @@
     "You've reached the maximum number of simultaneous calls.": "لقد وصلت للحد الاقصى من المكالمات المتزامنة.",
     "Too Many Calls": "مكالمات كثيرة جدا",
     "Call failed because webcam or microphone could not be accessed. Check that:": "فشلت المكالمة لعدم امكانية الوصل للميكروفون او الكاميرا , من فضلك  قم بالتأكد.",
-    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "فشلت المكالمة لعدم امكانية الوصل للميكروفون , تأكد من ان المكروفون متصل وتم اعداده بشكل صحيح."
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "فشلت المكالمة لعدم امكانية الوصل للميكروفون , تأكد من ان المكروفون متصل وتم اعداده بشكل صحيح.",
+    "Explore rooms": "استكشِف الغرف"
 }

src/i18n/strings/az.json

@@ -380,5 +380,8 @@
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "Bu otaqda %(groups)s üçün %(senderDisplayName)s aktiv oldu.",
     "powered by Matrix": "Matrix tərəfindən təchiz edilmişdir",
     "Custom Server Options": "Fərdi Server Seçimləri",
-    "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "Bu otaqda %(newGroups)s üçün aktiv və %(oldGroups)s üçün %(senderDisplayName)s deaktiv oldu."
+    "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "Bu otaqda %(newGroups)s üçün aktiv və %(oldGroups)s üçün %(senderDisplayName)s deaktiv oldu.",
+    "Create Account": "Hesab Aç",
+    "Explore rooms": "Otaqları kəşf edin",
+    "Sign In": "Daxil ol"
 }

src/i18n/strings/ca.json

@@ -950,5 +950,6 @@
     "Confirm": "Confirma",
     "Click the button below to confirm adding this email address.": "Fes clic al botó de sota per confirmar l'addició d'aquesta adreça de correu electrònic.",
     "Unable to access webcam / microphone": "No s'ha pogut accedir a la càmera web / micròfon",
-    "Unable to access microphone": "No s'ha pogut accedir al micròfon"
+    "Unable to access microphone": "No s'ha pogut accedir al micròfon",
+    "Explore rooms": "Explora sales"
 }

src/i18n/strings/cs.json

@@ -3165,5 +3165,42 @@
     "Edit devices": "Upravit zařízení",
     "Check your devices": "Zkontrolujte svá zařízení",
     "You have unverified logins": "Máte neověřená přihlášení",
-    "Open": "Otevřít"
+    "Open": "Otevřít",
+    "Share decryption keys for room history when inviting users": "Při pozvání uživatelů sdílet dešifrovací klíče pro historii místnosti",
+    "Manage & explore rooms": "Spravovat a prozkoumat místnosti",
+    "Message search initilisation failed": "Inicializace vyhledávání zpráv se nezdařila",
+    "%(count)s people you know have already joined|one": "%(count)s osoba, kterou znáte, se již připojila",
+    "Invited people will be able to read old messages.": "Pozvaní lidé budou moci číst staré zprávy.",
+    "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": "Pokud tak učiníte, nezapomeňte, že žádná z vašich zpráv nebude smazána, ale vyhledávání může být na několik okamžiků degradováno, zatímco index bude znovu vytvářen",
+    "You can add more later too, including already existing ones.": "Později můžete přidat i další, včetně již existujících.",
+    "Verify your identity to access encrypted messages and prove your identity to others.": "Ověřte svou identitu, abyste získali přístup k šifrovaným zprávám a prokázali svou identitu ostatním.",
+    "Sends the given message as a spoiler": "Odešle danou zprávu jako spoiler",
+    "Review to ensure your account is safe": "Zkontrolujte, zda je váš účet v bezpečí",
+    "%(deviceId)s from %(ip)s": "%(deviceId)s z %(ip)s",
+    "Send and receive voice messages (in development)": "Odesílat a přijímat hlasové zprávy (ve vývoji)",
+    "unknown person": "neznámá osoba",
+    "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>": "Konzultace s %(transferTarget)s. <a>Převod na %(transferee)s</a>",
+    "Warn before quitting": "Varovat před ukončením",
+    "Invite to just this room": "Pozvat jen do této místnosti",
+    "Quick actions": "Rychlé akce",
+    "Invite messages are hidden by default. Click to show the message.": "Zprávy s pozvánkou jsou ve výchozím nastavení skryté. Kliknutím zobrazíte zprávu.",
+    "Record a voice message": "Nahrát hlasovou zprávu",
+    "Stop & send recording": "Zastavit a odeslat záznam",
+    "Accept on your other login…": "Přijměte ve svém dalším přihlášení…",
+    "%(count)s people you know have already joined|other": "%(count)s lidí, které znáte, se již připojili",
+    "Add existing rooms": "Přidat stávající místnosti",
+    "Adding...": "Přidávání...",
+    "We couldn't create your DM.": "Nemohli jsme vytvořit vaši přímou zprávu.",
+    "Consult first": "Nejprve se poraďte",
+    "You most likely do not want to reset your event index store": "Pravděpodobně nechcete resetovat úložiště indexů událostí",
+    "Reset event store": "Resetovat úložiště událostí",
+    "Reset event store?": "Resetovat úložiště událostí?",
+    "Verify other login": "Ověřit další přihlášení",
+    "Avatar": "Avatar",
+    "Verification requested": "Žádost ověření",
+    "Please choose a strong password": "Vyberte silné heslo",
+    "What are some things you want to discuss in %(spaceName)s?": "O kterých tématech chcete diskutovat v %(spaceName)s?",
+    "Let's create a room for each of them.": "Vytvořme pro každé z nich místnost.",
+    "Use another login": "Použijte jiné přihlašovací jméno",
+    "Without verifying, you won’t have access to all your messages and may appear as untrusted to others.": "Bez ověření nebudete mít přístup ke všem svým zprávám a ostatním se můžete zobrazit jako nedůvěryhodný."
 }

src/i18n/strings/cy.json

@@ -8,5 +8,8 @@
     "The version of %(brand)s": "Fersiwn %(brand)s",
     "Whether or not you're logged in (we don't record your username)": "Os ydych wedi mewngofnodi ai peidio (nid ydym yn cofnodi'ch enw defnyddiwr)",
     "Your language of choice": "Eich iaith o ddewis",
-    "The version of %(brand)s": "Fersiwn %(brand)s"
+    "Sign In": "Mewngofnodi",
+    "Create Account": "Creu Cyfrif",
+    "Dismiss": "Wfftio",
+    "Explore rooms": "Archwilio Ystafelloedd"
 }

src/i18n/strings/da.json

@@ -54,7 +54,7 @@
     "OK": "OK",
     "Search": "Søg",
     "Custom Server Options": "Brugerdefinerede serverindstillinger",
-    "Dismiss": "Afskedige",
+    "Dismiss": "Afslut",
     "powered by Matrix": "Drevet af Matrix",
     "Close": "Luk",
     "Cancel": "Afbryd",
@@ -618,5 +618,45 @@
     "Unable to access microphone": "Kan ikke tilgå mikrofonen",
     "The call could not be established": "Opkaldet kunne ikke etableres",
     "Call Declined": "Opkald afvist",
-    "Folder": "Mappe"
+    "Folder": "Mappe",
+    "We couldn't log you in": "Vi kunne ikke logge dig ind",
+    "Try again": "Prøv igen",
+    "Already in call": "",
+    "You're already in a call with this person.": "Du har allerede i et opkald med denne person.",
+    "Chile": "Chile",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "Opkald fejlede på grund af kamera og mikrofon ikke kunne nås. Tjek dette:",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Opkald fejlede på grund af mikrofon ikke kunne nås. Tjek at din mikrofon er tilsluttet og sat op rigtigt.",
+    "India": "Indien",
+    "Iceland": "Island",
+    "Hong Kong": "Hong Kong",
+    "Greenland": "Grønland",
+    "Greece": "Grækenland",
+    "Ghana": "Ghana",
+    "Germany": "Tyskland",
+    "Faroe Islands": "Færøerne",
+    "Estonia": "Estonien",
+    "Ecuador": "Ecuador",
+    "Czech Republic": "Tjekkiet",
+    "Colombia": "Colombien",
+    "Chad": "Chad",
+    "Bulgaria": "Bulgarien",
+    "Brazil": "Brazilien",
+    "Bosnia": "Bosnien",
+    "Bolivia": "Bolivien",
+    "Belarus": "Hviderusland",
+    "Austria": "Østrig",
+    "Australia": "Australien",
+    "Armenia": "Armenien",
+    "Argentina": "Argentina",
+    "Antarctica": "Antarktis",
+    "Angola": "Angola",
+    "Albania": "Albanien",
+    "Afghanistan": "Afghanistan",
+    "United States": "Amerikas Forenede Stater",
+    "United Kingdom": "Storbritanien",
+    "This will end the conference for everyone. Continue?": "Dette vil afbryde opkaldet for alle. Fortsæt?",
+    "No other application is using the webcam": "Ingen anden application bruger kameraet",
+    "A microphone and webcam are plugged in and set up correctly": "En mikrofon og kamera er tilsluttet og sat op rigtigt",
+    "Croatia": "Kroatien",
+    "Answered Elsewhere": "Svaret andet sted"
 }

src/i18n/strings/en_EN.json

@@ -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",
@@ -1362,6 +1362,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",
@@ -1474,6 +1475,7 @@
     "The conversation continues here.": "The conversation continues here.",
     "This room has been replaced and is no longer active.": "This room has been replaced and is no longer active.",
     "You do not have permission to post to this room": "You do not have permission to post to this room",
+    "%(seconds)ss left": "%(seconds)ss left",
     "Bold": "Bold",
     "Italics": "Italics",
     "Strikethrough": "Strikethrough",
@@ -1579,7 +1581,6 @@
     "Start chatting": "Start chatting",
     "Do you want to join %(roomName)s?": "Do you want to join %(roomName)s?",
     "<userName/> invited you": "<userName/> invited you",
-    "Invite messages are hidden by default. Click to show the message.": "Invite messages are hidden by default. Click to show the message.",
     "Reject": "Reject",
     "Reject & Ignore user": "Reject & Ignore user",
     "You're previewing %(roomName)s. Want to join it?": "You're previewing %(roomName)s. Want to join it?",
@@ -1916,16 +1917,20 @@
     "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",
+    "View all %(count)s members|other": "View all %(count)s members",
+    "View all %(count)s members|one": "View 1 member",
+    "Including %(commaSeparatedMembers)s": "Including %(commaSeparatedMembers)s",
+    "%(count)s members including %(commaSeparatedMembers)s|other": "%(count)s members including %(commaSeparatedMembers)s",
+    "%(count)s members including %(commaSeparatedMembers)s|one": "%(commaSeparatedMembers)s",
     "%(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",
@@ -2016,6 +2021,7 @@
     "Add existing rooms": "Add existing rooms",
     "Filter your rooms and spaces": "Filter your rooms and spaces",
     "Spaces": "Spaces",
+    "Direct Messages": "Direct Messages",
     "Don't want to add an existing room?": "Don't want to add an existing room?",
     "Create a new room": "Create a new room",
     "Failed to add rooms to space": "Failed to add rooms to space",
@@ -2206,7 +2212,6 @@
     "Suggestions": "Suggestions",
     "May include members not in %(communityName)s": "May include members not in %(communityName)s",
     "Recently Direct Messaged": "Recently Direct Messaged",
-    "Direct Messages": "Direct Messages",
     "Start a conversation with someone using their name, email address or username (like <userId/>).": "Start a conversation with someone using their name, email address or username (like <userId/>).",
     "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>",
@@ -2312,7 +2317,7 @@
     "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",
+    "If you do, please note that none of your messages will be deleted, but the search experience might be degraded for a few moments whilst 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 moments whilst 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",
@@ -2378,6 +2383,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.",
@@ -2554,6 +2563,7 @@
     "Failed to reject invitation": "Failed to reject invitation",
     "Cannot create rooms in this community": "Cannot create rooms in this community",
     "You do not have permission to create rooms in this community.": "You do not have permission to create rooms in this community.",
+    "You are the only person here. If you leave, no one will be able to join in the future, including you.": "You are the only person here. If you leave, no one will be able to join in the future, including you.",
     "This space is not public. You will not be able to rejoin without an invite.": "This space is not public. You will not be able to rejoin without an invite.",
     "This room is not public. You will not be able to rejoin without an invite.": "This room is not public. You will not be able to rejoin without an invite.",
     "Are you sure you want to leave the space '%(spaceName)s'?": "Are you sure you want to leave the space '%(spaceName)s'?",
@@ -2797,7 +2807,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",

src/i18n/strings/en_US.json

@@ -650,5 +650,12 @@
     "Error upgrading room": "Error upgrading room",
     "Double check that your server supports the room version chosen and try again.": "Double check that your server supports the room version chosen and try again.",
     "Changes the avatar of the current room": "Changes the avatar of the current room",
-    "Changes your avatar in all rooms": "Changes your avatar in all rooms"
+    "Changes your avatar in all rooms": "Changes your avatar in all rooms",
+    "Favourited": "Favorited",
+    "Explore rooms": "Explore rooms",
+    "Click the button below to confirm adding this email address.": "Click the button below to confirm adding this email address.",
+    "Confirm adding email": "Confirm adding email",
+    "Single Sign On": "Single Sign On",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Confirm adding this email address by using Single Sign On to prove your identity.",
+    "Use Single Sign On to continue": "Use Single Sign On to continue"
 }

src/i18n/strings/es.json

@@ -3188,5 +3188,42 @@
     "From %(deviceName)s (%(deviceId)s) at %(ip)s": "De %(deviceName)s (%(deviceId)s) en",
     "Check your devices": "Comprueba tus dispositivos",
     "A new login is accessing your account: %(name)s (%(deviceID)s) at %(ip)s": "Alguien está iniciando sesión a tu cuenta: %(name)s (%(deviceID)s) en %(ip)s",
-    "You have unverified logins": "Tienes inicios de sesión sin verificar"
+    "You have unverified logins": "Tienes inicios de sesión sin verificar",
+    "Verification requested": "Verificación solicitada",
+    "Avatar": "Imagen de perfil",
+    "Verify other login": "Verificar otro inicio de sesión",
+    "Consult first": "Consultar primero",
+    "Invited people will be able to read old messages.": "Las personas invitadas podrán leer mensajes antiguos.",
+    "We couldn't create your DM.": "No hemos podido crear tu mensaje directo.",
+    "Adding...": "Añadiendo...",
+    "Add existing rooms": "Añadir salas existentes",
+    "%(count)s people you know have already joined|one": "%(count)s persona que ya conoces se ha unido",
+    "%(count)s people you know have already joined|other": "%(count)s personas que ya conoces se han unido",
+    "Accept on your other login…": "Acepta en tu otro inicio de sesión…",
+    "Stop & send recording": "Parar y enviar grabación",
+    "Record a voice message": "Grabar un mensaje de voz",
+    "Quick actions": "Acciones rápidas",
+    "Invite to just this room": "Invitar solo a esta sala",
+    "Warn before quitting": "Avisar antes de salir",
+    "Manage & explore rooms": "Gestionar y explorar salas",
+    "unknown person": "persona desconocida",
+    "Share decryption keys for room history when inviting users": "Compartir claves para descifrar el historial de la sala al invitar a gente",
+    "Send and receive voice messages (in development)": "Enviar y recibir mensajes de voz (en desarrollo)",
+    "%(deviceId)s from %(ip)s": "%(deviceId)s desde %(ip)s",
+    "Review to ensure your account is safe": "Revisa que tu cuenta esté segura",
+    "Sends the given message as a spoiler": "Envía el mensaje como un spoiler",
+    "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>": "Consultando a %(transferTarget)s. <a>Transferir a %(transferee)s</a>",
+    "Message search initilisation failed": "Ha fallado la inicialización de la búsqueda de mensajes",
+    "Reset event store?": "¿Restablecer almacenamiento de eventos?",
+    "You most likely do not want to reset your event index store": "Lo más probable es que no quieras restablecer tu almacenamiento de índice de ecentos",
+    "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": "Si lo haces, ten en cuenta que no se borrarán tus mensajes, pero la experiencia de búsqueda será peor durante unos momentos mientras se recrea el índice",
+    "Reset event store": "Restablecer el almacenamiento de eventos",
+    "What are some things you want to discuss in %(spaceName)s?": "¿De qué quieres hablar en %(spaceName)s?",
+    "Let's create a room for each of them.": "Crearemos una sala para cada uno.",
+    "You can add more later too, including already existing ones.": "Puedes añadir más después, incluso si ya existen.",
+    "Please choose a strong password": "Por favor, elige una contraseña segura",
+    "Use another login": "Usar otro inicio de sesión",
+    "Verify your identity to access encrypted messages and prove your identity to others.": "Verifica tu identidad para acceder a mensajes cifrados y probar tu identidad a otros.",
+    "Without verifying, you won’t have access to all your messages and may appear as untrusted to others.": "Si no verificas no tendrás acceso a todos tus mensajes y puede que aparezcas como no confiable para otros usuarios.",
+    "Invite messages are hidden by default. Click to show the message.": "Los mensajes de invitación no se muestran por defecto. Haz clic para mostrarlo."
 }

src/i18n/strings/et.json

@@ -2517,7 +2517,7 @@
     "Join the conference from the room information card on the right": "Liitu konverentsiga selle jututoa infolehelt paremal",
     "Video conference ended by %(senderName)s": "%(senderName)s lõpetas video rühmakõne",
     "Video conference updated by %(senderName)s": "%(senderName)s uuendas video rühmakõne",
-    "Video conference started by %(senderName)s": "%(senderName)s alustas video rühmakõne",
+    "Video conference started by %(senderName)s": "%(senderName)s alustas video rühmakõnet",
     "End conference": "Lõpeta videokonverents",
     "This will end the conference for everyone. Continue?": "Sellega lõpetame kõikide osalejate jaoks videokonverentsi. Nõus?",
     "Ignored attempt to disable encryption": "Eirasin katset lõpetada krüptimise kasutamine",
@@ -3226,5 +3226,42 @@
     "Open": "Ava",
     "Check your devices": "Kontrolli oma seadmeid",
     "A new login is accessing your account: %(name)s (%(deviceID)s) at %(ip)s": "Uus sisselogimissessioon kasutab sinu Matrixi kontot: %(name)s %(deviceID)s aadressil %(ip)s",
-    "You have unverified logins": "Sul on verifitseerimata sisselogimissessioone"
+    "You have unverified logins": "Sul on verifitseerimata sisselogimissessioone",
+    "Manage & explore rooms": "Halda ja uuri jututubasid",
+    "Warn before quitting": "Hoiata enne rakenduse töö lõpetamist",
+    "Invite to just this room": "Kutsi vaid siia jututuppa",
+    "Quick actions": "Kiirtoimingud",
+    "Adding...": "Lisan...",
+    "Sends the given message as a spoiler": "Saadab selle sõnumi rõõmurikkujana",
+    "unknown person": "tundmatu isik",
+    "Send and receive voice messages (in development)": "Saada ja võta vastu häälsõnumeid (arendusjärgus)",
+    "%(deviceId)s from %(ip)s": "%(deviceId)s ip-aadressil %(ip)s",
+    "Review to ensure your account is safe": "Tagamaks, et su konto on sinu kontrolli all, vaata andmed üle",
+    "Share decryption keys for room history when inviting users": "Kasutajate kutsumisel jaga jututoa ajaloo võtmeid",
+    "Record a voice message": "Salvesta häälsõnum",
+    "Stop & send recording": "Lõpeta salvestamine ja saada häälsõnum",
+    "Add existing rooms": "Lisa olemasolevaid jututubasid",
+    "%(count)s people you know have already joined|other": "%(count)s sulle tuttavat kasutajat on juba liitunud",
+    "We couldn't create your DM.": "Otsesuhtluse loomine ei õnnestunud.",
+    "Invited people will be able to read old messages.": "Kutse saanud kasutajad saavad lugeda vanu sõnumeid.",
+    "Consult first": "Pea esmalt nõu",
+    "Reset event store?": "Kas lähtestame sündmuste andmekogu?",
+    "Reset event store": "Lähtesta sündmuste andmekogu",
+    "Verify other login": "Verifitseeri muu sisselogimissessioon",
+    "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>": "Suhtlen teise osapoolega %(transferTarget)s. <a>Saadan andmeid kasutajale %(transferee)s</a>",
+    "Message search initilisation failed": "Sõnumite otsingu alustamine ei õnnestunud",
+    "Invite messages are hidden by default. Click to show the message.": "Kutsed on vaikimisi peidetud. Sõnumi nägemiseks klõpsi.",
+    "Accept on your other login…": "Nõustu oma teise sisselogimissessiooniga…",
+    "Avatar": "Tunnuspilt",
+    "Verification requested": "Verifitseerimistaotlus on saadetud",
+    "%(count)s people you know have already joined|one": "%(count)s sulle tuttav kasutaja on juba liitunud",
+    "You most likely do not want to reset your event index store": "Pigem sa siiski ei taha lähtestada sündmuste andmekogu ja selle indeksit",
+    "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": "Kui sa siiski soovid seda teha, siis sinu sõnumeid me ei kustuta, aga seniks kuni sõnumite indeks taustal uuesti luuakse, toimib otsing aeglaselt ja ebatõhusalt",
+    "You can add more later too, including already existing ones.": "Sa võid ka hiljem siia luua uusi jututubasid või lisada olemasolevaid.",
+    "What are some things you want to discuss in %(spaceName)s?": "Mida sa sooviksid arutada %(spaceName)s kogukonnakeskuses?",
+    "Please choose a strong password": "Palun tee üks korralik salasõna",
+    "Use another login": "Pruugi muud kasutajakontot",
+    "Verify your identity to access encrypted messages and prove your identity to others.": "Tagamaks ligipääsu oma krüptitud sõnumitele ja tõestamaks oma isikut teistele kasutajatale, verifitseeri end.",
+    "Let's create a room for each of them.": "Teeme siis iga teema jaoks oma jututoa.",
+    "Without verifying, you won’t have access to all your messages and may appear as untrusted to others.": "Ilma verifitseerimiseta sul puudub ligipääs kõikidele oma sõnumitele ning teised ei näe sinu kasutajakontot usaldusväärsena."
 }

src/i18n/strings/fa.json

@@ -311,5 +311,8 @@
     "Your device resolution": "وضوح دستگاه شما",
     "e.g. <CurrentPageURL>": "برای مثال <CurrentPageURL>",
     "Every page you use in the app": "هر صفحه‌ی برنامه از که آن استفاده می‌کنید",
-    "e.g. %(exampleValue)s": "برای مثال %(exampleValue)s"
+    "e.g. %(exampleValue)s": "برای مثال %(exampleValue)s",
+    "Explore rooms": "کاوش اتاق",
+    "Sign In": "ورود",
+    "Create Account": "ایجاد اکانت"
 }

src/i18n/strings/fr.json

@@ -3225,5 +3225,42 @@
     "From %(deviceName)s (%(deviceId)s) at %(ip)s": "Sur %(deviceName)s %(deviceId)s depuis %(ip)s",
     "Check your devices": "Vérifiez vos appareils",
     "A new login is accessing your account: %(name)s (%(deviceID)s) at %(ip)s": "Une nouvelle session a accès à votre compte : %(name)s %(deviceID)s depuis %(ip)s",
-    "You have unverified logins": "Vous avez des sessions non-vérifiées"
+    "You have unverified logins": "Vous avez des sessions non-vérifiées",
+    "Without verifying, you won’t have access to all your messages and may appear as untrusted to others.": "Sans vérification vous n’aurez pas accès à tous vos messages et n’apparaîtrez pas comme de confiance aux autres.",
+    "Verify your identity to access encrypted messages and prove your identity to others.": "Vérifiez votre identité pour accéder aux messages chiffrés et prouver votre identité aux autres.",
+    "Use another login": "Utiliser un autre identifiant",
+    "Please choose a strong password": "Merci de choisir un mot de passe fort",
+    "You can add more later too, including already existing ones.": "Vous pourrez en ajouter plus tard, y compris certains déjà existant.",
+    "Let's create a room for each of them.": "Créons un salon pour chacun d’entre eux.",
+    "What are some things you want to discuss in %(spaceName)s?": "De quoi voulez vous discuter dans %(spaceName)s ?",
+    "Verification requested": "Vérification requise",
+    "Avatar": "Avatar",
+    "Verify other login": "Vérifier l’autre connexion",
+    "Reset event store": "Réinitialiser le magasin d’événements",
+    "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": "Si vous le faites, notes qu’aucun de vos messages ne sera supprimé, mais la recherche pourrait être dégradée pendant quelques instants, le temps de recréer l’index",
+    "You most likely do not want to reset your event index store": "Il est probable que vous ne vouliez pas réinitialiser votre magasin d’index d’événements",
+    "Reset event store?": "Réinitialiser le magasin d’événements ?",
+    "Consult first": "Consulter d’abord",
+    "Invited people will be able to read old messages.": "Les personnes invitées pourront lire les anciens messages.",
+    "We couldn't create your DM.": "Nous n’avons pas pu créer votre message direct.",
+    "Adding...": "Ajout…",
+    "Add existing rooms": "Ajouter des salons existants",
+    "%(count)s people you know have already joined|one": "%(count)s personne que vous connaissez en fait déjà partie",
+    "%(count)s people you know have already joined|other": "%(count)s personnes que vous connaissez en font déjà partie",
+    "Accept on your other login…": "Acceptez sur votre autre connexion…",
+    "Stop & send recording": "Terminer et envoyer l’enregistrement",
+    "Record a voice message": "Enregistrer un message vocal",
+    "Invite messages are hidden by default. Click to show the message.": "Les messages d’invitation sont masqués par défaut. Cliquez pour voir le message.",
+    "Quick actions": "Actions rapides",
+    "Invite to just this room": "Inviter seulement dans ce salon",
+    "Warn before quitting": "Avertir avant de quitter",
+    "Message search initilisation failed": "Échec de l’initialisation de la recherche de message",
+    "Manage & explore rooms": "Gérer et découvrir les salons",
+    "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>": "Consultation avec %(transferTarget)s. <a>Transfert à %(transferee)s</a>",
+    "unknown person": "personne inconnue",
+    "Share decryption keys for room history when inviting users": "Partager les clés de déchiffrement lors de l’invitation d’utilisateurs",
+    "Send and receive voice messages (in development)": "Envoyez et recevez des messages vocaux (en développement)",
+    "%(deviceId)s from %(ip)s": "%(deviceId)s depuis %(ip)s",
+    "Review to ensure your account is safe": "Vérifiez pour assurer la sécurité de votre compte",
+    "Sends the given message as a spoiler": "Envoie le message flouté"
 }

src/i18n/strings/gl.json

@@ -3248,5 +3248,42 @@
     "From %(deviceName)s (%(deviceId)s) at %(ip)s": "Desde %(deviceName)s%(deviceId)s en %(ip)s",
     "Check your devices": "Comproba os teus dispositivos",
     "A new login is accessing your account: %(name)s (%(deviceID)s) at %(ip)s": "Hai unha nova conexión á túa conta: %(name)s %(deviceID)s desde %(ip)s",
-    "You have unverified logins": "Tes conexións sen verificar"
+    "You have unverified logins": "Tes conexións sen verificar",
+    "Sends the given message as a spoiler": "Envía a mensaxe dada como un spoiler",
+    "Review to ensure your account is safe": "Revisa para asegurarte de que a túa conta está protexida",
+    "Share decryption keys for room history when inviting users": "Comparte chaves de descifrado para o historial da sala ao convidar usuarias",
+    "Warn before quitting": "Aviso antes de saír",
+    "Invite to just this room": "Convida só a esta sala",
+    "Stop & send recording": "Deter e enviar e a gravación",
+    "We couldn't create your DM.": "Non puidemos crear o teu MD.",
+    "Invited people will be able to read old messages.": "As persoas convidadas poderán ler as mensaxes antigas.",
+    "Reset event store?": "Restablecer almacenaxe do evento?",
+    "You most likely do not want to reset your event index store": "Probablemente non queiras restablecer o índice de almacenaxe do evento",
+    "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": "Se o fas, ten en conta que ningunha das mensaxes será eliminada, pero a experiencia de busca podería degradarse durante o tempo en que o índice volve a crearse",
+    "Avatar": "Avatar",
+    "Please choose a strong password": "Escolle un contrasinal forte",
+    "Verify your identity to access encrypted messages and prove your identity to others.": "Verifica a túa identidade para acceder a mensaxes cifradas e acreditar a túa identidade ante outras.",
+    "Without verifying, you won’t have access to all your messages and may appear as untrusted to others.": "Sen verificación, non terás acceso a tódalas túas mensaxes e poderías aparecer antes outras como non confiable.",
+    "%(deviceId)s from %(ip)s": "%(deviceId)s desde %(ip)s",
+    "Send and receive voice messages (in development)": "Enviar e recibir mensaxes de voz (en desenvolvemento)",
+    "unknown person": "persoa descoñecida",
+    "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>": "Consultando con %(transferTarget)s. <a>Transferir a %(transferee)s</a>",
+    "Manage & explore rooms": "Xestionar e explorar salas",
+    "Message search initilisation failed": "Fallo a inicialización da busca de mensaxes",
+    "Quick actions": "Accións rápidas",
+    "Invite messages are hidden by default. Click to show the message.": "As mensaxes de convite están agochadas por defecto. Preme para amosar a mensaxe.",
+    "Record a voice message": "Gravar mensaxe de voz",
+    "Accept on your other login…": "Acepta na túa outra sesión…",
+    "%(count)s people you know have already joined|other": "%(count)s persoas que coñeces xa se uniron",
+    "%(count)s people you know have already joined|one": "%(count)s persoa que coñeces xa se uniu",
+    "Add existing rooms": "Engadir salas existentes",
+    "Adding...": "Engadindo...",
+    "Consult first": "Preguntar primeiro",
+    "Reset event store": "Restablecer almacenaxe de eventos",
+    "Verify other login": "Verificar outra conexión",
+    "Verification requested": "Verificación solicitada",
+    "What are some things you want to discuss in %(spaceName)s?": "Sobre que temas queres conversar en %(spaceName)s?",
+    "Let's create a room for each of them.": "Crea unha sala para cada un deles.",
+    "You can add more later too, including already existing ones.": "Podes engadir máis posteriormente, incluíndo os xa existentes.",
+    "Use another login": "Usar outra conexión"
 }

src/i18n/strings/he.json

@@ -52,7 +52,7 @@
     "Operation failed": "פעולה נכשלה",
     "Search": "חפש",
     "Custom Server Options": "הגדרות שרת מותאמות אישית",
-    "Dismiss": "שחרר",
+    "Dismiss": "התעלם",
     "powered by Matrix": "מופעל ע\"י Matrix",
     "Error": "שגיאה",
     "Remove": "הסר",

src/i18n/strings/hi.json

@@ -585,5 +585,8 @@
     "You cannot modify widgets in this room.": "आप इस रूम में विजेट्स को संशोधित नहीं कर सकते।",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s ने कमरे में शामिल होने के लिए %(targetDisplayName)s के निमंत्रण को रद्द कर दिया।",
     "User %(userId)s is already in the room": "उपयोगकर्ता %(userId)s पहले से ही रूम में है",
-    "The user must be unbanned before they can be invited.": "उपयोगकर्ता को आमंत्रित करने से पहले उन्हें प्रतिबंधित किया जाना चाहिए।"
+    "The user must be unbanned before they can be invited.": "उपयोगकर्ता को आमंत्रित करने से पहले उन्हें प्रतिबंधित किया जाना चाहिए।",
+    "Explore rooms": "रूम का अन्वेषण करें",
+    "Sign In": "साइन करना",
+    "Create Account": "खाता बनाएं"
 }

src/i18n/strings/hr.json

@@ -4,5 +4,6 @@
     "Failed to verify email address: make sure you clicked the link in the email": "Nismo u mogućnosti verificirati Vašu email adresu. Provjerite dali ste kliknuli link u mailu",
     "The platform you're on": "Platforma na kojoj se nalazite",
     "The version of %(brand)s": "Verzija %(brand)s",
-    "Your language of choice": "Izabrani jezik"
+    "Your language of choice": "Izabrani jezik",
+    "Dismiss": "Odbaci"
 }

src/i18n/strings/hu.json

@@ -3243,5 +3243,42 @@
     "From %(deviceName)s (%(deviceId)s) at %(ip)s": "Innen: %(deviceName)s (%(deviceId)s), %(ip)s",
     "Check your devices": "Ellenőrizze az eszközeit",
     "A new login is accessing your account: %(name)s (%(deviceID)s) at %(ip)s": "Új bejelentkezéssel hozzáférés történik a fiókjához: %(name)s (%(deviceID)s), %(ip)s",
-    "You have unverified logins": "Ellenőrizetlen bejelentkezései vannak"
+    "You have unverified logins": "Ellenőrizetlen bejelentkezései vannak",
+    "Without verifying, you won’t have access to all your messages and may appear as untrusted to others.": "Az ellenőrzés nélkül nem fér hozzá az összes üzenetéhez és mások számára megbízhatatlannak fog látszani.",
+    "Verify your identity to access encrypted messages and prove your identity to others.": "Ellenőrizze a személyazonosságát, hogy hozzáférjen a titkosított üzeneteihez és másoknak is bizonyítani tudja személyazonosságát.",
+    "Use another login": "Másik munkamenet használata",
+    "Please choose a strong password": "Kérem válasszon erős jelszót",
+    "You can add more later too, including already existing ones.": "Később is hozzáadhat többet, beleértve meglévőket is.",
+    "Let's create a room for each of them.": "Készítsünk szobát mindhez.",
+    "What are some things you want to discuss in %(spaceName)s?": "Mik azok amikről beszélni szeretne itt: %(spaceName)s?",
+    "Verification requested": "Hitelesítés kérés elküldve",
+    "Avatar": "Profilkép",
+    "Verify other login": "Másik munkamenet ellenőrzése",
+    "Reset event store": "Az esemény tárolót alaphelyzetbe állítása",
+    "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": "Ha ezt teszi, tudnia kell, hogy az üzenetek nem kerülnek törlésre de keresés nem lesz tökéletes amíg az indexek nem készülnek el újra",
+    "You most likely do not want to reset your event index store": "Az esemény index tárolót nagy valószínűséggel nem szeretné alaphelyzetbe állítani",
+    "Reset event store?": "Az esemény tárolót alaphelyzetbe állítja?",
+    "Consult first": "Kérjen először véleményt",
+    "Invited people will be able to read old messages.": "A meghívott személyek el tudják olvasni a régi üzeneteket.",
+    "We couldn't create your DM.": "Nem tudjuk elkészíteni a közvetlen üzenetét.",
+    "Adding...": "Hozzáadás…",
+    "Add existing rooms": "Létező szobák hozzáadása",
+    "%(count)s people you know have already joined|one": "%(count)s ismerős már csatlakozott",
+    "%(count)s people you know have already joined|other": "%(count)s ismerős már csatlakozott",
+    "Accept on your other login…": "Egy másik bejelentkezésében fogadta el…",
+    "Stop & send recording": "Megállít és a felvétel elküldése",
+    "Record a voice message": "Hang üzenet felvétele",
+    "Invite messages are hidden by default. Click to show the message.": "A meghívók alapesetben rejtve vannak. A megjelenítéshez kattintson.",
+    "Quick actions": "Gyors műveletek",
+    "Invite to just this room": "Meghívás csak ebbe a szobába",
+    "Warn before quitting": "Kilépés előtt figyelmeztet",
+    "Message search initilisation failed": "Üzenet keresés beállítása sikertelen",
+    "Manage & explore rooms": "Szobák kezelése és felderítése",
+    "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>": "Egyeztetés vele: %(transferTarget)s. <a>Átadás ide: %(transferee)s</a>",
+    "unknown person": "ismeretlen személy",
+    "Share decryption keys for room history when inviting users": "Visszafejtéshez szükséges kulcsok megosztása a szoba előzményekhez felhasználók meghívásakor",
+    "Send and receive voice messages (in development)": "Hang üzenetek küldése és fogadása (fejlesztés alatt)",
+    "%(deviceId)s from %(ip)s": "%(deviceId)s innen: %(ip)s",
+    "Review to ensure your account is safe": "Tekintse át, hogy meggyőződjön arról, hogy a fiókja biztonságban van",
+    "Sends the given message as a spoiler": "A megadott üzenet szpojlerként küldése"
 }

src/i18n/strings/it.json

@@ -3248,5 +3248,42 @@
     "Check your devices": "Controlla i tuoi dispositivi",
     "A new login is accessing your account: %(name)s (%(deviceID)s) at %(ip)s": "Una nuova sessione sta accedendo al tuo account: %(name)s (%(deviceID)s) al %(ip)s",
     "You have unverified logins": "Hai accessi non verificati",
-    "Open": "Apri"
+    "Open": "Apri",
+    "Send and receive voice messages (in development)": "Invia e ricevi messaggi vocali (in sviluppo)",
+    "unknown person": "persona sconosciuta",
+    "Sends the given message as a spoiler": "Invia il messaggio come spoiler",
+    "Review to ensure your account is safe": "Controlla per assicurarti che l'account sia sicuro",
+    "%(deviceId)s from %(ip)s": "%(deviceId)s da %(ip)s",
+    "Share decryption keys for room history when inviting users": "Condividi le chiavi di decifrazione della cronologia della stanza quando inviti utenti",
+    "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>": "Consultazione con %(transferTarget)s. <a>Trasferisci a %(transferee)s</a>",
+    "Manage & explore rooms": "Gestisci ed esplora le stanze",
+    "Invite to just this room": "Invita solo in questa stanza",
+    "%(count)s people you know have already joined|other": "%(count)s persone che conosci sono già entrate",
+    "%(count)s people you know have already joined|one": "%(count)s persona che conosci è già entrata",
+    "Message search initilisation failed": "Inizializzazione ricerca messaggi fallita",
+    "Add existing rooms": "Aggiungi stanze esistenti",
+    "Warn before quitting": "Avvisa prima di uscire",
+    "Invited people will be able to read old messages.": "Le persone invitate potranno leggere i vecchi messaggi.",
+    "You most likely do not want to reset your event index store": "Probabilmente non hai bisogno di reinizializzare il tuo archivio indice degli eventi",
+    "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": "Se lo fai, ricorda che nessuno dei tuoi messaggi verrà eliminato, ma l'esperienza di ricerca potrà peggiorare per qualche momento mentre l'indice viene ricreato",
+    "Avatar": "Avatar",
+    "Verification requested": "Verifica richiesta",
+    "What are some things you want to discuss in %(spaceName)s?": "Quali sono le cose di cui vuoi discutere in %(spaceName)s?",
+    "Please choose a strong password": "Scegli una password robusta",
+    "Quick actions": "Azioni rapide",
+    "Invite messages are hidden by default. Click to show the message.": "I messaggi di invito sono nascosti in modo predefinito. Clicca per mostrare il messaggio.",
+    "Record a voice message": "Registra un messaggio vocale",
+    "Stop & send recording": "Ferma e invia la registrazione",
+    "Accept on your other login…": "Accetta nella tua altra sessione…",
+    "Adding...": "Aggiunta...",
+    "We couldn't create your DM.": "Non abbiamo potuto creare il tuo messaggio diretto.",
+    "Consult first": "Prima consulta",
+    "Reset event store?": "Reinizializzare l'archivio eventi?",
+    "Reset event store": "Reinizializza archivio eventi",
+    "Verify other login": "Verifica l'altra sessione",
+    "Let's create a room for each of them.": "Creiamo una stanza per ognuno di essi.",
+    "You can add more later too, including already existing ones.": "Puoi aggiungerne anche altri in seguito, inclusi quelli già esistenti.",
+    "Use another login": "Usa un altro accesso",
+    "Verify your identity to access encrypted messages and prove your identity to others.": "Verifica la tua identità per accedere ai messaggi cifrati e provare agli altri che sei tu.",
+    "Without verifying, you won’t have access to all your messages and may appear as untrusted to others.": "Senza la verifica, non avrai accesso a tutti i tuoi messaggi e potresti apparire agli altri come non fidato."
 }

src/i18n/strings/jbo.json

@@ -580,5 +580,8 @@
     "%(displayName)s cancelled verification.": ".i la'o zoi. %(displayName)s .zoi co'u co'a lacri",
     "Decrypt %(text)s": "nu facki le du'u mifra la'o zoi. %(text)s .zoi",
     "Download %(text)s": "nu kibycpa la'o zoi. %(text)s .zoi",
-    "Download this file": "nu kibycpa le vreji"
+    "Download this file": "nu kibycpa le vreji",
+    "Explore rooms": "nu facki le du'u ve zilbe'i",
+    "Create Account": "nu pa re'u co'a jaspu",
+    "Dismiss": "nu mipri"
 }

src/i18n/strings/kab.json

@@ -2,7 +2,7 @@
     "Confirm": "Sentem",
     "Analytics": "Tiselḍin",
     "Error": "Tuccḍa",
-    "Dismiss": "Agi",
+    "Dismiss": "Agwi",
     "OK": "IH",
     "Permission Required": "Tasiregt tlaq",
     "Continue": "Kemmel",

src/i18n/strings/ko.json

@@ -1666,5 +1666,6 @@
     "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "경고: 키 검증 실패! 제공된 키인 \"%(fingerprint)s\"가 사용자 %(userId)s와 %(deviceId)s 세션의 서명 키인 \"%(fprint)s\"와 일치하지 않습니다. 이는 통신이 탈취되고 있는 중일 수도 있다는 뜻입니다!",
     "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "사용자 %(userId)s의 세션 %(deviceId)s에서 받은 서명 키와 당신이 제공한 서명 키가 일치합니다. 세션이 검증되었습니다.",
     "Show more": "더 보기",
-    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "비밀번호를 변경한다면 방의 암호화 키를 내보낸 후 다시 가져오지 않는 이상 모든 종단간 암호화 키는 초기화 될 것이고, 암호화된 대화 내역은 읽을 수 없게 될 것입니다. 이 문제는 추후에 개선될 것입니다."
+    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "비밀번호를 변경한다면 방의 암호화 키를 내보낸 후 다시 가져오지 않는 이상 모든 종단간 암호화 키는 초기화 될 것이고, 암호화된 대화 내역은 읽을 수 없게 될 것입니다. 이 문제는 추후에 개선될 것입니다.",
+    "Create Account": "계정 만들기"
 }

src/i18n/strings/lt.json

@@ -1184,7 +1184,7 @@
     "Manage integrations": "Valdyti integracijas",
     "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integracijų Tvarkytuvai gauna konfigūracijos duomenis ir jūsų vardu gali keisti valdiklius, siųsti kambario pakvietimus ir nustatyti galios lygius.",
     "Invalid theme schema.": "Klaidinga temos schema.",
-    "Error downloading theme information.": "Klaida parsisiunčiant temos informaciją.",
+    "Error downloading theme information.": "Klaida atsisiunčiant temos informaciją.",
     "Theme added!": "Tema pridėta!",
     "Custom theme URL": "Pasirinktinės temos URL",
     "Add theme": "Pridėti temą",
@@ -2091,5 +2091,16 @@
     "Successfully restored %(sessionCount)s keys": "Sėkmingai atkurti %(sessionCount)s raktai",
     "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Įspėjimas: Jūsų asmeniniai duomenys (įskaitant šifravimo raktus) vis dar yra saugomi šiame seanse. Išvalykite juos, jei baigėte naudoti šį seansą, arba norite prisijungti prie kitos paskyros.",
     "Reason (optional)": "Priežastis (nebūtina)",
-    "Reason: %(reason)s": "Priežastis: %(reason)s"
+    "Reason: %(reason)s": "Priežastis: %(reason)s",
+    "Already have an account? <a>Sign in here</a>": "Jau turite paskyrą? <a>Prisijunkite čia</a>",
+    "Host account on": "Kurti paskyrą serveryje",
+    "Forgotten your password?": "Pamiršote savo slaptažodį?",
+    "Homeserver": "Serveris",
+    "New? <a>Create account</a>": "Naujas vartotojas? <a>Sukurkite paskyrą</a>",
+    "Forgot password?": "Pamiršote slaptažodį?",
+    "Preparing to download logs": "Ruošiamasi parsiųsti žurnalus",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Element with an existing Matrix account on a different homeserver.": "Jūs galite naudoti serverio parinktis, norėdami prisijungti prie kitų Matrix serverių, nurodydami kitą serverio URL. Tai leidžia jums naudoti Element su egzistuojančia paskyra kitame serveryje.",
+    "Server Options": "Serverio Parinktys",
+    "Your homeserver": "Jūsų serveris",
+    "Download logs": "Parsisiųsti žurnalus"
 }

src/i18n/strings/lv.json

@@ -300,7 +300,7 @@
     "You need to be logged in.": "Tev ir jāpierakstās.",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Jūsu epasta adrese nav piesaistīta nevienam Matrix ID šajā bāzes serverī.",
     "You seem to be in a call, are you sure you want to quit?": "Izskatās, ka atrodies zvana režīmā. Vai tiešām vēlies iziet?",
-    "You seem to be uploading files, are you sure you want to quit?": "Izskatās, ka šobrīd augšuplādē failus. Vai tiešām vēlies iziet?",
+    "You seem to be uploading files, are you sure you want to quit?": "Izskatās, ka šobrīd notiek failu augšupielāde. Vai tiešām vēlaties iziet?",
     "Sun": "Sv.",
     "Mon": "P.",
     "Tue": "O.",
@@ -747,7 +747,7 @@
     "Unhide Preview": "Rādīt priekšskatījumu",
     "Unable to join network": "Neizdodas pievienoties tīklam",
     "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Atvaino, diemžēl tavs tīmekļa pārlūks <b>nespēj</b> darbināt %(brand)s.",
-    "Uploaded on %(date)s by %(user)s": "Augšuplādēja %(user)s %(date)s",
+    "Uploaded on %(date)s by %(user)s": "Augšupielādēja %(user)s %(date)s",
     "Messages in group chats": "Ziņas grupas čatos",
     "Yesterday": "Vakardien",
     "Error encountered (%(errorDetail)s).": "Gadījās kļūda (%(errorDetail)s).",
@@ -1559,5 +1559,27 @@
     "Verify this session": "Verificēt šo sesiju",
     "You signed in to a new session without verifying it:": "Jūs pierakstījāties jaunā sesijā, neveicot tās verifikāciju:",
     "You're already in a call with this person.": "Jums jau notiek zvans ar šo personu.",
-    "Already in call": "Notiek zvans"
+    "Already in call": "Notiek zvans",
+    "%(deviceId)s from %(ip)s": "%(deviceId)s no %(ip)s",
+    "%(count)s people you know have already joined|other": "%(count)s pazīstami cilvēki ir jau pievienojusies",
+    "%(count)s people you know have already joined|one": "%(count)s pazīstama persona ir jau pievienojusies",
+    "Saving...": "Saglabā…",
+    "%(count)s members|one": "%(count)s dalībnieks",
+    "Save Changes": "Saglabāt izmaiņas",
+    "%(count)s messages deleted.|other": "%(count)s ziņas ir dzēstas.",
+    "%(count)s messages deleted.|one": "%(count)s ziņa ir dzēsta.",
+    "Welcome to <name/>": "Laipni lūdzam uz <name/>",
+    "Room name": "Istabas nosaukums",
+    "%(count)s members|other": "%(count)s dalībnieki",
+    "Room List": "Istabu saraksts",
+    "Send as message": "Nosūtīt kā ziņu",
+    "%(brand)s URL": "%(brand)s URL",
+    "Send a message…": "Nosūtīt ziņu…",
+    "Send a reply…": "Nosūtīt atbildi…",
+    "Room version": "Istabas versija",
+    "Room list": "Istabu saraksts",
+    "Failed to set topic": "Neizdevās iestatīt tematu",
+    "Upload files": "Failu augšupielāde",
+    "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Šie faili <b>pārsniedz</b> augšupielādes izmēra limitu %(limit)s.",
+    "Upload files (%(current)s of %(total)s)": "Failu augšupielāde (%(current)s no %(total)s)"
 }

src/i18n/strings/ml.json

@@ -127,5 +127,8 @@
     "Failed to change settings": "സജ്ജീകരണങ്ങള്‍ മാറ്റുന്നവാന്‍ സാധിച്ചില്ല",
     "View Source": "സോഴ്സ് കാണുക",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "നിങ്ങളുടെ ഇപ്പോളത്തെ ബ്രൌസര്‍ റയട്ട് പ്രവര്‍ത്തിപ്പിക്കാന്‍ പൂര്‍ണമായും പര്യാപത്മല്ല. പല ഫീച്ചറുകളും പ്രവര്‍ത്തിക്കാതെയിരിക്കാം. ഈ ബ്രൌസര്‍ തന്നെ ഉപയോഗിക്കണമെങ്കില്‍ മുന്നോട്ട് പോകാം. പക്ഷേ നിങ്ങള്‍ നേരിടുന്ന പ്രശ്നങ്ങള്‍ നിങ്ങളുടെ ഉത്തരവാദിത്തത്തില്‍ ആയിരിക്കും!",
-    "Checking for an update...": "അപ്ഡേറ്റ് ഉണ്ടോ എന്ന് തിരയുന്നു..."
+    "Checking for an update...": "അപ്ഡേറ്റ് ഉണ്ടോ എന്ന് തിരയുന്നു...",
+    "Explore rooms": "മുറികൾ കണ്ടെത്തുക",
+    "Sign In": "പ്രവേശിക്കുക",
+    "Create Account": "അക്കൗണ്ട് സൃഷ്ടിക്കുക"
 }

src/i18n/strings/mn.json

@@ -1 +1,6 @@
-{}
+{
+    "Explore rooms": "Өрөөнүүд үзэх",
+    "Sign In": "Нэвтрэх",
+    "Create Account": "Хэрэглэгч үүсгэх",
+    "Dismiss": "Орхих"
+}

src/i18n/strings/nb_NO.json

@@ -1507,5 +1507,479 @@
     "This will end the conference for everyone. Continue?": "Dette vil avslutte konferansen for alle. Fortsett?",
     "End conference": "Avslutt konferanse",
     "You're already in a call with this person.": "Du er allerede i en samtale med denne personen.",
-    "Already in call": "Allerede i en samtale"
+    "Already in call": "Allerede i en samtale",
+    "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Er du sikke på at du vil fjerne '%(roomName)s' fra %(groupId)s?",
+    "Burundi": "Burundi",
+    "Burkina Faso": "Burkina Faso",
+    "Bulgaria": "Bulgaria",
+    "Brunei": "Brunei",
+    "Brazil": "Brazil",
+    "Botswana": "Botswana",
+    "Bolivia": "Bolivia",
+    "Bhutan": "Bhutan",
+    "Bermuda": "Bermuda",
+    "Benin": "Benin",
+    "Belize": "Belize",
+    "Belarus": "Hviterussland",
+    "Barbados": "Barbados",
+    "Bangladesh": "Bangladesh",
+    "Bahrain": "Bahrain",
+    "Bahamas": "Bahamas",
+    "Azerbaijan": "Azerbaijan",
+    "Austria": "Østerrike",
+    "Australia": "Australia",
+    "Aruba": "Aruba",
+    "Armenia": "Armenia",
+    "Argentina": "Argentina",
+    "Antigua & Barbuda": "Antigua og Barbuda",
+    "Antarctica": "Antarktis",
+    "Anguilla": "Anguilla",
+    "Angola": "Angola",
+    "Andorra": "Andorra",
+    "Algeria": "Algeria",
+    "Albania": "Albania",
+    "Åland Islands": "Åland",
+    "Afghanistan": "Afghanistan",
+    "United Kingdom": "Storbritannia",
+    "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "Din hjemmeserver kunne ikke nås, og kan derfor ikke logge deg inn. Vennligst prøv igjen. Hvis dette fortsetter, kontakt administratoren til din hjemmeserver.",
+    "Only continue if you trust the owner of the server.": "Fortsett kun om du stoler på eieren av serveren.",
+    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Denne handlingen krever tilgang til standard identitetsserver <server /> for å kunne validere en epostaddresse eller telefonnummer, men serveren har ikke bruksvilkår.",
+    "Too Many Calls": "For mange samtaler",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "Samtalen mislyktes fordi du fikk ikke tilgang til webkamera eller mikrofon. Sørg for at:",
+    "Unable to access webcam / microphone": "Ingen tilgang til webkamera / mikrofon",
+    "The call was answered on another device.": "Samtalen ble besvart på en annen enhet.",
+    "The call could not be established": "Samtalen kunne ikke etableres",
+    "The other party declined the call.": "Den andre parten avviste samtalen.",
+    "Call Declined": "Samtale avvist",
+    "Click the button below to confirm adding this phone number.": "Klikk knappen nedenfor for å bekrefte dette telefonnummeret.",
+    "Single Sign On": "Single Sign On",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Bekreft dette telefonnummeret ved å bruke Single Sign On for å bevise din identitet.",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Befrekt denne e-postadressen ved å bruke Single Sign On for å bevise din identitet.",
+    "Show stickers button": "Vis klistremerkeknappen",
+    "Recently visited rooms": "Nylig besøkte rom",
+    "Windows": "Vinduer",
+    "Abort": "Avbryt",
+    "You have unverified logins": "Du har uverifiserte pålogginger",
+    "Check your devices": "Sjekk enhetene dine",
+    "Record a voice message": "Send en stemmebeskjed",
+    "Edit devices": "Rediger enheter",
+    "Homeserver": "Hjemmetjener",
+    "Edit Values": "Rediger verdier",
+    "Add existing room": "Legg til et eksisterende rom",
+    "Spell check dictionaries": "Stavesjekk-ordbøker",
+    "Invite to this space": "Inviter til dette området",
+    "Send message": "Send melding",
+    "Cookie Policy": "Infokapselretningslinjer",
+    "Invite to %(roomName)s": "Inviter til %(roomName)s",
+    "Resume": "Fortsett",
+    "Avatar": "Profilbilde",
+    "A confirmation email has been sent to %(emailAddress)s": "En bekreftelses-E-post har blitt sendt til %(emailAddress)s",
+    "Suggested Rooms": "Foreslåtte rom",
+    "Welcome %(name)s": "Velkommen, %(name)s",
+    "Upgrade to %(hostSignupBrand)s": "Oppgrader til %(hostSignupBrand)s",
+    "Verification requested": "Verifisering ble forespurt",
+    "%(count)s members|one": "%(count)s medlem",
+    "Removing...": "Fjerner …",
+    "No results found": "Ingen resultater ble funnet",
+    "Public space": "Offentlig område",
+    "Private space": "Privat område",
+    "Support": "Support",
+    "What projects are you working on?": "Hvilke prosjekter jobber du på?",
+    "Suggested": "Anbefalte",
+    "%(deviceId)s from %(ip)s": "%(deviceId)s fra %(ip)s",
+    "Accept on your other login…": "Aksepter på din andre pålogging …",
+    "Value:": "Verdi:",
+    "Leave Space": "Forlat området",
+    "View dev tools": "Vis utviklerverktøy",
+    "Saving...": "Lagrer …",
+    "Save Changes": "Lagre endringer",
+    "Verify other login": "Verifiser en annen pålogging",
+    "You don't have permission": "Du har ikke tillatelse",
+    "%(count)s rooms|other": "%(count)s rom",
+    "%(count)s rooms|one": "%(count)s rom",
+    "Invite by username": "Inviter etter brukernavn",
+    "Delete": "Slett",
+    "Your public space": "Ditt offentlige område",
+    "Your private space": "Ditt private område",
+    "Invite to %(spaceName)s": "Inviter til %(spaceName)s",
+    "%(count)s members|other": "%(count)s medlemmer",
+    "Random": "Tilfeldig",
+    "unknown person": "ukjent person",
+    "Public": "Offentlig",
+    "Private": "Privat",
+    "Click to copy": "Klikk for å kopiere",
+    "Share invite link": "Del invitasjonslenke",
+    "Leave space": "Forlat området",
+    "Warn before quitting": "Advar før avslutning",
+    "Quick actions": "Hurtigvalg",
+    "Screens": "Skjermer",
+    "%(count)s people you know have already joined|other": "%(count)s personer du kjenner har allerede blitt med",
+    "Add existing rooms": "Legg til eksisterende rom",
+    "Don't want to add an existing room?": "Vil du ikke legge til et eksisterende rom?",
+    "Create a new room": "Opprett et nytt rom",
+    "Adding...": "Legger til …",
+    "Settings Explorer": "Innstillingsutforsker",
+    "Value": "Verdi",
+    "Setting:": "Innstilling:",
+    "Caution:": "Advarsel:",
+    "Level": "Nivå",
+    "Privacy Policy": "Personvern",
+    "You should know": "Du bør vite",
+    "Room name": "Rommets navn",
+    "Skip for now": "Hopp over for nå",
+    "Creating rooms...": "Oppretter rom …",
+    "Share %(name)s": "Del %(name)s",
+    "Just me": "Bare meg selv",
+    "Inviting...": "Inviterer …",
+    "Please choose a strong password": "Vennligst velg et sterkt passord",
+    "New? <a>Create account</a>": "Er du ny her? <a>Opprett en konto</a>",
+    "Use another login": "Bruk en annen pålogging",
+    "Use Security Key or Phrase": "Bruk sikkerhetsnøkkel eller -frase",
+    "Use Security Key": "Bruk sikkerhetsnøkkel",
+    "Upgrade private room": "Oppgrader privat rom",
+    "Upgrade public room": "Oppgrader offentlig rom",
+    "Decline All": "Avslå alle",
+    "Enter Security Key": "Skriv inn sikkerhetsnøkkel",
+    "Germany": "Tyskland",
+    "Malta": "Malta",
+    "Uruguay": "Uruguay",
+    "Community settings": "Fellesskapsinnstillinger",
+    "You’re all caught up": "Du har lest deg opp på alt det nye",
+    "Remember this": "Husk dette",
+    "Move right": "Gå til høyre",
+    "Notify the whole room": "Varsle hele rommet",
+    "Got an account? <a>Sign in</a>": "Har du en konto? <a>Logg på</a>",
+    "You created this room.": "Du opprettet dette rommet.",
+    "Security Phrase": "Sikkerhetsfrase",
+    "Start a Conversation": "Start en samtale",
+    "Open dial pad": "Åpne nummerpanelet",
+    "Message deleted on %(date)s": "Meldingen ble slettet den %(date)s",
+    "Approve": "Godkjenn",
+    "Create community": "Opprett fellesskap",
+    "Already have an account? <a>Sign in here</a>": "Har du allerede en konto? <a>Logg på</a>",
+    "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s eller %(usernamePassword)s",
+    "That username already exists, please try another.": "Det brukernavnet finnes allerede, vennligst prøv et annet et",
+    "New here? <a>Create an account</a>": "Er du ny her? <a>Opprett en konto</a>",
+    "Now, let's help you get started": "Nå, la oss hjelpe deg med å komme i gang",
+    "Forgot password?": "Glemt passord?",
+    "Enter email address": "Legg inn e-postadresse",
+    "Enter phone number": "Skriv inn telefonnummer",
+    "Please enter the code it contains:": "Vennligst skriv inn koden den inneholder:",
+    "Token incorrect": "Sjetongen er feil",
+    "A text message has been sent to %(msisdn)s": "En SMS har blitt sendt til %(msisdn)s",
+    "Open the link in the email to continue registration.": "Åpne lenken i E-posten for å fortsette registreringen.",
+    "This room is public": "Dette rommet er offentlig",
+    "Move left": "Gå til venstre",
+    "Take a picture": "Ta et bilde",
+    "Hold": "Hold",
+    "Enter Security Phrase": "Skriv inn sikkerhetsfrase",
+    "Security Key": "Sikkerhetsnøkkel",
+    "Invalid Security Key": "Ugyldig sikkerhetsnøkkel",
+    "Wrong Security Key": "Feil sikkerhetsnøkkel",
+    "About homeservers": "Om hjemmetjenere",
+    "New Recovery Method": "Ny gjenopprettingsmetode",
+    "Generate a Security Key": "Generer en sikkerhetsnøkkel",
+    "Confirm your Security Phrase": "Bekreft sikkerhetsfrasen din",
+    "Your Security Key": "Sikkerhetsnøkkelen din",
+    "Repeat your Security Phrase...": "Gjenta sikkerhetsfrasen din",
+    "Set up with a Security Key": "Sett opp med en sikkerhetsnøkkel",
+    "Use app": "Bruk app",
+    "Learn more": "Lær mer",
+    "Use app for a better experience": "Bruk appen for en bedre opplevelse",
+    "Continue with %(provider)s": "Fortsett med %(provider)s",
+    "This address is already in use": "Denne adressen er allerede i bruk",
+    "<a>In reply to</a> <pill>": "<a>Som svar på</a> <pill>",
+    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)sendret navnet sitt %(count)s ganger",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)sfikk sin invitasjon trukket tilbake",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)sfikk sine invitasjoner trukket tilbake",
+    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)savslo invitasjonen sin",
+    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)sforlot og ble med igjen",
+    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)sforlot og ble med igjen",
+    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)sble med og forlot igjen",
+    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)sble med og forlot igjen",
+    "Information": "Informasjon",
+    "Add rooms to this community": "Legg til rom i dette fellesskapet",
+    "%(name)s cancelled verifying": "%(name)s avbrøt verifiseringen",
+    "You cancelled verifying %(name)s": "Du avbrøt verifiseringen av %(name)s",
+    "Invalid file%(extra)s": "Ugyldig fil%(extra)s",
+    "Failed to ban user": "Mislyktes i å bannlyse brukeren",
+    "Room settings": "Rominnstillinger",
+    "Show files": "Vis filer",
+    "Not encrypted": "Ikke kryptert",
+    "About": "Om",
+    "Widgets": "Komponenter",
+    "Room Info": "Rominfo",
+    "Favourited": "Favorittmerket",
+    "Forget Room": "Glem rommet",
+    "Show previews of messages": "Vis forhåndsvisninger av meldinger",
+    "Invalid URL": "Ugyldig URL",
+    "Continuing without email": "Fortsetter uten E-post",
+    "Are you sure you want to sign out?": "Er du sikker på at du vil logge av?",
+    "Transfer": "Overfør",
+    "Invite by email": "Inviter gjennom E-post",
+    "Waiting for partner to confirm...": "Venter på at partneren skal bekrefte …",
+    "Report a bug": "Rapporter en feil",
+    "Comment": "Kommentar",
+    "Add comment": "Legg til kommentar",
+    "Active Widgets": "Aktive moduler",
+    "Create a room in %(communityName)s": "Opprett et rom i %(communityName)s",
+    "Reason (optional)": "Årsak (valgfritt)",
+    "Send %(count)s invites|one": "Send %(count)s invitasjon",
+    "Send %(count)s invites|other": "Send %(count)s invitasjoner",
+    "Add another email": "Legg til en annen E-postadresse",
+    "%(count)s results|one": "%(count)s resultat",
+    "%(count)s results|other": "%(count)s resultater",
+    "Start a new chat": "Start en ny chat",
+    "Custom Tag": "Egendefinert merkelapp",
+    "Explore public rooms": "Utforsk offentlige rom",
+    "Explore community rooms": "Utforsk samfunnsrom",
+    "Invite to this community": "Inviter til dette fellesskapet",
+    "Verify the link in your inbox": "Verifiser lenken i innboksen din",
+    "Bridges": "Broer",
+    "Privacy": "Personvern",
+    "Reject all %(invitedRooms)s invites": "Avslå alle %(invitedRooms)s-invitasjoner",
+    "Upgrade Room Version": "Oppgrader romversjon",
+    "You cancelled verification.": "Du avbrøt verifiseringen.",
+    "Ask %(displayName)s to scan your code:": "Be %(displayName)s om å skanne koden:",
+    "Role": "Rolle",
+    "Failed to deactivate user": "Mislyktes i å deaktivere brukeren",
+    "Accept all %(invitedRooms)s invites": "Aksepter alle %(invitedRooms)s-invitasjoner",
+    "<not supported>": "<ikke støttet>",
+    "Custom theme URL": "URL-en til et selvvalgt tema",
+    "not ready": "ikke klar",
+    "ready": "klar",
+    "Algorithm:": "Algoritme:",
+    "Backing up %(sessionsRemaining)s keys...": "Sikkerhetskopierer %(sessionsRemaining)s nøkler …",
+    "Away": "Borte",
+    "Start chat": "Start chat",
+    "Show Widgets": "Vis moduler",
+    "Hide Widgets": "Skjul moduler",
+    "Unknown for %(duration)s": "Ukjent i %(duration)s",
+    "Update %(brand)s": "Oppdater %(brand)s",
+    "You are currently ignoring:": "Du ignorerer for øyeblikket:",
+    "Unknown caller": "Ukjent oppringer",
+    "Dial pad": "Nummerpanel",
+    "%(name)s on hold": "%(name)s står på vent",
+    "Fill Screen": "Fyll skjermen",
+    "Voice Call": "Taleanrop",
+    "Video Call": "Videoanrop",
+    "sends confetti": "sender konfetti",
+    "System font name": "Systemskrifttypenavn",
+    "Use a system font": "Bruk en systemskrifttype",
+    "Waiting for answer": "Venter på svar",
+    "Call in progress": "Anrop pågår",
+    "Channel: <channelLink/>": "Kanal: <channelLink/>",
+    "Enable desktop notifications": "Aktiver skrivebordsvarsler",
+    "Don't miss a reply": "Ikke gå glipp av noen svar",
+    "Help us improve %(brand)s": "Hjelp oss å forbedre %(brand)s",
+    "Unknown App": "Ukjent app",
+    "Short keyboard patterns are easy to guess": "Korte tastatur mønstre er lett å gjette",
+    "This is similar to a commonly used password": "Dette ligner på et passord som er brukt mye",
+    "Predictable substitutions like '@' instead of 'a' don't help very much": "Forutsigbar erstatninger som ‘ @‘ istedet for ‘a’ hjelper ikke mye",
+    "Reversed words aren't much harder to guess": "Ord som er skrevet baklengs er vanskeligere å huske.",
+    "All-uppercase is almost as easy to guess as all-lowercase": "Bare store bokstaver er nesten like enkelt å gjette som bare små bokstaver",
+    "Capitalization doesn't help very much": "Store bokstaver er ikke spesielt nyttig",
+    "Use a longer keyboard pattern with more turns": "Bruke et lengre og mer uventet tastatur mønster",
+    "No need for symbols, digits, or uppercase letters": "Ikke nødvendig med symboler, sifre eller bokstaver",
+    "See images posted to this room": "Se bilder som er lagt ut i dette rommet",
+    "%(senderName)s declined the call.": "%(senderName)s avslo oppringingen.",
+    "(an error occurred)": "(en feil oppstod)",
+    "(connection failed)": "(tilkobling mislyktes)",
+    "Change the topic of this room": "Endre dette rommets tema",
+    "Effects": "Effekter",
+    "Zimbabwe": "Zimbabwe",
+    "Yemen": "Jemen",
+    "Zambia": "Zambia",
+    "Western Sahara": "Vest-Sahara",
+    "Wallis & Futuna": "Wallis og Futuna",
+    "Venezuela": "Venezuela",
+    "Vietnam": "Vietnam",
+    "Vatican City": "Vatikanstaten",
+    "Vanuatu": "Vanuatu",
+    "Uzbekistan": "Usbekistan",
+    "United Arab Emirates": "De forente arabiske emirater",
+    "Ukraine": "Ukraina",
+    "U.S. Virgin Islands": "De amerikanske jomfruøyene",
+    "Uganda": "Uganda",
+    "Tuvalu": "Tuvalu",
+    "Turks & Caicos Islands": "Turks- og Caicosøyene",
+    "Turkmenistan": "Turkmenistan",
+    "Tunisia": "Tunis",
+    "Turkey": "Tyrkia",
+    "Trinidad & Tobago": "Trinidad og Tobago",
+    "Tonga": "Tonga",
+    "Tokelau": "Tokelau",
+    "Togo": "Togo",
+    "Timor-Leste": "Timor-Leste",
+    "Thailand": "Thailand",
+    "Tanzania": "Tanzania",
+    "Tajikistan": "Tadsjikistan",
+    "Taiwan": "Taiwan",
+    "São Tomé & Príncipe": "São Tomé og Príncipe",
+    "Syria": "Syria",
+    "Sweden": "Sverige",
+    "Switzerland": "Sveits",
+    "Swaziland": "Swaziland",
+    "Svalbard & Jan Mayen": "Svalbard og Jan Mayen",
+    "Suriname": "Surinam",
+    "Sudan": "Sudan",
+    "St. Vincent & Grenadines": "St. Vincent og Grenadinene",
+    "St. Kitts & Nevis": "St. Kitts og Nevis",
+    "St. Helena": "St. Helena",
+    "Sri Lanka": "Sri Lanka",
+    "Spain": "Spania",
+    "South Sudan": "Sør-Sudan",
+    "South Korea": "Syd-Korea",
+    "Somalia": "Somalia",
+    "South Africa": "Sør-Afrika",
+    "Solomon Islands": "Solomonøyene",
+    "Slovenia": "Slovenia",
+    "Slovakia": "Slovakia",
+    "Sint Maarten": "Sint Maarten",
+    "Singapore": "Singapore",
+    "Sierra Leone": "Sierra Leone",
+    "Seychelles": "Seyschellene",
+    "Serbia": "Serbia",
+    "Saudi Arabia": "Saudi-Arabia",
+    "Senegal": "Senegal",
+    "San Marino": "San Marino",
+    "Samoa": "Samoa",
+    "Réunion": "Réunion",
+    "Rwanda": "Rwanda",
+    "Russia": "Russland",
+    "Qatar": "Qatar",
+    "Romania": "Romania",
+    "Puerto Rico": "Puerto Rico",
+    "Portugal": "Portugal",
+    "Poland": "Polen",
+    "Pitcairn Islands": "Pitcairn-øyene",
+    "Philippines": "Filippinene",
+    "Peru": "Peru",
+    "Papua New Guinea": "Papua New Guinea",
+    "Paraguay": "Paraguay",
+    "Panama": "Panama",
+    "Palestine": "Palestina",
+    "Pakistan": "Pakistan",
+    "Palau": "Palau",
+    "Oman": "Oman",
+    "Norway": "Norge",
+    "Northern Mariana Islands": "Northern Mariana Islands",
+    "North Korea": "Nord-Korea",
+    "Norfolk Island": "Norfolkøyene",
+    "Niue": "Niue",
+    "Nigeria": "Nigeria",
+    "Niger": "Niger",
+    "New Zealand": "New Zealand",
+    "Nicaragua": "Nicaragua",
+    "New Caledonia": "New Caledonia",
+    "Netherlands": "Nederland",
+    "Nepal": "Nepal",
+    "Nauru": "Nauru",
+    "Namibia": "Namibia",
+    "Myanmar": "Myanmar",
+    "Mozambique": "Mosambik",
+    "Morocco": "Marokko",
+    "Montenegro": "Montenegro",
+    "Montserrat": "Montserrat",
+    "Mongolia": "Mongolia",
+    "Monaco": "Monaco",
+    "Moldova": "Moldova",
+    "Micronesia": "Mikronesia",
+    "Mexico": "Mexico",
+    "Mayotte": "Mayotte",
+    "Mauritius": "Mauritius",
+    "Mauritania": "Mauretania",
+    "Martinique": "Martinique",
+    "Marshall Islands": "Marshall Islands",
+    "Maldives": "Maldivene",
+    "Mali": "Mali",
+    "Malaysia": "Malaysia",
+    "Malawi": "Malawi",
+    "Madagascar": "Madagaskar",
+    "Macedonia": "Nord-Makedonia",
+    "Macau": "Macau",
+    "Luxembourg": "Luxemburg",
+    "Lithuania": "Litauen",
+    "Liechtenstein": "Liechtenstein",
+    "Libya": "Libya",
+    "Liberia": "Liberia",
+    "Lesotho": "Lesotho",
+    "Lebanon": "Libanon",
+    "Latvia": "Latvia",
+    "Laos": "Laos",
+    "Kyrgyzstan": "Kirgistan",
+    "Kuwait": "Kuwait",
+    "Kosovo": "Kosovo",
+    "Kiribati": "Kiribati",
+    "Kazakhstan": "Kasakstan",
+    "Kenya": "Kenya",
+    "Jamaica": "Jamaica",
+    "Isle of Man": "Man",
+    "Iceland": "Island",
+    "Hungary": "Ungarn",
+    "Hong Kong": "Hong Kong",
+    "Honduras": "Honduras",
+    "Haiti": "Haiti",
+    "Guinea-Bissau": "Guinea-Bissau",
+    "Guyana": "Guyana",
+    "Guinea": "Guinea",
+    "Guernsey": "Guernsey",
+    "Guatemala": "Guatemala",
+    "Guam": "Guam",
+    "Guadeloupe": "Guadeloupe",
+    "Grenada": "Grenada",
+    "Greece": "Hellas",
+    "Greenland": "Grønland",
+    "Gibraltar": "Gibraltar",
+    "Ghana": "Ghana",
+    "Georgia": "Georgia",
+    "Gambia": "Gambia",
+    "Gabon": "Gabon",
+    "French Southern Territories": "De franske sørterritoriene",
+    "French Polynesia": "Fransk polynesia",
+    "French Guiana": "Fransk Guyana",
+    "France": "Frankrike",
+    "Finland": "Finnland",
+    "Fiji": "Fiji",
+    "Falkland Islands": "Falklandsøyene",
+    "Faroe Islands": "Færøyene",
+    "Ethiopia": "Etiopia",
+    "Estonia": "Estland",
+    "Eritrea": "Eritrea",
+    "Equatorial Guinea": "Ekvatorial-Guinea",
+    "El Salvador": "El Salvador",
+    "Egypt": "Egypt",
+    "Ecuador": "Ecuador",
+    "Dominican Republic": "Dominikanske republikk",
+    "Djibouti": "Djibouti",
+    "Dominica": "Dominica",
+    "Denmark": "Danmark",
+    "Côte d’Ivoire": "Elfenbenskysten",
+    "Czech Republic": "Tsjekkia",
+    "Cyprus": "Kypros",
+    "Curaçao": "Curaçao",
+    "Cuba": "Kuba",
+    "Colombia": "Colombia",
+    "Comoros": "Komorene",
+    "Cocos (Keeling) Islands": "Cocos- (Keeling) øyene",
+    "Christmas Island": "Juløya",
+    "China": "Kina",
+    "Chad": "Tsjad",
+    "Chile": "Chile",
+    "Central African Republic": "Sentralafrikanske republikk",
+    "Cayman Islands": "Caymanøyene",
+    "Caribbean Netherlands": "Karibisk Nederland",
+    "Cape Verde": "Kapp Verde",
+    "Canada": "Canada",
+    "Cameroon": "Kamerun",
+    "Cambodia": "Kambodsja",
+    "British Virgin Islands": "De britiske jomfruøyer",
+    "British Indian Ocean Territory": "Britiske havområder i det indiske hav",
+    "Bouvet Island": "Bouvetøya",
+    "Bosnia": "Bosnia",
+    "Croatia": "Kroatia",
+    "Costa Rica": "Costa Rica",
+    "Cook Islands": "Cook-øyene",
+    "All keys backed up": "Alle nøkler er sikkerhetskopiert",
+    "Secret storage:": "Hemmelig lagring:"
 }

src/i18n/strings/nl.json

@@ -198,7 +198,7 @@
     "Join Room": "Gesprek toetreden",
     "%(targetName)s joined the room.": "%(targetName)s is tot het gesprek toegetreden.",
     "Jump to first unread message.": "Spring naar het eerste ongelezen bericht.",
-    "Labs": "Experimenteel",
+    "Labs": "Labs",
     "Last seen": "Laatst gezien",
     "Leave room": "Gesprek verlaten",
     "%(targetName)s left the room.": "%(targetName)s heeft het gesprek verlaten.",
@@ -632,7 +632,7 @@
     "The version of %(brand)s": "De versie van %(brand)s",
     "Your language of choice": "De door jou gekozen taal",
     "Which officially provided instance you are using, if any": "Welke officieel aangeboden instantie je eventueel gebruikt",
-    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Of je de tekstverwerker al dan niet in de modus voor opgemaakte tekst gebruikt",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Of u de tekstverwerker al dan niet in de modus voor opgemaakte tekst gebruikt",
     "Your homeserver's URL": "De URL van je homeserver",
     "<a>In reply to</a> <pill>": "<a>Als antwoord op</a> <pill>",
     "This room is not public. You will not be able to rejoin without an invite.": "Dit is geen openbaar gesprek. Slechts op uitnodiging zult u opnieuw kunnen toetreden.",
@@ -1255,7 +1255,7 @@
     "The homeserver may be unavailable or overloaded.": "De homeserver is mogelijk onbereikbaar of overbelast.",
     "You have %(count)s unread notifications in a prior version of this room.|other": "U heeft %(count)s ongelezen meldingen in een vorige versie van dit gesprek.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "U heeft %(count)s ongelezen meldingen in een vorige versie van dit gesprek.",
-    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Of je de icoontjes voor recente gesprekken (boven de gesprekkenlijst) al dan niet gebruikt",
+    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Of u de icoontjes voor recente gesprekken (boven de gesprekkenlijst) al dan niet gebruikt",
     "Replying With Files": "Beantwoorden met bestanden",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Het is momenteel niet mogelijk met een bestand te antwoorden. Wil je dit bestand uploaden zonder te antwoorden?",
     "The file '%(fileName)s' failed to upload.": "Het bestand ‘%(fileName)s’ kon niet geüpload worden.",
@@ -1758,7 +1758,7 @@
     "Cancelling…": "Bezig met annuleren…",
     "%(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>.": "In %(brand)s ontbreken enige modulen vereist voor het veilig lokaal bewaren van versleutelde berichten. Wilt u deze functie uittesten, compileer dan een aangepaste versie van %(brand)s Desktop <nativeLink>die de zoekmodulen bevat</nativeLink>.",
     "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Deze sessie <b>maakt geen back-ups van uw sleutels</b>, maar u beschikt over een reeds bestaande back-up waaruit u kunt herstellen en waaraan u nieuwe sleutels vanaf nu kunt toevoegen.",
-    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Personaliseer uw ervaring met experimentele functies. <a>Klik hier voor meer informatie</a>.",
+    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Personaliseer uw ervaring met experimentele labs functies. <a>Lees verder</a>.",
     "Cross-signing": "Kruiselings ondertekenen",
     "Your key share request has been sent - please check your other sessions for key share requests.": "Uw sleuteldeelverzoek is verstuurd - controleer de sleuteldeelverzoeken op uw andere sessies.",
     "Key share requests are sent to your other sessions automatically. If you rejected or dismissed the key share request on your other sessions, click here to request the keys for this session again.": "Sleuteldeelverzoeken worden automatisch naar andere sessies verstuurd. Als u op uw andere sessies het sleuteldeelverzoek geweigerd of genegeerd hebt, kunt u hier klikken op de sleutels voor deze sessie opnieuw aan te vragen.",
@@ -3134,5 +3134,42 @@
     "From %(deviceName)s (%(deviceId)s) at %(ip)s": "Van %(deviceName)s (%(deviceId)s) op %(ip)s",
     "Check your devices": "Controleer uw apparaten",
     "A new login is accessing your account: %(name)s (%(deviceID)s) at %(ip)s": "Een nieuwe login heeft toegang tot uw account: %(name)s (%(deviceID)s) op %(ip)s",
-    "You have unverified logins": "U heeft ongeverifieerde logins"
+    "You have unverified logins": "U heeft ongeverifieerde logins",
+    "Without verifying, you won’t have access to all your messages and may appear as untrusted to others.": "Zonder verifiëren heeft u geen toegang tot al uw berichten en kan u als onvertrouwd aangemerkt staan bij anderen.",
+    "Verify your identity to access encrypted messages and prove your identity to others.": "Verifeer uw identiteit om toegang te krijgen tot uw versleutelde berichten en uw identiteit te bewijzen voor anderen.",
+    "Use another login": "Gebruik andere login",
+    "Please choose a strong password": "Kies een sterk wachtwoord",
+    "You can add more later too, including already existing ones.": "U kunt er later nog meer toevoegen, inclusief al bestaande gesprekken.",
+    "Let's create a room for each of them.": "Laten we voor elk een los gesprek maken.",
+    "What are some things you want to discuss in %(spaceName)s?": "Wat wilt u allemaal bespreken in %(spaceName)s?",
+    "Verification requested": "Verificatieverzocht",
+    "Avatar": "Avatar",
+    "Verify other login": "Verifieer andere login",
+    "You most likely do not want to reset your event index store": "U wilt waarschijnlijk niet uw gebeurtenisopslag-index resetten",
+    "Reset event store?": "Gebeurtenisopslag resetten?",
+    "Reset event store": "Gebeurtenisopslag resetten",
+    "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": "Als u dit wilt, let op uw berichten worden niet verwijderd, zal het zoeken tijdelijk minder goed werken terwijl we uw index opnieuw opbouwen",
+    "Consult first": "Eerst overleggen",
+    "Invited people will be able to read old messages.": "Uitgenodigde personen kunnen de oude berichten lezen.",
+    "We couldn't create your DM.": "We konden uw DM niet aanmaken.",
+    "Adding...": "Toevoegen...",
+    "Add existing rooms": "Bestaande gesprekken toevoegen",
+    "%(count)s people you know have already joined|one": "%(count)s persoon die u kent is al geregistreerd",
+    "%(count)s people you know have already joined|other": "%(count)s personen die u kent hebben zijn al geregistreerd",
+    "Accept on your other login…": "Accepteer op uw andere login…",
+    "Stop & send recording": "Stop & verstuur opname",
+    "Record a voice message": "Audiobericht opnemen",
+    "Invite messages are hidden by default. Click to show the message.": "Uitnodigingen zijn standaard verborgen. Klik om de uitnodigingen weer te geven.",
+    "Quick actions": "Snelle acties",
+    "Invite to just this room": "Uitnodigen voor alleen dit gesprek",
+    "Warn before quitting": "Waarschuwen voordat u afsluit",
+    "Message search initilisation failed": "Zoeken in berichten opstarten is mislukt",
+    "Manage & explore rooms": "Beheer & ontdek gesprekken",
+    "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>": "Overleggen met %(transferTarget)s. <a>Verstuur naar %(transferee)s</a>",
+    "unknown person": "onbekend persoon",
+    "Share decryption keys for room history when inviting users": "Deel ontsleutelsleutels voor de gespreksgeschiedenis wanneer u personen uitnodigd",
+    "Send and receive voice messages (in development)": "Verstuur en ontvang audioberichten (in ontwikkeling)",
+    "%(deviceId)s from %(ip)s": "%(deviceId)s van %(ip)s",
+    "Review to ensure your account is safe": "Controleer om u te verzekeren dat uw account veilig is",
+    "Sends the given message as a spoiler": "Verstuurt het bericht als een spoiler"
 }

src/i18n/strings/oc.json

@@ -62,7 +62,7 @@
     "Server error": "Error servidor",
     "Single Sign On": "Autentificacion unica",
     "Confirm": "Confirmar",
-    "Dismiss": "Far desaparéisser",
+    "Dismiss": "Refusar",
     "OK": "D’acòrdi",
     "Continue": "Contunhar",
     "Go Back": "En arrièr",
@@ -118,7 +118,7 @@
     "Incoming call": "Sonada entranta",
     "Accept": "Acceptar",
     "Start": "Començament",
-    "Cancelling…": "Anullacion...",
+    "Cancelling…": "Anullacion…",
     "Fish": "Pes",
     "Butterfly": "Parpalhòl",
     "Tree": "Arborescéncia",
@@ -338,5 +338,13 @@
     "Esc": "Escap",
     "Enter": "Entrada",
     "Space": "Espaci",
-    "End": "Fin"
+    "End": "Fin",
+    "Explore rooms": "Percórrer las salas",
+    "Create Account": "Crear un compte",
+    "Click the button below to confirm adding this email address.": "Clicatz sus lo boton aicí dejós per confirmar l'adicion de l'adreça e-mail.",
+    "Confirm adding email": "Confirmar l'adicion de l'adressa e-mail",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Confirmatz l'adicion d'aquela adreça e-mail en utilizant l'autentificacion unica per provar la vòstra identitat.",
+    "Use Single Sign On to continue": "Utilizar l'autentificacion unica (SSO) per contunhar",
+    "This phone number is already in use": "Aquel numèro de telefòn es ja utilizat",
+    "This email address is already in use": "Aquela adreça e-mail es ja utilizada"
 }

src/i18n/strings/pl.json

@@ -1277,8 +1277,8 @@
     "Enable desktop notifications for this session": "Włącz powiadomienia na pulpicie dla tej sesji",
     "Enable audible notifications for this session": "Włącz powiadomienia dźwiękowe dla tej sesji",
     "Direct Messages": "Wiadomości bezpośrednie",
-    "Create Account": "Utwórz konto",
-    "Sign In": "Zaloguj się",
+    "Create Account": "Stwórz konto",
+    "Sign In": "Zaloguj",
     "a few seconds ago": "kilka sekund temu",
     "%(num)s minutes ago": "%(num)s minut temu",
     "%(num)s hours ago": "%(num)s godzin temu",

src/i18n/strings/pt.json

@@ -569,5 +569,8 @@
     "Try using turn.matrix.org": "Tente utilizar turn.matrix.org",
     "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Quer esteja a usar o %(brand)s num dispositivo onde o touch é o mecanismo de entrada primário",
     "Whether you're using %(brand)s as an installed Progressive Web App": "Quer esteja a usar o %(brand)s como uma Progressive Web App (PWA)",
-    "Your user agent": "O seu user agent"
+    "Your user agent": "O seu user agent",
+    "Explore rooms": "Explorar rooms",
+    "Sign In": "Iniciar sessão",
+    "Create Account": "Criar conta"
 }

src/i18n/strings/pt_BR.json

@@ -1175,7 +1175,7 @@
     "Learn More": "Saiba mais",
     "Sign In or Create Account": "Faça login ou crie uma conta",
     "Use your account or create a new one to continue.": "Use sua conta ou crie uma nova para continuar.",
-    "Create Account": "Criar conta",
+    "Create Account": "Criar Conta",
     "Sign In": "Entrar",
     "Custom (%(level)s)": "Personalizado (%(level)s)",
     "Messages": "Mensagens",

src/i18n/strings/ro.json

@@ -70,5 +70,9 @@
     "Add to community": "Adăugați la comunitate",
     "Failed to invite the following users to %(groupId)s:": "Nu a putut fi invitat următorii utilizatori %(groupId)s",
     "Failed to invite users to community": "Nu a fost posibilă invitarea utilizatorilor la comunitate",
-    "Failed to invite users to %(groupId)s": "Nu a fost posibilă invitarea utilizatorilor la %(groupId)s"
+    "Failed to invite users to %(groupId)s": "Nu a fost posibilă invitarea utilizatorilor la %(groupId)s",
+    "Explore rooms": "Explorează camerele",
+    "Sign In": "Autentificare",
+    "Create Account": "Înregistare",
+    "Dismiss": "Închide"
 }

src/i18n/strings/ru.json

@@ -3169,5 +3169,46 @@
     "Decrypted event source": "Расшифрованный исходный код",
     "%(count)s rooms and %(numSpaces)s spaces|one": "%(count)s комната и %(numSpaces)s пространств",
     "%(count)s rooms and %(numSpaces)s spaces|other": "%(count)s комнат и %(numSpaces)s пространств",
-    "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.": "Если вы не можете найти комнату, попросите приглашение или <a>создайте новую комнату</a>."
+    "If you can't find the room you're looking for, ask for an invite or <a>create a new room</a>.": "Если вы не можете найти комнату, попросите приглашение или <a>создайте новую комнату</a>.",
+    "Values at explicit levels in this room:": "Значения уровня чувствительности в этой комнате:",
+    "Values at explicit levels:": "Значения уровня чувствительности:",
+    "Values at explicit levels in this room": "Значения уровня чувствительности в этой комнате",
+    "Values at explicit levels": "Значения уровня чувствительности",
+    "We'll create rooms for each of them. You can add more later too, including already existing ones.": "Мы создадим комнаты для каждого из них. Вы можете добавить ещё больше позже, включая уже существующие.",
+    "What projects are you working on?": "Над какими проектами вы работаете?",
+    "Invite by username": "Пригласить по имени пользователя",
+    "Make sure the right people have access. You can invite more later.": "Убедитесь, что правильные люди имеют доступ. Вы можете пригласить больше людей позже.",
+    "Invite your teammates": "Пригласите своих товарищей по команде",
+    "Inviting...": "Приглашение…",
+    "Failed to invite the following users to your space: %(csvUsers)s": "Не удалось пригласить следующих пользователей в ваше пространство: %(csvUsers)s",
+    "Me and my teammates": "Я и мои товарищи по команде",
+    "A private space for you and your teammates": "Приватное пространство для вас и ваших товарищей по команде",
+    "A private space to organise your rooms": "Приватное пространство для организации ваших комнат",
+    "Just me": "Только я",
+    "Make sure the right people have access to %(name)s": "Убедитесь, что правильные люди имеют доступ к %(name)s",
+    "Who are you working with?": "С кем ты работаешь?",
+    "Go to my first room": "Перейти в мою первую комнату",
+    "It's just you at the moment, it will be even better with others.": "Сейчас здесь только ты, с другими будет ещё лучше.",
+    "Share %(name)s": "Поделиться %(name)s",
+    "Creating rooms...": "Создание комнат…",
+    "Skip for now": "Пропустить сейчас",
+    "Failed to create initial space rooms": "Не удалось создать первоначальные комнаты пространства",
+    "Room name": "Название комнаты",
+    "Support": "Поддержка",
+    "Random": "Случайный",
+    "Welcome to <name/>": "Добро пожаловать в <name/>",
+    "Your server does not support showing space hierarchies.": "Ваш сервер не поддерживает отображение пространственных иерархий.",
+    "Add existing rooms & spaces": "Добавить существующие комнаты и пространства",
+    "Private space": "Приватное пространство",
+    "Public space": "Публичное пространство",
+    "<inviter/> invites you": "<inviter/> пригласил(а) тебя",
+    "Search names and description": "Искать имена и описание",
+    "You may want to try a different search or check for typos.": "Вы можете попробовать другой поиск или проверить опечатки.",
+    "No results found": "Результаты не найдены",
+    "Mark as suggested": "Отметить как рекомендуется",
+    "Mark as not suggested": "Отметить как не рекомендуется",
+    "Removing...": "Удаление…",
+    "Failed to remove some rooms. Try again later": "Не удалось удалить несколько комнат. Попробуйте позже",
+    "%(count)s rooms and 1 space|one": "%(count)s комната и одно пространство",
+    "%(count)s rooms and 1 space|other": "%(count)s комнат и одно пространство"
 }

src/i18n/strings/sl.json

@@ -27,5 +27,7 @@
     "Your homeserver's URL": "URL domačega strežnika",
     "End": "Konec",
     "Use default": "Uporabi privzeto",
-    "Change": "Sprememba"
+    "Change": "Sprememba",
+    "Explore rooms": "Raziščite sobe",
+    "Create Account": "Registracija"
 }

src/i18n/strings/sq.json

@@ -874,7 +874,7 @@
     "Incompatible Database": "Bazë të dhënash e Papërputhshme",
     "Continue With Encryption Disabled": "Vazhdo Me Fshehtëzimin të Çaktivizuar",
     "Unable to load! Check your network connectivity and try again.": "S’arrihet të ngarkohet! Kontrolloni lidhjen tuaj në rrjet dhe riprovoni.",
-    "Forces the current outbound group session in an encrypted room to be discarded": "",
+    "Forces the current outbound group session in an encrypted room to be discarded": "E detyron të hidhet tej sesionin e tanishëm outbound grupi në një dhomë të fshehtëzuar",
     "Delete Backup": "Fshije Kopjeruajtjen",
     "Unable to load key backup status": "S’arrihet të ngarkohet gjendje kopjeruajtjeje kyçesh",
     "Backup version: ": "Version kopjeruajtjeje: ",
@@ -3240,5 +3240,37 @@
     "From %(deviceName)s (%(deviceId)s) at %(ip)s": "Nga %(deviceName)s (%(deviceId)s) te %(ip)s",
     "Check your devices": "Kontrolloni pajisjet tuaja",
     "A new login is accessing your account: %(name)s (%(deviceID)s) at %(ip)s": "Në llogarinë tuaj po hyhet nga një palë kredenciale të reja: %(name)s (%(deviceID)s) te %(ip)s",
-    "You have unverified logins": "Keni kredenciale të erifikuar"
+    "You have unverified logins": "Keni kredenciale të erifikuar",
+    "Without verifying, you won’t have access to all your messages and may appear as untrusted to others.": "Pa e verifikuar, s’do të mund të hyni te krejt mesazhet tuaja dhe mund të dukeni jo i besueshëm për të tjerët.",
+    "Verify your identity to access encrypted messages and prove your identity to others.": "Verifikoni identitetin tuaj që të hyhet në mesazhe të fshehtëzuar dhe t’u provoni të tjerëve identitetin tuaj.",
+    "Use another login": "Përdorni të tjera kredenciale hyrjesh",
+    "Please choose a strong password": "Ju lutemi, zgjidhni një fjalëkalim të fuqishëm",
+    "You can add more later too, including already existing ones.": "Mund të shtoni edhe të tjera më vonë, përfshi ato ekzistueset tashmë.",
+    "Let's create a room for each of them.": "Le të krijojmë një dhomë për secilën prej tyre.",
+    "What are some things you want to discuss in %(spaceName)s?": "Cilat janë disa nga gjërat që doni të diskutoni në %(spaceName)s?",
+    "Verification requested": "U kërkua verifikim",
+    "Avatar": "Avatar",
+    "Verify other login": "Verifikoni kredencialet e tjera për hyrje",
+    "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": "Nëse e bëni, ju lutemi, kini parasysh se s’do të fshihet asnjë prej mesazheve tuaja, por puna me kërkimet mund të bjerë, për ca çaste, teksa rikrijohet treguesi",
+    "Consult first": "Konsultohu së pari",
+    "Invited people will be able to read old messages.": "Personat e ftuar do të jenë në gjendje të lexojnë mesazhe të vjetër.",
+    "We couldn't create your DM.": "S’e krijuam dot DM-në tuaj.",
+    "Adding...": "Po shtohet…",
+    "Add existing rooms": "Shtoni dhoma ekzistuese",
+    "%(count)s people you know have already joined|one": "%(count)s person që e njihni është bërë pjesë tashmë",
+    "%(count)s people you know have already joined|other": "%(count)s persona që i njihni janë bërë pjesë tashmë",
+    "Stop & send recording": "Ndale & dërgo incizimin",
+    "Record a voice message": "Incizoni një mesazh zanor",
+    "Invite messages are hidden by default. Click to show the message.": "Mesazhet e ftesave, si parazgjedhje, janë të fshehur. Klikoni që të shfaqet mesazhi.",
+    "Quick actions": "Veprime të shpejta",
+    "Invite to just this room": "Ftoje thjesht te kjo dhomë",
+    "Warn before quitting": "Sinjalizo përpara daljes",
+    "Message search initilisation failed": "Dështoi gatitje kërkimi mesazhesh",
+    "Manage & explore rooms": "Administroni & eksploroni dhoma",
+    "unknown person": "person i panjohur",
+    "Sends the given message as a spoiler": "E dërgon mesazhin e dhënë si <em>spoiler</em>",
+    "Share decryption keys for room history when inviting users": "Ndani me përdorues kyçe shfshehtëzimi, kur ftohen përdorues",
+    "Send and receive voice messages (in development)": "Dërgoni dhe merrni mesazhe zanorë (në zhvillim)",
+    "%(deviceId)s from %(ip)s": "%(deviceId)s prej %(ip)s",
+    "Review to ensure your account is safe": "Shqyrtojeni për t’u siguruar se llogaria është e parrezik"
 }

src/i18n/strings/sr_Latn.json

@@ -58,5 +58,6 @@
     "Failed to invite users to the room:": "Nije uspelo pozivanje korisnika u sobu:",
     "You need to be logged in.": "Morate biti prijavljeni",
     "You need to be able to invite users to do that.": "Mora vam biti dozvoljeno da pozovete korisnike kako bi to uradili.",
-    "Failed to send request.": "Slanje zahteva nije uspelo."
+    "Failed to send request.": "Slanje zahteva nije uspelo.",
+    "Create Account": "Napravite nalog"
 }

src/i18n/strings/sv.json

@@ -3180,5 +3180,41 @@
     "From %(deviceName)s (%(deviceId)s) at %(ip)s": "Från %(deviceName)s %(deviceId)s på %(ip)s",
     "Check your devices": "Kolla dina enheter",
     "A new login is accessing your account: %(name)s (%(deviceID)s) at %(ip)s": "En ny inloggning kommer åt ditt konto: %(name)s %(deviceID)s på %(ip)s",
-    "You have unverified logins": "Du har overifierade inloggningar"
+    "You have unverified logins": "Du har overifierade inloggningar",
+    "%(count)s people you know have already joined|other": "%(count)s personer du känner har redan gått med",
+    "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": "Om du gör det, observera att inga av dina meddelanden kommer att raderas, men din sökupplevelse kommer att degraderas en stund medans registret byggs upp igen",
+    "What are some things you want to discuss in %(spaceName)s?": "Vad är några saker du vill diskutera i %(spaceName)s?",
+    "You can add more later too, including already existing ones.": "Du kan lägga till flera senare också, inklusive redan existerande.",
+    "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>": "Tillfrågar %(transferTarget)s. <a>%(transferTarget)sÖverför till %(transferee)s</a>",
+    "Review to ensure your account is safe": "Granska för att försäkra dig om att ditt konto är säkert",
+    "%(deviceId)s from %(ip)s": "%(deviceId)s från %(ip)s",
+    "Send and receive voice messages (in development)": "Skicka och ta emot röstmeddelanden (under utveckling)",
+    "unknown person": "okänd person",
+    "Warn before quitting": "Varna innan avslutning",
+    "Invite to just this room": "Bjud in till bara det här rummet",
+    "Invite messages are hidden by default. Click to show the message.": "Inbjudningsmeddelanden är dolda som förval. Klicka för att visa meddelandet.",
+    "Record a voice message": "Spela in ett röstmeddelande",
+    "Stop & send recording": "Stoppa och skicka inspelning",
+    "Accept on your other login…": "Acceptera på din andra inloggning…",
+    "%(count)s people you know have already joined|one": "%(count)s person du känner har redan gått med",
+    "Quick actions": "Snabbhandlingar",
+    "Add existing rooms": "Lägg till existerande rum",
+    "Adding...": "Lägger till…",
+    "We couldn't create your DM.": "Vi kunde inte skapa ditt DM.",
+    "Reset event store": "Återställ händelselagring",
+    "Invited people will be able to read old messages.": "Inbjudna personer kommer att kunna läsa gamla meddelanden.",
+    "Reset event store?": "Återställ händelselagring?",
+    "You most likely do not want to reset your event index store": "Du vill troligen inte återställa din händelseregisterlagring",
+    "Consult first": "Tillfråga först",
+    "Verify other login": "Verifiera annan inloggning",
+    "Avatar": "Avatar",
+    "Let's create a room for each of them.": "Låt oss skapa ett rum för varje.",
+    "Verification requested": "Verifiering begärd",
+    "Sends the given message as a spoiler": "Skickar det angivna meddelandet som en spoiler",
+    "Manage & explore rooms": "Hantera och utforska rum",
+    "Message search initilisation failed": "Initialisering av meddelandesökning misslyckades",
+    "Please choose a strong password": "Vänligen välj ett starkt lösenord",
+    "Use another login": "Använd annan inloggning",
+    "Verify your identity to access encrypted messages and prove your identity to others.": "Verifiera din identitet för att komma åt krypterade meddelanden och bevisa din identitet för andra.",
+    "Without verifying, you won’t have access to all your messages and may appear as untrusted to others.": "Om du inte verifierar så kommer du inte ha åtkomst till alla dina meddelanden och kan synas som ej betrodd för andra."
 }

src/i18n/strings/ta.json

@@ -179,5 +179,7 @@
     "Mar": "மார்ச்",
     "Apr": "ஏப்ரல்",
     "May": "மே",
-    "Jun": "ஜூன்"
+    "Jun": "ஜூன்",
+    "Explore rooms": "அறைகளை ஆராயுங்கள்",
+    "Create Account": "உங்கள் கணக்கை துவங்குங்கள்"
 }

src/i18n/strings/th.json

@@ -26,7 +26,7 @@
     "Results from DuckDuckGo": "ผลจาก DuckDuckGo",
     "%(brand)s version:": "เวอร์ชัน %(brand)s:",
     "Cancel": "ยกเลิก",
-    "Dismiss": "ไม่สนใจ",
+    "Dismiss": "ปิด",
     "Mute": "เงียบ",
     "Notifications": "การแจ้งเตือน",
     "Operation failed": "การดำเนินการล้มเหลว",
@@ -378,5 +378,10 @@
     "Unable to fetch notification target list": "ไม่สามารถรับรายชื่ออุปกรณ์แจ้งเตือน",
     "Quote": "อ้างอิง",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "การแสดงผลของโปรแกรมอาจผิดพลาด ฟังก์ชันบางอย่างหรือทั้งหมดอาจไม่ทำงานในเบราว์เซอร์ปัจจุบันของคุณ หากคุณต้องการลองดำเนินการต่อ คุณต้องรับมือกับปัญหาที่อาจจะเกิดขึ้นด้วยตัวคุณเอง!",
-    "Checking for an update...": "กำลังตรวจหาอัปเดต..."
+    "Checking for an update...": "กำลังตรวจหาอัปเดต...",
+    "Explore rooms": "สำรวจห้อง",
+    "Sign In": "ลงชื่อเข้า",
+    "Create Account": "สร้างบัญชี",
+    "Add Email Address": "เพิ่มที่อยู่อีเมล",
+    "Confirm": "ยืนยัน"
 }

src/i18n/strings/vi.json

@@ -293,5 +293,7 @@
     "Enable URL previews by default for participants in this room": "Bật mặc định xem trước nội dung đường link cho mọi người trong phòng",
     "Room Colour": "Màu phòng chat",
     "Enable widget screenshots on supported widgets": "Bật widget chụp màn hình cho các widget có hỗ trợ",
-    "Sign In": "Đăng nhập"
+    "Sign In": "Đăng nhập",
+    "Explore rooms": "Khám phá phòng chat",
+    "Create Account": "Tạo tài khoản"
 }

src/i18n/strings/vls.json

@@ -1443,5 +1443,7 @@
     "Terms of service not accepted or the identity server is invalid.": "Dienstvoorwoardn nie anveird, of den identiteitsserver is oungeldig.",
     "Enter a new identity server": "Gift e nieuwen identiteitsserver in",
     "Remove %(email)s?": "%(email)s verwydern?",
-    "Remove %(phone)s?": "%(phone)s verwydern?"
+    "Remove %(phone)s?": "%(phone)s verwydern?",
+    "Explore rooms": "Gesprekkn ountdekkn",
+    "Create Account": "Account anmoakn"
 }

src/i18n/strings/zh_Hant.json

@@ -3251,5 +3251,42 @@
     "From %(deviceName)s (%(deviceId)s) at %(ip)s": "從 %(deviceName)s (%(deviceId)s) 於 %(ip)s",
     "Check your devices": "檢查您的裝置",
     "A new login is accessing your account: %(name)s (%(deviceID)s) at %(ip)s": "新登入正在存取您的帳號：%(name)s (%(deviceID)s) 於 %(ip)s",
-    "You have unverified logins": "您有未驗證的登入"
+    "You have unverified logins": "您有未驗證的登入",
+    "unknown person": "不明身份的人",
+    "Consulting with %(transferTarget)s. <a>Transfer to %(transferee)s</a>": "與 %(transferTarget)s 進行協商。<a>轉讓至 %(transferee)s</a>",
+    "Message search initilisation failed": "訊息搜尋初始化失敗",
+    "Invite to just this room": "邀請到此聊天室",
+    "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": "如果這樣做，請注意，您的任何訊息都不會被刪除，但是在重新建立索引的同時，搜索體驗可能會降低片刻",
+    "Let's create a room for each of them.": "讓我們為每個主題建立一個聊天室吧。",
+    "Verify your identity to access encrypted messages and prove your identity to others.": "驗證您的身份來存取已加密的訊息並對其他人證明您的身份。",
+    "Sends the given message as a spoiler": "將指定訊息以劇透傳送",
+    "Review to ensure your account is safe": "請審閱以確保您的帳號安全",
+    "%(deviceId)s from %(ip)s": "從 %(ip)s 而來的 %(deviceId)s",
+    "Send and receive voice messages (in development)": "傳送與接收語音訊息（開發中）",
+    "Share decryption keys for room history when inviting users": "邀請使用者時分享聊天室歷史紀錄的解密金鑰",
+    "Manage & explore rooms": "管理與探索聊天室",
+    "Warn before quitting": "離開前警告",
+    "Quick actions": "快速動作",
+    "Invite messages are hidden by default. Click to show the message.": "邀請訊息預設隱藏。點擊以顯示訊息。",
+    "Record a voice message": "錄製語音訊息",
+    "Stop & send recording": "停止並傳送錄音",
+    "Accept on your other login…": "接受您的其他登入……",
+    "%(count)s people you know have already joined|other": "%(count)s 個您認識的人已加入",
+    "%(count)s people you know have already joined|one": "%(count)s 個您認識的人已加入",
+    "Add existing rooms": "新增既有聊天室",
+    "Adding...": "正在新增……",
+    "We couldn't create your DM.": "我們無法建立您的直接訊息。",
+    "Invited people will be able to read old messages.": "被邀請的人將能閱讀舊訊息。",
+    "Consult first": "先協商",
+    "Reset event store?": "重設活動儲存？",
+    "You most likely do not want to reset your event index store": "您很可能不想重設您的活動索引儲存",
+    "Reset event store": "重設活動儲存",
+    "Verify other login": "驗證其他登入",
+    "Avatar": "大頭貼",
+    "Verification requested": "已請求驗證",
+    "What are some things you want to discuss in %(spaceName)s?": "您想在 %(spaceName)s 中討論什麼？",
+    "You can add more later too, including already existing ones.": "您稍後可以新增更多內容，包含既有的。",
+    "Please choose a strong password": "請選擇強密碼",
+    "Use another login": "使用其他登入",
+    "Without verifying, you won’t have access to all your messages and may appear as untrusted to others.": "未經驗證，您將無法存取您的所有訊息，且可能不被其他人信任。"
 }

src/settings/Settings.ts

@@ -128,6 +128,12 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         default: false,
         controller: new ReloadOnChangeController(),
     },
+    "feature_dnd": {
+        isFeature: true,
+        displayName: _td("Show options to enable 'Do not disturb' mode"),
+        supportedLevels: LEVELS_FEATURE,
+        default: false,
+    },
     "feature_voice_messages": {
         isFeature: true,
         displayName: _td("Send and receive voice messages (in development)"),
@@ -220,18 +226,16 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },
-    "feature_room_history_key_sharing": {
-        isFeature: true,
-        displayName: _td("Share decryption keys for room history when inviting users"),
-        supportedLevels: LEVELS_FEATURE,
-        default: false,
-    },
     "advancedRoomListLogging": {
         // TODO: Remove flag before launch: https://github.com/vector-im/element-web/issues/14231
         displayName: _td("Enable advanced debugging for the room list"),
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
         default: false,
     },
+    "doNotDisturb": {
+        supportedLevels: [SettingLevel.DEVICE],
+        default: false,
+    },
     "mjolnirRooms": {
         supportedLevels: [SettingLevel.ACCOUNT],
         default: [],

src/stores/SpaceStore.tsx

@@ -46,11 +46,14 @@ export const HOME_SPACE = Symbol("home-space");
 export const SUGGESTED_ROOMS = Symbol("suggested-rooms");
 
 export const UPDATE_TOP_LEVEL_SPACES = Symbol("top-level-spaces");
+export const UPDATE_INVITED_SPACES = Symbol("invited-spaces");
 export const UPDATE_SELECTED_SPACE = Symbol("selected-space");
 // Space Room ID/HOME_SPACE will be emitted when a Space's children change
 
 const MAX_SUGGESTED_ROOMS = 20;
 
+const getSpaceContextKey = (space?: Room) => `mx_space_context_${space?.roomId || "home_space"}`;
+
 const partitionSpacesAndRooms = (arr: Room[]): [Room[], Room[]] => { // [spaces, rooms]
     return arr.reduce((result, room: Room) => {
         result[room.isSpaceRoom() ? 0 : 1].push(room);
@@ -91,6 +94,11 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
     // The space currently selected in the Space Panel - if null then `Home` is selected
     private _activeSpace?: Room = null;
     private _suggestedRooms: ISpaceSummaryRoom[] = [];
+    private _invitedSpaces = new Set<Room>();
+
+    public get invitedSpaces(): Room[] {
+        return Array.from(this._invitedSpaces);
+    }
 
     public get spacePanelSpaces(): Room[] {
         return this.rootSpaces;
@@ -104,13 +112,41 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
         return this._suggestedRooms;
     }
 
-    public async setActiveSpace(space: Room | null) {
+    public async setActiveSpace(space: Room | null, contextSwitch = true) {
         if (space === this.activeSpace) return;
 
         this._activeSpace = space;
         this.emit(UPDATE_SELECTED_SPACE, this.activeSpace);
         this.emit(SUGGESTED_ROOMS, this._suggestedRooms = []);
 
+        if (contextSwitch) {
+            // view last selected room from space
+            const roomId = window.localStorage.getItem(getSpaceContextKey(this.activeSpace));
+
+            // if the space being selected is an invite then always view that invite
+            // else if the last viewed room in this space is joined then view that
+            // else view space home or home depending on what is being clicked on
+            if (space?.getMyMembership !== "invite" &&
+                this.matrixClient?.getRoom(roomId)?.getMyMembership() === "join"
+            ) {
+                defaultDispatcher.dispatch({
+                    action: "view_room",
+                    room_id: roomId,
+                    context_switch: true,
+                });
+            } else if (space) {
+                defaultDispatcher.dispatch({
+                    action: "view_room",
+                    room_id: space.roomId,
+                    context_switch: true,
+                });
+            } else {
+                defaultDispatcher.dispatch({
+                    action: "view_home_page",
+                });
+            }
+        }
+
         // persist space selected
         if (space) {
             window.localStorage.setItem(ACTIVE_SPACE_LS_KEY, space.roomId);
@@ -189,25 +225,27 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
         return sortBy(parents, r => r.roomId)?.[0] || null;
     }
 
-    public getSpaces = () => {
-        return this.matrixClient.getRooms().filter(r => r.isSpaceRoom() && r.getMyMembership() === "join");
-    };
-
     public getSpaceFilteredRoomIds = (space: Room | null): Set<string> => {
         return this.spaceFilteredRooms.get(space?.roomId || HOME_SPACE) || new Set();
     };
 
     private rebuild = throttle(() => {
-        // get all most-upgraded rooms & spaces except spaces which have been left (historical)
-        const visibleRooms = this.matrixClient.getVisibleRooms().filter(r => {
-            return !r.isSpaceRoom() || r.getMyMembership() === "join";
-        });
+        const [visibleSpaces, visibleRooms] = partitionSpacesAndRooms(this.matrixClient.getVisibleRooms());
+        const [joinedSpaces, invitedSpaces] = visibleSpaces.reduce((arr, s) => {
+            if (s.getMyMembership() === "join") {
+                arr[0].push(s);
+            } else if (s.getMyMembership() === "invite") {
+                arr[1].push(s);
+            }
+            return arr;
+        }, [[], []]);
 
-        const unseenChildren = new Set<Room>(visibleRooms);
+        // exclude invited spaces from unseenChildren as they will be forcibly shown at the top level of the treeview
+        const unseenChildren = new Set<Room>([...visibleRooms, ...joinedSpaces]);
         const backrefs = new EnhancedMap<string, Set<string>>();
 
         // Sort spaces by room ID to force the cycle breaking to be deterministic
-        const spaces = sortBy(visibleRooms.filter(r => r.isSpaceRoom()), space => space.roomId);
+        const spaces = sortBy(joinedSpaces, space => space.roomId);
 
         // TODO handle cleaning up links when a Space is removed
         spaces.forEach(space => {
@@ -271,6 +309,10 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
 
         this.onRoomsUpdate(); // TODO only do this if a change has happened
         this.emit(UPDATE_TOP_LEVEL_SPACES, this.spacePanelSpaces);
+
+        // build initial state of invited spaces as we would have missed the emitted events about the room at launch
+        this._invitedSpaces = new Set(invitedSpaces);
+        this.emit(UPDATE_INVITED_SPACES, this.invitedSpaces);
     }, 100, {trailing: true, leading: true});
 
     onSpaceUpdate = () => {
@@ -278,6 +320,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
     }
 
     private showInHomeSpace = (room: Room) => {
+        if (room.isSpaceRoom()) return false;
         return !this.parentMap.get(room.roomId)?.size // put all orphaned rooms in the Home Space
             || DMRoomMap.shared().getUserIdForRoomId(room.roomId) // put all DMs in the Home Space
             || RoomListStore.instance.getTagsForRoom(room).includes(DefaultTagID.Favourite) // show all favourites
@@ -308,8 +351,8 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
         const oldFilteredRooms = this.spaceFilteredRooms;
         this.spaceFilteredRooms = new Map();
 
-        // put all invites (rooms & spaces) in the Home Space
-        const invites = this.matrixClient.getRooms().filter(r => r.getMyMembership() === "invite");
+        // put all room invites in the Home Space
+        const invites = visibleRooms.filter(r => !r.isSpaceRoom() && r.getMyMembership() === "invite");
         this.spaceFilteredRooms.set(HOME_SPACE, new Set<string>(invites.map(room => room.roomId)));
 
         visibleRooms.forEach(room => {
@@ -362,13 +405,18 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
 
         this.spaceFilteredRooms.forEach((roomIds, s) => {
             // Update NotificationStates
-            const rooms = this.matrixClient.getRooms().filter(room => roomIds.has(room.roomId));
-            this.getNotificationState(s)?.setRooms(rooms);
+            this.getNotificationState(s)?.setRooms(visibleRooms.filter(room => roomIds.has(room.roomId)));
         });
     }, 100, {trailing: true, leading: true});
 
-    private onRoom = (room: Room) => {
-        if (room?.isSpaceRoom()) {
+    private onRoom = (room: Room, membership?: string, oldMembership?: string) => {
+        if ((membership || room.getMyMembership()) === "invite") {
+            this._invitedSpaces.add(room);
+            this.emit(UPDATE_INVITED_SPACES, this.invitedSpaces);
+        } else if (oldMembership === "invite") {
+            this._invitedSpaces.delete(room);
+            this.emit(UPDATE_INVITED_SPACES, this.invitedSpaces);
+        } else if (room?.isSpaceRoom()) {
             this.onSpaceUpdate();
             this.emit(room.roomId);
         } else {
@@ -376,16 +424,16 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
             this.onRoomsUpdate();
         }
 
-        // if the user was looking at the room and then joined select that space
-        if (room.getMyMembership() === "join" && room.roomId === RoomViewStore.getRoomId()) {
-            this.setActiveSpace(room);
-        }
-
         if (room.getMyMembership() === "join") {
-            const numSuggestedRooms = this._suggestedRooms.length;
-            this._suggestedRooms = this._suggestedRooms.filter(r => r.room_id !== room.roomId);
-            if (numSuggestedRooms !== this._suggestedRooms.length) {
-                this.emit(SUGGESTED_ROOMS, this._suggestedRooms);
+            if (!room.isSpaceRoom()) {
+                const numSuggestedRooms = this._suggestedRooms.length;
+                this._suggestedRooms = this._suggestedRooms.filter(r => r.room_id !== room.roomId);
+                if (numSuggestedRooms !== this._suggestedRooms.length) {
+                    this.emit(SUGGESTED_ROOMS, this._suggestedRooms);
+                }
+            } else if (room.roomId === RoomViewStore.getRoomId()) {
+                // if the user was looking at the space and then joined: select that space
+                this.setActiveSpace(room);
             }
         }
     };
@@ -421,11 +469,11 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
         }
     };
 
-    private onRoomAccountData = (ev: MatrixEvent, room: Room, lastEvent: MatrixEvent) => {
+    private onRoomAccountData = (ev: MatrixEvent, room: Room, lastEvent?: MatrixEvent) => {
         if (ev.getType() === EventType.Tag && !room.isSpaceRoom()) {
             // If the room was in favourites and now isn't or the opposite then update its position in the trees
-            const oldTags = lastEvent.getContent()?.tags;
-            const newTags = ev.getContent()?.tags;
+            const oldTags = lastEvent?.getContent()?.tags || {};
+            const newTags = ev.getContent()?.tags || {};
             if (!!oldTags[DefaultTagID.Favourite] !== !!newTags[DefaultTagID.Favourite]) {
                 this.onRoomUpdate(room);
             }
@@ -488,24 +536,32 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
             case "view_room": {
                 const room = this.matrixClient?.getRoom(payload.room_id);
 
-                if (room?.getMyMembership() === "join") {
-                    if (room.isSpaceRoom()) {
-                        this.setActiveSpace(room);
-                    } else if (!this.spaceFilteredRooms.get(this._activeSpace?.roomId || HOME_SPACE).has(room.roomId)) {
-                        // TODO maybe reverse these first 2 clauses once space panel active is fixed
-                        let parent = this.rootSpaces.find(s => this.spaceFilteredRooms.get(s.roomId)?.has(room.roomId));
-                        if (!parent) {
-                            parent = this.getCanonicalParent(room.roomId);
-                        }
-                        if (!parent) {
-                            const parents = Array.from(this.parentMap.get(room.roomId) || []);
-                            parent = parents.find(p => this.matrixClient.getRoom(p));
-                        }
-                        if (parent) {
-                            this.setActiveSpace(parent);
-                        }
+                // Don't auto-switch rooms when reacting to a context-switch
+                // as this is not helpful and can create loops of rooms/space switching
+                if (!room || payload.context_switch) break;
+
+                // persist last viewed room from a space
+
+                if (room.isSpaceRoom()) {
+                    this.setActiveSpace(room);
+                } else if (!this.getSpaceFilteredRoomIds(this.activeSpace).has(room.roomId)) {
+                    // TODO maybe reverse these first 2 clauses once space panel active is fixed
+                    let parent = this.rootSpaces.find(s => this.spaceFilteredRooms.get(s.roomId)?.has(room.roomId));
+                    if (!parent) {
+                        parent = this.getCanonicalParent(room.roomId);
                     }
+                    if (!parent) {
+                        const parents = Array.from(this.parentMap.get(room.roomId) || []);
+                        parent = parents.find(p => this.matrixClient.getRoom(p));
+                    }
+                    // don't trigger a context switch when we are switching a space to match the chosen room
+                    this.setActiveSpace(parent || null, false);
                 }
+
+                // Persist last viewed room from a space
+                // we don't await setActiveSpace above as we only care about this.activeSpace being up to date
+                // synchronously for the below code - everything else can and should be async.
+                window.localStorage.setItem(getSpaceContextKey(this.activeSpace), payload.room_id);
                 break;
             }
             case "after_leave_room":
@@ -525,6 +581,26 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
         this.notificationStateMap.set(key, state);
         return state;
     }
+
+    // traverse space tree with DFS calling fn on each space including the given root one
+    public traverseSpace(
+        spaceId: string,
+        fn: (roomId: string) => void,
+        includeRooms = false,
+        parentPath?: Set<string>,
+    ) {
+        if (parentPath && parentPath.has(spaceId)) return; // prevent cycles
+
+        fn(spaceId);
+
+        const newPath = new Set(parentPath).add(spaceId);
+        const [childSpaces, childRooms] = partitionSpacesAndRooms(this.getChildren(spaceId));
+
+        if (includeRooms) {
+            childRooms.forEach(r => fn(r.roomId));
+        }
+        childSpaces.forEach(s => this.traverseSpace(s.roomId, fn, includeRooms, newPath));
+    }
 }
 
 export default class SpaceStore {