From 0dc5200b0e858f9c922d67fe5323ab241c51513e Mon Sep 17 00:00:00 2001
From: Glandos <bugs-github@antipoul.fr>
Date: Thu, 3 Sep 2020 15:10:33 +0200
Subject: [PATCH 001/146] Push name to the end, near text, in IRC layout

Currently, the name (and aux message) are align to the start, leaving a blank space between the end of the name and the message.

In a lot of IRC themes, names (and actions) are aligned to the end, next to the message, for a better readability.

Signed-off-by: Adrien CLERC <bugs-github@antipoul.fr>
---
 res/css/views/rooms/_IRCLayout.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/css/views/rooms/_IRCLayout.scss b/res/css/views/rooms/_IRCLayout.scss
index 958d718b11..ece547d02b 100644
--- a/res/css/views/rooms/_IRCLayout.scss
+++ b/res/css/views/rooms/_IRCLayout.scss
@@ -186,6 +186,7 @@ $irc-line-height: $font-18px;
                 overflow: hidden;
                 text-overflow: ellipsis;
                 min-width: var(--name-width);
+                text-align: end;
             }
         }
     }

From f36651f5380f1c119577495622365a015b34cdba Mon Sep 17 00:00:00 2001
From: Heiko Carrasco <heiko.carrasco@yahoo.com>
Date: Sat, 26 Sep 2020 23:21:16 +0200
Subject: [PATCH 002/146] Add keyboard shortcut to close current conversations

Signed-off-by: Heiko Carrasco <heiko.carrasco@yahoo.com>
---
 src/accessibility/KeyboardShortcuts.tsx    |  6 ++++++
 src/components/structures/LoggedInView.tsx | 12 +++++++++++-
 src/i18n/strings/en_EN.json                |  1 +
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/accessibility/KeyboardShortcuts.tsx b/src/accessibility/KeyboardShortcuts.tsx
index 58d8124122..48d0eb2ab1 100644
--- a/src/accessibility/KeyboardShortcuts.tsx
+++ b/src/accessibility/KeyboardShortcuts.tsx
@@ -257,6 +257,12 @@ const shortcuts: Record<Categories, IShortcut[]> = {
                 key: Key.SLASH,
             }],
             description: _td("Toggle this dialog"),
+        }, {
+            keybinds: [{
+                modifiers: [CMD_OR_CTRL, Modifiers.ALT],
+                key: Key.H,
+            }],
+            description: _td("Go to Home View"),
         },
     ],
 
diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index 79f2916200..e7256e4cd4 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -21,7 +21,7 @@ import * as PropTypes from 'prop-types';
 import { MatrixClient } from 'matrix-js-sdk/src/client';
 import { DragDropContext } from 'react-beautiful-dnd';
 
-import {Key, isOnlyCtrlOrCmdKeyEvent, isOnlyCtrlOrCmdIgnoreShiftKeyEvent} from '../../Keyboard';
+import {Key, isOnlyCtrlOrCmdKeyEvent, isOnlyCtrlOrCmdIgnoreShiftKeyEvent, isMac} from '../../Keyboard';
 import PageTypes from '../../PageTypes';
 import CallMediaHandler from '../../CallMediaHandler';
 import { fixupColorFonts } from '../../utils/FontManager';
@@ -400,6 +400,7 @@ class LoggedInView extends React.Component<IProps, IState> {
         const ctrlCmdOnly = isOnlyCtrlOrCmdKeyEvent(ev);
         const hasModifier = ev.altKey || ev.ctrlKey || ev.metaKey || ev.shiftKey;
         const isModifier = ev.key === Key.ALT || ev.key === Key.CONTROL || ev.key === Key.META || ev.key === Key.SHIFT;
+        const modKey = isMac ? ev.metaKey : ev.ctrlKey;
 
         switch (ev.key) {
             case Key.PAGE_UP:
@@ -444,6 +445,15 @@ class LoggedInView extends React.Component<IProps, IState> {
                 }
                 break;
 
+            case Key.H:
+                if (ev.altKey && modKey) {
+                    dis.dispatch({
+                        action: 'view_home_page',
+                    });
+                    handled = true;
+                }
+                break;
+
             case Key.ARROW_UP:
             case Key.ARROW_DOWN:
                 if (ev.altKey && !ev.ctrlKey && !ev.metaKey) {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index eb8f9100ec..0bc430d87a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2350,6 +2350,7 @@
     "Activate selected button": "Activate selected button",
     "Toggle right panel": "Toggle right panel",
     "Toggle this dialog": "Toggle this dialog",
+    "Go to Home View": "Go to Home View",
     "Move autocomplete selection up/down": "Move autocomplete selection up/down",
     "Cancel autocomplete": "Cancel autocomplete",
     "Page Up": "Page Up",

From d7f15985f590232a72be980570d98d81b7efd45c Mon Sep 17 00:00:00 2001
From: Heiko Carrasco <heiko.carrasco@yahoo.com>
Date: Tue, 13 Oct 2020 18:26:48 +0200
Subject: [PATCH 003/146] Close all active modals when home shortcut is used

Signed-off-by: Heiko Carrasco <heiko.carrasco@yahoo.com>
---
 src/Modal.tsx                              | 9 +++++++++
 src/components/structures/LoggedInView.tsx | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/src/Modal.tsx b/src/Modal.tsx
index b0f6ef988e..b6074e4807 100644
--- a/src/Modal.tsx
+++ b/src/Modal.tsx
@@ -147,6 +147,15 @@ export class ModalManager {
         return this.appendDialogAsync<T>(...rest);
     }
 
+    public closeCurrentModal(reason: string) {
+        const modal = this.getCurrentModal();
+        if (!modal) {
+            return;
+        }
+        modal.closeReason = reason;
+        modal.close();
+    }
+
     private buildModal<T extends any[]>(
         prom: Promise<React.ComponentType>,
         props?: IProps<T>,
diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index e7256e4cd4..98921d03a1 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -52,6 +52,7 @@ import RoomListStore from "../../stores/room-list/RoomListStore";
 import NonUrgentToastContainer from "./NonUrgentToastContainer";
 import { ToggleRightPanelPayload } from "../../dispatcher/payloads/ToggleRightPanelPayload";
 import { IThreepidInvite } from "../../stores/ThreepidInviteStore";
+import Modal from "../../Modal";
 
 // We need to fetch each pinned message individually (if we don't already have it)
 // so each pinned message may trigger a request. Limit the number per room for sanity.
@@ -450,6 +451,7 @@ class LoggedInView extends React.Component<IProps, IState> {
                     dis.dispatch({
                         action: 'view_home_page',
                     });
+                    Modal.closeCurrentModal("homeKeyboardShortcut");
                     handled = true;
                 }
                 break;

From 7506e9a85de9a7a1cb4b5836dc3ca4b234dd17b2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 15 Oct 2020 15:58:18 +0100
Subject: [PATCH 004/146] Disable notifications for the room you have recently
 been active in

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/Notifier.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Notifier.ts b/src/Notifier.ts
index 1899896f9b..6460be20ad 100644
--- a/src/Notifier.ts
+++ b/src/Notifier.ts
@@ -34,6 +34,8 @@ import SettingsStore from "./settings/SettingsStore";
 import { hideToast as hideNotificationsToast } from "./toasts/DesktopNotificationsToast";
 import {SettingLevel} from "./settings/SettingLevel";
 import {isPushNotifyDisabled} from "./settings/controllers/NotificationControllers";
+import RoomViewStore from "./stores/RoomViewStore";
+import UserActivity from "./UserActivity";
 
 /*
  * Dispatches:
@@ -376,6 +378,11 @@ export const Notifier = {
         const room = MatrixClientPeg.get().getRoom(ev.getRoomId());
         const actions = MatrixClientPeg.get().getPushActionsForEvent(ev);
         if (actions && actions.notify) {
+            if (RoomViewStore.getRoomId() === room.roomId && UserActivity.sharedInstance().userActiveRecently()) {
+                // don't bother notifying as user was recently active in this room
+                return;
+            }
+
             if (this.isEnabled()) {
                 this._displayPopupNotification(ev, room);
             }

From 176c7c32da6c8e8314889f6b8bbaa632b03c4f2d Mon Sep 17 00:00:00 2001
From: Bryan Kok <bryan.wyern1@gmail.com>
Date: Sat, 17 Oct 2020 14:35:11 +0800
Subject: [PATCH 005/146] Search through the list of unfiltered rooms rather
 than the rooms in the state which are already filtered by the search text

---
 src/components/views/rooms/RoomSublist.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/rooms/RoomSublist.tsx b/src/components/views/rooms/RoomSublist.tsx
index 4056f2fbd4..111692786c 100644
--- a/src/components/views/rooms/RoomSublist.tsx
+++ b/src/components/views/rooms/RoomSublist.tsx
@@ -420,7 +420,7 @@ export default class RoomSublist extends React.Component<IProps, IState> {
             room = this.state.rooms && this.state.rooms[0];
         } else {
             // find the first room with a count of the same colour as the badge count
-            room = this.state.rooms.find((r: Room) => {
+            room = RoomListStore.instance.unfilteredLists[this.props.tagId].find((r: Room) => {
                 const notifState = this.notificationState.getForRoom(r);
                 return notifState.count > 0 && notifState.color === this.notificationState.color;
             });

From 091143db525e9eb1a563bd097333b2a6e644af22 Mon Sep 17 00:00:00 2001
From: Resynth <resynth1943@tutanota.com>
Date: Sun, 18 Oct 2020 22:40:19 +0100
Subject: [PATCH 006/146] Add border-radius for video

Images have a rounded border, so we may as well add it to videos.
Works fine in Chrome, and in other spec-compliant browsers.

Signed-off-by: Resynth <resynth1943@tutanota.com>
---
 res/css/views/messages/_MVideoBody.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/css/views/messages/_MVideoBody.scss b/res/css/views/messages/_MVideoBody.scss
index 3b05c53f34..ac3491bc8f 100644
--- a/res/css/views/messages/_MVideoBody.scss
+++ b/res/css/views/messages/_MVideoBody.scss
@@ -18,5 +18,6 @@ span.mx_MVideoBody {
     video.mx_MVideoBody {
         max-width: 100%;
         height: auto;
+        border-radius: 4px;
     }
 }

From da60e4dba69d0475d837a55eb98293285fb116b0 Mon Sep 17 00:00:00 2001
From: Resynth <resynth1943@tutanota.com>
Date: Sun, 25 Oct 2020 16:47:15 +0000
Subject: [PATCH 007/146] Lighten blockquote colour in dark mode

Signed-off-by: Resynth <resynth1943@tutanota.com>
---
 res/themes/dark/css/_dark.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index 6e0c9acdfe..df68bf0e2f 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -272,6 +272,10 @@ $composer-shadow-color: rgba(0, 0, 0, 0.28);
             background-color: #080808;
         }
     }
+
+    blockquote {
+        
+    }
 }
 
 // diff highlight colors

From dc28616a6f366af8cf34970ce363d2e31fe74555 Mon Sep 17 00:00:00 2001
From: Resynth <resynth1943@tutanota.com>
Date: Mon, 26 Oct 2020 22:53:37 +0000
Subject: [PATCH 008/146] Remove empty CSS block

Signed-off-by: Resynth <resynth1943@tutanota.com>
---
 res/themes/dark/css/_dark.scss | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index df68bf0e2f..6e0c9acdfe 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -272,10 +272,6 @@ $composer-shadow-color: rgba(0, 0, 0, 0.28);
             background-color: #080808;
         }
     }
-
-    blockquote {
-        
-    }
 }
 
 // diff highlight colors

From 6dc709a045204862279629d1e69f799537e27305 Mon Sep 17 00:00:00 2001
From: Resynth <resynth1943@tutanota.com>
Date: Tue, 27 Oct 2020 20:10:23 +0000
Subject: [PATCH 009/146] =?UTF-8?q?=F0=9F=98=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Resynth <resynth1943@tutanota.com>
---
 res/themes/dark/css/_dark.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index 6e0c9acdfe..fdf64d52f8 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -272,6 +272,10 @@ $composer-shadow-color: rgba(0, 0, 0, 0.28);
             background-color: #080808;
         }
     }
+
+    blockquote {
+        color: #919191;
+    }
 }
 
 // diff highlight colors

From 24ba566877e5d9a897a3fe21a7b09cf860f0b5ab Mon Sep 17 00:00:00 2001
From: Matthew Kenigsberg <matthewkenigsberg@gmail.com>
Date: Wed, 28 Oct 2020 18:34:04 -0500
Subject: [PATCH 010/146] Specify community description img must be mxc urls

Closes vector-im/element-web#7100

Signed-off-by: Matthew Kenigsberg <matthewkenigsberg@gmail.com>
---
 src/components/structures/GroupView.js | 2 +-
 src/i18n/strings/en_EN.json            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 482b9f6da2..bbc4187298 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -47,7 +47,7 @@ const LONG_DESC_PLACEHOLDER = _td(
     some important <a href="foo">links</a>
 </p>
 <p>
-    You can even use 'img' tags
+    You can even add images with Matrix URLs <img src="mxc://url" />
 </p>
 `);
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 1548dd5c13..600319a874 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2001,7 +2001,7 @@
     "Attach files from chat or just drag and drop them anywhere in a room.": "Attach files from chat or just drag and drop them anywhere in a room.",
     "Communities": "Communities",
     "Create community": "Create community",
-    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n",
+    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even add images with Matrix URLs <img src=\"mxc://url\" />\n</p>\n": "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even add images with Matrix URLs <img src=\"mxc://url\" />\n</p>\n",
     "Add rooms to the community summary": "Add rooms to the community summary",
     "Which rooms would you like to add to this summary?": "Which rooms would you like to add to this summary?",
     "Add to summary": "Add to summary",

From f828c6d49467bcb9f9efc5104637a94b1ef13a6a Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 29 Oct 2020 17:56:24 +0000
Subject: [PATCH 011/146] Implement call hold

Currently just by adding /holdcall and /unholdcall slash commands

The only place the hold status of the call is currently represented
is when the call is a voice call and you're viewing a different room:
it's not wired up when you're viewing the room because that currently
uses the room status bar which it won't do with the new UI.

Also convert VideoFeed to typescript, and remove videoview because
it essentially just managed the fullscreen functionality, but we'll
want and 'on hold' representation (and probably chrome for hagnup etc)
in the fullscreen UI too, so let's just make CallView the thing that
gets fullscreened.
---
 res/css/_components.scss                  |   4 +-
 res/css/views/voip/_CallContainer.scss    |   4 +-
 res/css/views/voip/_CallView.scss         |   7 +
 res/css/views/voip/_VideoView.scss        |  49 ------
 src/@types/global.d.ts                    |  14 ++
 src/CallHandler.tsx                       |  25 ++-
 src/SlashCommands.tsx                     |  27 +++
 src/components/structures/RoomView.tsx    |   2 +-
 src/components/views/elements/AppTile.js  |   2 +-
 src/components/views/voip/CallPreview.tsx |   2 +-
 src/components/views/voip/CallView.tsx    | 196 ++++++++++++++--------
 src/components/views/voip/VideoFeed.js    |  58 -------
 src/components/views/voip/VideoFeed.tsx   |  82 +++++++++
 src/components/views/voip/VideoView.js    | 142 ----------------
 src/i18n/strings/en_EN.json               |   3 +
 15 files changed, 287 insertions(+), 330 deletions(-)
 delete mode 100644 res/css/views/voip/_VideoView.scss
 delete mode 100644 src/components/views/voip/VideoFeed.js
 create mode 100644 src/components/views/voip/VideoFeed.tsx
 delete mode 100644 src/components/views/voip/VideoView.js

diff --git a/res/css/_components.scss b/res/css/_components.scss
index ad3cfbdcea..4a9301d085 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -9,6 +9,7 @@
 @import "./structures/_CustomRoomTagPanel.scss";
 @import "./structures/_FilePanel.scss";
 @import "./structures/_GenericErrorPage.scss";
+@import "./structures/_GroupFilterPanel.scss";
 @import "./structures/_GroupView.scss";
 @import "./structures/_HeaderButtons.scss";
 @import "./structures/_HomePage.scss";
@@ -27,7 +28,6 @@
 @import "./structures/_ScrollPanel.scss";
 @import "./structures/_SearchBox.scss";
 @import "./structures/_TabbedView.scss";
-@import "./structures/_GroupFilterPanel.scss";
 @import "./structures/_ToastContainer.scss";
 @import "./structures/_UploadBar.scss";
 @import "./structures/_UserMenu.scss";
@@ -227,4 +227,4 @@
 @import "./views/verification/_VerificationShowSas.scss";
 @import "./views/voip/_CallContainer.scss";
 @import "./views/voip/_CallView.scss";
-@import "./views/voip/_VideoView.scss";
+@import "./views/voip/_VideoFeed.scss";
diff --git a/res/css/views/voip/_CallContainer.scss b/res/css/views/voip/_CallContainer.scss
index 759797ae7b..eec8a1f188 100644
--- a/res/css/views/voip/_CallContainer.scss
+++ b/res/css/views/voip/_CallContainer.scss
@@ -33,11 +33,11 @@ limitations under the License.
         pointer-events: initial; // restore pointer events so the user can leave/interact
         cursor: pointer;
 
-        .mx_VideoView {
+        .mx_CallView_video {
             width: 350px;
         }
 
-        .mx_VideoView_localVideoFeed {
+        .mx_VideoFeed_local {
             border-radius: 8px;
             overflow: hidden;
         }
diff --git a/res/css/views/voip/_CallView.scss b/res/css/views/voip/_CallView.scss
index f6f3d40308..2aeaaa87dc 100644
--- a/res/css/views/voip/_CallView.scss
+++ b/res/css/views/voip/_CallView.scss
@@ -92,3 +92,10 @@ limitations under the License.
         background-color: $primary-fg-color;
     }
 }
+
+.mx_CallView_video {
+    width: 100%;
+    position: relative;
+    z-index: 30;
+}
+
diff --git a/res/css/views/voip/_VideoView.scss b/res/css/views/voip/_VideoView.scss
deleted file mode 100644
index feb60f4763..0000000000
--- a/res/css/views/voip/_VideoView.scss
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-
-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.
-*/
-
-.mx_VideoView {
-    width: 100%;
-    position: relative;
-    z-index: 30;
-}
-
-.mx_VideoView video {
-    width: 100%;
-}
-
-.mx_VideoView_remoteVideoFeed {
-    width: 100%;
-    background-color: #000;
-    z-index: 50;
-}
-
-.mx_VideoView_localVideoFeed {
-    width: 25%;
-    height: 25%;
-    position: absolute;
-    left: 10px;
-    bottom: 10px;
-    z-index: 100;
-}
-
-.mx_VideoView_localVideoFeed video {
-    width: auto;
-    height: 100%;
-}
-
-.mx_VideoView_localVideoFeed.mx_VideoView_localVideoFeed_flipped video {
-    transform: scale(-1, 1);
-}
diff --git a/src/@types/global.d.ts b/src/@types/global.d.ts
index ed28a5c479..acb2c40031 100644
--- a/src/@types/global.d.ts
+++ b/src/@types/global.d.ts
@@ -65,6 +65,13 @@ declare global {
     interface Document {
         // https://developer.mozilla.org/en-US/docs/Web/API/Document/hasStorageAccess
         hasStorageAccess?: () => Promise<boolean>;
+
+        // Safari & IE11 only have this prefixed: we used prefixed versions
+        // previously so let's continue to support them for now
+        webkitExitFullscreen(): Promise<void>;
+        msExitFullscreen(): Promise<void>;
+        readonly webkitFullscreenElement: Element | null;
+        readonly msFullscreenElement: Element | null;
     }
 
     interface Navigator {
@@ -94,4 +101,11 @@ declare global {
     interface HTMLAudioElement {
         type?: string;
     }
+
+    interface Element {
+        // Safari & IE11 only have this prefixed: we used prefixed versions
+        // previously so let's continue to support them for now
+        webkitRequestFullScreen(options?: FullscreenOptions): Promise<void>;
+        msRequestFullscreen(options?: FullscreenOptions): Promise<void>;
+    }
 }
diff --git a/src/CallHandler.tsx b/src/CallHandler.tsx
index e303dd3819..17867536ed 100644
--- a/src/CallHandler.tsx
+++ b/src/CallHandler.tsx
@@ -59,8 +59,7 @@ import {MatrixClientPeg} from './MatrixClientPeg';
 import PlatformPeg from './PlatformPeg';
 import Modal from './Modal';
 import { _t } from './languageHandler';
-// @ts-ignore - XXX: tsc doesn't like this: our js-sdk imports are complex so this isn't surprising
-import Matrix from 'matrix-js-sdk';
+import Matrix from 'matrix-js-sdk/src/browser-index';
 import dis from './dispatcher/dispatcher';
 import WidgetUtils from './utils/WidgetUtils';
 import WidgetEchoStore from './stores/WidgetEchoStore';
@@ -77,7 +76,7 @@ import ErrorDialog from "./components/views/dialogs/ErrorDialog";
 import WidgetStore from "./stores/WidgetStore";
 import { WidgetMessagingStore } from "./stores/widgets/WidgetMessagingStore";
 import { ElementWidgetActions } from "./stores/widgets/ElementWidgetActions";
-import { MatrixCall, CallErrorCode, CallState, CallEvent, CallParty } from "matrix-js-sdk/lib/webrtc/call";
+import { MatrixCall, CallErrorCode, CallState, CallEvent, CallParty } from "matrix-js-sdk/src/webrtc/call";
 import Analytics from './Analytics';
 
 enum AudioID {
@@ -97,6 +96,18 @@ export enum PlaceCallType {
     ScreenSharing = 'screensharing',
 }
 
+function getRemoteAudioElement(): HTMLAudioElement {
+    // this needs to be somewhere at the top of the DOM which
+    // always exists to avoid audio interruptions.
+    // Might as well just use DOM.
+    const remoteAudioElement = document.getElementById("remoteAudio") as HTMLAudioElement;
+    if (!remoteAudioElement) {
+        console.error("Failed to find remoteAudio element - cannot play audio!"
+            + "You need to add an <audio/> to the DOM.");
+    }
+    return remoteAudioElement;
+}
+
 export default class CallHandler {
     private calls = new Map<string, MatrixCall>();
     private audioPromises = new Map<AudioID, Promise<void>>();
@@ -290,6 +301,11 @@ export default class CallHandler {
         });
     }
 
+    private setCallAudioElement(call: MatrixCall) {
+        const audioElement = getRemoteAudioElement();
+        if (audioElement) call.setRemoteAudioElement(audioElement);
+    }
+
     private setCallState(call: MatrixCall, status: CallState) {
         console.log(
             `Call state in ${call.roomId} changed to ${status}`,
@@ -344,6 +360,8 @@ export default class CallHandler {
         const call = Matrix.createNewMatrixCall(MatrixClientPeg.get(), roomId);
         this.calls.set(roomId, call);
         this.setCallListeners(call);
+        this.setCallAudioElement(call);
+
         if (type === PlaceCallType.Voice) {
             call.placeVoiceCall();
         } else if (type === 'video') {
@@ -448,6 +466,7 @@ export default class CallHandler {
                     Analytics.trackEvent('voip', 'receiveCall', 'type', call.type);
                     this.calls.set(call.roomId, call)
                     this.setCallListeners(call);
+                    this.setCallAudioElement(call);
                 }
                 break;
             case 'hangup':
diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx
index a6481d5b95..85e0776453 100644
--- a/src/SlashCommands.tsx
+++ b/src/SlashCommands.tsx
@@ -46,6 +46,7 @@ import { EffectiveMembership, getEffectiveMembership, leaveRoomBehaviour } from
 import SdkConfig from "./SdkConfig";
 import SettingsStore from "./settings/SettingsStore";
 import {UIFeature} from "./settings/UIFeature";
+import CallHandler from "./CallHandler";
 
 // XXX: workaround for https://github.com/microsoft/TypeScript/issues/31816
 interface HTMLInputEvent extends Event {
@@ -1039,6 +1040,32 @@ export const Commands = [
         },
         category: CommandCategories.actions,
     }),
+    new Command({
+        command: "holdcall",
+        description: _td('Places the call in the current room on hold'),
+        category: CommandCategories.other,
+        runFn: function(roomId, args) {
+            const call = CallHandler.sharedInstance().getCallForRoom(roomId);
+            if (!call) {
+                return reject("No active call in this room");
+            }
+            call.setRemoteOnHold(true);
+            return success();
+        },
+    }),
+    new Command({
+        command: "unholdcall",
+        description: _td('Takes the call in the current room off hold'),
+        category: CommandCategories.other,
+        runFn: function(roomId, args) {
+            const call = CallHandler.sharedInstance().getCallForRoom(roomId);
+            if (!call) {
+                return reject("No active call in this room");
+            }
+            call.setRemoteOnHold(false);
+            return success();
+        },
+    }),
 
     // Command definitions for autocompletion ONLY:
     // /me is special because its not handled by SlashCommands.js and is instead done inside the Composer classes
diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index 4b2fa67c1c..372186ff38 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -71,7 +71,7 @@ import RoomHeader from "../views/rooms/RoomHeader";
 import TintableSvg from "../views/elements/TintableSvg";
 import {XOR} from "../../@types/common";
 import { IThreepidInvite } from "../../stores/ThreepidInviteStore";
-import { CallState, CallType, MatrixCall } from "matrix-js-sdk/lib/webrtc/call";
+import { CallState, CallType, MatrixCall } from "matrix-js-sdk/src/webrtc/call";
 import WidgetStore from "../../stores/WidgetStore";
 import {UPDATE_EVENT} from "../../stores/AsyncStore";
 
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index f3ebe24c15..595f1fcee7 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -163,7 +163,7 @@ export default class AppTile extends React.Component {
         if (ref) {
             this._sgWidget.start(ref);
         } else {
-            this._resetWidget(this.props);
+            //this._resetWidget(this.props);
         }
     };
 
diff --git a/src/components/views/voip/CallPreview.tsx b/src/components/views/voip/CallPreview.tsx
index ca2b510f20..3d9235792b 100644
--- a/src/components/views/voip/CallPreview.tsx
+++ b/src/components/views/voip/CallPreview.tsx
@@ -24,7 +24,7 @@ import dis from '../../../dispatcher/dispatcher';
 import { ActionPayload } from '../../../dispatcher/payloads';
 import PersistentApp from "../elements/PersistentApp";
 import SettingsStore from "../../../settings/SettingsStore";
-import { CallState, MatrixCall } from 'matrix-js-sdk/lib/webrtc/call';
+import { CallState, MatrixCall } from 'matrix-js-sdk/src/webrtc/call';
 
 interface IProps {
 }
diff --git a/src/components/views/voip/CallView.tsx b/src/components/views/voip/CallView.tsx
index 3e1833a903..653a72cca0 100644
--- a/src/components/views/voip/CallView.tsx
+++ b/src/components/views/voip/CallView.tsx
@@ -15,17 +15,18 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {createRef} from 'react';
+import React, { createRef } from 'react';
 import Room from 'matrix-js-sdk/src/models/room';
 import dis from '../../../dispatcher/dispatcher';
 import CallHandler from '../../../CallHandler';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 import AccessibleButton from '../elements/AccessibleButton';
-import VideoView from "./VideoView";
+import VideoFeed, { VideoFeedType } from "./VideoFeed";
 import RoomAvatar from "../avatars/RoomAvatar";
 import PulsedAvatar from '../avatars/PulsedAvatar';
-import { CallState, MatrixCall } from 'matrix-js-sdk/lib/webrtc/call';
+import { CallState, CallType, MatrixCall } from 'matrix-js-sdk/src/webrtc/call';
+import { CallEvent } from 'matrix-js-sdk/src/webrtc/call';
 
 interface IProps {
         // js-sdk room object. If set, we will only show calls for the given
@@ -50,53 +51,104 @@ interface IProps {
 }
 
 interface IState {
-    call: any;
+    call: MatrixCall;
+    isLocalOnHold: boolean,
+}
+
+function getFullScreenElement() {
+    return (
+        document.fullscreenElement ||
+        // moz omitted because firefox supports this unprefixed now (webkit here for safari)
+        document.webkitFullscreenElement ||
+        document.msFullscreenElement
+    );
+}
+
+function requestFullscreen(element: Element) {
+    const method = (
+        element.requestFullscreen ||
+        // moz omitted since firefox supports unprefixed now
+        element.webkitRequestFullScreen ||
+        element.msRequestFullscreen
+    );
+    if (method) method.call(element);
+}
+
+function exitFullscreen() {
+    const exitMethod = (
+        document.exitFullscreen ||
+        document.webkitExitFullscreen ||
+        document.msExitFullscreen
+    );
+    if (exitMethod) exitMethod.call(document);
 }
 
 export default class CallView extends React.Component<IProps, IState> {
-    private videoref: React.RefObject<any>;
     private dispatcherRef: string;
-    public call: any;
+    private container = createRef<HTMLDivElement>();
 
     constructor(props: IProps) {
         super(props);
 
+        const call = this.getCall();
         this.state = {
-            // the call this view is displaying (if any)
-            call: null,
-        };
+            call,
+            isLocalOnHold: call ? call.isLocalOnHold() : null,
+        }
 
-        this.videoref = createRef();
+        this.updateCallListeners(null, call);
     }
 
     public componentDidMount() {
         this.dispatcherRef = dis.register(this.onAction);
-        this.showCall();
     }
 
     public componentWillUnmount() {
+        this.updateCallListeners(this.state.call, null);
         dis.unregister(this.dispatcherRef);
     }
 
     private onAction = (payload) => {
-        // don't filter out payloads for room IDs other than props.room because
-        // we may be interested in the conf 1:1 room
-        if (payload.action !== 'call_state') {
-            return;
+        switch (payload.action) {
+            case 'video_fullscreen': {
+                if (!this.container.current) {
+                    return;
+                }
+                if (payload.fullscreen) {
+                    requestFullscreen(this.container.current);
+                } else if (getFullScreenElement()) {
+                    exitFullscreen();
+                }
+                break;
+            }
+            case 'call_state': {
+                const newCall = this.getCall();
+                if (newCall !== this.state.call) {
+                    this.updateCallListeners(this.state.call, newCall);
+                    this.setState({
+                        call: newCall,
+                        isLocalOnHold: newCall ? newCall.isLocalOnHold() : null,
+                    });
+                }
+                if (!newCall && getFullScreenElement()) {
+                    exitFullscreen();
+                }
+                break;
+            }
         }
-        this.showCall();
     };
 
-    private showCall() {
+    private getCall(): MatrixCall {
         let call: MatrixCall;
 
         if (this.props.room) {
             const roomId = this.props.room.roomId;
             call = CallHandler.sharedInstance().getCallForRoom(roomId);
 
-            if (this.call) {
-                this.setState({ call: call });
-            }
+            // We don't currently show voice calls in this view when in the room:
+            // they're represented in the room status bar at the bottom instead
+            // (but this will all change with the new designs)
+            if (call && call.type == CallType.Voice) call = null;
         } else {
             call = CallHandler.sharedInstance().getAnyActiveCall();
             // Ignore calls if we can't get the room associated with them.
@@ -106,65 +158,68 @@ export default class CallView extends React.Component<IProps, IState> {
             if (MatrixClientPeg.get().getRoom(call.roomId) === null) {
                 call = null;
             }
-            this.setState({ call: call });
         }
 
-        if (call) {
-            if (this.getVideoView()) {
-                call.setLocalVideoElement(this.getVideoView().getLocalVideoElement());
-                call.setRemoteVideoElement(this.getVideoView().getRemoteVideoElement());
-
-                // always use a separate element for audio stream playback.
-                // this is to let us move CallView around the DOM without interrupting remote audio
-                // during playback, by having the audio rendered by a top-level <audio/> element.
-                // rather than being rendered by the main remoteVideo <video/> element.
-                call.setRemoteAudioElement(this.getVideoView().getRemoteAudioElement());
-            }
-        }
-        if (call && call.type === "video" && call.state !== CallState.Ended && call.state !== CallState.Ringing) {
-            this.getVideoView().getLocalVideoElement().style.display = "block";
-            this.getVideoView().getRemoteVideoElement().style.display = "block";
-        } else {
-            this.getVideoView().getLocalVideoElement().style.display = "none";
-            this.getVideoView().getRemoteVideoElement().style.display = "none";
-            dis.dispatch({action: 'video_fullscreen', fullscreen: false});
-        }
-
-        if (this.props.onResize) {
-            this.props.onResize();
-        }
+        if (call && call.state == CallState.Ended) return null;
+        return call;
     }
 
-    private getVideoView() {
-        return this.videoref.current;
+    private updateCallListeners(oldCall: MatrixCall, newCall: MatrixCall) {
+        if (oldCall === newCall) return;
+
+        if (oldCall) oldCall.removeListener(CallEvent.HoldUnhold, this.onCallHoldUnhold);
+        if (newCall) newCall.on(CallEvent.HoldUnhold, this.onCallHoldUnhold);
     }
 
+    private onCallHoldUnhold = () => {
+        this.setState({
+            isLocalOnHold: this.state.call ? this.state.call.isLocalOnHold() : null,
+        });
+    };
+
     public render() {
         let view: React.ReactNode;
-        if (this.state.call && this.state.call.type === "voice") {
-            const client = MatrixClientPeg.get();
-            const callRoom = client.getRoom(this.state.call.roomId);
 
-            view = <AccessibleButton className="mx_CallView_voice" onClick={this.props.onClick}>
-                <PulsedAvatar>
-                    <RoomAvatar
-                        room={callRoom}
-                        height={35}
-                        width={35}
+        if (this.state.call) {
+            if (this.state.call.type === "voice") {
+                const client = MatrixClientPeg.get();
+                const callRoom = client.getRoom(this.state.call.roomId);
+
+                let caption = _t("Active call");
+                if (this.state.isLocalOnHold) {
+                    // we currently have no UI for holding / unholding a call (apart from slash
+                    // commands) so we don't disintguish between when we've put the call on hold
+                    // (ie. we'd show an unhold button) and when the other side has put us on hold
+                    // (where obviously we would not show such a button).
+                    caption = _t("Call Paused");
+                }
+
+                view = <AccessibleButton className="mx_CallView_voice" onClick={this.props.onClick}>
+                    <PulsedAvatar>
+                        <RoomAvatar
+                            room={callRoom}
+                            height={35}
+                            width={35}
+                        />
+                    </PulsedAvatar>
+                    <div>
+                        <h1>{callRoom.name}</h1>
+                        <p>{ caption }</p>
+                    </div>
+                </AccessibleButton>;
+            } else {
+                // For video calls, we currently ignore the call hold state altogether
+                // (the video will just go black)
+
+                // if we're fullscreen, we don't want to set a maxHeight on the video element.
+                const maxVideoHeight = getFullScreenElement() ? null : this.props.maxVideoHeight;
+                view = <div className="mx_CallView_video" onClick={this.props.onClick}>
+                    <VideoFeed type={VideoFeedType.Remote} call={this.state.call} onResize={this.props.onResize}
+                        maxHeight={maxVideoHeight}
                     />
-                </PulsedAvatar>
-                <div>
-                    <h1>{callRoom.name}</h1>
-                    <p>{ _t("Active call") }</p>
-                </div>
-            </AccessibleButton>;
-        } else {
-            view = <VideoView
-                ref={this.videoref}
-                onClick={this.props.onClick}
-                onResize={this.props.onResize}
-                maxHeight={this.props.maxVideoHeight}
-            />;
+                    <VideoFeed type={VideoFeedType.Local} call={this.state.call} />
+                </div>;
+            }
         }
 
         let hangup: React.ReactNode;
@@ -180,10 +235,9 @@ export default class CallView extends React.Component<IProps, IState> {
             />;
         }
 
-        return <div className={this.props.className}>
+        return <div className={this.props.className} ref={this.container}>
             {view}
             {hangup}
         </div>;
     }
 }
-
diff --git a/src/components/views/voip/VideoFeed.js b/src/components/views/voip/VideoFeed.js
deleted file mode 100644
index a0330f8cb1..0000000000
--- a/src/components/views/voip/VideoFeed.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2019 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 React, {createRef} from 'react';
-import PropTypes from 'prop-types';
-
-export default class VideoFeed extends React.Component {
-    static propTypes = {
-        // maxHeight style attribute for the video element
-        maxHeight: PropTypes.number,
-
-        // a callback which is called when the video element is resized
-        // due to a change in video metadata
-        onResize: PropTypes.func,
-    };
-
-    constructor(props) {
-        super(props);
-
-        this._vid = createRef();
-    }
-
-    componentDidMount() {
-        this._vid.current.addEventListener('resize', this.onResize);
-    }
-
-    componentWillUnmount() {
-        this._vid.current.removeEventListener('resize', this.onResize);
-    }
-
-    onResize = (e) => {
-        if (this.props.onResize) {
-            this.props.onResize(e);
-        }
-    };
-
-    render() {
-        return (
-            <video ref={this._vid} style={{maxHeight: this.props.maxHeight}}>
-            </video>
-        );
-    }
-}
-
diff --git a/src/components/views/voip/VideoFeed.tsx b/src/components/views/voip/VideoFeed.tsx
new file mode 100644
index 0000000000..ee6305c79c
--- /dev/null
+++ b/src/components/views/voip/VideoFeed.tsx
@@ -0,0 +1,82 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2019 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 { MatrixCall } from 'matrix-js-sdk/src/webrtc/call';
+import React, {createRef} from 'react';
+import SettingsStore from "../../../settings/SettingsStore";
+
+export enum VideoFeedType {
+    Local,
+    Remote,
+}
+
+interface IProps {
+    call: MatrixCall,
+
+    type: VideoFeedType,
+
+    // maxHeight style attribute for the video element
+    maxHeight?: number,
+
+    // a callback which is called when the video element is resized
+    // due to a change in video metadata
+    onResize?: (e: Event) => void,
+}
+
+export default class VideoFeed extends React.Component<IProps> {
+    private vid = createRef<HTMLVideoElement>();
+
+    componentDidMount() {
+        this.vid.current.addEventListener('resize', this.onResize);
+        if (this.props.type === VideoFeedType.Local) {
+            this.props.call.setLocalVideoElement(this.vid.current);
+        } else {
+            this.props.call.setRemoteVideoElement(this.vid.current);
+        }
+    }
+
+    componentWillUnmount() {
+        this.vid.current.removeEventListener('resize', this.onResize);
+    }
+
+    onResize = (e) => {
+        if (this.props.onResize) {
+            this.props.onResize(e);
+        }
+    };
+
+    render() {
+        const videoClasses = {
+            mx_VideoFeed: true,
+            mx_VideoFeed_local: this.props.type === VideoFeedType.Local,
+            mx_VideoFeed_remote: this.props.type === VideoFeedType.Remote,
+            mx_VideoFeed_mirror: (
+                this.props.type === VideoFeedType.Local &&
+                SettingsStore.getValue('VideoView.flipVideoHorizontally')
+            ),
+        };
+
+        let videoStyle = {};
+        if (this.props.maxHeight) videoStyle = { maxHeight: this.props.maxHeight };
+
+        return <div className={classnames(videoClasses)}>
+            <video ref={this.vid} style={videoStyle}></video>
+        </div>;
+    }
+}
+
diff --git a/src/components/views/voip/VideoView.js b/src/components/views/voip/VideoView.js
deleted file mode 100644
index 374a12e82d..0000000000
--- a/src/components/views/voip/VideoView.js
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2019 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 React, {createRef} from 'react';
-import ReactDOM from 'react-dom';
-import PropTypes from 'prop-types';
-import classNames from 'classnames';
-
-import * as sdk from '../../../index';
-import dis from '../../../dispatcher/dispatcher';
-
-import SettingsStore from "../../../settings/SettingsStore";
-
-function getFullScreenElement() {
-    return (
-        document.fullscreenElement ||
-        document.mozFullScreenElement ||
-        document.webkitFullscreenElement ||
-        document.msFullscreenElement
-    );
-}
-
-export default class VideoView extends React.Component {
-    static propTypes = {
-        // maxHeight style attribute for the video element
-        maxHeight: PropTypes.number,
-
-        // a callback which is called when the user clicks on the video div
-        onClick: PropTypes.func,
-
-        // a callback which is called when the video element is resized due to
-        // a change in video metadata
-        onResize: PropTypes.func,
-    };
-
-    constructor(props) {
-        super(props);
-
-        this._local = createRef();
-        this._remote = createRef();
-    }
-
-    componentDidMount() {
-        this.dispatcherRef = dis.register(this.onAction);
-    }
-
-    componentWillUnmount() {
-        dis.unregister(this.dispatcherRef);
-    }
-
-    getRemoteVideoElement = () => {
-        return ReactDOM.findDOMNode(this._remote.current);
-    };
-
-    getRemoteAudioElement = () => {
-        // this needs to be somewhere at the top of the DOM which
-        // always exists to avoid audio interruptions.
-        // Might as well just use DOM.
-        const remoteAudioElement = document.getElementById("remoteAudio");
-        if (!remoteAudioElement) {
-            console.error("Failed to find remoteAudio element - cannot play audio!"
-                + "You need to add an <audio/> to the DOM.");
-        }
-        return remoteAudioElement;
-    };
-
-    getLocalVideoElement = () => {
-        return ReactDOM.findDOMNode(this._local.current);
-    };
-
-    setContainer = (c) => {
-        this.container = c;
-    };
-
-    onAction = (payload) => {
-        switch (payload.action) {
-            case 'video_fullscreen': {
-                if (!this.container) {
-                    return;
-                }
-                const element = this.container;
-                if (payload.fullscreen) {
-                    const requestMethod = (
-                        element.requestFullScreen ||
-                        element.webkitRequestFullScreen ||
-                        element.mozRequestFullScreen ||
-                        element.msRequestFullscreen
-                    );
-                    requestMethod.call(element);
-                } else if (getFullScreenElement()) {
-                    const exitMethod = (
-                        document.exitFullscreen ||
-                        document.mozCancelFullScreen ||
-                        document.webkitExitFullscreen ||
-                        document.msExitFullscreen
-                    );
-                    if (exitMethod) {
-                        exitMethod.call(document);
-                    }
-                }
-                break;
-            }
-        }
-    };
-
-    render() {
-        const VideoFeed = sdk.getComponent('voip.VideoFeed');
-
-        // if we're fullscreen, we don't want to set a maxHeight on the video element.
-        const maxVideoHeight = getFullScreenElement() ? null : this.props.maxHeight;
-        const localVideoFeedClasses = classNames("mx_VideoView_localVideoFeed",
-            { "mx_VideoView_localVideoFeed_flipped":
-                SettingsStore.getValue('VideoView.flipVideoHorizontally'),
-            },
-        );
-        return (
-            <div className="mx_VideoView" ref={this.setContainer} onClick={this.props.onClick}>
-                <div className="mx_VideoView_remoteVideoFeed">
-                    <VideoFeed ref={this._remote} onResize={this.props.onResize}
-                        maxHeight={maxVideoHeight} />
-                </div>
-                <div className={localVideoFeedClasses}>
-                    <VideoFeed ref={this._local} />
-                </div>
-            </div>
-        );
-    }
-}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 400fa24713..79b777c1fb 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -213,6 +213,8 @@
     "Send a bug report with logs": "Send a bug report with logs",
     "Opens chat with the given user": "Opens chat with the given user",
     "Sends a message to the given user": "Sends a message to the given user",
+    "Places the call in the current room on hold": "Places the call in the current room on hold",
+    "Takes the call in the current room off hold": "Takes the call in the current room off hold",
     "Displays action": "Displays action",
     "Reason": "Reason",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepted the invitation for %(displayName)s.",
@@ -529,6 +531,7 @@
     "My Ban List": "My Ban List",
     "This is your list of users/servers you have blocked - don't leave the room!": "This is your list of users/servers you have blocked - don't leave the room!",
     "Active call": "Active call",
+    "Call Paused": "Call Paused",
     "Unknown caller": "Unknown caller",
     "Incoming voice call": "Incoming voice call",
     "Incoming video call": "Incoming video call",

From 90cdc2f341961d1c0118caa7e2b86e096de22199 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 30 Oct 2020 13:47:43 +0000
Subject: [PATCH 012/146] Add the new css file

---
 res/css/views/voip/_VideoFeed.scss | 43 ++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 res/css/views/voip/_VideoFeed.scss

diff --git a/res/css/views/voip/_VideoFeed.scss b/res/css/views/voip/_VideoFeed.scss
new file mode 100644
index 0000000000..0f5e46dae5
--- /dev/null
+++ b/res/css/views/voip/_VideoFeed.scss
@@ -0,0 +1,43 @@
+/*
+Copyright 2020 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.
+*/
+
+.mx_VideoFeed video {
+    width: 100%;
+}
+
+.mx_VideoFeed_remote {
+    width: 100%;
+    background-color: #000;
+    z-index: 50;
+}
+
+.mx_VideoFeed_local {
+    width: 25%;
+    height: 25%;
+    position: absolute;
+    left: 10px;
+    bottom: 10px;
+    z-index: 100;
+}
+
+.mx_VideoFeed_local video {
+    width: auto;
+    height: 100%;
+}
+
+.mx_VideoFeed_mirror video {
+    transform: scale(-1, 1);
+}

From cfb9d0f2d45ace5ad80862e038c0f366668bf50f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 3 Nov 2020 16:06:45 +0000
Subject: [PATCH 013/146] Disallow sending of empty messages

---
 src/components/views/rooms/SendMessageComposer.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js
index 9438cceef5..78b1dd85db 100644
--- a/src/components/views/rooms/SendMessageComposer.js
+++ b/src/components/views/rooms/SendMessageComposer.js
@@ -308,6 +308,9 @@ export default class SendMessageComposer extends React.Component {
             const startTime = CountlyAnalytics.getTimestamp();
             const {roomId} = this.props.room;
             const content = createMessageContent(this.model, this.props.permalinkCreator, replyToEvent);
+            // don't bother sending an empty message
+            if (!content.body.trim()) return;
+
             const prom = this.context.sendMessage(roomId, content);
             if (replyToEvent) {
                 // Clear reply_to_event as we put the message into the queue

From 1b55eb5f44d0216900fe125dc5ef6511388e1eb6 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 4 Nov 2020 14:10:56 +0000
Subject: [PATCH 014/146] Upgrade matrix-js-sdk to 9.1.0-rc.1

---
 package.json | 2 +-
 yarn.lock    | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 9689892e24..5d47d81ca4 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,7 @@
     "is-ip": "^2.0.0",
     "linkifyjs": "^2.1.9",
     "lodash": "^4.17.19",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+    "matrix-js-sdk": "9.1.0-rc.1",
     "matrix-widget-api": "^0.1.0-beta.5",
     "minimist": "^1.2.5",
     "pako": "^1.0.11",
diff --git a/yarn.lock b/yarn.lock
index 4d4152c659..04ceb32110 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6505,9 +6505,10 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "9.0.1"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/f8863d5c2488a31a093f5a1b11761d7ac3829470"
+matrix-js-sdk@9.1.0-rc.1:
+  version "9.1.0-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.1.0-rc.1.tgz#cbdad0d272152a27bb32fe74e02ad069717d2554"
+  integrity sha512-Y0ftnH3HtMaNPFyfYqbrhS6aZkdQxxeluErFmOmpMTRGuMiIGrqhdWP8Z/MCZMRP4NPAh/dN2eW0vgqH9ij52A==
   dependencies:
     "@babel/runtime" "^7.11.2"
     another-json "^0.2.0"

From 6752e1f8d752235300781ba054754799c8cd2c70 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 4 Nov 2020 14:16:13 +0000
Subject: [PATCH 015/146] Prepare changelog for v3.8.0-rc.1

---
 CHANGELOG.md | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f5372ae5d..035225b18a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,73 @@
+Changes in [3.8.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.8.0-rc.1) (2020-11-04)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.7.1...v3.8.0-rc.1)
+
+ * Upgrade JS SDK to 9.1.0-rc.1
+ * Log when saving profile
+   [\#5394](https://github.com/matrix-org/matrix-react-sdk/pull/5394)
+ * Translations update from Weblate
+   [\#5395](https://github.com/matrix-org/matrix-react-sdk/pull/5395)
+ * Hide prompt to add email for notifications if 3pid ui feature is off
+   [\#5392](https://github.com/matrix-org/matrix-react-sdk/pull/5392)
+ * Fix room list message preview copy for hangup events
+   [\#5388](https://github.com/matrix-org/matrix-react-sdk/pull/5388)
+ * Track UISIs as Countly Events
+   [\#5382](https://github.com/matrix-org/matrix-react-sdk/pull/5382)
+ * Don't let users accidentally redact ACL events
+   [\#5384](https://github.com/matrix-org/matrix-react-sdk/pull/5384)
+ * Two more easy files to remove from eslintignore
+   [\#5378](https://github.com/matrix-org/matrix-react-sdk/pull/5378)
+ * Fix Widget OpenID Permissions for realsies
+   [\#5381](https://github.com/matrix-org/matrix-react-sdk/pull/5381)
+ * Fix regression with OpenID permissions on widgets
+   [\#5380](https://github.com/matrix-org/matrix-react-sdk/pull/5380)
+ * Fix room directory events happening in the wrong order for Funnels
+   [\#5379](https://github.com/matrix-org/matrix-react-sdk/pull/5379)
+ * Remove a couple more files from eslintignore
+   [\#5377](https://github.com/matrix-org/matrix-react-sdk/pull/5377)
+ * Fix countly method bindings and errors
+   [\#5376](https://github.com/matrix-org/matrix-react-sdk/pull/5376)
+ * Fix a bunch of silly lint errors
+   [\#5375](https://github.com/matrix-org/matrix-react-sdk/pull/5375)
+ * Typescript: ImageUtils
+   [\#5374](https://github.com/matrix-org/matrix-react-sdk/pull/5374)
+ * Convert AuxPanel to TypeScript
+   [\#5373](https://github.com/matrix-org/matrix-react-sdk/pull/5373)
+ * Only pass metrics if they exist otherwise Countly will be unhappy!
+   [\#5372](https://github.com/matrix-org/matrix-react-sdk/pull/5372)
+ * Fix CountlyAnalytics NPE on MatrixClientPeg
+   [\#5370](https://github.com/matrix-org/matrix-react-sdk/pull/5370)
+ * fix CountlyAnalytics canEnable on wrong target
+   [\#5369](https://github.com/matrix-org/matrix-react-sdk/pull/5369)
+ * Initial Countly work
+   [\#5365](https://github.com/matrix-org/matrix-react-sdk/pull/5365)
+ * Fix videos not playing in non-encrypted rooms
+   [\#5368](https://github.com/matrix-org/matrix-react-sdk/pull/5368)
+ * Fix custom tag layout which regressed in #5309
+   [\#5367](https://github.com/matrix-org/matrix-react-sdk/pull/5367)
+ * Watch replyToEvent at RoomView to prevent races
+   [\#5360](https://github.com/matrix-org/matrix-react-sdk/pull/5360)
+ * Add a UI Feature flag for room history settings
+   [\#5362](https://github.com/matrix-org/matrix-react-sdk/pull/5362)
+ * Hide inline images when preference disabled
+   [\#5361](https://github.com/matrix-org/matrix-react-sdk/pull/5361)
+ * Fix React warning by moving handler to each button
+   [\#5359](https://github.com/matrix-org/matrix-react-sdk/pull/5359)
+ * Do not preload encrypted videos|images unless autoplay or thumbnailing is on
+   [\#5352](https://github.com/matrix-org/matrix-react-sdk/pull/5352)
+ * Fix theme variable passed to Jitsi
+   [\#5357](https://github.com/matrix-org/matrix-react-sdk/pull/5357)
+ * docs: added comment explanation
+   [\#5349](https://github.com/matrix-org/matrix-react-sdk/pull/5349)
+ * Modal Widgets - MSC2790
+   [\#5252](https://github.com/matrix-org/matrix-react-sdk/pull/5252)
+ * Widgets fixes
+   [\#5350](https://github.com/matrix-org/matrix-react-sdk/pull/5350)
+ * Fix User Menu avatar colouring being based on wrong string
+   [\#5348](https://github.com/matrix-org/matrix-react-sdk/pull/5348)
+ * Support 'answered elsewhere'
+   [\#5345](https://github.com/matrix-org/matrix-react-sdk/pull/5345)
+
 Changes in [3.7.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.7.1) (2020-10-28)
 ===================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.7.0...v3.7.1)

From 82574703833ef28a9fbd5efcff9e0d0d3e0691c1 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 4 Nov 2020 14:16:13 +0000
Subject: [PATCH 016/146] v3.8.0-rc.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5d47d81ca4..a4beaa696b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "3.7.1",
+  "version": "3.8.0-rc.1",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 4880abc64a50515eac468d84c677e653715ef49f Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Wed, 4 Nov 2020 14:45:00 +0000
Subject: [PATCH 017/146] Translated using Weblate (Hungarian)

Currently translated at 99.4% (2367 of 2379 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index edd2cc5d21..6eefc9f8f0 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2549,5 +2549,15 @@
     "Show Widgets": "Kisalkalmazások megjelenítése",
     "Hide Widgets": "Kisalkalmazások elrejtése",
     "The call was answered on another device.": "A hívás másik eszközön lett fogadva.",
-    "Answered Elsewhere": "Máshol lett felvéve"
+    "Answered Elsewhere": "Máshol lett felvéve",
+    "Tell us below how you feel about %(brand)s so far.": "Mond el nekünk, hogy tetszik eddig ez: %(brand)s.",
+    "Rate %(brand)s": "Értékeld ezt: %(brand)s",
+    "Feedback sent": "Visszajelzés elküldve",
+    "Use the + to make a new room or explore existing ones below": "Új szoba készítéshez vagy kereséshez alább, használd a + jelet",
+    "%(senderName)s ended the call": "%(senderName)s befejezte a hívást",
+    "You ended the call": "Befejezted a hívást",
+    "New version of %(brand)s is available": "Új verzió érhető el ebből: %(brand)s",
+    "Update %(brand)s": "%(brand)s frissítése",
+    "Enable desktop notifications": "Asztali értesítések engedélyezése",
+    "Don't miss a reply": "Ne szalassz el egy választ se"
 }

From 3e3b5af7ead0b9a808b9ee4761380f40bfa3bc44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Wed, 4 Nov 2020 14:48:01 +0000
Subject: [PATCH 018/146] Translated using Weblate (Estonian)

Currently translated at 100.0% (2379 of 2379 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
---
 src/i18n/strings/et.json | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 0c90b2b196..f384c9e40d 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -2562,5 +2562,14 @@
     "Rate %(brand)s": "Hinda %(brand)s rakendust",
     "Feedback sent": "Tagasiside on saadetud",
     "%(senderName)s ended the call": "%(senderName)s lõpetas kõne",
-    "You ended the call": "Sina lõpetasid kõne"
+    "You ended the call": "Sina lõpetasid kõne",
+    "Now, lets help you get started": "Nüüd näitame sulle, mida saad järgmiseks teha",
+    "Welcome %(name)s": "Tere tulemast, %(name)s",
+    "Add a photo so people know it's you.": "Enda tutvustamiseks lisa foto.",
+    "Great, that'll help people know it's you": "Suurepärane, nüüd teised teavad et tegemist on sinuga",
+    "Use the + to make a new room or explore existing ones below": "Uue jututoa tegemiseks või olemasolevatega tutvumiseks klõpsi + märki",
+    "New version of %(brand)s is available": "%(brand)s ralenduse uus versioon on saadaval",
+    "Update %(brand)s": "Uuenda %(brand)s rakendust",
+    "Enable desktop notifications": "Võta kasutusele töölauakeskkonna teavitused",
+    "Don't miss a reply": "Ära jäta vastust vahele"
 }

From fa5b07428cbd9053d6eb72424f8742fa2b0fca1a Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Wed, 4 Nov 2020 15:12:22 +0000
Subject: [PATCH 019/146] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2380 of 2380 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 6eefc9f8f0..f35b67cfaf 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2559,5 +2559,20 @@
     "New version of %(brand)s is available": "Új verzió érhető el ebből: %(brand)s",
     "Update %(brand)s": "%(brand)s frissítése",
     "Enable desktop notifications": "Asztali értesítések engedélyezése",
-    "Don't miss a reply": "Ne szalassz el egy választ se"
+    "Don't miss a reply": "Ne szalassz el egy választ se",
+    "Now, let's help you get started": "És most segítünk az indulásban",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Hívj meg valakit a nevével, e-mail címéve, felhasználói nevével (pl. <userId/>) vagy <a>oszd meg ezt a szobát</a>.",
+    "Start a conversation with someone using their name, email address or username (like <userId/>).": "Indíts beszélgetést valakivel és használd hozzá a nevét, e-mail címét vagy a felhasználói nevét (mint <userId/>).",
+    "Invite by email": "Meghívás e-maillel",
+    "Welcome %(name)s": "Üdv %(name)s",
+    "Add a photo so people know it's you.": "Hogy másik megismerhessenek adj hozzá egy fényképet.",
+    "Great, that'll help people know it's you": "Szuper, ez segíteni eldönteni másoknak, hogy te te vagy",
+    "Send feedback": "Visszajelzés küldése",
+    "PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> to help us track down the problem.": "Tipp: Ha hibajegyet készítesz, légyszíves segíts a probléma feltárásában azzal, hogy elküldöd a <debugLogsLink>részletes naplót</debugLogsLink>.",
+    "Please view <existingIssuesLink>existing bugs on Github</existingIssuesLink> first. No match? <newIssueLink>Start a new one</newIssueLink>.": "Először nézd meg, hogy <existingIssuesLink>van-e már jegy róla a Github-on</existingIssuesLink>. Nincs? <newIssueLink>Adj fel egy új jegyet</newIssueLink>.",
+    "Report a bug": "Hibajegy feladása",
+    "There are two ways you can provide feedback and help us improve %(brand)s.": "Van két lehetőséged, hogy visszajelezz vagy segíts jobbá tenni ezt: %(brand)s.",
+    "Comment": "Megjegyzés",
+    "Add comment": "Megjegyzés hozzáadása",
+    "Please go into as much detail as you like, so we can track down the problem.": "Ahhoz, hogy megérthessük a problémát olyan részletesen írd le ahogy csak szeretnéd."
 }

From ff25a9b45de5e5125bfb6552ff7470df8327acd1 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 4 Nov 2020 17:00:07 +0000
Subject: [PATCH 020/146] Consolidate all EventTile bubble stuff into its own
 component and use it for the room continuation plinth

---
 res/css/_components.scss                      |  1 +
 res/css/views/messages/_CreateEvent.scss      | 34 ++++------
 res/css/views/messages/_EventTileBubble.scss  | 63 +++++++++++++++++++
 .../views/messages/_MJitsiWidgetEvent.scss    | 33 ----------
 .../views/messages/_common_CryptoEvent.scss   | 48 +++-----------
 res/css/views/rooms/_EventTile.scss           |  9 ---
 .../views/messages/EncryptionEvent.js         | 45 ++++++-------
 .../views/messages/EventTileBubble.tsx        | 34 ++++++++++
 .../views/messages/MJitsiWidgetEvent.tsx      | 42 +++++--------
 .../messages/MKeyVerificationConclusion.js    | 13 ++--
 .../views/messages/MKeyVerificationRequest.js | 25 ++++----
 src/components/views/messages/RoomCreate.js   | 20 +++---
 src/components/views/rooms/EventTile.js       |  1 +
 13 files changed, 182 insertions(+), 186 deletions(-)
 create mode 100644 res/css/views/messages/_EventTileBubble.scss
 create mode 100644 src/components/views/messages/EventTileBubble.tsx

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 37d0e0d286..af3589a415 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -139,6 +139,7 @@
 @import "./views/groups/_GroupUserSettings.scss";
 @import "./views/messages/_CreateEvent.scss";
 @import "./views/messages/_DateSeparator.scss";
+@import "./views/messages/_EventTileBubble.scss";
 @import "./views/messages/_MEmoteBody.scss";
 @import "./views/messages/_MFileBody.scss";
 @import "./views/messages/_MImageBody.scss";
diff --git a/res/css/views/messages/_CreateEvent.scss b/res/css/views/messages/_CreateEvent.scss
index d45645863f..1f75fb9693 100644
--- a/res/css/views/messages/_CreateEvent.scss
+++ b/res/css/views/messages/_CreateEvent.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 New Vector Ltd
+Copyright 2020 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.
@@ -15,25 +15,17 @@ limitations under the License.
 */
 
 .mx_CreateEvent {
-    background-color: $info-plinth-bg-color;
-    padding-left: 20px;
-    padding-right: 20px;
-    padding-top: 10px;
-    padding-bottom: 10px;
-}
+    // override default EventTileBubble styling
+    padding-left: 80px !important;
 
-.mx_CreateEvent_image {
-    float: left;
-    margin-right: 20px;
-    width: 72px;
-    height: 34px;
-
-    background-color: $primary-fg-color;
-    mask: url('$(res)/img/room-continuation.svg');
-    mask-repeat: no-repeat;
-    mask-position: center;
-}
-
-.mx_CreateEvent_header {
-    font-weight: bold;
+    &::before {
+        background-color: $primary-fg-color;
+        mask-image: url('$(res)/img/room-continuation.svg');
+        mask-repeat: no-repeat;
+        mask-position: center;
+        mask-size: 100%;
+        width: 72px !important;
+        height: 34px !important;
+        left: -64px !important;
+    }
 }
diff --git a/res/css/views/messages/_EventTileBubble.scss b/res/css/views/messages/_EventTileBubble.scss
new file mode 100644
index 0000000000..99feb03ef9
--- /dev/null
+++ b/res/css/views/messages/_EventTileBubble.scss
@@ -0,0 +1,63 @@
+/*
+Copyright 2019, 2020 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.
+*/
+
+.mx_EventTileBubble {
+    background-color: $dark-panel-bg-color;
+    padding: 10px;
+    border-radius: 8px;
+    margin: 10px auto;
+    max-width: 75%;
+    box-sizing: border-box;
+    display: grid;
+    grid-template-columns: 24px minmax(0, 1fr) min-content;
+
+    &::before, &::after {
+        position: relative;
+        grid-column: 1;
+        grid-row: 1 / 3;
+        width: 16px;
+        height: 16px;
+        content: "";
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        mask-repeat: no-repeat;
+        mask-position: center;
+        mask-size: contain;
+        margin-top: 4px;
+    }
+
+    .mx_EventTileBubble_title, .mx_EventTileBubble_subtitle {
+        overflow-wrap: break-word;
+    }
+
+    .mx_EventTileBubble_title {
+        font-weight: 600;
+        font-size: $font-15px;
+        grid-column: 2;
+        grid-row: 1;
+    }
+
+    .mx_EventTileBubble_subtitle {
+        grid-column: 2;
+        grid-row: 2;
+    }
+
+    .mx_EventTileBubble_subtitle {
+        font-size: $font-12px;
+    }
+}
diff --git a/res/css/views/messages/_MJitsiWidgetEvent.scss b/res/css/views/messages/_MJitsiWidgetEvent.scss
index 3e51e89744..bea8651543 100644
--- a/res/css/views/messages/_MJitsiWidgetEvent.scss
+++ b/res/css/views/messages/_MJitsiWidgetEvent.scss
@@ -15,41 +15,8 @@ limitations under the License.
 */
 
 .mx_MJitsiWidgetEvent {
-    display: grid;
-    grid-template-columns: 24px minmax(0, 1fr) min-content;
-
     &::before {
-        grid-column: 1;
-        grid-row: 1 / 3;
-        width: 16px;
-        height: 16px;
-        content: "";
-        top: 0;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        mask-repeat: no-repeat;
-        mask-position: center;
-        mask-size: contain;
         background-color: $composer-e2e-icon-color; // XXX: Variable abuse
-        margin-top: 4px;
         mask-image: url('$(res)/img/element-icons/call/video-call.svg');
     }
-
-    .mx_MJitsiWidgetEvent_title {
-        font-weight: 600;
-        font-size: $font-15px;
-        grid-column: 2;
-        grid-row: 1;
-    }
-
-    .mx_MJitsiWidgetEvent_subtitle {
-        grid-column: 2;
-        grid-row: 2;
-    }
-
-    .mx_MJitsiWidgetEvent_title,
-    .mx_MJitsiWidgetEvent_subtitle {
-        overflow-wrap: break-word;
-    }
 }
diff --git a/res/css/views/messages/_common_CryptoEvent.scss b/res/css/views/messages/_common_CryptoEvent.scss
index 09c78ae5b4..4faa4b594f 100644
--- a/res/css/views/messages/_common_CryptoEvent.scss
+++ b/res/css/views/messages/_common_CryptoEvent.scss
@@ -15,28 +15,6 @@ limitations under the License.
 */
 
 .mx_cryptoEvent {
-    display: grid;
-    grid-template-columns: 24px minmax(0, 1fr) min-content;
-
-    &.mx_cryptoEvent_icon::before,
-    &.mx_cryptoEvent_icon::after {
-        grid-column: 1;
-        grid-row: 1 / 3;
-        width: 16px;
-        height: 16px;
-        content: "";
-        top: 0;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        mask-repeat: no-repeat;
-        mask-position: center;
-        mask-size: contain;
-        mask-image: url('$(res)/img/e2e/normal.svg');
-        background-color: $composer-e2e-icon-color;
-        margin-top: 4px;
-    }
-
     // white infill for the transparency
     &.mx_cryptoEvent_icon::before {
         background-color: #ffffff;
@@ -46,6 +24,11 @@ limitations under the License.
         mask-size: 90%;
     }
 
+    &.mx_cryptoEvent_icon::after {
+        mask-image: url('$(res)/img/e2e/normal.svg');
+        background-color: $composer-e2e-icon-color;
+    }
+
     &.mx_cryptoEvent_icon_verified::after {
         mask-image: url("$(res)/img/e2e/verified.svg");
         background-color: $accent-color;
@@ -56,25 +39,6 @@ limitations under the License.
         background-color: $notice-primary-color;
     }
 
-    .mx_cryptoEvent_title, .mx_cryptoEvent_subtitle, .mx_cryptoEvent_state {
-        overflow-wrap: break-word;
-    }
-
-    .mx_cryptoEvent_title {
-        font-weight: 600;
-        font-size: $font-15px;
-        grid-column: 2;
-        grid-row: 1;
-    }
-
-    .mx_cryptoEvent_subtitle {
-        grid-column: 2;
-        grid-row: 2;
-    }
-
-    .mx_cryptoEvent_state, .mx_cryptoEvent_subtitle {
-        font-size: $font-12px;
-    }
 
     .mx_cryptoEvent_state, .mx_cryptoEvent_buttons {
         grid-column: 3;
@@ -92,5 +56,7 @@ limitations under the License.
         margin: auto 0;
         text-align: center;
         color: $notice-secondary-color;
+        overflow-wrap: break-word;
+        font-size: $font-12px;
     }
 }
diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 3b9a491db5..18eb581776 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -25,15 +25,6 @@ $left-gutter: 64px;
     position: relative;
 }
 
-.mx_EventTile_bubble {
-    background-color: $dark-panel-bg-color;
-    padding: 10px;
-    border-radius: 5px;
-    margin: 10px auto;
-    max-width: 75%;
-    box-sizing: border-box;
-}
-
 .mx_EventTile.mx_EventTile_info {
     padding-top: 0px;
 }
diff --git a/src/components/views/messages/EncryptionEvent.js b/src/components/views/messages/EncryptionEvent.js
index a9ce10d202..ee304b4fa3 100644
--- a/src/components/views/messages/EncryptionEvent.js
+++ b/src/components/views/messages/EncryptionEvent.js
@@ -18,42 +18,35 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
+import EventTileBubble from "./EventTileBubble";
 
 export default class EncryptionEvent extends React.Component {
     render() {
         const {mxEvent} = this.props;
 
-        let body;
-        let classes = "mx_EventTile_bubble mx_cryptoEvent mx_cryptoEvent_icon";
         const isRoomEncrypted = MatrixClientPeg.get().isRoomEncrypted(mxEvent.getRoomId());
         if (mxEvent.getContent().algorithm === 'm.megolm.v1.aes-sha2' && isRoomEncrypted) {
-            body = <div>
-                <div className="mx_cryptoEvent_title">{_t("Encryption enabled")}</div>
-                <div className="mx_cryptoEvent_subtitle">
-                    {_t(
-                        "Messages in this room are end-to-end encrypted. " +
-                        "Learn more & verify this user in their user profile.",
-                    )}
-                </div>
-            </div>;
+            return <EventTileBubble
+                className="mx_cryptoEvent mx_cryptoEvent_icon"
+                title={_t("Encryption enabled")}
+                subtitle={_t(
+                    "Messages in this room are end-to-end encrypted. " +
+                    "Learn more & verify this user in their user profile.",
+                )}
+            />;
         } else if (isRoomEncrypted) {
-            body = <div>
-                <div className="mx_cryptoEvent_title">{_t("Encryption enabled")}</div>
-                <div className="mx_cryptoEvent_subtitle">
-                    {_t("Ignored attempt to disable encryption")}
-                </div>
-            </div>;
-        } else {
-            body = <div>
-                <div className="mx_cryptoEvent_title">{_t("Encryption not enabled")}</div>
-                <div className="mx_cryptoEvent_subtitle">{_t("The encryption used by this room isn't supported.")}</div>
-            </div>;
-            classes += " mx_cryptoEvent_icon_warning";
+            return <EventTileBubble
+                className="mx_cryptoEvent mx_cryptoEvent_icon"
+                title={_t("Encryption enabled")}
+                subtitle={_t("Ignored attempt to disable encryption")}
+            />;
         }
 
-        return (<div className={classes}>
-            {body}
-        </div>);
+        return <EventTileBubble
+            className="mx_cryptoEvent mx_cryptoEvent_icon mx_cryptoEvent_icon_warning"
+            title={_t("Encryption not enabled")}
+            subtitle={_t("The encryption used by this room isn't supported.")}
+        />;
     }
 }
 
diff --git a/src/components/views/messages/EventTileBubble.tsx b/src/components/views/messages/EventTileBubble.tsx
new file mode 100644
index 0000000000..8a2cf0f01c
--- /dev/null
+++ b/src/components/views/messages/EventTileBubble.tsx
@@ -0,0 +1,34 @@
+/*
+Copyright 2020 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 React, {ReactNode} from "react";
+import classNames from "classnames";
+
+interface IProps {
+    className: string;
+    title: string;
+    subtitle?: ReactNode;
+}
+
+const EventTileBubble: React.FC<IProps> = ({ className, title, subtitle, children }) => {
+    return <div className={classNames("mx_EventTileBubble", className)}>
+        <div className="mx_EventTileBubble_title">{ title }</div>
+        { subtitle && <div className="mx_EventTileBubble_subtitle">{ subtitle }</div> }
+        { children }
+    </div>;
+};
+
+export default EventTileBubble;
diff --git a/src/components/views/messages/MJitsiWidgetEvent.tsx b/src/components/views/messages/MJitsiWidgetEvent.tsx
index 3d191209f9..82aa32d3b7 100644
--- a/src/components/views/messages/MJitsiWidgetEvent.tsx
+++ b/src/components/views/messages/MJitsiWidgetEvent.tsx
@@ -18,6 +18,7 @@ import React from 'react';
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { _t } from "../../../languageHandler";
 import WidgetStore from "../../../stores/WidgetStore";
+import EventTileBubble from "./EventTileBubble";
 
 interface IProps {
     mxEvent: MatrixEvent;
@@ -40,37 +41,24 @@ export default class MJitsiWidgetEvent extends React.PureComponent<IProps> {
 
         if (!url) {
             // removed
-            return (
-                <div className='mx_EventTile_bubble mx_MJitsiWidgetEvent'>
-                    <div className='mx_MJitsiWidgetEvent_title'>
-                        {_t('Video conference ended by %(senderName)s', {senderName})}
-                    </div>
-                </div>
-            );
+            return <EventTileBubble
+                className="mx_MJitsiWidgetEvent"
+                title={_t('Video conference ended by %(senderName)s', {senderName})}
+            />;
         } else if (prevUrl) {
             // modified
-            return (
-                <div className='mx_EventTile_bubble mx_MJitsiWidgetEvent'>
-                    <div className='mx_MJitsiWidgetEvent_title'>
-                        {_t('Video conference updated by %(senderName)s', {senderName})}
-                    </div>
-                    <div className='mx_MJitsiWidgetEvent_subtitle'>
-                        {joinCopy}
-                    </div>
-                </div>
-            );
+            return <EventTileBubble
+                className="mx_MJitsiWidgetEvent"
+                title={_t('Video conference updated by %(senderName)s', {senderName})}
+                subtitle={joinCopy}
+            />;
         } else {
             // assume added
-            return (
-                <div className='mx_EventTile_bubble mx_MJitsiWidgetEvent'>
-                    <div className='mx_MJitsiWidgetEvent_title'>
-                        {_t("Video conference started by %(senderName)s", {senderName})}
-                    </div>
-                    <div className='mx_MJitsiWidgetEvent_subtitle'>
-                        {joinCopy}
-                    </div>
-                </div>
-            );
+            return <EventTileBubble
+                className="mx_MJitsiWidgetEvent"
+                title={_t("Video conference started by %(senderName)s", {senderName})}
+                subtitle={joinCopy}
+            />;
         }
     }
 }
diff --git a/src/components/views/messages/MKeyVerificationConclusion.js b/src/components/views/messages/MKeyVerificationConclusion.js
index ececfc60ed..880299d29d 100644
--- a/src/components/views/messages/MKeyVerificationConclusion.js
+++ b/src/components/views/messages/MKeyVerificationConclusion.js
@@ -21,6 +21,7 @@ import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 import {getNameForEventRoom, userLabelForEventRoom}
     from '../../../utils/KeyVerificationStateObserver';
+import EventTileBubble from "./EventTileBubble";
 
 export default class MKeyVerificationConclusion extends React.Component {
     constructor(props) {
@@ -115,14 +116,14 @@ export default class MKeyVerificationConclusion extends React.Component {
         }
 
         if (title) {
-            const subtitle = userLabelForEventRoom(request.otherUserId, mxEvent.getRoomId());
-            const classes = classNames("mx_EventTile_bubble", "mx_cryptoEvent", "mx_cryptoEvent_icon", {
+            const classes = classNames("mx_cryptoEvent mx_cryptoEvent_icon", {
                 mx_cryptoEvent_icon_verified: request.done,
             });
-            return (<div className={classes}>
-                <div className="mx_cryptoEvent_title">{title}</div>
-                <div className="mx_cryptoEvent_subtitle">{subtitle}</div>
-            </div>);
+            return <EventTileBubble
+                className={classes}
+                title={title}
+                subtitle={userLabelForEventRoom(request.otherUserId, mxEvent.getRoomId())}
+            />;
         }
 
         return null;
diff --git a/src/components/views/messages/MKeyVerificationRequest.js b/src/components/views/messages/MKeyVerificationRequest.js
index 01a5c2663e..d9594091c5 100644
--- a/src/components/views/messages/MKeyVerificationRequest.js
+++ b/src/components/views/messages/MKeyVerificationRequest.js
@@ -24,6 +24,7 @@ import {getNameForEventRoom, userLabelForEventRoom}
 import dis from "../../../dispatcher/dispatcher";
 import {RightPanelPhases} from "../../../stores/RightPanelStorePhases";
 import {Action} from "../../../dispatcher/actions";
+import EventTileBubble from "./EventTileBubble";
 
 export default class MKeyVerificationRequest extends React.Component {
     constructor(props) {
@@ -146,10 +147,8 @@ export default class MKeyVerificationRequest extends React.Component {
 
         if (!request.initiatedByMe) {
             const name = getNameForEventRoom(request.requestingUserId, mxEvent.getRoomId());
-            title = (<div className="mx_cryptoEvent_title">{
-                _t("%(name)s wants to verify", {name})}</div>);
-            subtitle = (<div className="mx_cryptoEvent_subtitle">{
-                userLabelForEventRoom(request.requestingUserId, mxEvent.getRoomId())}</div>);
+            title = _t("%(name)s wants to verify", {name});
+            subtitle = userLabelForEventRoom(request.requestingUserId, mxEvent.getRoomId());
             if (request.canAccept) {
                 stateNode = (<div className="mx_cryptoEvent_buttons">
                     <FormButton kind="danger" onClick={this._onRejectClicked} label={_t("Decline")} />
@@ -157,18 +156,18 @@ export default class MKeyVerificationRequest extends React.Component {
                 </div>);
             }
         } else { // request sent by us
-            title = (<div className="mx_cryptoEvent_title">{
-                _t("You sent a verification request")}</div>);
-            subtitle = (<div className="mx_cryptoEvent_subtitle">{
-                userLabelForEventRoom(request.receivingUserId, mxEvent.getRoomId())}</div>);
+            title = _t("You sent a verification request");
+            subtitle = userLabelForEventRoom(request.receivingUserId, mxEvent.getRoomId());
         }
 
         if (title) {
-            return (<div className="mx_EventTile_bubble mx_cryptoEvent mx_cryptoEvent_icon">
-                {title}
-                {subtitle}
-                {stateNode}
-            </div>);
+            return <EventTileBubble
+                className="mx_cryptoEvent mx_cryptoEvent_icon"
+                title={title}
+                subtitle={subtitle}
+            >
+                { stateNode }
+            </EventTileBubble>;
         }
         return null;
     }
diff --git a/src/components/views/messages/RoomCreate.js b/src/components/views/messages/RoomCreate.js
index 6098b1217e..479592aa42 100644
--- a/src/components/views/messages/RoomCreate.js
+++ b/src/components/views/messages/RoomCreate.js
@@ -22,6 +22,7 @@ import dis from '../../../dispatcher/dispatcher';
 import { RoomPermalinkCreator } from '../../../utils/permalinks/Permalinks';
 import { _t } from '../../../languageHandler';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
+import EventTileBubble from "./EventTileBubble";
 
 export default class RoomCreate extends React.Component {
     static propTypes = {
@@ -51,17 +52,16 @@ export default class RoomCreate extends React.Component {
         const permalinkCreator = new RoomPermalinkCreator(prevRoom, predecessor['room_id']);
         permalinkCreator.load();
         const predecessorPermalink = permalinkCreator.forEvent(predecessor['event_id']);
-        return <div className="mx_CreateEvent">
-            <div className="mx_CreateEvent_image" />
-            <div className="mx_CreateEvent_header">
-                {_t("This room is a continuation of another conversation.")}
-            </div>
-            <a className="mx_CreateEvent_link"
-                href={predecessorPermalink}
-                onClick={this._onLinkClicked}
-            >
+        const link = (
+            <a href={predecessorPermalink} onClick={this._onLinkClicked}>
                 {_t("Click here to see older messages.")}
             </a>
-        </div>;
+        );
+
+        return <EventTileBubble
+            className="mx_CreateEvent"
+            title={_t("This room is a continuation of another conversation.")}
+            subtitle={link}
+        />;
     }
 }
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 48ab6831d9..9060ddb02b 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -647,6 +647,7 @@ export default class EventTile extends React.Component {
         // Info messages are basically information about commands processed on a room
         const isBubbleMessage = eventType.startsWith("m.key.verification") ||
             (eventType === "m.room.message" && msgtype && msgtype.startsWith("m.key.verification")) ||
+            (eventType === "m.room.create") ||
             (eventType === "m.room.encryption") ||
             (tileHandler === "messages.MJitsiWidgetEvent");
         let isInfoMessage = (

From 4e2d9c28f5347ac184492cf6ec6ac5433e492ba2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 4 Nov 2020 17:21:25 +0000
Subject: [PATCH 021/146] Convert EncryptionEvent to Typescript

---
 .../views/messages/EncryptionEvent.js         | 56 -------------------
 .../views/messages/EncryptionEvent.tsx        | 54 ++++++++++++++++++
 2 files changed, 54 insertions(+), 56 deletions(-)
 delete mode 100644 src/components/views/messages/EncryptionEvent.js
 create mode 100644 src/components/views/messages/EncryptionEvent.tsx

diff --git a/src/components/views/messages/EncryptionEvent.js b/src/components/views/messages/EncryptionEvent.js
deleted file mode 100644
index ee304b4fa3..0000000000
--- a/src/components/views/messages/EncryptionEvent.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-Copyright 2020 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 React from 'react';
-import PropTypes from 'prop-types';
-import { _t } from '../../../languageHandler';
-import { MatrixClientPeg } from '../../../MatrixClientPeg';
-import EventTileBubble from "./EventTileBubble";
-
-export default class EncryptionEvent extends React.Component {
-    render() {
-        const {mxEvent} = this.props;
-
-        const isRoomEncrypted = MatrixClientPeg.get().isRoomEncrypted(mxEvent.getRoomId());
-        if (mxEvent.getContent().algorithm === 'm.megolm.v1.aes-sha2' && isRoomEncrypted) {
-            return <EventTileBubble
-                className="mx_cryptoEvent mx_cryptoEvent_icon"
-                title={_t("Encryption enabled")}
-                subtitle={_t(
-                    "Messages in this room are end-to-end encrypted. " +
-                    "Learn more & verify this user in their user profile.",
-                )}
-            />;
-        } else if (isRoomEncrypted) {
-            return <EventTileBubble
-                className="mx_cryptoEvent mx_cryptoEvent_icon"
-                title={_t("Encryption enabled")}
-                subtitle={_t("Ignored attempt to disable encryption")}
-            />;
-        }
-
-        return <EventTileBubble
-            className="mx_cryptoEvent mx_cryptoEvent_icon mx_cryptoEvent_icon_warning"
-            title={_t("Encryption not enabled")}
-            subtitle={_t("The encryption used by this room isn't supported.")}
-        />;
-    }
-}
-
-EncryptionEvent.propTypes = {
-    /* the MatrixEvent to show */
-    mxEvent: PropTypes.object.isRequired,
-};
diff --git a/src/components/views/messages/EncryptionEvent.tsx b/src/components/views/messages/EncryptionEvent.tsx
new file mode 100644
index 0000000000..9a6af9446f
--- /dev/null
+++ b/src/components/views/messages/EncryptionEvent.tsx
@@ -0,0 +1,54 @@
+/*
+Copyright 2020 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 React from 'react';
+import {MatrixEvent} from "matrix-js-sdk/src/models/event";
+
+import { _t } from '../../../languageHandler';
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
+import EventTileBubble from "./EventTileBubble";
+
+interface IProps {
+    mxEvent: MatrixEvent;
+}
+
+const EncryptionEvent: React.FC<IProps> = ({mxEvent}) => {
+    const isRoomEncrypted = MatrixClientPeg.get().isRoomEncrypted(mxEvent.getRoomId());
+    if (mxEvent.getContent().algorithm === 'm.megolm.v1.aes-sha2' && isRoomEncrypted) {
+        return <EventTileBubble
+            className="mx_cryptoEvent mx_cryptoEvent_icon"
+            title={_t("Encryption enabled")}
+            subtitle={_t(
+                "Messages in this room are end-to-end encrypted. " +
+                "Learn more & verify this user in their user profile.",
+            )}
+        />;
+    } else if (isRoomEncrypted) {
+        return <EventTileBubble
+            className="mx_cryptoEvent mx_cryptoEvent_icon"
+            title={_t("Encryption enabled")}
+            subtitle={_t("Ignored attempt to disable encryption")}
+        />;
+    }
+
+    return <EventTileBubble
+        className="mx_cryptoEvent mx_cryptoEvent_icon mx_cryptoEvent_icon_warning"
+        title={_t("Encryption not enabled")}
+        subtitle={_t("The encryption used by this room isn't supported.")}
+    />;
+}
+
+export default EncryptionEvent;

From af71b0735dfc0f28d15040514f60ebac22cb7084 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 4 Nov 2020 17:24:03 +0000
Subject: [PATCH 022/146] Change icon for the Create Event bubble tile

---
 res/css/views/messages/_CreateEvent.scss | 11 +----------
 res/img/element-icons/chat-bubbles.svg   | 11 +++++++++++
 res/img/room-continuation.svg            |  6 ------
 3 files changed, 12 insertions(+), 16 deletions(-)
 create mode 100644 res/img/element-icons/chat-bubbles.svg
 delete mode 100644 res/img/room-continuation.svg

diff --git a/res/css/views/messages/_CreateEvent.scss b/res/css/views/messages/_CreateEvent.scss
index 1f75fb9693..1181a80d10 100644
--- a/res/css/views/messages/_CreateEvent.scss
+++ b/res/css/views/messages/_CreateEvent.scss
@@ -15,17 +15,8 @@ limitations under the License.
 */
 
 .mx_CreateEvent {
-    // override default EventTileBubble styling
-    padding-left: 80px !important;
-
     &::before {
         background-color: $primary-fg-color;
-        mask-image: url('$(res)/img/room-continuation.svg');
-        mask-repeat: no-repeat;
-        mask-position: center;
-        mask-size: 100%;
-        width: 72px !important;
-        height: 34px !important;
-        left: -64px !important;
+        mask-image: url('$(res)/img/element-icons/chat-bubbles.svg');
     }
 }
diff --git a/res/img/element-icons/chat-bubbles.svg b/res/img/element-icons/chat-bubbles.svg
new file mode 100644
index 0000000000..ac9db61f29
--- /dev/null
+++ b/res/img/element-icons/chat-bubbles.svg
@@ -0,0 +1,11 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.90964 11.5297C9.09231 11.5297 11.6724 8.94865 11.6724 5.76483C11.6724 2.581 9.09231 0 5.90964 0C2.72697 0 0.146904 2.581 0.146904 5.76483C0.146904 6.65678 0.3494 7.50142 0.710912 8.25525L0.0648767 10.3556C-0.171716 11.1248 0.550948 11.8442 1.31906 11.6041L3.39724 10.9544C4.15657 11.323 5.00898 11.5297 5.90964 11.5297Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.03851 12.8449C5.70399 13.1151 6.4314 13.2638 7.19345 13.2638C10.3676 13.2638 13.5 10.6832 13.5 7.49979C13.5 6.63255 13.2676 5.81005 12.8651 5.07227C14.6487 6.05071 15.8583 7.94999 15.8583 10.1326C15.8583 11.0243 15.6564 11.8688 15.2959 12.6224L15.9404 14.7232C16.1765 15.4926 15.4533 16.2114 14.6854 15.9708L12.6155 15.322C11.8585 15.6902 11.0088 15.8966 10.111 15.8966C7.91459 15.8966 6.00594 14.661 5.03851 12.8449Z" fill="black"/>
+</g>
+<defs>
+<clipPath id="clip0">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/res/img/room-continuation.svg b/res/img/room-continuation.svg
deleted file mode 100644
index dc7e15462a..0000000000
--- a/res/img/room-continuation.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="72" height="34" viewBox="0 0 72 34" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M1 7.26087V1H28.7889V7.26087M1 7.26087V33H28.7889V7.26087M1 7.26087H28.7889M4.16583 4.13043H16.8291" stroke="#454545" stroke-width="2" stroke-linejoin="round"/>
-<path d="M43.2109 7.26087V1H70.9999V7.26087M43.2109 7.26087V33H70.9999V7.26087M43.2109 7.26087H70.9999M46.3768 4.13043H59.0401" stroke="#454545" stroke-width="2" stroke-linejoin="round"/>
-<path d="M27.03 28.8262C34.2226 28.8262 36.0207 26.343 36.0207 25.1014V16.0996C36.0207 12.1264 43.6283 11.3401 47.432 11.4436" stroke="black" stroke-width="2"/>
-</svg>
-

From d90fcaaae1cf7bb96362265dec6ba4bbd317d870 Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Wed, 4 Nov 2020 15:57:30 +0000
Subject: [PATCH 023/146] Translated using Weblate (Albanian)

Currently translated at 99.7% (2375 of 2380 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
---
 src/i18n/strings/sq.json | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 3f4a79b3f6..148e373b98 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -2556,5 +2556,19 @@
     "Please go into as much detail as you like, so we can track down the problem.": "Ju lutemi, shkoni aq thellë sa doni, që të mund të ndjekim problemin.",
     "Tell us below how you feel about %(brand)s so far.": "Tregonani më poshtë se si ndiheni rreth %(brand)s deri këtu.",
     "Rate %(brand)s": "Vlerësojeni %(brand)s",
-    "Feedback sent": "Përshtypjet u dërguan"
+    "Feedback sent": "Përshtypjet u dërguan",
+    "Now, let's help you get started": "Tani, le t’ju ndihmojmë për t’ia filluar",
+    "Welcome %(name)s": "Mirë se vini %(name)s",
+    "Add a photo so people know it's you.": "Shtoni një foto, që njerëzit ta dinë se jeni ju.",
+    "Great, that'll help people know it's you": "Bukur, kjo do t’i ndihmojë njerëzit ta dinë se jeni ju",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Ftoni dikë duke përdorur emrin e tij, adresën email, emrin e përdoruesit (bie fjala, <userId/>) ose <a>ndani me të këtë dhomë</a>.",
+    "Start a conversation with someone using their name, email address or username (like <userId/>).": "Nisni një bisedë me dikë duke përdorur emrin e tij, adresën email ose emrin e përdoruesit (bie fjala, <userId/>).",
+    "Invite by email": "Ftojeni me email",
+    "Use the + to make a new room or explore existing ones below": "Përdorni + për të krijuar një dhomë të re ose eksploroni ato ekzistuese më poshtë",
+    "%(senderName)s ended the call": "%(senderName)s e përfundoi thirrjen",
+    "You ended the call": "E përfunduat thirrjen",
+    "New version of %(brand)s is available": "Ka gati një version të ri të %(brand)s",
+    "Update %(brand)s": "Përditësoni %(brand)s",
+    "Enable desktop notifications": "Aktivizoni njoftime desktopi",
+    "Don't miss a reply": "Mos humbni asnjë përgjigje"
 }

From 2fdfe9346f962abdb350ae0731f8ba90ad428370 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 4 Nov 2020 17:50:59 +0000
Subject: [PATCH 024/146] Update copy on the Encryption Enabled bubble tile and
 room creation ELS to cater better in general but specifically for DMs

---
 src/components/structures/MessagePanel.js     | 14 ++++++++---
 .../views/messages/EncryptionEvent.tsx        | 25 ++++++++++++++-----
 src/i18n/strings/en_EN.json                   |  6 +++--
 3 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index e2e3592536..9cf3eaaa9d 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -30,6 +30,7 @@ import {_t} from "../../languageHandler";
 import {haveTileForEvent} from "../views/rooms/EventTile";
 import {textForEvent} from "../../TextForEvent";
 import IRCTimelineProfileResizer from "../views/elements/IRCTimelineProfileResizer";
+import DMRoomMap from "../../utils/DMRoomMap";
 
 const CONTINUATION_MAX_INTERVAL = 5 * 60 * 1000; // 5 minutes
 const continuedTypes = ['m.sticker', 'm.room.message'];
@@ -952,15 +953,22 @@ class CreationGrouper {
         }).reduce((a, b) => a.concat(b), []);
         // Get sender profile from the latest event in the summary as the m.room.create doesn't contain one
         const ev = this.events[this.events.length - 1];
+
+        let summaryText;
+        const creator = ev.sender ? ev.sender.name : ev.getSender();
+        if (DMRoomMap.shared().getUserIdForRoomId(ev.getRoomId())) {
+            summaryText = _t("%(creator)s created this DM.", { creator });
+        } else {
+            summaryText = _t("%(creator)s created and configured the room.", { creator });
+        }
+
         ret.push(
             <EventListSummary
                  key="roomcreationsummary"
                  events={this.events}
                  onToggle={panel._onHeightChanged} // Update scroll state
                  summaryMembers={[ev.sender]}
-                 summaryText={_t("%(creator)s created and configured the room.", {
-                     creator: ev.sender ? ev.sender.name : ev.getSender(),
-                 })}
+                 summaryText={summaryText}
             >
                  { eventTiles }
             </EventListSummary>,
diff --git a/src/components/views/messages/EncryptionEvent.tsx b/src/components/views/messages/EncryptionEvent.tsx
index 9a6af9446f..7416cc3c9a 100644
--- a/src/components/views/messages/EncryptionEvent.tsx
+++ b/src/components/views/messages/EncryptionEvent.tsx
@@ -14,27 +14,40 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
+import React, {useContext} from 'react';
 import {MatrixEvent} from "matrix-js-sdk/src/models/event";
 
 import { _t } from '../../../languageHandler';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import EventTileBubble from "./EventTileBubble";
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import DMRoomMap from "../../../utils/DMRoomMap";
 
 interface IProps {
     mxEvent: MatrixEvent;
 }
 
 const EncryptionEvent: React.FC<IProps> = ({mxEvent}) => {
-    const isRoomEncrypted = MatrixClientPeg.get().isRoomEncrypted(mxEvent.getRoomId());
+    const cli = useContext(MatrixClientContext);
+    const roomId = mxEvent.getRoomId();
+    const isRoomEncrypted = MatrixClientPeg.get().isRoomEncrypted(roomId);
+
     if (mxEvent.getContent().algorithm === 'm.megolm.v1.aes-sha2' && isRoomEncrypted) {
+        let subtitle: string;
+        const dmPartner = DMRoomMap.shared().getUserIdForRoomId(roomId);
+        if (dmPartner) {
+            const displayName = cli?.getRoom(roomId)?.getMember(dmPartner)?.rawDisplayName || dmPartner;
+            subtitle = _t("Messages here are end-to-end encrypted. " +
+                "Verify %(displayName)s in their profile - tap on their avatar.", { displayName });
+        } else {
+            subtitle = _t("Messages in this room are end-to-end encrypted. " +
+                "When people join, you can verify them in their profile, just tap on their avatar.");
+        }
+
         return <EventTileBubble
             className="mx_cryptoEvent mx_cryptoEvent_icon"
             title={_t("Encryption enabled")}
-            subtitle={_t(
-                "Messages in this room are end-to-end encrypted. " +
-                "Learn more & verify this user in their user profile.",
-            )}
+            subtitle={subtitle}
         />;
     } else if (isRoomEncrypted) {
         return <EventTileBubble
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index a56e22e5fc..8b976c144e 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1381,8 +1381,9 @@
     "Today": "Today",
     "Yesterday": "Yesterday",
     "View Source": "View Source",
+    "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.",
+    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.",
     "Encryption enabled": "Encryption enabled",
-    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.",
     "Ignored attempt to disable encryption": "Ignored attempt to disable encryption",
     "Encryption not enabled": "Encryption not enabled",
     "The encryption used by this room isn't supported.": "The encryption used by this room isn't supported.",
@@ -1428,8 +1429,8 @@
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s changed the avatar for %(roomName)s",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removed the room avatar.",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s changed the room avatar to <img/>",
-    "This room is a continuation of another conversation.": "This room is a continuation of another conversation.",
     "Click here to see older messages.": "Click here to see older messages.",
+    "This room is a continuation of another conversation.": "This room is a continuation of another conversation.",
     "Copied!": "Copied!",
     "Failed to copy": "Failed to copy",
     "Add an Integration": "Add an Integration",
@@ -2079,6 +2080,7 @@
     "Data from an older version of %(brand)s has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Data from an older version of %(brand)s has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.",
     "Self-verification request": "Self-verification request",
     "Logout": "Logout",
+    "%(creator)s created this DM.": "%(creator)s created this DM.",
     "%(creator)s created and configured the room.": "%(creator)s created and configured the room.",
     "Your Communities": "Your Communities",
     "Did you know: you can use communities to filter your %(brand)s experience!": "Did you know: you can use communities to filter your %(brand)s experience!",

From b035909239f92f6b3a52609fee3cd009e4f52332 Mon Sep 17 00:00:00 2001
From: Atalonica <auri97@gmail.com>
Date: Wed, 4 Nov 2020 19:11:23 +0000
Subject: [PATCH 025/146] Translated using Weblate (Catalan)

Currently translated at 29.0% (692 of 2380 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ca/
---
 src/i18n/strings/ca.json | 70 ++++++++++++++++++++--------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index 6b954da9f2..3144d3ed65 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -29,7 +29,7 @@
     "Search": "Cerca",
     "powered by Matrix": "amb tecnologia de Matrix",
     "Edit": "Edita",
-    "Unpin Message": "Desenganxa el missatge",
+    "Unpin Message": "Anul·la la fixació de missatge",
     "Register": "Registre",
     "Rooms": "Sales",
     "Add rooms to this community": "Afegeix sales a aquesta comunitat",
@@ -97,7 +97,7 @@
     "Failed to invite": "No s'ha pogut tramitar la invitació",
     "Failed to invite the following users to the %(roomName)s room:": "No s'ha pogut convidar a la sala %(roomName)s els següents usuaris:",
     "You need to be logged in.": "És necessari estar autenticat.",
-    "You need to be able to invite users to do that.": "Per poder fer això, heu de poder convidar a altres usuaris.",
+    "You need to be able to invite users to do that.": "Per poder fer això, necessites poder convidar a usuaris.",
     "Unable to create widget.": "No s'ha pogut crear el giny.",
     "Failed to send request.": "No s'ha pogut enviar la sol·licitud.",
     "This room is not recognised.": "No es reconeix aquesta sala.",
@@ -108,7 +108,7 @@
     "Room %(roomId)s not visible": "La sala %(roomId)s no és visible",
     "Missing user_id in request": "Falta l'user_id a la vostra sol·licitud",
     "Usage": "Ús",
-    "/ddg is not a command": "/ddg no és un comandament",
+    "/ddg is not a command": "/ddg no és una ordre",
     "To use it, just wait for autocomplete results to load and tab through them.": "Per utilitzar-lo, simplement espereu que es completin els resultats automàticament i seleccioneu-ne el desitjat.",
     "Ignored user": "Usuari ignorat",
     "You are now ignoring %(userId)s": "Esteu ignorant l'usuari %(userId)s",
@@ -122,7 +122,7 @@
     "%(senderName)s requested a VoIP conference.": "%(senderName)s ha sol·licitat una conferència VoIP.",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s ha convidat a %(targetName)s.",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s ha expulsat a %(targetName)s.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s ha establert %(displayName)s com el seu nom visible.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s han establert el seu nom visible a %(displayName)s.",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s ha retirat el seu nom visible %(oldDisplayName)s.",
     "%(senderName)s removed their profile picture.": "%(senderName)s ha retirat la seva foto de perfil.",
     "%(senderName)s changed their profile picture.": "%(senderName)s ha canviat la seva foto de perfil.",
@@ -148,7 +148,7 @@
     "%(senderName)s ended the call.": "%(senderName)s ha penjat.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s ha convidat a %(targetDisplayName)s a entrar a la sala.",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s ha fet visible l'històric futur de la sala per a tots els membres, a partir de que hi són convidats.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s ha fet visible l'històric futur de la sala a tots els membres, des de que entren a la sala.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s ha establert la visibilitat de l'històric futur de la sala a tots els membres des de que s'hi uneixen.",
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s ha fet visible l'històric futur de la sala a tots els membres de la sala.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s ha fet visible el futur historial de la sala per a tothom.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s ha fet visible el futur historial de la sala per a desconeguts (%(visibility)s).",
@@ -204,7 +204,7 @@
     "Cannot add any more widgets": "No s'ha pogut afegir cap més giny",
     "The maximum permitted number of widgets have already been added to this room.": "Ja s'han afegit el màxim de ginys permesos en aquesta sala.",
     "Drop File Here": "Deixeu anar un fitxer aquí",
-    "Drop file here to upload": "Deixeu anar un arxiu aquí per pujar-lo",
+    "Drop file here to upload": "Deixa anar l'arxiu aquí per pujar-lo",
     " (unsupported)": " (incompatible)",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Uneix-te com <voiceText>voice</voiceText> o <videoText>video</videoText>.",
     "Ongoing conference call%(supportedText)s.": "Trucada de conferència en curs %(supportedText)s.",
@@ -226,9 +226,9 @@
     "Failed to ban user": "No s'ha pogut expulsar l'usuari",
     "Failed to mute user": "No s'ha pogut silenciar l'usuari",
     "Failed to change power level": "No s'ha pogut canviar el nivell de poders",
-    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "No podreu desfer aquest canvi ja que estareu baixant de grau de privilegis. Només un altre usuari amb més privilegis podrà fer que els recupereu.",
-    "Are you sure?": "Esteu segur?",
-    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "No podreu desfer aquesta acció ja que esteu donant al usuari el mateix nivell de privilegi que el vostre.",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "No podràs desfer aquest canvi ja que t'estàs baixant de rang, si ets l'últim usuari de la sala amb privilegis, et serà impossible recuperar-los.",
+    "Are you sure?": "Estàs segur?",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "No podràs desfer aquest canvi ja que estàs donant a l'usuari el mateix nivell de privilegis que el teu.",
     "Unignore": "Deixa de ignorar",
     "Ignore": "Ignora",
     "Jump to read receipt": "Vés a l'últim missatge llegit",
@@ -248,11 +248,11 @@
     "Upload file": "Puja un fitxer",
     "Send an encrypted reply…": "Envia una resposta xifrada…",
     "Send an encrypted message…": "Envia un missatge xifrat…",
-    "You do not have permission to post to this room": "No teniu el permís per escriure en aquesta sala",
-    "Server error": "S'ha produït un error al servidor",
-    "Mirror local video feed": "Mostra el vídeo local com un mirall",
+    "You do not have permission to post to this room": "No tens permís per enviar res en aquesta sala",
+    "Server error": "Error del servidor",
+    "Mirror local video feed": "Remet el flux de vídeo local",
     "Server unavailable, overloaded, or something else went wrong.": "El servidor no està disponible, està sobrecarregat o alguna altra cosa no ha funcionat correctament.",
-    "Command error": "S'ha produït un error en l'ordre",
+    "Command error": "Error en l'ordre",
     "Jump to message": "Salta al missatge",
     "No pinned messages.": "No hi ha cap missatge fixat.",
     "Loading...": "S'està carregant...",
@@ -263,15 +263,15 @@
     "%(duration)sd": "%(duration)sd",
     "Online for %(duration)s": "En línia durant %(duration)s",
     "Idle for %(duration)s": "Inactiu durant %(duration)s",
-    "Offline for %(duration)s": "Desconnectat durant %(duration)s",
+    "Offline for %(duration)s": "Fora de línia durant %(duration)s",
     "Unknown for %(duration)s": "Desconegut durant %(duration)s",
-    "Online": "Conectat",
+    "Online": "En línia",
     "Idle": "Inactiu",
-    "Offline": "Desconnectat",
+    "Offline": "Fora de línia",
     "Unknown": "Desconegut",
     "Replying": "S'està contestant",
     "Seen by %(userName)s at %(dateTime)s": "Vist per %(userName)s a les %(dateTime)s",
-    "No rooms to show": "No hi ha cap sala per a mostrar",
+    "No rooms to show": "No hi ha sales per mostrar",
     "Unnamed room": "Sala sense nom",
     "Save": "Desa",
     "(~%(count)s results)|other": "(~%(count)s resultats)",
@@ -326,9 +326,9 @@
     "Invalid file%(extra)s": "Fitxer invàlid%(extra)s",
     "Error decrypting image": "S'ha produït un error en desxifrar la imatge",
     "Error decrypting video": "S'ha produït un error en desxifrar el vídeo",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s ha canviat el seu avatar per a la sala %(roomName)s",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s ha canviat l'avatar de %(roomName)s",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s ha eliminat l'avatar de la sala.",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s ha canviat l'avatar de la sala per aquest <img/>",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s ha canviat l'avatar de la sala a <img/>",
     "Copied!": "Copiat!",
     "Failed to copy": "No s'ha pogut copiar",
     "Add an Integration": "Afegeix una integració",
@@ -349,10 +349,10 @@
     "Failed to remove user from community": "No s'ha pogut treure l'usuari de la comunitat",
     "Filter community members": "Filtra els membres de la comunitat",
     "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Esteu segur que voleu treure l'usuari '%(roomName)s' del grup %(groupId)s?",
-    "<a>In reply to</a> <pill>": "<a>In reply to</a> <pill>",
+    "<a>In reply to</a> <pill>": "<a>En resposta a</a> <pill>",
     "Removing a room from the community will also remove it from the community page.": "L'eliminació d'una sala de la comunitat també l'eliminarà de la pàgina de la comunitat.",
     "Failed to remove room from community": "No s'ha pogut eliminar la sala de la comunitat",
-    "Failed to remove '%(roomName)s' from %(groupId)s": "No s'ha pogut treure la sala '%(roomName)s' de la comunitat %(groupId)s",
+    "Failed to remove '%(roomName)s' from %(groupId)s": "No s'ha pogut eliminar '%(roomName)s' de %(groupId)s",
     "Something went wrong!": "Alguna cosa ha anat malament!",
     "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "No s'ha pogut actualitzar la visibilitat de la sala '%(roomName)s' de la comunitat %(groupId)s.",
     "Visibility in Room List": "Visibilitat a la llista de les sales",
@@ -372,12 +372,12 @@
     "Home": "Inici",
     "Manage Integrations": "Gestiona les integracions",
     "%(nameList)s %(transitionList)s": "%(transitionList)s%(nameList)s",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s han entrat",
+    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s s'hi han unit",
     "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s s'ha unit",
     "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s han sortit",
     "%(oneUser)sleft %(count)s times|one": "%(oneUser)s ha sortit",
-    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s s'han unit i han sortit %(count)s vegades",
-    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s s'han unit i han sortit",
+    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s s'hi han unit i han sortit %(count)s vegades",
+    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s s'hi han unit i han sortit",
     "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s ha entrat i ha sortit %(count)s vegades",
     "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s ha entrat i ha sortit",
     "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s han sortit i han tornat a entrar %(count)s vegades",
@@ -388,10 +388,10 @@
     "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s han rebutjat les seves invitacions",
     "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s ha rebutjat la seva invitació %(count)s vegades",
     "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s ha rebutjat la seva invitació",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "a %(severalUsers)s els hi han retirat les seves invitacions %(count)s vegades",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "a %(severalUsers)s els hi han retirat les seves invitacions",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "a %(oneUser)s li han retirat la seva invitació %(count)s vegades",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "a %(oneUser)s li han retirat la seva invitació",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "S'han retirat les invitacions de %(severalUsers)s %(count)s vegades",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "S'han retirat les invitacions de %(severalUsers)s",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "S'ha retirat la invitació de %(oneUser)s %(count)s vegades",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "S'ha retirat la invitació de %(oneUser)s",
     "were invited %(count)s times|other": "a sigut invitat %(count)s vegades",
     "were invited %(count)s times|one": "han sigut convidats",
     "was invited %(count)s times|other": "ha sigut convidat %(count)s vegades",
@@ -410,7 +410,7 @@
     "was kicked %(count)s times|one": "l'han fet fora",
     "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s han canviat el seu nom %(count)s vegades",
     "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s han canviat el seu nom",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s han canviat el seu nom %(count)s vegades",
+    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s ha canviat el seu nom %(count)s vegades",
     "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s ha canviat el seu nom",
     "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)s han canviat el seu avatar %(count)s vegades",
     "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)s han canviat el seu avatar",
@@ -426,7 +426,7 @@
     "ex. @bob:example.com": "per exemple @carles:exemple.cat",
     "Add User": "Afegeix un usuari",
     "Matrix ID": "ID de Matrix",
-    "Matrix Room ID": "ID de sala de Matrix",
+    "Matrix Room ID": "ID de la sala de Matrix",
     "email address": "correu electrònic",
     "Try using one of the following valid address types: %(validTypesList)s.": "Proveu d'utilitzar un dels següents tipus d'adreça vàlids: %(validTypesList)s.",
     "You have entered an invalid address.": "No heu introduït una adreça vàlida.",
@@ -456,7 +456,7 @@
     "An error has occurred.": "S'ha produït un error.",
     "Unable to restore session": "No s'ha pogut restaurar la sessió",
     "Invalid Email Address": "El correu electrònic no és vàlid",
-    "This doesn't appear to be a valid email address": "Aquest no sembla ser un correu electrònic vàlid",
+    "This doesn't appear to be a valid email address": "Sembla que aquest correu electrònic no és vàlid",
     "Verification Pending": "Verificació pendent",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Reviseu el vostre correu electrònic i feu clic a l'enllaç que conté. Un cop fet això, feu clic a Continua.",
     "Unable to add email address": "No s'ha pogut afegir el correu electrònic",
@@ -506,7 +506,7 @@
     "%(inviter)s has invited you to join this community": "%(inviter)s vos convida a unir-vos a aquesta comunitat",
     "You are an administrator of this community": "Sou un administrador d'aquesta comunitat",
     "You are a member of this community": "Sou un membre d'aquesta comunitat",
-    "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Esteu a punt de ser portat a un lloc de tercers perquè pugui autenticar-se amb el vostre compte per utilitzar-lo amb %(integrationsUrl)s. Voleu continuar?",
+    "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Estàs a punt de ser redirigit a una web de tercers per autenticar el teu compte i poder ser utilitzat amb %(integrationsUrl)s. Vols continuar?",
     "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "La vostra comunitat no té una descripció llarga, una pàgina HTML per mostrar als membres de la comunitat. <br />Feu clic aquí per obrir la configuració i donar-ne una!",
     "Long Description (HTML)": "Descripció llarga (HTML)",
     "Description": "Descripció",
@@ -556,7 +556,7 @@
     "Sign out": "Tanca la sessió",
     "Import E2E room keys": "Importar claus E2E de sala",
     "Cryptography": "Criptografia",
-    "Labs": "Laboraroris",
+    "Labs": "Laboratoris",
     "%(brand)s version:": "Versió de %(brand)s:",
     "olm version:": "Versió d'olm:",
     "Incorrect username and/or password.": "Usuari i/o contrasenya incorrectes.",
@@ -653,7 +653,7 @@
     "Enable them now": "Habilita-ho ara",
     "Toolbox": "Caixa d'eines",
     "Collecting logs": "S'estan recopilant els registres",
-    "You must specify an event type!": "Heu d'especificar un tipus d'esdeveniment",
+    "You must specify an event type!": "Has d'especificar un tipus d'esdeveniment!",
     "(HTTP status %(httpStatus)s)": "(Estat de l´HTTP %(httpStatus)s)",
     "All Rooms": "Totes les sales",
     "State Key": "Clau d'estat",
@@ -702,7 +702,7 @@
     "Pin Message": "Enganxa el missatge",
     "Failed to change settings": "No s'han pogut modificar els paràmetres",
     "View Community": "Mira la communitat",
-    "Event sent!": "S'ha enviat l'esdeveniment",
+    "Event sent!": "Esdeveniment enviat!",
     "Event Content": "Contingut de l'esdeveniment",
     "Thank you!": "Gràcies!",
     "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!": "Amb el vostre navegador actual, l'aparença de l'aplicació pot ser completament incorrecta i algunes o totes les funcions poden no funcionar correctament. Si voleu provar-ho de totes maneres, podeu continuar, però esteu sols pel que fa als problemes que pugueu trobar!",

From 7581266839ce7339a1b642f1f322d150c8a21118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Wed, 4 Nov 2020 17:54:06 +0000
Subject: [PATCH 026/146] Translated using Weblate (Estonian)

Currently translated at 100.0% (2380 of 2380 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
---
 src/i18n/strings/et.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index f384c9e40d..ad52b7df6a 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -2571,5 +2571,9 @@
     "New version of %(brand)s is available": "%(brand)s ralenduse uus versioon on saadaval",
     "Update %(brand)s": "Uuenda %(brand)s rakendust",
     "Enable desktop notifications": "Võta kasutusele töölauakeskkonna teavitused",
-    "Don't miss a reply": "Ära jäta vastust vahele"
+    "Don't miss a reply": "Ära jäta vastust vahele",
+    "Now, let's help you get started": "Nüüd näitame sulle, mida saad järgmiseks teha",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Kutsu teist osapoolt tema nime, e-posti aadressi, kasutajanime (nagu <userId/>) alusel või <a>jaga seda jututuba</a>.",
+    "Start a conversation with someone using their name, email address or username (like <userId/>).": "Alusta vestlust kasutades teise osapoole nime, e-posti aadressi või kasutajanime (näiteks <userId/>).",
+    "Invite by email": "Saada kutse e-kirjaga"
 }

From 90bbc082dcf219fad301c6b3b63b41174743fc0e Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Thu, 5 Nov 2020 09:25:52 +0000
Subject: [PATCH 027/146] Copyright

Co-authored-by: Travis Ralston <travpc@gmail.com>
---
 res/css/views/voip/_VideoFeed.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/voip/_VideoFeed.scss b/res/css/views/voip/_VideoFeed.scss
index 0f5e46dae5..e5e3587dac 100644
--- a/res/css/views/voip/_VideoFeed.scss
+++ b/res/css/views/voip/_VideoFeed.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 2015, 2016, 2020 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.

From 9be3ce928fb358144a193f1a978a88165779847d Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 5 Nov 2020 09:47:09 +0000
Subject: [PATCH 028/146] explicitly retuen null

and also sort out formatting from a different time
---
 src/CallHandler.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/CallHandler.tsx b/src/CallHandler.tsx
index 5fb7197283..aefa66ecc5 100644
--- a/src/CallHandler.tsx
+++ b/src/CallHandler.tsx
@@ -103,8 +103,11 @@ function getRemoteAudioElement(): HTMLAudioElement {
     // Might as well just use DOM.
     const remoteAudioElement = document.getElementById("remoteAudio") as HTMLAudioElement;
     if (!remoteAudioElement) {
-        console.error("Failed to find remoteAudio element - cannot play audio!"
-            + "You need to add an <audio/> to the DOM.");
+        console.error(
+            "Failed to find remoteAudio element - cannot play audio!" +
+            "You need to add an <audio/> to the DOM.",
+        );
+        return null;
     }
     return remoteAudioElement;
 }

From 5cccb2848e6d6717c8db6fa05a15793206767b22 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 5 Nov 2020 09:49:14 +0000
Subject: [PATCH 029/146] make quotes consistent

---
 src/SlashCommands.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx
index 8cda290d07..4f1759b15e 100644
--- a/src/SlashCommands.tsx
+++ b/src/SlashCommands.tsx
@@ -1045,7 +1045,7 @@ export const Commands = [
     }),
     new Command({
         command: "holdcall",
-        description: _td('Places the call in the current room on hold'),
+        description: _td("Places the call in the current room on hold"),
         category: CommandCategories.other,
         runFn: function(roomId, args) {
             const call = CallHandler.sharedInstance().getCallForRoom(roomId);
@@ -1058,7 +1058,7 @@ export const Commands = [
     }),
     new Command({
         command: "unholdcall",
-        description: _td('Takes the call in the current room off hold'),
+        description: _td("Takes the call in the current room off hold"),
         category: CommandCategories.other,
         runFn: function(roomId, args) {
             const call = CallHandler.sharedInstance().getCallForRoom(roomId);

From 9f456a2acf97f73e3e06ae59377dc80027da8bfd Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 5 Nov 2020 09:50:12 +0000
Subject: [PATCH 030/146] accidentally committed commenting

---
 src/components/views/elements/AppTile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 595f1fcee7..f3ebe24c15 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -163,7 +163,7 @@ export default class AppTile extends React.Component {
         if (ref) {
             this._sgWidget.start(ref);
         } else {
-            //this._resetWidget(this.props);
+            this._resetWidget(this.props);
         }
     };
 

From 6953aed70a9548e145b669bb4412a269b50404ec Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Thu, 5 Nov 2020 09:51:02 +0000
Subject: [PATCH 031/146] Copyright

Co-authored-by: Travis Ralston <travpc@gmail.com>
---
 src/components/views/voip/VideoFeed.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/views/voip/VideoFeed.tsx b/src/components/views/voip/VideoFeed.tsx
index ee6305c79c..9dba9fa9c8 100644
--- a/src/components/views/voip/VideoFeed.tsx
+++ b/src/components/views/voip/VideoFeed.tsx
@@ -1,6 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2015, 2016, 2019 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.
@@ -79,4 +78,3 @@ export default class VideoFeed extends React.Component<IProps> {
         </div>;
     }
 }
-

From 2594ff8e803b5eb6d9125ddad50698172bde0eee Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 5 Nov 2020 15:39:22 +0000
Subject: [PATCH 032/146] Remove old isAlone checker

---
 res/css/structures/_RoomStatusBar.scss     | 10 -----
 src/components/structures/RoomStatusBar.js | 30 +-------------
 src/components/structures/RoomView.tsx     | 46 +++-------------------
 3 files changed, 7 insertions(+), 79 deletions(-)

diff --git a/res/css/structures/_RoomStatusBar.scss b/res/css/structures/_RoomStatusBar.scss
index cd4390ee5c..2d5359c0eb 100644
--- a/res/css/structures/_RoomStatusBar.scss
+++ b/res/css/structures/_RoomStatusBar.scss
@@ -153,16 +153,6 @@ limitations under the License.
     display: block;
 }
 
-.mx_RoomStatusBar_isAlone {
-    height: 50px;
-    line-height: $font-50px;
-
-    color: $primary-fg-color;
-    opacity: 0.5;
-    overflow-y: hidden;
-    display: block;
-}
-
 .mx_MatrixChat_useCompactLayout {
     .mx_RoomStatusBar {
         min-height: 40px;
diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index e390be6979..e6d2985073 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -41,9 +41,6 @@ export default class RoomStatusBar extends React.Component {
     static propTypes = {
         // the room this statusbar is representing.
         room: PropTypes.object.isRequired,
-        // This is true when the user is alone in the room, but has also sent a message.
-        // Used to suggest to the user to invite someone
-        sentMessageAndIsAlone: PropTypes.bool,
 
         // The active call in the room, if any (means we show the call bar
         // along with the status of the call)
@@ -68,10 +65,6 @@ export default class RoomStatusBar extends React.Component {
         // 'you are alone' bar
         onInviteClick: PropTypes.func,
 
-        // callback for when the user clicks on the 'stop warning me' button in the
-        // 'you are alone' bar
-        onStopWarningClick: PropTypes.func,
-
         // callback for when we do something that changes the size of the
         // status bar. This is used to trigger a re-layout in the parent
         // component.
@@ -159,10 +152,7 @@ export default class RoomStatusBar extends React.Component {
     // changed - so we use '0' to indicate normal size, and other values to
     // indicate other sizes.
     _getSize() {
-        if (this._shouldShowConnectionError() ||
-            this._showCallBar() ||
-            this.props.sentMessageAndIsAlone
-        ) {
+        if (this._shouldShowConnectionError() || this._showCallBar()) {
             return STATUS_BAR_EXPANDED;
         } else if (this.state.unsentMessages.length > 0) {
             return STATUS_BAR_EXPANDED_LARGE;
@@ -325,24 +315,6 @@ export default class RoomStatusBar extends React.Component {
             );
         }
 
-        // If you're alone in the room, and have sent a message, suggest to invite someone
-        if (this.props.sentMessageAndIsAlone && !this.props.isPeeking) {
-            return (
-                <div className="mx_RoomStatusBar_isAlone">
-                    { _t("There's no one else here! Would you like to <inviteText>invite others</inviteText> " +
-                            "or <nowarnText>stop warning about the empty room</nowarnText>?",
-                        {},
-                        {
-                            'inviteText': (sub) =>
-                                <a className="mx_RoomStatusBar_resend_link" key="invite" onClick={this.props.onInviteClick}>{ sub }</a>,
-                            'nowarnText': (sub) =>
-                                <a className="mx_RoomStatusBar_resend_link" key="nowarn" onClick={this.props.onStopWarningClick}>{ sub }</a>,
-                        },
-                    ) }
-                </div>
-            );
-        }
-
         return null;
     }
 
diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index 0cb4a5d305..8618e930d5 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -150,7 +150,6 @@ export interface IState {
     guestsCanJoin: boolean;
     canPeek: boolean;
     showApps: boolean;
-    isAlone: boolean;
     isPeeking: boolean;
     showingPinned: boolean;
     showReadReceipts: boolean;
@@ -223,7 +222,6 @@ export default class RoomView extends React.Component<IProps, IState> {
             guestsCanJoin: false,
             canPeek: false,
             showApps: false,
-            isAlone: false,
             isPeeking: false,
             showingPinned: false,
             showReadReceipts: true,
@@ -705,9 +703,8 @@ export default class RoomView extends React.Component<IProps, IState> {
 
     private onAction = payload => {
         switch (payload.action) {
-            case 'message_send_failed':
             case 'message_sent':
-                this.checkIfAlone(this.state.room);
+                this.checkDesktopNotifications();
                 break;
             case 'post_sticker_message':
                 this.injectSticker(
@@ -1025,36 +1022,15 @@ export default class RoomView extends React.Component<IProps, IState> {
     }
 
     // rate limited because a power level change will emit an event for every member in the room.
-    private updateRoomMembers = rateLimitedFunc((dueToMember) => {
+    private updateRoomMembers = rateLimitedFunc(() => {
         this.updateDMState();
-
-        let memberCountInfluence = 0;
-        if (dueToMember && dueToMember.membership === "invite" && this.state.room.getInvitedMemberCount() === 0) {
-            // A member got invited, but the room hasn't detected that change yet. Influence the member
-            // count by 1 to counteract this.
-            memberCountInfluence = 1;
-        }
-        this.checkIfAlone(this.state.room, memberCountInfluence);
-
         this.updateE2EStatus(this.state.room);
     }, 500);
 
-    private checkIfAlone(room: Room, countInfluence?: number) {
-        let warnedAboutLonelyRoom = false;
-        if (localStorage) {
-            warnedAboutLonelyRoom = Boolean(localStorage.getItem('mx_user_alone_warned_' + this.state.room.roomId));
-        }
-        if (warnedAboutLonelyRoom) {
-            if (this.state.isAlone) this.setState({isAlone: false});
-            return;
-        }
-
-        let joinedOrInvitedMemberCount = room.getJoinedMemberCount() + room.getInvitedMemberCount();
-        if (countInfluence) joinedOrInvitedMemberCount += countInfluence;
-        this.setState({isAlone: joinedOrInvitedMemberCount === 1});
-
-        // if they are not alone additionally prompt the user about notifications so they don't miss replies
-        if (joinedOrInvitedMemberCount > 1 && Notifier.shouldShowPrompt()) {
+    private checkDesktopNotifications() {
+        const memberCount = this.state.room.getJoinedMemberCount() + this.state.room.getInvitedMemberCount();
+        // if they are not alone prompt the user about notifications so they don't miss replies
+        if (memberCount > 1 && Notifier.shouldShowPrompt()) {
             showNotificationsToast(true);
         }
     }
@@ -1091,14 +1067,6 @@ export default class RoomView extends React.Component<IProps, IState> {
             action: 'view_invite',
             roomId: this.state.room.roomId,
         });
-        this.setState({isAlone: false}); // there's a good chance they'll invite someone
-    };
-
-    private onStopAloneWarningClick = () => {
-        if (localStorage) {
-            localStorage.setItem('mx_user_alone_warned_' + this.state.room.roomId, String(true));
-        }
-        this.setState({isAlone: false});
     };
 
     private onJoinButtonClicked = () => {
@@ -1797,12 +1765,10 @@ export default class RoomView extends React.Component<IProps, IState> {
             isStatusAreaExpanded = this.state.statusBarVisible;
             statusBar = <RoomStatusBar
                 room={this.state.room}
-                sentMessageAndIsAlone={this.state.isAlone}
                 callState={this.state.callState}
                 callType={activeCall ? activeCall.type : null}
                 isPeeking={myMembership !== "join"}
                 onInviteClick={this.onInviteButtonClick}
-                onStopWarningClick={this.onStopAloneWarningClick}
                 onVisible={this.onStatusBarVisible}
                 onHidden={this.onStatusBarHidden}
             />;

From 0a42853a2534b410807933d5d529bd178eff93ad Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 5 Nov 2020 15:39:37 +0000
Subject: [PATCH 033/146] Fix centering of bubble event tile

---
 res/css/views/rooms/_EventTile.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 18eb581776..80ede1152d 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -122,9 +122,9 @@ $left-gutter: 64px;
     grid-template-columns: 1fr 100px;
 
     .mx_EventTile_line {
-        margin-right: 0px;
+        margin-right: 0;
         grid-column: 1 / 3;
-        padding: 0;
+        padding: 0 !important;
     }
 
     .mx_EventTile_msgOption {

From 6aeea3e38e0ba6f8b6a2467b293f69148ee7c2e4 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 5 Nov 2020 15:42:45 +0000
Subject: [PATCH 034/146] Extract MiniAvatarUploader into a reusable component

---
 res/css/_components.scss                      |  1 +
 res/css/structures/_HomePage.scss             | 36 +-------
 .../views/elements/_MiniAvatarUploader.scss   | 56 ++++++++++++
 src/components/structures/HomePage.tsx        | 60 +++----------
 .../views/elements/MiniAvatarUploader.tsx     | 90 +++++++++++++++++++
 5 files changed, 159 insertions(+), 84 deletions(-)
 create mode 100644 res/css/views/elements/_MiniAvatarUploader.scss
 create mode 100644 src/components/views/elements/MiniAvatarUploader.tsx

diff --git a/res/css/_components.scss b/res/css/_components.scss
index af3589a415..860b0f126e 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -115,6 +115,7 @@
 @import "./views/elements/_InfoTooltip.scss";
 @import "./views/elements/_InlineSpinner.scss";
 @import "./views/elements/_ManageIntegsButton.scss";
+@import "./views/elements/_MiniAvatarUploader.scss";
 @import "./views/elements/_PowerSelector.scss";
 @import "./views/elements/_ProgressBar.scss";
 @import "./views/elements/_QRCode.scss";
diff --git a/res/css/structures/_HomePage.scss b/res/css/structures/_HomePage.scss
index 2077582a7d..45aa34d3b5 100644
--- a/res/css/structures/_HomePage.scss
+++ b/res/css/structures/_HomePage.scss
@@ -50,42 +50,8 @@ limitations under the License.
         color: $muted-fg-color;
     }
 
-    .mx_HomePage_userAvatar {
-        position: relative;
-        width: min-content;
+    .mx_MiniAvatarUploader {
         margin: 0 auto;
-
-        &::before, &::after {
-            content: '';
-            position: absolute;
-
-            height: 26px;
-            width: 26px;
-
-            right: -6px;
-            bottom: -6px;
-        }
-
-        &::before {
-            background-color: $primary-bg-color;
-            border-radius: 50%;
-            z-index: 1;
-        }
-
-        &::after {
-            background-color: $secondary-fg-color;
-            mask-position: center;
-            mask-repeat: no-repeat;
-            mask-image: url('$(res)/img/element-icons/camera.svg');
-            mask-size: 16px;
-            z-index: 2;
-        }
-
-        &.mx_HomePage_userAvatar_busy::after {
-            background: url("$(res)/img/spinner.gif") no-repeat center;
-            background-size: 80%;
-            mask: unset;
-        }
     }
 
     .mx_HomePage_default_buttons {
diff --git a/res/css/views/elements/_MiniAvatarUploader.scss b/res/css/views/elements/_MiniAvatarUploader.scss
new file mode 100644
index 0000000000..2502977331
--- /dev/null
+++ b/res/css/views/elements/_MiniAvatarUploader.scss
@@ -0,0 +1,56 @@
+/*
+Copyright 2020 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.
+*/
+
+.mx_MiniAvatarUploader {
+    position: relative;
+    width: min-content;
+
+    &::before, &::after {
+        content: '';
+        position: absolute;
+
+        height: 26px;
+        width: 26px;
+
+        right: -6px;
+        bottom: -6px;
+    }
+
+    &::before {
+        background-color: $primary-bg-color;
+        border-radius: 50%;
+        z-index: 1;
+    }
+
+    &::after {
+        background-color: $secondary-fg-color;
+        mask-position: center;
+        mask-repeat: no-repeat;
+        mask-image: url('$(res)/img/element-icons/camera.svg');
+        mask-size: 16px;
+        z-index: 2;
+    }
+
+    &.mx_MiniAvatarUploader_busy::after {
+        background: url("$(res)/img/spinner.gif") no-repeat center;
+        background-size: 80%;
+        mask: unset;
+    }
+}
+
+.mx_MiniAvatarUploader_input {
+    display: none;
+}
diff --git a/src/components/structures/HomePage.tsx b/src/components/structures/HomePage.tsx
index 8058ddad93..d11944e470 100644
--- a/src/components/structures/HomePage.tsx
+++ b/src/components/structures/HomePage.tsx
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import * as React from "react";
-import {useContext, useRef, useState} from "react";
+import {useContext, useState} from "react";
 
 import AutoHideScrollbar from './AutoHideScrollbar';
 import {getHomePageUrl} from "../../utils/pages";
@@ -24,16 +24,13 @@ import SdkConfig from "../../SdkConfig";
 import * as sdk from "../../index";
 import dis from "../../dispatcher/dispatcher";
 import {Action} from "../../dispatcher/actions";
-import {Transition} from "react-transition-group";
 import BaseAvatar from "../views/avatars/BaseAvatar";
 import {OwnProfileStore} from "../../stores/OwnProfileStore";
 import AccessibleButton from "../views/elements/AccessibleButton";
-import Tooltip from "../views/elements/Tooltip";
 import {UPDATE_EVENT} from "../../stores/AsyncStore";
 import {useEventEmitter} from "../../hooks/useEventEmitter";
 import MatrixClientContext from "../../contexts/MatrixClientContext";
-import classNames from "classnames";
-import {ENTERING} from "react-transition-group/Transition";
+import MiniAvatarUploader, {AVATAR_SIZE} from "../views/elements/MiniAvatarUploader";
 
 const onClickSendDm = () => dis.dispatch({action: 'view_create_chat'});
 const onClickExplore = () => dis.fire(Action.ViewRoomDirectory);
@@ -43,11 +40,9 @@ interface IProps {
     justRegistered?: boolean;
 }
 
-const avatarSize = 52;
-
 const getOwnProfile = (userId: string) => ({
     displayName: OwnProfileStore.instance.displayName || userId,
-    avatarUrl: OwnProfileStore.instance.getHttpAvatarUrl(avatarSize),
+    avatarUrl: OwnProfileStore.instance.getHttpAvatarUrl(AVATAR_SIZE),
 });
 
 const UserWelcomeTop = () => {
@@ -57,56 +52,23 @@ const UserWelcomeTop = () => {
     useEventEmitter(OwnProfileStore.instance, UPDATE_EVENT, () => {
         setOwnProfile(getOwnProfile(userId));
     });
-    const [busy, setBusy] = useState(false);
-
-    const uploadRef = useRef<HTMLInputElement>();
 
     return <div>
-        <input
-            type="file"
-            ref={uploadRef}
-            className="mx_ProfileSettings_avatarUpload"
-            onChange={async (ev) => {
-                if (!ev.target.files?.length) return;
-                setBusy(true);
-                const file = ev.target.files[0];
-                const uri = await cli.uploadContent(file);
-                await cli.setAvatarUrl(uri);
-                setBusy(false);
-            }}
-            accept="image/*"
-        />
-
-        <AccessibleButton
-            className={classNames("mx_HomePage_userAvatar", {
-                mx_HomePage_userAvatar_busy: busy,
-            })}
-            disabled={busy}
-            onClick={() => {
-                uploadRef.current.click();
-            }}
+        <MiniAvatarUploader
+            hasAvatar={!!ownProfile.avatarUrl}
+            hasAvatarLabel={_t("Great, that'll help people know it's you")}
+            noAvatarLabel={_t("Add a photo so people know it's you.")}
+            setAvatarUrl={url => cli.setAvatarUrl(url)}
         >
             <BaseAvatar
                 idName={userId}
                 name={ownProfile.displayName}
                 url={ownProfile.avatarUrl}
-                width={avatarSize}
-                height={avatarSize}
+                width={AVATAR_SIZE}
+                height={AVATAR_SIZE}
                 resizeMethod="crop"
             />
-
-            <Transition appear in timeout={3000}>
-                {state => (
-                    <Tooltip
-                        label={ownProfile.avatarUrl || busy
-                            ? _t("Great, that'll help people know it's you")
-                            : _t("Add a photo so people know it's you.")}
-                        visible={state !== ENTERING}
-                        forceOnRight
-                    />
-                )}
-            </Transition>
-        </AccessibleButton>
+        </MiniAvatarUploader>
 
         <h1>{ _t("Welcome %(name)s", { name: ownProfile.displayName }) }</h1>
         <h4>{ _t("Now, let's help you get started") }</h4>
diff --git a/src/components/views/elements/MiniAvatarUploader.tsx b/src/components/views/elements/MiniAvatarUploader.tsx
new file mode 100644
index 0000000000..903826c3e6
--- /dev/null
+++ b/src/components/views/elements/MiniAvatarUploader.tsx
@@ -0,0 +1,90 @@
+/*
+Copyright 2020 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 React, {useContext, useRef, useState} from 'react';
+import classNames from 'classnames';
+
+import AccessibleButton from "./AccessibleButton";
+import Tooltip from './Tooltip';
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import {useTimeout} from "../../../hooks/useTimeout";
+
+export const AVATAR_SIZE = 52;
+
+interface IProps {
+    hasAvatar: boolean;
+    noAvatarLabel?: string;
+    hasAvatarLabel?: string;
+    setAvatarUrl(url: string): Promise<void>;
+}
+
+const MiniAvatarUploader: React.FC<IProps> = ({ hasAvatar, hasAvatarLabel, noAvatarLabel, setAvatarUrl, children }) => {
+    const cli = useContext(MatrixClientContext);
+    const [busy, setBusy] = useState(false);
+    const [hover, setHover] = useState(false);
+    const [show, setShow] = useState(false);
+
+    useTimeout(() => {
+        setShow(true);
+    }, 3_000); // show after 3 seconds
+    useTimeout(() => {
+        setShow(false);
+    }, 13_000); // hide after being shown for 10 seconds
+
+    const uploadRef = useRef<HTMLInputElement>();
+
+    const label = hasAvatar || busy ? hasAvatarLabel : noAvatarLabel;
+
+    return <React.Fragment>
+        <input
+            type="file"
+            ref={uploadRef}
+            className="mx_MiniAvatarUploader_input"
+            onChange={async (ev) => {
+                if (!ev.target.files?.length) return;
+                setBusy(true);
+                const file = ev.target.files[0];
+                const uri = await cli.uploadContent(file);
+                await setAvatarUrl(uri);
+                setBusy(false);
+            }}
+            accept="image/*"
+        />
+
+        <AccessibleButton
+            className={classNames("mx_MiniAvatarUploader", {
+                mx_MiniAvatarUploader_busy: busy,
+                mx_MiniAvatarUploader_hasAvatar: hasAvatar,
+            })}
+            disabled={busy}
+            onClick={() => {
+                uploadRef.current.click();
+            }}
+            onMouseOver={() => setHover(true)}
+            onMouseLeave={() => setHover(false)}
+        >
+            { children }
+
+            <Tooltip
+                label={label}
+                visible={!!label && (hover || show)}
+                forceOnRight
+            />
+        </AccessibleButton>
+    </React.Fragment>;
+};
+
+export default MiniAvatarUploader;

From 664079a12735f0bbeb36593d2da754dbdfda76f6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 5 Nov 2020 15:50:42 +0000
Subject: [PATCH 035/146] Use MiniAvatarUploader for the new NewRoomIntro
 component

---
 res/css/_components.scss                    |   1 +
 res/css/views/messages/_CreateEvent.scss    |   2 +-
 res/css/views/rooms/_NewRoomIntro.scss      |  67 ++++++++++
 src/components/structures/MessagePanel.js   |   6 +-
 src/components/views/avatars/RoomAvatar.tsx |   5 +-
 src/components/views/rooms/NewRoomIntro.tsx | 131 ++++++++++++++++++++
 6 files changed, 208 insertions(+), 4 deletions(-)
 create mode 100644 res/css/views/rooms/_NewRoomIntro.scss
 create mode 100644 src/components/views/rooms/NewRoomIntro.tsx

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 860b0f126e..62b5031a31 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -184,6 +184,7 @@
 @import "./views/rooms/_MemberList.scss";
 @import "./views/rooms/_MessageComposer.scss";
 @import "./views/rooms/_MessageComposerFormatBar.scss";
+@import "./views/rooms/_NewRoomIntro.scss";
 @import "./views/rooms/_NotificationBadge.scss";
 @import "./views/rooms/_PinnedEventTile.scss";
 @import "./views/rooms/_PinnedEventsPanel.scss";
diff --git a/res/css/views/messages/_CreateEvent.scss b/res/css/views/messages/_CreateEvent.scss
index 1181a80d10..a61a261ff1 100644
--- a/res/css/views/messages/_CreateEvent.scss
+++ b/res/css/views/messages/_CreateEvent.scss
@@ -16,7 +16,7 @@ limitations under the License.
 
 .mx_CreateEvent {
     &::before {
-        background-color: $primary-fg-color;
+        background-color: $composer-e2e-icon-color;
         mask-image: url('$(res)/img/element-icons/chat-bubbles.svg');
     }
 }
diff --git a/res/css/views/rooms/_NewRoomIntro.scss b/res/css/views/rooms/_NewRoomIntro.scss
new file mode 100644
index 0000000000..af72a0dd69
--- /dev/null
+++ b/res/css/views/rooms/_NewRoomIntro.scss
@@ -0,0 +1,67 @@
+/*
+Copyright 2020 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.
+*/
+
+.mx_NewRoomIntro {
+    margin: 80px 0 48px 64px;
+
+    .mx_MiniAvatarUploader_hasAvatar:not(.mx_MiniAvatarUploader_busy):not(:hover) {
+        &::before, &::after {
+            content: unset;
+        }
+    }
+
+    .mx_AccessibleButton_kind_link {
+        padding: 0;
+        font-size: inherit;
+    }
+
+    .mx_NewRoomIntro_buttons {
+        margin-top: 28px;
+
+        .mx_AccessibleButton {
+            line-height: $font-24px;
+
+            &::before {
+                content: '';
+                display: inline-block;
+                background-color: $button-fg-color;
+                mask-position: center;
+                mask-repeat: no-repeat;
+                mask-size: 20px;
+                width: 20px;
+                height: 20px;
+                margin-right: 5px;
+                vertical-align: text-bottom;
+            }
+        }
+
+        .mx_NewRoomIntro_inviteButton::before {
+            mask-image: url('$(res)/img/element-icons/room/invite.svg');
+        }
+    }
+
+    > h2 {
+        margin-top: 24px;
+        font-size: $font-24px;
+        font-weight: 600;
+    }
+
+    > p {
+        margin: 0;
+        font-size: $font-15px;
+        color: $secondary-fg-color;
+    }
+}
diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 9cf3eaaa9d..512ffb6c07 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -31,6 +31,7 @@ import {haveTileForEvent} from "../views/rooms/EventTile";
 import {textForEvent} from "../../TextForEvent";
 import IRCTimelineProfileResizer from "../views/elements/IRCTimelineProfileResizer";
 import DMRoomMap from "../../utils/DMRoomMap";
+import NewRoomIntro from "../views/rooms/NewRoomIntro";
 
 const CONTINUATION_MAX_INTERVAL = 5 * 60 * 1000; // 5 minutes
 const continuedTypes = ['m.sticker', 'm.room.message'];
@@ -955,13 +956,16 @@ class CreationGrouper {
         const ev = this.events[this.events.length - 1];
 
         let summaryText;
+        const roomId = ev.getRoomId();
         const creator = ev.sender ? ev.sender.name : ev.getSender();
-        if (DMRoomMap.shared().getUserIdForRoomId(ev.getRoomId())) {
+        if (DMRoomMap.shared().getUserIdForRoomId(roomId)) {
             summaryText = _t("%(creator)s created this DM.", { creator });
         } else {
             summaryText = _t("%(creator)s created and configured the room.", { creator });
         }
 
+        ret.push(<NewRoomIntro />);
+
         ret.push(
             <EventListSummary
                  key="roomcreationsummary"
diff --git a/src/components/views/avatars/RoomAvatar.tsx b/src/components/views/avatars/RoomAvatar.tsx
index cbdae765f7..98d69a63e7 100644
--- a/src/components/views/avatars/RoomAvatar.tsx
+++ b/src/components/views/avatars/RoomAvatar.tsx
@@ -35,6 +35,7 @@ interface IProps {
     height?: number;
     resizeMethod?: ResizeMethod;
     viewAvatarOnClick?: boolean;
+    onClick?(): void;
 }
 
 interface IState {
@@ -130,7 +131,7 @@ export default class RoomAvatar extends React.Component<IProps, IState> {
     };
 
     public render() {
-        const {room, oobData, viewAvatarOnClick, ...otherProps} = this.props;
+        const {room, oobData, viewAvatarOnClick, onClick, ...otherProps} = this.props;
 
         const roomName = room ? room.name : oobData.name;
 
@@ -139,7 +140,7 @@ export default class RoomAvatar extends React.Component<IProps, IState> {
                 name={roomName}
                 idName={room ? room.roomId : null}
                 urls={this.state.urls}
-                onClick={viewAvatarOnClick && this.state.urls[0] ? this.onRoomAvatarClick : null}
+                onClick={viewAvatarOnClick && this.state.urls[0] ? this.onRoomAvatarClick : onClick}
             />
         );
     }
diff --git a/src/components/views/rooms/NewRoomIntro.tsx b/src/components/views/rooms/NewRoomIntro.tsx
new file mode 100644
index 0000000000..27404eef12
--- /dev/null
+++ b/src/components/views/rooms/NewRoomIntro.tsx
@@ -0,0 +1,131 @@
+/*
+Copyright 2020 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 React, {useContext} from "react";
+import {EventType} from "matrix-js-sdk/src/@types/event";
+
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import RoomContext from "../../../contexts/RoomContext";
+import DMRoomMap from "../../../utils/DMRoomMap";
+import {_t} from "../../../languageHandler";
+import AccessibleButton from "../elements/AccessibleButton";
+import MiniAvatarUploader, {AVATAR_SIZE} from "../elements/MiniAvatarUploader";
+import RoomAvatar from "../avatars/RoomAvatar";
+import defaultDispatcher from "../../../dispatcher/dispatcher";
+import {ViewUserPayload} from "../../../dispatcher/payloads/ViewUserPayload";
+import {Action} from "../../../dispatcher/actions";
+import dis from "../../../dispatcher/dispatcher";
+
+const NewRoomIntro = () => {
+    const cli = useContext(MatrixClientContext);
+    const {room, roomId} = useContext(RoomContext);
+
+    const dmPartner = DMRoomMap.shared().getUserIdForRoomId(roomId);
+    let body;
+    if (dmPartner) {
+        let caption;
+        if ((room.getJoinedMemberCount() + room.getInvitedMemberCount()) === 2) {
+            caption = _t("Only the two of you are in this conversation, unless either of you invites anyone to join.");
+        }
+
+        const member = room?.getMember(dmPartner);
+        const displayName = member?.rawDisplayName || dmPartner;
+        body = <React.Fragment>
+            <RoomAvatar room={room} width={AVATAR_SIZE} height={AVATAR_SIZE} onClick={() => {
+                defaultDispatcher.dispatch<ViewUserPayload>({
+                    action: Action.ViewUser,
+                    // XXX: We should be using a real member object and not assuming what the receiver wants.
+                    member: member || {userId: dmPartner},
+                });
+            }} />
+
+            <h2>{ room.name }</h2>
+
+            <p>{_t("This is the beginning of your direct message history with <displayName/>.", {}, {
+                displayName: () => <b>{ displayName }</b>,
+            })}</p>
+            { caption && <p>{ caption }</p> }
+        </React.Fragment>;
+    } else {
+        const topic = room.currentState.getStateEvents(EventType.RoomTopic, "")?.getContent()?.topic;
+        const canAddTopic = room.currentState.maySendStateEvent(EventType.RoomTopic, cli.getUserId());
+
+        const onTopicClick = () => {
+            dis.dispatch({
+                action: "open_room_settings",
+                room_id: roomId,
+            }, true);
+            // focus the topic field to help the user find it as it'll gain an outline
+            setImmediate(() => {
+                window.document.getElementById("profileTopic").focus();
+            });
+        };
+
+        let topicText;
+        if (canAddTopic && topic) {
+            topicText = _t("Topic: %(topic)s (<a>edit</a>)", { topic }, {
+                a: sub => <AccessibleButton kind="link" onClick={onTopicClick}>{ sub }</AccessibleButton>,
+            });
+        } else if (topic) {
+            topicText = _t("Topic: %(topic)s ", { topic });
+        } else if (canAddTopic) {
+            topicText = _t("<a>Add a topic</a> to help people know what it is about.", {}, {
+                a: sub => <AccessibleButton kind="link" onClick={onTopicClick}>{ sub }</AccessibleButton>,
+            });
+        }
+
+        const creator = room.currentState.getStateEvents(EventType.RoomCreate, "")?.getSender();
+        const creatorName = room?.getMember(creator)?.rawDisplayName || creator;
+
+        let createdText;
+        if (creator === cli.getUserId()) {
+            createdText = _t("You created this room.");
+        } else {
+            createdText = _t("%(displayName)s created this room.", {
+                displayName: creatorName,
+            });
+        }
+
+        const avatarUrl = room.currentState.getStateEvents(EventType.RoomAvatar, "")?.getContent()?.url;
+        body = <React.Fragment>
+            <MiniAvatarUploader
+                hasAvatar={!!avatarUrl}
+                noAvatarLabel={_t("Add a photo, so people can easily spot your room.")}
+                setAvatarUrl={url => cli.sendStateEvent(roomId, EventType.RoomAvatar, { url }, '')}
+            >
+                <RoomAvatar room={room} width={AVATAR_SIZE} height={AVATAR_SIZE} />
+            </MiniAvatarUploader>
+
+            <h2>{ room.name }</h2>
+
+            <p>{createdText} {_t("This is the start of <roomName/>.", {}, {
+                roomName: () => <b>{ room.name }</b>,
+            })}</p>
+            <p>{topicText}</p>
+            <div className="mx_NewRoomIntro_buttons">
+                <AccessibleButton className="mx_NewRoomIntro_inviteButton" kind="primary">
+                    {_t("Invite to this room")}
+                </AccessibleButton>
+            </div>
+        </React.Fragment>;
+    }
+
+    return <div className="mx_NewRoomIntro">
+        { body }
+    </div>;
+};
+
+export default NewRoomIntro;

From c269577037ca209266c2e95cd8d182e4932f86d6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 5 Nov 2020 15:51:36 +0000
Subject: [PATCH 036/146] i18n

---
 src/i18n/strings/en_EN.json | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 8b976c144e..271b288c11 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1083,6 +1083,15 @@
     "Strikethrough": "Strikethrough",
     "Code block": "Code block",
     "Quote": "Quote",
+    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Only the two of you are in this conversation, unless either of you invites anyone to join.",
+    "This is the beginning of your direct message history with <displayName/>.": "This is the beginning of your direct message history with <displayName/>.",
+    "Topic: %(topic)s (<a>edit</a>)": "Topic: %(topic)s (<a>edit</a>)",
+    "Topic: %(topic)s ": "Topic: %(topic)s ",
+    "<a>Add a topic</a> to help people know what it is about.": "<a>Add a topic</a> to help people know what it is about.",
+    "You created this room.": "You created this room.",
+    "%(displayName)s created this room.": "%(displayName)s created this room.",
+    "Add a photo, so people can easily spot your room.": "Add a photo, so people can easily spot your room.",
+    "This is the start of <roomName/>.": "This is the start of <roomName/>.",
     "No pinned messages.": "No pinned messages.",
     "Loading...": "Loading...",
     "Pinned Messages": "Pinned Messages",
@@ -2126,7 +2135,6 @@
     "Starting microphone...": "Starting microphone...",
     "Connectivity to the server has been lost.": "Connectivity to the server has been lost.",
     "Sent messages will be stored until your connection has returned.": "Sent messages will be stored until your connection has returned.",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?",
     "You seem to be uploading files, are you sure you want to quit?": "You seem to be uploading files, are you sure you want to quit?",
     "You seem to be in a call, are you sure you want to quit?": "You seem to be in a call, are you sure you want to quit?",
     "Search failed": "Search failed",

From 81f1e1d8d713da3264722a58ba534fd430d4c859 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 5 Nov 2020 15:54:21 +0000
Subject: [PATCH 037/146] delint

---
 res/css/views/messages/_EventTileBubble.scss | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/res/css/views/messages/_EventTileBubble.scss b/res/css/views/messages/_EventTileBubble.scss
index 99feb03ef9..e0f5d521cb 100644
--- a/res/css/views/messages/_EventTileBubble.scss
+++ b/res/css/views/messages/_EventTileBubble.scss
@@ -53,11 +53,8 @@ limitations under the License.
     }
 
     .mx_EventTileBubble_subtitle {
+        font-size: $font-12px;
         grid-column: 2;
         grid-row: 2;
     }
-
-    .mx_EventTileBubble_subtitle {
-        font-size: $font-12px;
-    }
 }

From 602232a524d0b2b17fd878b3949e999a1634ec86 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 5 Nov 2020 16:08:36 +0000
Subject: [PATCH 038/146] Update res/css/views/messages/_CreateEvent.scss

Co-authored-by: Travis Ralston <travpc@gmail.com>
---
 res/css/views/messages/_CreateEvent.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/messages/_CreateEvent.scss b/res/css/views/messages/_CreateEvent.scss
index a61a261ff1..cb2bf841dd 100644
--- a/res/css/views/messages/_CreateEvent.scss
+++ b/res/css/views/messages/_CreateEvent.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 2018, 2020 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.

From 54e41b5f32e37e43686f827a05f232905d03ed2d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 5 Nov 2020 16:27:41 +0000
Subject: [PATCH 039/146] fix tests

---
 src/components/views/messages/EncryptionEvent.tsx | 7 ++++---
 src/components/views/messages/EventTileBubble.tsx | 8 ++++----
 src/contexts/RoomContext.ts                       | 1 -
 test/components/structures/MessagePanel-test.js   | 3 +++
 test/test-utils.js                                | 1 +
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/components/views/messages/EncryptionEvent.tsx b/src/components/views/messages/EncryptionEvent.tsx
index 7416cc3c9a..3af9c463c9 100644
--- a/src/components/views/messages/EncryptionEvent.tsx
+++ b/src/components/views/messages/EncryptionEvent.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {useContext} from 'react';
+import React, {forwardRef, useContext} from 'react';
 import {MatrixEvent} from "matrix-js-sdk/src/models/event";
 
 import { _t } from '../../../languageHandler';
@@ -27,7 +27,7 @@ interface IProps {
     mxEvent: MatrixEvent;
 }
 
-const EncryptionEvent: React.FC<IProps> = ({mxEvent}) => {
+const EncryptionEvent = forwardRef<HTMLDivElement, IProps>(({mxEvent}, ref) => {
     const cli = useContext(MatrixClientContext);
     const roomId = mxEvent.getRoomId();
     const isRoomEncrypted = MatrixClientPeg.get().isRoomEncrypted(roomId);
@@ -61,7 +61,8 @@ const EncryptionEvent: React.FC<IProps> = ({mxEvent}) => {
         className="mx_cryptoEvent mx_cryptoEvent_icon mx_cryptoEvent_icon_warning"
         title={_t("Encryption not enabled")}
         subtitle={_t("The encryption used by this room isn't supported.")}
+        ref={ref}
     />;
-}
+});
 
 export default EncryptionEvent;
diff --git a/src/components/views/messages/EventTileBubble.tsx b/src/components/views/messages/EventTileBubble.tsx
index 8a2cf0f01c..f797a97a3d 100644
--- a/src/components/views/messages/EventTileBubble.tsx
+++ b/src/components/views/messages/EventTileBubble.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {ReactNode} from "react";
+import React, {forwardRef, ReactNode} from "react";
 import classNames from "classnames";
 
 interface IProps {
@@ -23,12 +23,12 @@ interface IProps {
     subtitle?: ReactNode;
 }
 
-const EventTileBubble: React.FC<IProps> = ({ className, title, subtitle, children }) => {
-    return <div className={classNames("mx_EventTileBubble", className)}>
+const EventTileBubble = forwardRef<HTMLDivElement, IProps>(({ className, title, subtitle, children }, ref) => {
+    return <div className={classNames("mx_EventTileBubble", className)} ref={ref}>
         <div className="mx_EventTileBubble_title">{ title }</div>
         { subtitle && <div className="mx_EventTileBubble_subtitle">{ subtitle }</div> }
         { children }
     </div>;
-};
+});
 
 export default EventTileBubble;
diff --git a/src/contexts/RoomContext.ts b/src/contexts/RoomContext.ts
index e8eb0c23b4..082dcc4e6b 100644
--- a/src/contexts/RoomContext.ts
+++ b/src/contexts/RoomContext.ts
@@ -29,7 +29,6 @@ const RoomContext = createContext<IState>({
     guestsCanJoin: false,
     canPeek: false,
     showApps: false,
-    isAlone: false,
     isPeeking: false,
     showingPinned: false,
     showReadReceipts: true,
diff --git a/test/components/structures/MessagePanel-test.js b/test/components/structures/MessagePanel-test.js
index 235ae94010..0bcdfcd5e5 100644
--- a/test/components/structures/MessagePanel-test.js
+++ b/test/components/structures/MessagePanel-test.js
@@ -38,6 +38,7 @@ import { configure, mount } from "enzyme";
 import Velocity from 'velocity-animate';
 import MatrixClientContext from "../../../src/contexts/MatrixClientContext";
 import RoomContext from "../../../src/contexts/RoomContext";
+import DMRoomMap from "../../../src/utils/DMRoomMap";
 
 configure({ adapter: new Adapter() });
 
@@ -79,6 +80,8 @@ describe('MessagePanel', function() {
         // complete without this even if we mock the clock and tick it
         // what should be the correct amount of time).
         Velocity.mock = true;
+
+        DMRoomMap.makeShared();
     });
 
     afterEach(function() {
diff --git a/test/test-utils.js b/test/test-utils.js
index d006eee823..c8e623b1d9 100644
--- a/test/test-utils.js
+++ b/test/test-utils.js
@@ -242,6 +242,7 @@ export function mkStubRoom(roomId = null) {
         setBlacklistUnverifiedDevices: jest.fn(),
         on: jest.fn(),
         removeListener: jest.fn(),
+        getDMInviter: jest.fn(),
     };
 }
 

From ae2d9941ff26c4f8dc55124dbf1237c879332b67 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 5 Nov 2020 16:54:25 +0000
Subject: [PATCH 040/146] fix more tests

---
 src/Skinner.js                                  | 4 ++--
 test/components/structures/MessagePanel-test.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Skinner.js b/src/Skinner.js
index 87c5a7be7f..d17bc1782a 100644
--- a/src/Skinner.js
+++ b/src/Skinner.js
@@ -50,8 +50,8 @@ class Skinner {
             return null;
         }
 
-        // components have to be functions.
-        const validType = typeof comp === 'function';
+        // components have to be functions or forwardRef objects with a render function.
+        const validType = typeof comp === 'function' || comp.render;
         if (!validType) {
             throw new Error(`Not a valid component: ${name} (type = ${typeof(comp)}).`);
         }
diff --git a/test/components/structures/MessagePanel-test.js b/test/components/structures/MessagePanel-test.js
index 0bcdfcd5e5..0cb7e2cc71 100644
--- a/test/components/structures/MessagePanel-test.js
+++ b/test/components/structures/MessagePanel-test.js
@@ -53,7 +53,7 @@ class WrappedMessagePanel extends React.Component {
 
     render() {
         return <MatrixClientContext.Provider value={client}>
-            <RoomContext.Provider value={{ canReact: true, canReply: true }}>
+            <RoomContext.Provider value={{ canReact: true, canReply: true, room, roomId: room.roomId }}>
                 <MessagePanel room={room} {...this.props} resizeNotifier={this.state.resizeNotifier} />
             </RoomContext.Provider>
         </MatrixClientContext.Provider>;

From 4997676f5d472462b0ddbabafb7aafb1044ea7e3 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 5 Nov 2020 16:57:51 +0000
Subject: [PATCH 041/146] fix last remaining broken test

---
 test/components/structures/MessagePanel-test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/components/structures/MessagePanel-test.js b/test/components/structures/MessagePanel-test.js
index 0cb7e2cc71..f40f8c5187 100644
--- a/test/components/structures/MessagePanel-test.js
+++ b/test/components/structures/MessagePanel-test.js
@@ -436,8 +436,8 @@ describe('MessagePanel', function() {
         const rm = res.find('.mx_RoomView_myReadMarker_container').getDOMNode();
 
         const rows = res.find('.mx_RoomView_MessageList').children();
-        expect(rows.length).toEqual(6);
-        expect(rm.previousSibling).toEqual(rows.at(4).getDOMNode());
+        expect(rows.length).toEqual(7); // 6 events + the NewRoomIntro
+        expect(rm.previousSibling).toEqual(rows.at(5).getDOMNode());
 
         // read marker should be hidden given props and at the last event
         expect(isReadMarkerVisible(rm)).toBeFalsy();

From 252484fcd9c9d435c41ea7f6832af04ee94a4277 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 5 Nov 2020 17:01:20 +0000
Subject: [PATCH 042/146] add key to make React happier

---
 src/components/structures/MessagePanel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 512ffb6c07..375545f819 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -964,7 +964,7 @@ class CreationGrouper {
             summaryText = _t("%(creator)s created and configured the room.", { creator });
         }
 
-        ret.push(<NewRoomIntro />);
+        ret.push(<NewRoomIntro key="newroomintro" />);
 
         ret.push(
             <EventListSummary

From cf2d8d2f1f522bca03240eba71a7e900bf75f2ac Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 5 Nov 2020 17:59:02 +0000
Subject: [PATCH 043/146] Wrench createNewMatrixCall straight out of call

rather than importing browser-index
---
 src/CallHandler.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CallHandler.tsx b/src/CallHandler.tsx
index aefa66ecc5..710eded2cd 100644
--- a/src/CallHandler.tsx
+++ b/src/CallHandler.tsx
@@ -59,7 +59,7 @@ import {MatrixClientPeg} from './MatrixClientPeg';
 import PlatformPeg from './PlatformPeg';
 import Modal from './Modal';
 import { _t } from './languageHandler';
-import Matrix from 'matrix-js-sdk/src/browser-index';
+import { createNewMatrixCall } from 'matrix-js-sdk/src/webrtc/call';
 import dis from './dispatcher/dispatcher';
 import WidgetUtils from './utils/WidgetUtils';
 import WidgetEchoStore from './stores/WidgetEchoStore';
@@ -362,7 +362,7 @@ export default class CallHandler {
     ) {
         Analytics.trackEvent('voip', 'placeCall', 'type', type);
         CountlyAnalytics.instance.trackStartCall(roomId, type === PlaceCallType.Video, false);
-        const call = Matrix.createNewMatrixCall(MatrixClientPeg.get(), roomId);
+        const call = createNewMatrixCall(MatrixClientPeg.get(), roomId);
         this.calls.set(roomId, call);
         this.setCallListeners(call);
         this.setCallAudioElement(call);

From 75fd37772cd6f414099e703079966811e21dfc1a Mon Sep 17 00:00:00 2001
From: Marcelo Filho <marceloaof@protonmail.com>
Date: Thu, 5 Nov 2020 22:33:55 +0000
Subject: [PATCH 044/146] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2380 of 2380 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pt_BR/
---
 src/i18n/strings/pt_BR.json | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index d44ea4d014..1d720702cf 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -300,7 +300,7 @@
     "Ongoing conference call%(supportedText)s.": "Chamada em grupo em andamento%(supportedText)s.",
     "Online": "Conectada/o",
     "Idle": "Ocioso",
-    "Offline": "Desconectado",
+    "Offline": "Offline",
     "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "O arquivo exportado irá permitir a qualquer pessoa que o acesse a descriptografar qualquer uma das mensagens criptografadas que você veja, portanto seja bastante cuidadosa(o) em manter este arquivo seguro. Para deixar este arquivo mais protegido, recomendamos que você insira uma senha abaixo, que será usada para criptografar o arquivo. Só será possível importar os dados usando exatamente a mesma senha.",
     "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Este processo faz com que você possa importar as chaves de criptografia que tinha previamente exportado de outro cliente Matrix. Você poderá então descriptografar todas as mensagens que o outro cliente pôde criptografar.",
     "Start automatically after system login": "Iniciar automaticamente ao iniciar o sistema",
@@ -461,7 +461,7 @@
     "%(duration)sd": "%(duration)sd",
     "Online for %(duration)s": "Online há %(duration)s",
     "Idle for %(duration)s": "Inativo há %(duration)s",
-    "Offline for %(duration)s": "Desconectado há %(duration)s",
+    "Offline for %(duration)s": "Offline há %(duration)s",
     "Unknown for %(duration)s": "Status desconhecido há %(duration)s",
     "Unknown": "Desconhecido",
     "Replying": "Em resposta a",
@@ -1431,7 +1431,7 @@
     "%(brand)s can't securely cache encrypted messages locally while running in a web browser. Use <desktopLink>%(brand)s Desktop</desktopLink> for encrypted messages to appear in search results.": "%(brand)s não consegue pesquisar as mensagens criptografadas armazenadas localmente em um navegador de internet. Use o <desktopLink>%(brand)s para Computador</desktopLink> para que as mensagens criptografadas sejam exibidas nos resultados de buscas.",
     "Connecting to integration manager...": "Conectando ao gestor de integrações...",
     "Cannot connect to integration manager": "Não foi possível conectar ao gerenciador de integrações",
-    "The integration manager is offline or it cannot reach your homeserver.": "Ou o gerenciador de integrações está desconectado, ou ele não conseguiu acessar o seu servidor.",
+    "The integration manager is offline or it cannot reach your homeserver.": "Ou o gerenciador de integrações está indisponível, ou ele não conseguiu acessar o seu servidor.",
     "This session is backing up your keys. ": "Esta sessão está fazendo backup das suas chaves. ",
     "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.": "Esta sessão <b>não está fazendo backup de suas chaves</b>, mas você tem um backup existente que pode restaurar para continuar.",
     "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Autorize esta sessão a fazer o backup de chaves antes de se desconectar, para evitar perder chaves que possam estar apenas nesta sessão.",
@@ -1781,7 +1781,7 @@
     "Disconnect identity server": "Desconectar servidor de identidade",
     "Disconnect from the identity server <idserver />?": "Desconectar-se do servidor de identidade <idserver />?",
     "Disconnect": "Desconectar",
-    "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "Você deve <b>remover seus dados pessoais</b> do servidor de identidade <idserver /> antes de desconectar. Infelizmente, o servidor de identidade <idserver /> ou está desconectado no momento, ou não pode ser acessado.",
+    "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "Você deve <b>remover seus dados pessoais</b> do servidor de identidade <idserver /> antes de desconectar. Infelizmente, o servidor de identidade <idserver /> ou está indisponível no momento, ou não pode ser acessado.",
     "You should:": "Você deveria:",
     "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "verifique se há extensões no seu navegador que possam bloquear o servidor de identidade (por exemplo, Privacy Badger)",
     "contact the administrators of identity server <idserver />": "entre em contato com os administradores do servidor de identidade <idserver />",
@@ -1918,7 +1918,7 @@
     "Collapse room list section": "Esconder seção da lista de salas",
     "Expand room list section": "Mostrar seção da lista de salas",
     "The person who invited you already left the room.": "A pessoa que convidou você já saiu da sala.",
-    "The person who invited you already left the room, or their server is offline.": "A pessoa que convidou você já saiu da sala, ou o servidor dela está desconectado.",
+    "The person who invited you already left the room, or their server is offline.": "A pessoa que convidou você já saiu da sala, ou o servidor dela está indisponível.",
     "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Use o Gerenciador de Integrações em <b>(%(serverName)s)</b> para gerenciar bots, widgets e pacotes de figurinhas.",
     "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Use o Gerenciador de Integrações para gerenciar bots, widgets e pacotes de figurinhas.",
     "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "O Gerenciador de Integrações recebe dados de configuração e pode modificar widgets, enviar convites para salas e definir níveis de permissão em seu nome.",
@@ -2493,5 +2493,17 @@
     "Tell us below how you feel about %(brand)s so far.": "Conte-nos abaixo o que você sente sobre o %(brand)s até o momento.",
     "Rate %(brand)s": "Avalie o %(brand)s",
     "%(senderName)s ended the call": "%(senderName)s encerrou a chamada",
-    "You ended the call": "Você encerrou a chamada"
+    "You ended the call": "Você encerrou a chamada",
+    "Now, let's help you get started": "Agora, vamos começar",
+    "Don't miss a reply": "Não perca uma resposta",
+    "Enable desktop notifications": "Ativar notificações na área de trabalho",
+    "Welcome %(name)s": "Boas-vindas, %(name)s",
+    "Add a photo so people know it's you.": "Adicione uma foto para as pessoas identificarem você.",
+    "Great, that'll help people know it's you": "Ótimo, agora as pessoas identificarão você",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Convide alguém a partir do nome, e-mail ou nome de usuário (por exemplo: <userId/>) ou <a>compartilhe esta sala</a>.",
+    "Start a conversation with someone using their name, email address or username (like <userId/>).": "Comece uma conversa, a partir do nome, e-mail ou nome de usuário de alguém (por exemplo: <userId/>).",
+    "Invite by email": "Convidar por e-mail",
+    "Use the + to make a new room or explore existing ones below": "Clique em + para criar uma nova sala ou explore as salas existentes abaixo",
+    "New version of %(brand)s is available": "Uma nova versão do %(brand)s está disponível",
+    "Update %(brand)s": "Atualizar o %(brand)s"
 }

From 799de3981ff99ed41c99565f857fe6c8039fc0f0 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 5 Nov 2020 02:19:22 +0000
Subject: [PATCH 045/146] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2380 of 2380 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
---
 src/i18n/strings/zh_Hant.json | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index f1af2f3719..afefbb1bc0 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2565,5 +2565,17 @@
     "Rate %(brand)s": "評價 %(brand)s",
     "Feedback sent": "已傳送回饋",
     "%(senderName)s ended the call": "%(senderName)s 結束了通話",
-    "You ended the call": "您結束了通話"
+    "You ended the call": "您結束了通話",
+    "Now, let's help you get started": "現在，讓我們協助您開始",
+    "Welcome %(name)s": "歡迎 %(name)s",
+    "Add a photo so people know it's you.": "新增照片以讓其他人知道是您。",
+    "Great, that'll help people know it's you": "太好了，這會讓人們知道是您",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "使用某人的名字、電子郵件地址或使用者名稱來與他們開始對話（如 <userId/>）或是<a>分享此聊天室</a>。",
+    "Start a conversation with someone using their name, email address or username (like <userId/>).": "使用某人的名字、電子郵件地址或使用者名稱來與他們開始對話（如 <userId/>）。",
+    "Invite by email": "透過電子郵件邀請",
+    "Use the + to make a new room or explore existing ones below": "使用 + 建立新的聊天室或在下方探索既有的聊天室",
+    "New version of %(brand)s is available": "%(brand)s 的新版本已可使用",
+    "Update %(brand)s": "更新 %(brand)s",
+    "Enable desktop notifications": "啟用桌面通知",
+    "Don't miss a reply": "不要錯過回覆"
 }

From 02158339b47dea6028a51f3fcf83ee1c884b9cb1 Mon Sep 17 00:00:00 2001
From: Arusekk <arek_koz@o2.pl>
Date: Thu, 5 Nov 2020 12:00:50 +0000
Subject: [PATCH 046/146] Translated using Weblate (Polish)

Currently translated at 62.4% (1486 of 2380 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pl/
---
 src/i18n/strings/pl.json | 47 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 43 insertions(+), 4 deletions(-)

diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 1343405781..4ac9f9363c 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -692,7 +692,7 @@
     "Unable to reject invite": "Nie udało się odrzucić zaproszenia",
     "Share Message": "Udostępnij wiadomość",
     "Collapse Reply Thread": "Zwiń wątek odpowiedzi",
-    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>Strona HTML dla Twojej Społeczności</h1>\n<p>\n    Skorzystaj z długiego opisu aby wprowadzić nowych członków do Społeczności lub rozpowszechnić ważne <a href=\"blabla\">linki</a>.\n</p>\n<p>\n    Możesz nawet używać tagów 'img'.\n</p>\n",
+    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>Strona HTML dla Twojej Społeczności</h1>\n<p>\n    Skorzystaj z długiego opisu aby wprowadzić nowych członków do Społeczności lub rozpowszechnić\n    ważne <a href=\"blabla\">linki</a>.\n</p>\n<p>\n    Możesz nawet używać tagów 'img'.\n</p>\n",
     "Add rooms to the community summary": "Dodaj pokoje do podsumowania Społeczności",
     "Which rooms would you like to add to this summary?": "Które pokoje chcesz dodać do tego podsumowania?",
     "Add to summary": "Dodaj do podsumowania",
@@ -1081,7 +1081,7 @@
     "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s zmienił(a) zasadę dołączania na %(rule)s",
     "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s pozwolił(a) by goście dołączali do pokoju.",
     "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s zabronił(a) gościom dołączać do pokoju.",
-    "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s zmienił dostęp gościnny dla %(rule)s",
+    "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s zmienił dostęp gościnny na %(rule)s",
     "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s aktywował Flair dla %(groups)s w tym pokoju.",
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s dezaktywował Flair dla %(groups)s w tym pokoju.",
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s aktywował Flair dla %(newGroups)s i dezaktywował Flair dla %(oldGroups)s w tym pokoju.",
@@ -1505,7 +1505,7 @@
     "Use Single Sign On to continue": "Użyj pojedynczego logowania, aby kontynuować",
     "Confirm adding this email address by using Single Sign On to prove your identity.": "Potwierdź dodanie tego adresu e-mail przez użycie pojedynczego logowania, aby potwierdzić swoją tożsamość.",
     "Single Sign On": "Pojedyncze logowanie",
-    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Potwierdź dodanie tego numeru telefonu przez użycie pojedynczego logowania, aby potwierdzić swoją tożsamość.",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Potwierdź dodanie tego numeru telefonu przy użyciu pojedynczego logowania, aby potwierdzić swoją tożsamość.",
     "Learn More": "Dowiedz się więcej",
     "Light": "Jasny",
     "Dark": "Ciemny",
@@ -1531,5 +1531,44 @@
     "Switch to light mode": "Przełącz na tryb jasny",
     "Switch to dark mode": "Przełącz na tryb ciemny",
     "Switch theme": "Przełącz motyw",
-    "All settings": "Wszystkie ustawienia"
+    "All settings": "Wszystkie ustawienia",
+    "This requires the latest %(brand)s on your other devices:": "To wymaga najnowszy %(brand)s na pozostałych urządzeniach:",
+    "%(brand)s Desktop": "%(brand)s na komputer",
+    "%(brand)s Web": "%(brand)s w przeglądarce",
+    "%(brand)s iOS": "%(brand)s na iOS",
+    "%(brand)s Android": "%(brand)s na Android",
+    "You're signed out": "Wylogowano",
+    "That matches!": "Zgadza się!",
+    "New Recovery Method": "Nowy sposób odzyskiwania",
+    "If disabled, messages from encrypted rooms won't appear in search results.": "Jeśli wyłączone, wiadomości z szyfrowanych pokojów nie pojawią się w wynikach wyszukiwania.",
+    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s z %(totalRooms)s",
+    "Super": "Super",
+    "Toggle video on/off": "Włącz/wyłącz wideo",
+    "Jump to room search": "Przejdź do szukania pokoju",
+    "Upload a file": "Wyślij plik",
+    "Unknown (user, session) pair:": "Nieznana para (użytkownik, sesja):",
+    "Verifies a user, session, and pubkey tuple": "Weryfikuje użytkownika, sesję oraz klucz publiczny",
+    "Find other public servers or use a custom server": "Znajdź inne publiczne serwery lub podaj własny",
+    "Join millions for free on the largest public server": "Dołącz do milionów za darmo na największym publicznym serwerze",
+    "Free": "Za darmo",
+    "Enter your password to sign in and regain access to your account.": "Podaj hasło, aby zalogować się i odzyskać dostęp do swojego konta.",
+    "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Odzyskaj dostęp do swojego konta i klucze zachowane w tej sesji. Bez nich nie uda się odczytać bezpiecznych wiadomości w żadnej sesji.",
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Ci użytkownicy mogą nie istnieć lub są nieprawidłowi, i nie mogą zostać zaproszeni: %(csvNames)s",
+    "Failed to find the following users": "Nie udało się znaleźć tych użytkowników",
+    "We couldn't invite those users. Please check the users you want to invite and try again.": "Nie udało się zaprosić tych użytkowników. Proszę sprawdzić zaproszonych użytkowników i spróbować ponownie.",
+    "Something went wrong trying to invite the users.": "Coś poszło nie tak podczas zapraszania użytkowników.",
+    "We couldn't create your DM. Please check the users you want to invite and try again.": "Nie udało się utworzyć wiadomości. Proszę sprawdzić zaproszonych użytkowników i spróbować ponownie.",
+    "Failed to invite the following users to chat: %(csvUsers)s": "Nie udało się zaprosić tych użytkowników do rozmowy: %(csvUsers)s",
+    "Invite by email": "Zaproś przez e-mail",
+    "Invite anyway and never warn me again": "Zaproś mimo to i nie ostrzegaj ponownie",
+    "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Nie znaleziono profilów wymienionych ID Matriksa — czy zaprosić ich mimo to?",
+    "The following users may not exist": "Tych użytkowników może nie być",
+    "Use a different passphrase?": "Użyć innego hasła?",
+    "Emoji picker": "Wybór emoji",
+    "Widgets": "Widżety",
+    "The call could not be established": "Nie udało się nawiązać połączenia",
+    "Answered Elsewhere": "Odebrane gdzie indziej",
+    "The call was answered on another device.": "Połączenie zostało odebrane na innym urządzeniu.",
+    "The other party declined the call.": "Połączenie zostało odrzucone przez drugą stronę.",
+    "Call Declined": "Połączenie odrzucone"
 }

From 62cc96f3f2c647d827ef400304d25f5592a6ed5f Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Thu, 5 Nov 2020 11:51:01 +0000
Subject: [PATCH 047/146] Translated using Weblate (Polish)

Currently translated at 62.4% (1486 of 2380 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pl/
---
 src/i18n/strings/pl.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 4ac9f9363c..5ae85654a6 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -1570,5 +1570,6 @@
     "Answered Elsewhere": "Odebrane gdzie indziej",
     "The call was answered on another device.": "Połączenie zostało odebrane na innym urządzeniu.",
     "The other party declined the call.": "Połączenie zostało odrzucone przez drugą stronę.",
-    "Call Declined": "Połączenie odrzucone"
+    "Call Declined": "Połączenie odrzucone",
+    "Messages in this room are end-to-end encrypted.": "Wiadomości w tym pokoju są szyfrowane end-to-end."
 }

From 8205b4121b8857d69d2c516327e412ba08ff79aa Mon Sep 17 00:00:00 2001
From: Frisk <furrtrex43@protonmail.ch>
Date: Thu, 5 Nov 2020 11:50:28 +0000
Subject: [PATCH 048/146] Translated using Weblate (Polish)

Currently translated at 62.4% (1486 of 2380 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pl/
---
 src/i18n/strings/pl.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 5ae85654a6..d22fe3d4a0 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -1571,5 +1571,6 @@
     "The call was answered on another device.": "Połączenie zostało odebrane na innym urządzeniu.",
     "The other party declined the call.": "Połączenie zostało odrzucone przez drugą stronę.",
     "Call Declined": "Połączenie odrzucone",
-    "Messages in this room are end-to-end encrypted.": "Wiadomości w tym pokoju są szyfrowane end-to-end."
+    "Messages in this room are end-to-end encrypted.": "Wiadomości w tym pokoju są szyfrowane end-to-end.",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Klucz podpisujący, który podano jest taki sam jak klucz podpisujący otrzymany od %(userId)s oraz sesji %(deviceId)s. Sesja została oznaczona jako zweryfikowana."
 }

From 8d1a6d735ba68abe4cda156e3deccf87359e3b9b Mon Sep 17 00:00:00 2001
From: "Auri B. P" <auri97@gmail.com>
Date: Thu, 5 Nov 2020 20:57:19 +0000
Subject: [PATCH 049/146] Translated using Weblate (Catalan)

Currently translated at 35.4% (843 of 2380 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ca/
---
 src/i18n/strings/ca.json | 345 +++++++++++++++++++++++++++------------
 1 file changed, 241 insertions(+), 104 deletions(-)

diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index 3144d3ed65..4661e61c1d 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -15,9 +15,9 @@
     "Favourite": "Favorit",
     "Mute": "Silencia",
     "Room directory": "Directori de sales",
-    "Settings": "Paràmetres",
+    "Settings": "Configuració",
     "Start chat": "Inicia un xat",
-    "Failed to change password. Is your password correct?": "Hi ha hagut un error al canviar la vostra contrasenya. És correcte la vostra contrasenya?",
+    "Failed to change password. Is your password correct?": "S'ha produït un error en canviar la contrasenya. És correcta la teva contrasenya?",
     "Continue": "Continua",
     "Custom Server Options": "Opcions de servidor personalitzat",
     "Dismiss": "Omet",
@@ -37,17 +37,17 @@
     "Guests can join": "Els usuaris d'altres xarxes s'hi poden unir",
     "This email address is already in use": "Aquesta adreça de correu electrònic ja està en ús",
     "This phone number is already in use": "Aquest número de telèfon ja està en ús",
-    "Failed to verify email address: make sure you clicked the link in the email": "No s'ha pogut verificar l'adreça de correu electrònic. Assegureu-vos de fer clic a l'enllaç del correu electrònic de verificació",
+    "Failed to verify email address: make sure you clicked the link in the email": "No s'ha pogut verificar l'adreça de correu electrònic: assegura't de fer clic a l'enllaç del correu electrònic",
     "Call Failed": "No s'ha pogut realitzar la trucada",
-    "The remote side failed to pick up": "El costat remot no ha contestat",
+    "The remote side failed to pick up": "El part remota no ha contestat",
     "Unable to capture screen": "No s'ha pogut capturar la pantalla",
     "Existing Call": "Trucada existent",
-    "You are already in a call.": "Ja sou a una trucada.",
-    "VoIP is unsupported": "El VoIP no és compatible",
-    "You cannot place VoIP calls in this browser.": "No es poden fer trucades VoIP amb aquest navegador.",
-    "You cannot place a call with yourself.": "No és possible trucar-se a un mateix.",
+    "You are already in a call.": "Ja ets en una trucada.",
+    "VoIP is unsupported": "VoIP no és compatible",
+    "You cannot place VoIP calls in this browser.": "No pots fer trucades VoIP en aquest navegador.",
+    "You cannot place a call with yourself.": "No pots trucar-te a tu mateix.",
     "Warning!": "Avís!",
-    "Upload Failed": "No s'ha pogut realitzar la pujada",
+    "Upload Failed": "No s'ha pogut pujar",
     "Sun": "dg.",
     "Mon": "dl.",
     "Tue": "dt.",
@@ -69,51 +69,51 @@
     "Dec": "des.",
     "PM": "PM",
     "AM": "AM",
-    "%(weekDayName)s %(time)s": "%(weekDayName)s%(time)s",
-    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(day)s de %(monthName)s %(time)s",
-    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s de %(monthName)s de %(fullYear)s",
-    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s de %(monthName)s de %(fullYear)s %(time)s",
-    "Who would you like to add to this community?": "A qui voleu afegir a aquesta comunitat?",
-    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Avís: les persones que afegiu a aquesta comunitat seran visibles públicament per a qualsevol que conegui l'ID de la comunitat",
-    "Invite new community members": "Convida nous membres a unir-se a la comunitat",
+    "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(day)s de/d' %(monthName)s %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s de/d' %(monthName)s de %(fullYear)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s de/d' %(monthName)s de %(fullYear)s %(time)s",
+    "Who would you like to add to this community?": "A qui vols afegir a aquesta comunitat?",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Avís: qualsevol persona que afegeixis a una comunitat serà visible públicament per a qualsevol que conegui l'ID de la comunitat",
+    "Invite new community members": "Convida nous membres a la comunitat",
     "Invite to Community": "Convida a la comunitat",
-    "Which rooms would you like to add to this community?": "Quines sales voleu afegir a aquesta comunitat?",
-    "Show these rooms to non-members on the community page and room list?": "Voleu mostrar aquestes sales als que no son membres a la pàgina de la comunitat i a la llista de sales?",
+    "Which rooms would you like to add to this community?": "Quines sales vols afegir a aquesta comunitat?",
+    "Show these rooms to non-members on the community page and room list?": "Vols mostrar aquestes sales a la pàgina de la comunitat i a la llista de sales per als que no hi son membres?",
     "Add rooms to the community": "Afegeix sales a la comunitat",
     "Add to community": "Afegeix a la comunitat",
-    "Failed to invite the following users to %(groupId)s:": "No s'ha pogut convidar a %(groupId)s els següents usuaris:",
-    "Failed to invite users to community": "No s'ha pogut convidar als usuaris a la comunitat",
-    "Failed to invite users to %(groupId)s": "No s'ha pogut convidar els usuaris a %(groupId)s",
-    "Failed to add the following rooms to %(groupId)s:": "No s'ha pogut afegir les següents sales al %(groupId)s:",
-    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s no té permís per enviar-vos notificacions. Comproveu la configuració del vostre navegador",
-    "%(brand)s was not given permission to send notifications - please try again": "%(brand)s no ha rebut cap permís per enviar notificacions. Torneu-ho a provar",
-    "Unable to enable Notifications": "No s'ha pogut activar les notificacions",
+    "Failed to invite the following users to %(groupId)s:": "No s'han pogut convidar a %(groupId)s els següents usuaris:",
+    "Failed to invite users to community": "No s'han pogut convidar els usuaris a la comunitat",
+    "Failed to invite users to %(groupId)s": "No s'han pogut convidar els usuaris a %(groupId)s",
+    "Failed to add the following rooms to %(groupId)s:": "No s'han pogut afegir a %(groupId)s les següents sales:",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s no té permís per enviar-te notificacions, comprova la configuració del teu navegador",
+    "%(brand)s was not given permission to send notifications - please try again": "%(brand)s no ha rebut cap permís per enviar notificacions, torna-ho a provar",
+    "Unable to enable Notifications": "No s'han pogut activar les notificacions",
     "This email address was not found": "Aquesta adreça de correu electrònic no s'ha trobat",
-    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "La vostra adreça de correu electrònic no sembla que estigui associada amb un identificador de Matrix d'aquest servidor.",
-    "Default": "Per defecte",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "La teva adreça de correu electrònic no sembla estar associada amb un ID de Matrix en aquest servidor.",
+    "Default": "Predeterminat",
     "Restricted": "Restringit",
     "Moderator": "Moderador",
     "Admin": "Administrador",
-    "Failed to invite": "No s'ha pogut tramitar la invitació",
+    "Failed to invite": "No s'ha pogut convidar",
     "Failed to invite the following users to the %(roomName)s room:": "No s'ha pogut convidar a la sala %(roomName)s els següents usuaris:",
-    "You need to be logged in.": "És necessari estar autenticat.",
-    "You need to be able to invite users to do that.": "Per poder fer això, necessites poder convidar a usuaris.",
+    "You need to be logged in.": "Has d'haver iniciat sessió.",
+    "You need to be able to invite users to do that.": "Per fer això, necessites poder convidar a usuaris.",
     "Unable to create widget.": "No s'ha pogut crear el giny.",
     "Failed to send request.": "No s'ha pogut enviar la sol·licitud.",
     "This room is not recognised.": "No es reconeix aquesta sala.",
-    "Power level must be positive integer.": "El nivell de poders ha de ser un enter positiu.",
-    "You are not in this room.": "No heu entrat a aquesta sala.",
-    "You do not have permission to do that in this room.": "No teniu el permís per realitzar aquesta acció en aquesta sala.",
-    "Missing room_id in request": "Falta el room_id en la vostra sol·licitud",
-    "Room %(roomId)s not visible": "La sala %(roomId)s no és visible",
-    "Missing user_id in request": "Falta l'user_id a la vostra sol·licitud",
+    "Power level must be positive integer.": "El nivell d'autoritat ha de ser un enter positiu.",
+    "You are not in this room.": "No ets en aquesta sala.",
+    "You do not have permission to do that in this room.": "No tens permís per fer això en aquesta sala.",
+    "Missing room_id in request": "Falta el room_id a la sol·licitud",
+    "Room %(roomId)s not visible": "Sala %(roomId)s no visible",
+    "Missing user_id in request": "Falta l'user_id a la sol·licitud",
     "Usage": "Ús",
     "/ddg is not a command": "/ddg no és una ordre",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Per utilitzar-lo, simplement espereu que es completin els resultats automàticament i seleccioneu-ne el desitjat.",
+    "To use it, just wait for autocomplete results to load and tab through them.": "Per utilitzar-ho, simplement espera que es completin els resultats automàticament i clica'n el desitjat.",
     "Ignored user": "Usuari ignorat",
-    "You are now ignoring %(userId)s": "Esteu ignorant l'usuari %(userId)s",
+    "You are now ignoring %(userId)s": "Estàs ignorant l'usuari %(userId)s",
     "Unignored user": "Usuari no ignorat",
-    "You are no longer ignoring %(userId)s": "Ja no esteu ignorant l'usuari %(userId)s",
+    "You are no longer ignoring %(userId)s": "Ja no estàs ignorant l'usuari %(userId)s",
     "Verified key": "Claus verificades",
     "Call Timeout": "Temps d'espera de les trucades",
     "Reason": "Raó",
@@ -147,19 +147,19 @@
     "(unknown failure: %(reason)s)": "(error desconegut: %(reason)s)",
     "%(senderName)s ended the call.": "%(senderName)s ha penjat.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s ha convidat a %(targetDisplayName)s a entrar a la sala.",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s ha fet visible l'històric futur de la sala per a tots els membres, a partir de que hi són convidats.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s ha establert la visibilitat de l'històric futur de la sala a tots els membres des de que s'hi uneixen.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s ha fet visible l'històric futur de la sala a tots els membres de la sala.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s ha fet visible el futur historial de la sala per a tothom.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s ha fet visible el futur historial de la sala per a desconeguts (%(visibility)s).",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s ha establert la visibilitat de l'historial futur de la sala a tots els seus membres, a partir de que hi són convidats.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s ha establert la visibilitat de l'historial futur de la sala a tots els seus membres des de que s'hi uneixen.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s ha establert la visibilitat de l'historial futur de la sala a tots els seus membres.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s ha establert la visibilitat de l'historial futur de la sala a tothom.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s ha establert la visibilitat de l'historial futur de la sala a desconegut (%(visibility)s).",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s a %(toPowerLevel)s",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ha canviat el nivell de poders de %(powerLevelDiffText)s.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ha canviat el nivell d'autoritat de %(powerLevelDiffText)s.",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s ha canviat els missatges fixats de la sala.",
     "%(widgetName)s widget modified by %(senderName)s": "%(senderName)s ha modificat el giny %(widgetName)s",
     "%(widgetName)s widget added by %(senderName)s": "%(senderName)s ha afegit el giny %(widgetName)s",
     "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s ha eliminat el giny %(widgetName)s",
     "Failure to create room": "No s'ha pogut crear la sala",
-    "Server may be unavailable, overloaded, or you hit a bug.": "És possible que el servidor no estigui disponible, amb sobrecàrrega o que s'hagi trobat un error.",
+    "Server may be unavailable, overloaded, or you hit a bug.": "És possible que el servidor no estigui disponible, sobrecarregat o que hagi topat amb un error.",
     "Send": "Envia",
     "Unnamed Room": "Sala sense nom",
     "Your browser does not support the required cryptography extensions": "El vostre navegador no és compatible amb els complements criptogràfics necessaris",
@@ -167,7 +167,7 @@
     "Authentication check failed: incorrect password?": "Ha fallat l'autenticació: heu introduït correctament la contrasenya?",
     "Failed to join room": "No s'ha pogut entrar a la sala",
     "Message Pinning": "Fixació de missatges",
-    "Show timestamps in 12 hour format (e.g. 2:30pm)": "Mostra les marques de temps en format de 12 hores (per exemple, 2:30pm)",
+    "Show timestamps in 12 hour format (e.g. 2:30pm)": "Mostra les marques de temps en format de 12 hores (p.e. 2:30pm)",
     "Autoplay GIFs and videos": "Reprodueix de forma automàtica els GIF i vídeos",
     "Enable automatic language detection for syntax highlighting": "Activa la detecció automàtica d'idiomes per al ressaltat de sintaxi",
     "Automatically replace plain text Emoji": "Substitueix automàticament Emoji de text pla",
@@ -204,7 +204,7 @@
     "Cannot add any more widgets": "No s'ha pogut afegir cap més giny",
     "The maximum permitted number of widgets have already been added to this room.": "Ja s'han afegit el màxim de ginys permesos en aquesta sala.",
     "Drop File Here": "Deixeu anar un fitxer aquí",
-    "Drop file here to upload": "Deixa anar l'arxiu aquí per pujar-lo",
+    "Drop file here to upload": "Deixa anar el fitxer aquí per pujar-lo",
     " (unsupported)": " (incompatible)",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Uneix-te com <voiceText>voice</voiceText> o <videoText>video</videoText>.",
     "Ongoing conference call%(supportedText)s.": "Trucada de conferència en curs %(supportedText)s.",
@@ -225,10 +225,10 @@
     "Ban this user?": "Voleu expulsar a aquest usuari?",
     "Failed to ban user": "No s'ha pogut expulsar l'usuari",
     "Failed to mute user": "No s'ha pogut silenciar l'usuari",
-    "Failed to change power level": "No s'ha pogut canviar el nivell de poders",
+    "Failed to change power level": "No s'ha pogut canviar el nivell d'autoritat",
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "No podràs desfer aquest canvi ja que t'estàs baixant de rang, si ets l'últim usuari de la sala amb privilegis, et serà impossible recuperar-los.",
     "Are you sure?": "Estàs segur?",
-    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "No podràs desfer aquest canvi ja que estàs donant a l'usuari el mateix nivell de privilegis que el teu.",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "No podràs desfer aquest canvi ja que estàs donant a l'usuari el mateix nivell d'autoritat que el teu.",
     "Unignore": "Deixa de ignorar",
     "Ignore": "Ignora",
     "Jump to read receipt": "Vés a l'últim missatge llegit",
@@ -240,7 +240,7 @@
     "and %(count)s others...|one": "i un altre...",
     "Invited": "Convidat",
     "Filter room members": "Filtra els membres de la sala",
-    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (poder %(powerLevelNumber)s)",
+    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (autoritat %(powerLevelNumber)s)",
     "Attachment": "Adjunt",
     "Hangup": "Penja",
     "Voice call": "Trucada de veu",
@@ -249,7 +249,7 @@
     "Send an encrypted reply…": "Envia una resposta xifrada…",
     "Send an encrypted message…": "Envia un missatge xifrat…",
     "You do not have permission to post to this room": "No tens permís per enviar res en aquesta sala",
-    "Server error": "Error del servidor",
+    "Server error": "Error de servidor",
     "Mirror local video feed": "Remet el flux de vídeo local",
     "Server unavailable, overloaded, or something else went wrong.": "El servidor no està disponible, està sobrecarregat o alguna altra cosa no ha funcionat correctament.",
     "Command error": "Error en l'ordre",
@@ -299,7 +299,7 @@
     "Who can access this room?": "Qui pot entrar a aquesta sala?",
     "Only people who have been invited": "Només les persones que hi hagin sigut convidades",
     "Anyone who knows the room's link, apart from guests": "Qualsevol que conegui l'enllaç de la sala, excepte usuaris d'altres xarxes",
-    "Publish this room to the public in %(domain)s's room directory?": "Voleu que es publiqui aquesta sala al directori de sales públiques de %(domain)s?",
+    "Publish this room to the public in %(domain)s's room directory?": "Vols publicar aquesta sala al directori de sales públiques de %(domain)s?",
     "Who can read history?": "Qui pot llegir l'historial?",
     "Anyone": "Qualsevol",
     "Members only (since the point in time of selecting this option)": "Només els membres (a partir del punt en què seleccioneu aquesta opció)",
@@ -313,19 +313,19 @@
     "This room has no local addresses": "Aquesta sala no té adreces locals",
     "Invalid community ID": "L'ID de la comunitat no és vàlid",
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s' no és un ID de comunitat vàlid",
-    "New community ID (e.g. +foo:%(localDomain)s)": "Nou ID de comunitat (per exemple +foo:%(localDomain)s)",
+    "New community ID (e.g. +foo:%(localDomain)s)": "Nou ID de comunitat (p.e. +foo:%(localDomain)s)",
     "You have <a>enabled</a> URL previews by default.": "Heu <a>habilitat</a> les previsualitzacions per defecte dels URL.",
     "You have <a>disabled</a> URL previews by default.": "Heu <a>inhabilitat</a> les previsualitzacions per defecte dels URL.",
     "URL previews are enabled by default for participants in this room.": "Les previsualitzacions dels URL estan habilitades per defecte per als membres d'aquesta sala.",
     "URL previews are disabled by default for participants in this room.": "Les previsualitzacions dels URL estan inhabilitades per defecte per als membres d'aquesta sala.",
     "URL Previews": "Previsualitzacions dels URL",
-    "Error decrypting audio": "S'ha produït un error mentre es desxifrava l'àudio",
-    "Error decrypting attachment": "S'ha produït un error en desxifrar el fitxer adjunt",
+    "Error decrypting audio": "Error desxifrant àudio",
+    "Error decrypting attachment": "Error desxifrant fitxer adjunt",
     "Decrypt %(text)s": "Desxifra %(text)s",
     "Download %(text)s": "Baixa %(text)s",
     "Invalid file%(extra)s": "Fitxer invàlid%(extra)s",
-    "Error decrypting image": "S'ha produït un error en desxifrar la imatge",
-    "Error decrypting video": "S'ha produït un error en desxifrar el vídeo",
+    "Error decrypting image": "Error desxifrant imatge",
+    "Error decrypting video": "Error desxifrant video",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s ha canviat l'avatar de %(roomName)s",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s ha eliminat l'avatar de la sala.",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s ha canviat l'avatar de la sala a <img/>",
@@ -334,9 +334,9 @@
     "Add an Integration": "Afegeix una integració",
     "An email has been sent to %(emailAddress)s": "S'ha enviat un correu electrònic a %(emailAddress)s",
     "Please check your email to continue registration.": "Reviseu el vostre correu electrònic per a poder continuar amb el registre.",
-    "Token incorrect": "El testimoni és incorrecte",
+    "Token incorrect": "Token incorrecte",
     "A text message has been sent to %(msisdn)s": "S'ha enviat un missatge de text a %(msisdn)s",
-    "Please enter the code it contains:": "Introduïu el codi que conté:",
+    "Please enter the code it contains:": "Introdueix el codi que conté:",
     "Start authentication": "Inicia l'autenticació",
     "Sign in with": "Inicieu sessió amb",
     "Email address": "Correu electrònic",
@@ -359,7 +359,7 @@
     "Visible to everyone": "Visible per a tothom",
     "Only visible to community members": "Només visible per als membres de la comunitat",
     "Filter community rooms": "Filtra sales de comunitats",
-    "Something went wrong when trying to get your communities.": "S'ha produït un error en intentar obtenir les vostres comunitats.",
+    "Something went wrong when trying to get your communities.": "Alguna cosa ha anat malament mentre s'intentaven obtenir les comunitats.",
     "You're not currently a member of any communities.": "Actualment no sou membre de cap comunitat.",
     "Unknown Address": "Adreça desconeguda",
     "Allow": "Permetre",
@@ -431,7 +431,7 @@
     "Try using one of the following valid address types: %(validTypesList)s.": "Proveu d'utilitzar un dels següents tipus d'adreça vàlids: %(validTypesList)s.",
     "You have entered an invalid address.": "No heu introduït una adreça vàlida.",
     "Confirm Removal": "Confirmeu l'eliminació",
-    "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Esteu segur que voleu eliminar (suprimir) aquest esdeveniment? Tingueu en compte que si suprimiu un nom sala o si feu un canvi de tema, desfaria el canvi.",
+    "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Estàs segur que vols eliminar (suprimir) aquest esdeveniment? Tingues en compte que, si suprimeixes un nom de sala o es canvia el tema, podria ser que es revertís.",
     "This room is not showing flair for any communities": "Aquesta sala no mostra talent per a cap comunitat",
     "Flair": "Talents",
     "Showing flair for these communities:": "Mostra els talents d'aquestes comunitats:",
@@ -442,7 +442,7 @@
     "%(oneUser)sleft %(count)s times|other": "%(oneUser)s ha sortit %(count)s vegades",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Les ID de les comunitats només poden contendre caràcters a-z, 0-9, o '=_-./'",
     "Community IDs cannot be empty.": "Les ID de les comunitats no poden estar buides.",
-    "Something went wrong whilst creating your community": "S'ha produït un error al crear la vostra comunitat",
+    "Something went wrong whilst creating your community": "S'ha produït un error mentre es creava la comunitat",
     "Create Community": "Crea una comunitat",
     "Community Name": "Nom de la comunitat",
     "Example": "Exemple",
@@ -450,7 +450,7 @@
     "example": "exemple",
     "Create": "Crea",
     "Create Room": "Crea una sala",
-    "Unknown error": "S'ha produït un error desconegut",
+    "Unknown error": "Error desconegut",
     "Incorrect password": "Contrasenya incorrecta",
     "Deactivate Account": "Desactivar el compte",
     "An error has occurred.": "S'ha produït un error.",
@@ -475,8 +475,8 @@
     "Public Chat": "Xat públic",
     "Custom": "Personalitzat",
     "Name": "Nom",
-    "You must <a>register</a> to use this functionality": "Heu de <a>register</a> per utilitzar aquesta funcionalitat",
-    "You must join the room to see its files": "Heu d'entrar a la sala per poder-ne veure els fitxers",
+    "You must <a>register</a> to use this functionality": "Per poder utilitzar aquesta funcionalitat has de <a>registrar-te</a>",
+    "You must join the room to see its files": "Per poder veure els fitxers de la sala t'hi has d'unir",
     "There are no visible files in this room": "No hi ha fitxers visibles en aquesta sala",
     "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>Aquest és l'HTML per a la pàgina de la vostra comunitat</h1>\n<p>\n    Utilitzeu la descripció llarga per a presentar la comunitat a nous membres,\n    o per afegir-hi <a href=\"foo\">enlaços</a> d'interès. \n</p>\n<p>\n    També podeu utilitzar etiquetes 'img'.\n</p>\n",
     "Add rooms to the community summary": "Afegiu sales al resum de la comunitat",
@@ -499,7 +499,7 @@
     "Leave Community": "Abandona la comunitat",
     "Leave %(groupName)s?": "Voleu sortir de la comunitat %(groupName)s?",
     "Leave": "Surt",
-    "Community Settings": "Paràmetres de la comunitat",
+    "Community Settings": "Configuració de comunitat",
     "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Aquestes sales es mostren a la pàgina de la comunitat als seus membres i poden entrar-hi fent clic sobre elles.",
     "Featured Rooms:": "Sales destacades:",
     "Featured Users:": "Usuaris destacats:",
@@ -507,7 +507,7 @@
     "You are an administrator of this community": "Sou un administrador d'aquesta comunitat",
     "You are a member of this community": "Sou un membre d'aquesta comunitat",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Estàs a punt de ser redirigit a una web de tercers per autenticar el teu compte i poder ser utilitzat amb %(integrationsUrl)s. Vols continuar?",
-    "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "La vostra comunitat no té una descripció llarga, una pàgina HTML per mostrar als membres de la comunitat. <br />Feu clic aquí per obrir la configuració i donar-ne una!",
+    "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "La teva comunitat no té cap descripció llarga (una pàgina HTML per mostrar als membres de la comunitat).<br />Clica aquí per obrir la configuració i crear-ne una!",
     "Long Description (HTML)": "Descripció llarga (HTML)",
     "Description": "Descripció",
     "Community %(groupId)s not found": "No s'ha pogut trobar la comunitat %(groupId)s",
@@ -522,7 +522,7 @@
     "Data from an older version of %(brand)s has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "S'han detectat dades d'una versió antiga del %(brand)s. Això haurà provocat que el xifratge d'extrem a extrem no funcioni correctament a la versió anterior. Els missatges xifrats d'extrem a extrem que s'han intercanviat recentment mentre s'utilitzava la versió anterior no es poden desxifrar en aquesta versió. També pot provocar que els missatges intercanviats amb aquesta versió fallin. Si teniu problemes, sortiu de la sessió i torneu a entrar-hi. Per poder llegir l'historial dels missatges xifrats, exporteu i torneu a importar les vostres claus.",
     "Logout": "Surt",
     "Your Communities": "Les teves comunitats",
-    "Error whilst fetching joined communities": "S'ha produït un error en buscar comunitats unides",
+    "Error whilst fetching joined communities": "Error en l'obtenció de comunitats unides",
     "Create a new community": "Crea una comunitat nova",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Crea una comunitat per agrupar usuaris i sales! Creeu una pàgina d'inici personalitzada per definir el vostre espai a l'univers Matrix.",
     "You have no visible notifications": "No teniu cap notificació visible",
@@ -568,23 +568,23 @@
     "Export": "Exporta",
     "Import room keys": "Importa les claus de la sala",
     "Import": "Importa",
-    "The version of %(brand)s": "La versió del %(brand)s",
+    "The version of %(brand)s": "La versió de %(brand)s",
     "Email": "Correu electrònic",
     "I have verified my email address": "He verificat l'adreça de correu electrònic",
     "Send Reset Email": "Envia email de reinici",
-    "Your homeserver's URL": "L'URL del vostre servidor personal",
+    "Your homeserver's URL": "L'URL del teu servidor propi",
     "Analytics": "Analítiques",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s ha canviat el seu nom visible a %(displayName)s.",
     "Identity Server is": "El servidor d'identitat és",
     "Submit debug logs": "Enviar logs de depuració",
-    "The platform you're on": "La plataforma a la que estàs",
-    "Your language of choice": "El teu idioma preferit",
+    "The platform you're on": "La plataforma a la que et trobes",
+    "Your language of choice": "El teu idioma desitjat",
     "Which officially provided instance you are using, if any": "Quina instància oficial estàs utilitzant, si escau",
-    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Si esteu utilitzant el mode Richtext del Rich Text Editor o no",
-    "The information being sent to us to help make %(brand)s better includes:": "La informació enviada a %(brand)s per ajudar-nos a millorar inclou:",
-    "Fetching third party location failed": "S'ha produït un error en obtenir la ubicació de tercers",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Si estàs utilitzant, o no, el mode Richtext de Rich Text Editor",
+    "The information being sent to us to help make %(brand)s better includes:": "La informació que s'envia a %(brand)s per ajudar-nos a millorar inclou:",
+    "Fetching third party location failed": "Ha fallat l'obtenció de la ubicació de tercers",
     "Send Account Data": "Envia les dades del compte",
-    "Advanced notification settings": "Paràmetres avançats de notificacions",
+    "Advanced notification settings": "Configuració avançada de notificacions",
     "Uploading report": "S'està enviant l'informe",
     "Sunday": "Diumenge",
     "Failed to add tag %(tagName)s to room": "No s'ha pogut afegir l'etiqueta %(tagName)s a la sala",
@@ -612,14 +612,14 @@
     "Messages containing my display name": "Missatges que contenen el meu nom visible",
     "Messages in one-to-one chats": "Missatges en xats un a un",
     "Unavailable": "No disponible",
-    "Error saving email notification preferences": "No s'han pogut desar les preferències de les notificacions a causa d'un error",
+    "Error saving email notification preferences": "Error desant preferències de notificacions de correu electrònic",
     "View Decrypted Source": "Mostra el codi desxifrat",
     "Failed to update keywords": "No s'han pogut actualitzar les paraules clau",
     "remove %(name)s from the directory.": "elimina %(name)s del directori.",
     "Notifications on the following keywords follow rules which can’t be displayed here:": "Les notificacions sobre les següents paraules clau segueixen regles que no es poden mostrar aquí:",
     "Please set a password!": "Si us plau, establiu una contrasenya",
     "You have successfully set a password!": "Heu establert correctament la contrasenya",
-    "An error occurred whilst saving your email notification preferences.": "S'ha produït un error en desar les vostres preferències de notificació per correu electrònic.",
+    "An error occurred whilst saving your email notification preferences.": "S'ha produït un error mentre es desaven les teves preferències de notificació de correu electrònic.",
     "Explore Room State": "Esbrina els estats de les sales",
     "Source URL": "URL origen",
     "Messages sent by bot": "Missatges enviats pel bot",
@@ -668,7 +668,7 @@
     "Notify me for anything else": "Notifica'm per a qualsevol altra cosa",
     "View Source": "Mostra el codi",
     "Keywords": "Paraules clau",
-    "Can't update user notification settings": "No es poden actualitzar els paràmetres de les notificacions de l'usuari",
+    "Can't update user notification settings": "No es pot actualitzar la configuració de notificacions d'usuari",
     "Notify for all other messages/rooms": "Notifica per a tots els altres missatges o sales",
     "Unable to look up room ID from server": "No s'ha pogut cercar l'ID de la sala en el servidor",
     "Couldn't find a matching Matrix room": "No s'ha pogut trobar una sala de Matrix que coincideixi",
@@ -700,44 +700,44 @@
     "Event Type": "Tipus d'esdeveniment",
     "Download this file": "Descarrega aquest fitxer",
     "Pin Message": "Enganxa el missatge",
-    "Failed to change settings": "No s'han pogut modificar els paràmetres",
+    "Failed to change settings": "No s'ha pogut canviar la configuració",
     "View Community": "Mira la communitat",
     "Event sent!": "Esdeveniment enviat!",
     "Event Content": "Contingut de l'esdeveniment",
     "Thank you!": "Gràcies!",
     "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!": "Amb el vostre navegador actual, l'aparença de l'aplicació pot ser completament incorrecta i algunes o totes les funcions poden no funcionar correctament. Si voleu provar-ho de totes maneres, podeu continuar, però esteu sols pel que fa als problemes que pugueu trobar!",
     "Checking for an update...": "Comprovant si hi ha actualitzacions...",
-    "e.g. %(exampleValue)s": "p. ex. %(exampleValue)s",
-    "Every page you use in the app": "Cada pàgina que utilitzeu a l'aplicació",
-    "e.g. <CurrentPageURL>": "p. ex. <CurrentPageURL>",
-    "Your device resolution": "La resolució del vostre dispositiu",
+    "e.g. %(exampleValue)s": "p.e. %(exampleValue)s",
+    "Every page you use in the app": "Cada pàgina que utilitzes a l'aplicació",
+    "e.g. <CurrentPageURL>": "p.e. <CurrentPageURL>",
+    "Your device resolution": "La resolució del teu dispositiu",
     "Show Stickers": "Mostra els adhesius",
-    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Quan aquesta pàgina contingui informació identificable, com per exemple una sala, usuari o ID de grup, aquestes dades se suprimeixen abans d'enviar-se al servidor.",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Quan aquesta pàgina contingui informació d'identificació, com per exemple una sala, usuari o ID de grup, aquestes dades s'eliminen abans d'enviar-se al servidor.",
     "Call in Progress": "Trucada en curs",
-    "A call is currently being placed!": "S'està fent una trucada en aquest moment!",
+    "A call is currently being placed!": "En aquest moment s'està realitzant una trucada!",
     "A call is already in progress!": "Ja hi ha una trucada en curs!",
-    "Permission Required": "Permís requerit",
-    "You do not have permission to start a conference call in this room": "No teniu permís per iniciar una trucada de conferència en aquesta sala",
-    "Unable to load! Check your network connectivity and try again.": "No s'ha pogut carregar! Comproveu la vostra connectivitat i torneu-ho a provar.",
-    "Failed to invite users to the room:": "No s'ha pogut convidar els usuaris a aquesta sala:",
-    "Missing roomId.": "Manca l'ID de la sala.",
+    "Permission Required": "Es necessita permís",
+    "You do not have permission to start a conference call in this room": "No tens permís per iniciar una conferència telefònica en aquesta sala",
+    "Unable to load! Check your network connectivity and try again.": "No s'ha pogut carregar! Comprova la connectivitat de xarxa i torna-ho a intentar.",
+    "Failed to invite users to the room:": "No s'han pogut convidar els usuaris a la sala:",
+    "Missing roomId.": "Falta l'ID de sala.",
     "Searches DuckDuckGo for results": "Cerca al DuckDuckGo els resultats",
-    "Changes your display nickname": "Canvia el vostre malnom",
-    "Invites user with given id to current room": "Convida l'usuari amb l'id donat a la sala actual",
-    "Kicks user with given id": "Expulsa l'usuari amb l'id donat",
-    "Bans user with given id": "Bandeja l'usuari amb l'id donat",
+    "Changes your display nickname": "Canvia el teu àlies de visualització",
+    "Invites user with given id to current room": "Convida a la sala actual l'usuari amb l'ID indicat",
+    "Kicks user with given id": "Expulsa l'usuari amb l'ID indicat",
+    "Bans user with given id": "Bandeja l'usuari amb l'ID indicat",
     "Ignores a user, hiding their messages from you": "Ignora un usuari, amagant-te els seus missatges",
-    "Stops ignoring a user, showing their messages going forward": "Deixa d'ignorar un usuari, mostrant els seus missatges ara en avant",
+    "Stops ignoring a user, showing their messages going forward": "Deixa d'ignorar un usuari, i mostra els seus missatges a partir d'ara",
     "Define the power level of a user": "Defineix el nivell d'autoritat d'un usuari",
     "Deops user with given id": "Degrada l'usuari amb l'id donat",
     "Opens the Developer Tools dialog": "Obre el diàleg d'Eines del desenvolupador",
     "Displays action": "Mostra l'acció",
-    "Whether or not you're logged in (we don't record your username)": "Si heu iniciat sessió o no (no desem el vostre usuari)",
-    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "El fitxer %(fileName)s supera el límit de pujades del servidor",
+    "Whether or not you're logged in (we don't record your username)": "Si has iniciat sessió o no (no registrem el teu nom d'usuari)",
+    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "El fitxer %(fileName)s supera la mida màxima permesa per a pujades d'aquest servidor",
     "Upgrades a room to a new version": "Actualitza la sala a una versió nova",
-    "Gets or sets the room topic": "Consulta o canvia el tema de la sala",
-    "This room has no topic.": "Aquesta sala no te tema.",
-    "Sets the room name": "Canvia el nom de la sala",
+    "Gets or sets the room topic": "Obté o estableix el tema de la sala",
+    "This room has no topic.": "Aquesta sala no té tema.",
+    "Sets the room name": "Estableix el nom de la sala",
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s ha actualitzat aquesta sala.",
     "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s ha fet la sala pública a tothom qui conegui l'adreça.",
     "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s ha limitat la sala als convidats.",
@@ -778,7 +778,7 @@
     "Common names and surnames are easy to guess": "Noms i cognoms comuns són fàcils d'esbrinar",
     "Straight rows of keys are easy to guess": "Fileres seguides de tecles són fàcils d'esbrinar",
     "Short keyboard patterns are easy to guess": "Patrons curts de teclat són fàcils d'esbrinar",
-    "There was an error joining the room": "Hi ha hagut un error en entrar a la sala",
+    "There was an error joining the room": "Hi ha hagut un error unint-se a la sala",
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "No s'ha trobat el perfil pels IDs de Matrix següents, els voleu convidar igualment?",
     "Invite anyway and never warn me again": "Convidar igualment i no avisar-me de nou",
     "Invite anyway": "Convidar igualment",
@@ -811,5 +811,142 @@
     "Theme": "Tema",
     "Phone Number": "Número de telèfon",
     "Help": "Ajuda",
-    "Send typing notifications": "Envia notificacions d'escriptura"
+    "Send typing notifications": "Envia notificacions d'escriptura",
+    "Delete the room address %(alias)s and remove %(name)s from the directory?": "Vols suprimir l'adreça de la sala %(alias)s i eliminar %(name)s del directori?",
+    "We encountered an error trying to restore your previous session.": "Hem trobat un error en intentar recuperar la teva sessió prèvia.",
+    "There was an error updating your community. The server is unable to process your request.": "S'ha produït un error en actualitzar la comunitat. El servidor no ha pogut processar la petició.",
+    "There was an error creating your community. The name may be taken or the server is unable to process your request.": "S'ha produït un error en crear la comunitat. Potser el nom ja existeix o el servidor no ha pogut processar la petició.",
+    "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "S'ha retornat un error (%(errcode)s) mentre s'intentava validar la invitació. Pots provar a informar d'això a un administrador de sala.",
+    "Error: Problem communicating with the given homeserver.": "Error: problema comunicant-se amb el servidor local proporcionat.",
+    "Upload Error": "Error de pujada",
+    "A connection error occurred while trying to contact the server.": "S'ha produït un error de connexió mentre s'intentava connectar al servidor.",
+    "%(brand)s encountered an error during upload of:": "%(brand)s ha trobat un error durant la pujada de:",
+    "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "S'ha produït un error en actualitzar l'adreça principal de la sala. Pot ser que el servidor no ho permeti o que s'hagi produït un error temporal.",
+    "Error upgrading room": "Error actualitzant sala",
+    "Error unsubscribing from list": "Error en cancel·lar subscripció de la llista",
+    "Error changing power level requirement": "Error en canviar requisit del nivell d'autoritat",
+    "Error changing power level": "Error en canviar nivell d'autoritat",
+    "Error updating main address": "Error actualitzant adreça principal",
+    "Error creating address": "Error creant adreça",
+    "Error removing address": "Error eliminant adreça",
+    "There was an error removing that address. It may no longer exist or a temporary error occurred.": "S'ha produït un error en eliminar l'adreça. Pot ser que ja no existeixi o que s'hagi produït un error temporal.",
+    "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "S'ha produït un error en crear l'adreça. Pot ser que el servidor no ho permeti o que s'hagi produït un error temporal.",
+    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "S'ha produït un error en actualitzar l'adreça alternativa de la sala. Pot ser que el servidor no ho permeti o que s'hagi produït un error temporal.",
+    "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "S'ha retornat %(errcode)s mentre s'intentava accedir a la sala. Si creus que aquest missatge és un error, <issueLink>envia un informe d'error</issueLink>.",
+    "Error removing ignored user/server": "Error eliminant usuari/servidor ignorat",
+    "Error subscribing to list": "Error subscrivint-se a la llista",
+    "Error adding ignored user/server": "Error afegint usuari/servidor ignorat",
+    "Error downloading theme information.": "Error baixant informació de tema.",
+    "Unexpected server error trying to leave the room": "Error de servidor inesperat intentant sortir de la sala",
+    "Error leaving room": "Error sortint de la sala",
+    "Unexpected error resolving identity server configuration": "Error inesperat resolent la configuració del servidor d'identitat",
+    "Unexpected error resolving homeserver configuration": "Error inesperat resolent la configuració del servidor local",
+    "(an error occurred)": "(s'ha produït un error)",
+    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Els gestors d'integracions reben dades de configuració i poden modificar ginys, enviar invitacions a sales i establir nivells d'autoritat en nom teu.",
+    "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "S'ha produït un error en canviar els requisits del nivell d'autoritat de la sala. Assegura't que tens suficients permisos i torna-ho a provar.",
+    "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "S'ha produït un error en canviar el nivell d'autoritat de l'usuari. Assegura't que tens suficients permisos i torna-ho a provar.",
+    "Power level": "Nivell d'autoritat",
+    "Unbans user with given ID": "Desbandeja l'usuari amb l'ID indicat",
+    "Unrecognised room address:": "Adreça de sala no reconeguda:",
+    "Joins room with given address": "S'uneix a la sala amb l'adreça indicada",
+    "Use an identity server": "Utilitza un servidor d'identitat",
+    "Failed to set topic": "No s'ha pogut establir el tema",
+    "Changes your avatar in all rooms": "Canvia el teu avatar en totes les sales",
+    "Changes your avatar in this current room only": "Canvia el teu avatar només en aquesta sala actual",
+    "Changes the avatar of the current room": "Canvia l'avatar de la sala actual",
+    "Changes your display nickname in the current room only": "Canvia el teu àlies de visualització només en la sala actual",
+    "Double check that your server supports the room version chosen and try again.": "Comprova que el teu servidor és compatible amb la versió de sala que has triat i torna-ho a intentar.",
+    "You do not have the required permissions to use this command.": "No disposes dels permisos necessaris per utilitzar aquesta ordre.",
+    "Sends a message as html, without interpreting it as markdown": "Envia un missatge com a html sense interpretar-lo com a markdown",
+    "Sends a message as plain text, without interpreting it as markdown": "Envia un missatge com a text pla sense interpretar-lo com a markdown",
+    "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Afegeix ( ͡° ͜ʖ ͡°) al principi d'un missatge de text pla",
+    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Afegeix ¯\\_(ツ)_/¯ al principi d'un missatge de text pla",
+    "Other": "Altres",
+    "Actions": "Accions",
+    "Messages": "Missatges",
+    "Setting up keys": "Configurant claus",
+    "Go Back": "Torna",
+    "Are you sure you want to cancel entering passphrase?": "Estàs segur que vols cancel·lar la introducció de la frase secreta?",
+    "Cancel entering passphrase?": "Vols cancel·lar la introducció de la frase secreta?",
+    "Custom (%(level)s)": "Personalitzat (%(level)s)",
+    "Sign In": "Inicia sessió",
+    "Create Account": "Crea un compte",
+    "Use your account or create a new one to continue.": "Utilitza el teu compte o crea'n un de nou per continuar.",
+    "Sign In or Create Account": "Inicia sessió o Crea un compte",
+    "%(name)s is requesting verification": "%(name)s està demanant verificació",
+    "Trust": "Confiança",
+    "Only continue if you trust the owner of the server.": "Continua, només, si confies amb el propietari del servidor.",
+    "Identity server has no terms of service": "El servidor d'identitat no disposa de condicions de servei",
+    "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.": "Aquesta acció necessita accedir al servidor d'identitat predeterminat <server /> per validar una adreça de correu electrònic o un número de telèfon, però el servidor no disposa de condicions de servei.",
+    "Room name or address": "Nom o adreça de la sala",
+    "Name or Matrix ID": "Nom o ID de Matrix",
+    "The server does not support the room version specified.": "El servidor no és compatible amb la versió de sala especificada.",
+    "The file '%(fileName)s' failed to upload.": "No s'ha pogut pujar el fitxer '%(fileName)s'.",
+    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "En aquests moments no és possible respondre amb un fitxer. Vols pujar aquest fitxer sense respondre?",
+    "Replying With Files": "Responent amb fitxers",
+    "Answered Elsewhere": "Respost en una altra banda",
+    "Your user agent": "El teu agent d'usuari",
+    "Find a room… (e.g. %(exampleRoom)s)": "Cerca un sala... (p.e. %(exampleRoom)s)",
+    "e.g. my-room": "p.e. la-meva-sala",
+    "New published address (e.g. #alias:server)": "Nova adreça publicada (p.e. #alias:server)",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "Si estàs utilitzant %(brand)s com a una instal·lació d'una Aplicació Web Progressiva (PWA)",
+    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Si estàs utilitzant, o no, la funció 'molles de pa' (avatars a sobre la llista de sales)",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Si estàs utilitzant %(brand)s en un dispositiu on el tàctil és el principal mecanisme d'entrada",
+    "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Si no has eliminat el mètode de recuperació, pot ser que un atacant estigui intentant accedir al teu compte. Canvia la teva contrasenya i configura un nou mètode de recuperació a Configuració, immediatament.",
+    "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Si no has configurat el teu mètode de recuperació, pot ser que un atacant estigui intentant accedir al teu compte. Canvia la teva contrasenya i configura un nou mètode de recuperació a Configuració, immediatament.",
+    "You can also set up Secure Backup & manage your keys in Settings.": "També pots configurar la còpia de seguretat segura i gestionar les teves claus a Configuració.",
+    "You've previously used %(brand)s on %(host)s with lazy loading of members enabled. In this version lazy loading is disabled. As the local cache is not compatible between these two settings, %(brand)s needs to resync your account.": "Prèviament has fet servir %(brand)s a %(host)s amb la càrrega mandrosa de membres activada. En aquesta versió la càrrega mandrosa està desactivada. Com que la memòria cau local no és compatible entre les dues versions, %(brand)s necessita tornar a sincronitzar el teu compte.",
+    "Show info about bridges in room settings": "Mostra informació d'enllaços a la configuració de sala",
+    "Use an identity server to invite by email. Manage in Settings.": "Utilitza un servidor d'identitat per convidar per correu electrònic. Gestiona'l a Configuració.",
+    "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Utilitza un servidor d'identitat per poder convidar per correu electrònic. Fes clic a continua per a utilitzar el servidor d'identitat predeterminat (%(defaultIdentityServerName)s) o gestiona'l a Configuració.",
+    "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Utilitza un servidor d'identitat per poder convidar per correu electrònic. <default>Utilitza el predeterminat (%(defaultIdentityServerName)s)</default> o gestiona'l a <settings>Configuració</settings>.",
+    "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Utilitza un servidor d'identitat per poder convidar per correu electrònic. Gestiona'l a <settings>Configuració</settings>.",
+    "Integrations not allowed": "No es permeten integracions",
+    "Integrations are disabled": "Les integracions estan desactivades",
+    "Manage integrations": "Gestió d'integracions",
+    "Community settings": "Configuració de comunitat",
+    "Notification settings": "Configuració de notificacions",
+    "Room Settings - %(roomName)s": "Configuració de sala - %(roomName)s",
+    "Confirm this user's session by comparing the following with their User Settings:": "Confirma aquesta sessió d'usuari comparant amb la seva configuració d'usuari, el següent:",
+    "Confirm by comparing the following with the User Settings in your other session:": "Confirma comparant el següent amb la configuració d'usuari de la teva altra sessió:",
+    "Room settings": "Configuració de sala",
+    "Appearance Settings only affect this %(brand)s session.": "La configuració d'aspecte només afecta aquesta sessió %(brand)s.",
+    "Change notification settings": "Canvia la configuració de notificacions",
+    "⚠ These settings are meant for advanced users.": "⚠ Aquesta configuració està pensada per usuaris avançats.",
+    "Link this email with your account in Settings to receive invites directly in %(brand)s.": "Per rebre invitacions directament a %(brand)s, enllaça aquest correu electrònic amb el teu compte a Configuració.",
+    "Change settings": "Canvia la configuració",
+    "Use an identity server in Settings to receive invites directly in %(brand)s.": "Per rebre invitacions directament a %(brand)s, utilitza un servidor d'identitat a Configuració.",
+    "Share this email in Settings to receive invites directly in %(brand)s.": "Per rebre invitacions directament a %(brand)s, comparteix aquest correu electrònic a Configuració.",
+    "Enable 'Manage Integrations' in Settings to do this.": "Per fer això, activa 'Gestió d'integracions' a Configuració.",
+    "We recommend you change your password and recovery key in Settings immediately": "Et recomanem que canviïs immediatament la teva contrasenya i clau de recuperació a Configuració",
+    "Go to Settings": "Ves a Configuració",
+    "No identity server is configured: add one in server settings to reset your password.": "No hi ha cap servidor d'identitat configurat: afegeix-ne un a la configuració del servidor per poder restablir la teva contrasenya.",
+    "User settings": "Configuració d'usuari",
+    "All settings": "Totes les configuracions",
+    "This will end the conference for everyone. Continue?": "Això finalitzarà la conferència per a tothom. Vols continuar?",
+    "End conference": "Finalitza la conferència",
+    "Alternatively, you can try to use the public server at <code>turn.matrix.org</code>, but this will not be as reliable, and it will share your IP address with that server. You can also manage this in Settings.": "Com a alternativa, pots provar d'utilitzar el servidor públic a <code>turn.matrix.org</code>, però no serà tant fiable i compartirà la teva IP amb el servidor. També pots gestionar-ho a Configuració.",
+    "Try using turn.matrix.org": "Prova d'utilitzar turn.matrix.org",
+    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Demana a l'administrador del servidor local (<code>%(homeserverDomain)s</code>) que configuri un servidor TURN perquè les trucades funcionin de manera fiable.",
+    "Call failed due to misconfigured server": "La trucada ha fallat a causa d'una configuració errònia al servidor",
+    "The call was answered on another device.": "La trucada s'ha respost des d'un altre dispositiu.",
+    "The call could not be established": "No s'ha pogut establir la trucada",
+    "The other party declined the call.": "L'altra part ha rebutjat la trucada.",
+    "Call Declined": "Trucada rebutjada",
+    "Add Phone Number": "Afegeix número de telèfon",
+    "Confirm adding email": "Confirma l'addició del correu electrònic",
+    "To continue, use Single Sign On to prove your identity.": "Per continuar, utilitza la inscripció única SSO (per demostrar la teva identitat).",
+    "Confirm your account deactivation by using Single Sign On to prove your identity.": "Confirma la desactivació del teu compte mitjançant la inscripció única SSO (per demostrar la teva identitat).",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "Confirma l'eliminació d'aquesta sessió mitjançant la inscripció única SSO (per demostrar la teva identitat).",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Confirma l'eliminació d'aquestes sessions mitjançant la inscripció única SSO (per demostrar la teva identitat).",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Confirma l'addició d'aquest número de telèfon mitjançant la inscripció única SSO (per demostrar la teva identitat).",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Confirma l'addició d'aquest correu electrònic mitjançant la inscripció única SSO (per demostrar la teva identitat).",
+    "Sign in with single sign-on": "Inicia sessió mitjançant la inscripció única (SSO)",
+    "Single Sign On": "Inscripció única (SSO)",
+    "Use Single Sign On to continue": "Utilitza la inscripció única (SSO) per a continuar",
+    "Click the button below to confirm adding this phone number.": "Fes clic al botó de sota per confirmar l'addició d'aquest número de telèfon.",
+    "Confirm adding phone number": "Confirma l'addició del número de telèfon",
+    "Add Email Address": "Afegeix una adreça de correu electrònic",
+    "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."
 }

From f4f3dbfcb6f2c14ea52c31688dc9771823d4815f Mon Sep 17 00:00:00 2001
From: XoseM <correoxm@disroot.org>
Date: Thu, 5 Nov 2020 03:35:49 +0000
Subject: [PATCH 050/146] Translated using Weblate (Galician)

Currently translated at 100.0% (2380 of 2380 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
---
 src/i18n/strings/gl.json | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index dc3e0ff1e4..17de8cc096 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -2561,5 +2561,18 @@
     "Add comment": "Engadir comentario",
     "Please go into as much detail as you like, so we can track down the problem.": "Podes entrar en detalle canto desexes, así poderemos entender mellor o problema.",
     "%(senderName)s ended the call": "%(senderName)s finalizou a chamada",
-    "You ended the call": "Finalizaches a chamada"
+    "You ended the call": "Finalizaches a chamada",
+    "Now, let's help you get started": "Ímosche axudar neste comezo",
+    "Welcome %(name)s": "Benvida %(name)s",
+    "Add a photo so people know it's you.": "Engade unha foto así a xente recoñecerate.",
+    "Great, that'll help people know it's you": "Moi ben, así axudarás a que outras persoas te recoñezan",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Convida a persoas usando o seu nome, enderezo de email, nome de usuaria (como <userId/>) ou <a>comparte esta sala</a>.",
+    "Start a conversation with someone using their name, email address or username (like <userId/>).": "Inicia unha conversa con alguén usando o seu nome, enderezo de email ou nome de usuaria (como <userId/>).",
+    "Invite by email": "Convidar por email",
+    "Use the + to make a new room or explore existing ones below": "Usa o + para crear unha nova sala ou explora as existentes embaixo",
+    "Offline encrypted messaging using dehydrated devices": "Mensaxería cifrada offline usando dispositivos \"deshidratados\"",
+    "New version of %(brand)s is available": "Hai unha nova versión de %(brand)s dispoñible",
+    "Update %(brand)s": "Actualizar %(brand)s",
+    "Enable desktop notifications": "Activar notificacións de escritorio",
+    "Don't miss a reply": "Non perdas as réplicas"
 }

From 5bde16ccbb0ea6c99c74e9c3f276c8aaa1b87afe Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 9 Nov 2020 01:07:15 +0000
Subject: [PATCH 051/146] hide some validation tooltips if fields are valid.

fixes https://github.com/vector-im/element-web/issues/9683
---
 src/components/views/auth/RegistrationForm.js | 3 +++
 src/components/views/elements/Validation.tsx  | 7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/views/auth/RegistrationForm.js b/src/components/views/auth/RegistrationForm.js
index db7d1df994..419443984a 100644
--- a/src/components/views/auth/RegistrationForm.js
+++ b/src/components/views/auth/RegistrationForm.js
@@ -250,6 +250,7 @@ export default class RegistrationForm extends React.Component {
 
     validateEmailRules = withValidation({
         description: () => _t("Use an email address to recover your account"),
+        hideDescriptionIfValid: true,
         rules: [
             {
                 key: "required",
@@ -326,6 +327,7 @@ export default class RegistrationForm extends React.Component {
 
     validatePhoneNumberRules = withValidation({
         description: () => _t("Other users can invite you to rooms using your contact details"),
+        hideDescriptionIfValid: true,
         rules: [
             {
                 key: "required",
@@ -356,6 +358,7 @@ export default class RegistrationForm extends React.Component {
 
     validateUsernameRules = withValidation({
         description: () => _t("Use lowercase letters, numbers, dashes and underscores only"),
+        hideDescriptionIfValid: true,
         rules: [
             {
                 key: "required",
diff --git a/src/components/views/elements/Validation.tsx b/src/components/views/elements/Validation.tsx
index 55e5714719..667b8e99aa 100644
--- a/src/components/views/elements/Validation.tsx
+++ b/src/components/views/elements/Validation.tsx
@@ -33,6 +33,7 @@ interface IRule<T, D = void> {
 interface IArgs<T, D = void> {
     rules: IRule<T, D>[];
     description(this: T, derivedData: D): React.ReactChild;
+    hideDescriptionIfValid: Boolean;
     deriveData?(data: Data): Promise<D>;
 }
 
@@ -54,6 +55,8 @@ export interface IValidationResult {
  * @param {Function} description
  *     Function that returns a string summary of the kind of value that will
  *     meet the validation rules. Shown at the top of the validation feedback.
+ * @param {Boolean} hideDescriptionIfValid
+ *     If true, don't show the description if the validation passes validation.
  * @param {Function} deriveData
  *     Optional function that returns a Promise to an object of generic type D.
  *     The result of this Promise is passed to rule methods `skip`, `test`, `valid`, and `invalid`.
@@ -71,7 +74,7 @@ export interface IValidationResult {
  *     A validation function that takes in the current input value and returns
  *     the overall validity and a feedback UI that can be rendered for more detail.
  */
-export default function withValidation<T = undefined, D = void>({ description, deriveData, rules }: IArgs<T, D>) {
+export default function withValidation<T = undefined, D = void>({ description, hideDescriptionIfValid, deriveData, rules }: IArgs<T, D>) {
     return async function onValidate({ value, focused, allowEmpty = true }: IFieldState): Promise<IValidationResult> {
         if (!value && allowEmpty) {
             return {
@@ -156,7 +159,7 @@ export default function withValidation<T = undefined, D = void>({ description, d
         }
 
         let summary;
-        if (description) {
+        if (description && (details || !hideDescriptionIfValid)) {
             // We're setting `this` to whichever component holds the validation
             // function. That allows rules to access the state of the component.
             const content = description.call(this, derivedData);

From 2cac5f05a1c56ce1a18c4f1fe6e6a789f3696e24 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 9 Nov 2020 01:16:38 +0000
Subject: [PATCH 052/146] lint

---
 src/components/views/elements/Validation.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/views/elements/Validation.tsx b/src/components/views/elements/Validation.tsx
index 667b8e99aa..7a8e47dfb6 100644
--- a/src/components/views/elements/Validation.tsx
+++ b/src/components/views/elements/Validation.tsx
@@ -74,7 +74,9 @@ export interface IValidationResult {
  *     A validation function that takes in the current input value and returns
  *     the overall validity and a feedback UI that can be rendered for more detail.
  */
-export default function withValidation<T = undefined, D = void>({ description, hideDescriptionIfValid, deriveData, rules }: IArgs<T, D>) {
+export default function withValidation<T = undefined, D = void>({
+    description, hideDescriptionIfValid, deriveData, rules
+}: IArgs<T, D>) {
     return async function onValidate({ value, focused, allowEmpty = true }: IFieldState): Promise<IValidationResult> {
         if (!value && allowEmpty) {
             return {

From ef09ff661593aa52e0b151cf0e7af87142bc8b8e Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 9 Nov 2020 01:16:58 +0000
Subject: [PATCH 053/146] lint again

---
 src/components/views/elements/Validation.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/elements/Validation.tsx b/src/components/views/elements/Validation.tsx
index 7a8e47dfb6..35bf3a0456 100644
--- a/src/components/views/elements/Validation.tsx
+++ b/src/components/views/elements/Validation.tsx
@@ -75,7 +75,7 @@ export interface IValidationResult {
  *     the overall validity and a feedback UI that can be rendered for more detail.
  */
 export default function withValidation<T = undefined, D = void>({
-    description, hideDescriptionIfValid, deriveData, rules
+    description, hideDescriptionIfValid, deriveData, rules,
 }: IArgs<T, D>) {
     return async function onValidate({ value, focused, allowEmpty = true }: IFieldState): Promise<IValidationResult> {
         if (!value && allowEmpty) {

From 99fb62cc681e4c006a26d6831ee0f75cab8ce7a5 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 9 Nov 2020 01:37:17 +0000
Subject: [PATCH 054/146] fix lint yet again

---
 src/components/views/elements/Validation.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/elements/Validation.tsx b/src/components/views/elements/Validation.tsx
index 35bf3a0456..c45a745918 100644
--- a/src/components/views/elements/Validation.tsx
+++ b/src/components/views/elements/Validation.tsx
@@ -33,7 +33,7 @@ interface IRule<T, D = void> {
 interface IArgs<T, D = void> {
     rules: IRule<T, D>[];
     description(this: T, derivedData: D): React.ReactChild;
-    hideDescriptionIfValid: Boolean;
+    hideDescriptionIfValid?: Boolean;
     deriveData?(data: Data): Promise<D>;
 }
 

From 7705e6185eb3337247bc625087b2322f928f039f Mon Sep 17 00:00:00 2001
From: TR_SLimey <tr_slimey@protonmail.com>
Date: Fri, 6 Nov 2020 17:17:10 +0000
Subject: [PATCH 055/146] Translated using Weblate (Polish)

Currently translated at 62.9% (1498 of 2380 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pl/
---
 src/i18n/strings/pl.json | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index d22fe3d4a0..8122e93f45 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -1572,5 +1572,17 @@
     "The other party declined the call.": "Połączenie zostało odrzucone przez drugą stronę.",
     "Call Declined": "Połączenie odrzucone",
     "Messages in this room are end-to-end encrypted.": "Wiadomości w tym pokoju są szyfrowane end-to-end.",
-    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Klucz podpisujący, który podano jest taki sam jak klucz podpisujący otrzymany od %(userId)s oraz sesji %(deviceId)s. Sesja została oznaczona jako zweryfikowana."
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Klucz podpisujący, który podano jest taki sam jak klucz podpisujący otrzymany od %(userId)s oraz sesji %(deviceId)s. Sesja została oznaczona jako zweryfikowana.",
+    "Sends a message to the given user": "Wysyła wiadomość do wybranego użytkownika",
+    "Opens chat with the given user": "Otwiera rozmowę z wybranym użytkownikiem",
+    "Please supply a widget URL or embed code": "Proszę podać adres URL widżetu lub embed code",
+    "Command failed": "Wykonywanie komendy nie powiodło się",
+    "Unrecognised room address:": "Nieznany adres pokoju:",
+    "Joins room with given address": "Dołącz do pokoju o wybranym adresie",
+    "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Dodaje ( ͡° ͜ʖ ͡°) na początku wiadomości tekstowej",
+    "Are you sure you want to cancel entering passphrase?": "Czy na pewno chcesz anulować wpisywanie hasła?",
+    "Cancel entering passphrase?": "Anulować wpisywanie hasła?",
+    "Room name or address": "Nazwa lub adres pokoju",
+    "This will end the conference for everyone. Continue?": "Czy na pewno chcesz zakończyc połączenie grupowe? To zakończy je dla wszystkich uczestnikow.",
+    "End conference": "Zakończ połączenie grupowe"
 }

From ae0e525b4bc8247257f6e1962442725da6dd658f Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Sat, 7 Nov 2020 10:57:59 +0000
Subject: [PATCH 056/146] Translated using Weblate (Italian)

Currently translated at 99.9% (2379 of 2380 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
---
 src/i18n/strings/it.json | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 9138bb86f9..36ba1477e6 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -797,7 +797,7 @@
     "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Il tuo account sarà permanentemente inutilizzabile. Non potrai accedere e nessuno potrà ri-registrare lo stesso ID utente. Il tuo account abbandonerà tutte le stanze a cui partecipa e i dettagli del tuo account saranno rimossi dal server di identità. <b>Questa azione è irreversibile.</b>",
     "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "Disattivare il tuo account <b>non eliminerà in modo predefinito i messaggi che hai inviato</b>. Se vuoi che noi dimentichiamo i tuoi messaggi, seleziona la casella sotto.",
     "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "La visibilità dei messaggi in Matrix è simile alle email. Se dimentichiamo i messaggi significa che quelli che hai inviato non verranno condivisi con alcun utente nuovo o non registrato, ma gli utenti registrati che avevano già accesso ai messaggi avranno ancora accesso alla loro copia.",
-    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Per favore dimenticate tutti i messaggi che ho inviato quando il mio account viene disattivato (Attenzione: gli utenti futuri vedranno un elenco incompleto di conversazioni)",
+    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Per favore dimenticate tutti i messaggi che ho inviato quando il mio account viene disattivato (<b>Attenzione:</b> gli utenti futuri vedranno un elenco incompleto di conversazioni)",
     "To continue, please enter your password:": "Per continuare, inserisci la tua password:",
     "Can't leave Server Notices room": "Impossibile abbandonare la stanza Notifiche Server",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Questa stanza viene usata per messaggi importanti dall'homeserver, quindi non puoi lasciarla.",
@@ -833,7 +833,7 @@
     "The email field must not be blank.": "Il campo email non deve essere vuoto.",
     "The phone number field must not be blank.": "Il campo telefono non deve essere vuoto.",
     "The password field must not be blank.": "Il campo passwordl non deve essere vuoto.",
-    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Non è possibile inviare alcun messaggio fino a quando non si esaminano e si accettano <consentLink> i nostri termini e condizioni </ permissionLink>.",
+    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Non puoi inviare alcun messaggio fino a quando non leggi ed accetti <consentLink>i nostri termini e condizioni</consentLink>.",
     "A call is currently being placed!": "Attualmente c'è una chiamata in corso!",
     "System Alerts": "Avvisi di sistema",
     "Failed to remove widget": "Rimozione del widget fallita",
@@ -893,7 +893,7 @@
     "Predictable substitutions like '@' instead of 'a' don't help very much": "Sostituzioni prevedibili come '@' al posto di 'a' non aiutano molto",
     "Add another word or two. Uncommon words are better.": "Aggiungi ancora una o due parole. Meglio parole non comuni.",
     "Repeats like \"aaa\" are easy to guess": "Ripetizioni come \"aaa\" sono facili da indovinare",
-    "Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"": "Ripetizioni come \"abcabcabc\"  sono solo leggermente più difficili da indovinare di \"abc\"",
+    "Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"": "Ripetizioni come \"abcabcabc\" sono solo leggermente più difficili da indovinare di \"abc\"",
     "Sequences like abc or 6543 are easy to guess": "Sequenze come abc o 6543 sono facili da indovinare",
     "Recent years are easy to guess": "Gli anni recenti sono facili da indovinare",
     "Dates are often easy to guess": "Le date sono spesso facili da indovinare",
@@ -2564,5 +2564,17 @@
     "Rate %(brand)s": "Valuta %(brand)s",
     "Feedback sent": "Feedback inviato",
     "%(senderName)s ended the call": "%(senderName)s ha terminato la chiamata",
-    "You ended the call": "Hai terminato la chiamata"
+    "You ended the call": "Hai terminato la chiamata",
+    "Now, let's help you get started": "Alcuni consigli per iniziare",
+    "Welcome %(name)s": "Benvenuto/a %(name)s",
+    "Add a photo so people know it's you.": "Aggiungi una foto in modo che le persone ti riconoscano.",
+    "Great, that'll help people know it's you": "Ottimo, ciò aiuterà le persone a capire che sei tu",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Invita qualcuno usando il suo nome, indirizzo email, nome utente (come <userId/>) o <a>condividi questa stanza</a>.",
+    "Start a conversation with someone using their name, email address or username (like <userId/>).": "Inizia una conversazione con qualcuno usando il suo nome, indirizzo email o nome utente (come <userId/>).",
+    "Invite by email": "Invita per email",
+    "Use the + to make a new room or explore existing ones below": "Usa la + per creare una nuova stanza o esplorare quelle esistenti sotto",
+    "New version of %(brand)s is available": "Nuova versione di %(brand)s disponibile",
+    "Update %(brand)s": "Aggiorna %(brand)s",
+    "Enable desktop notifications": "Attiva le notifiche desktop",
+    "Don't miss a reply": "Non perdere una risposta"
 }

From fc14d980ff951839f85525115ab0ef59a10504a1 Mon Sep 17 00:00:00 2001
From: Kaede <contact+element_translations@kaede.ch>
Date: Mon, 9 Nov 2020 01:56:55 +0000
Subject: [PATCH 057/146] Translated using Weblate (Japanese)

Currently translated at 57.5% (1369 of 2380 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ja/
---
 src/i18n/strings/ja.json | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index bab5b35125..cc38ef5d39 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -151,7 +151,7 @@
     "Preparing to send logs": "ログを送信する準備をしています",
     "Explore Account Data": "アカウントのデータを調べる",
     "The server may be unavailable or overloaded": "サーバは使用できないか、オーバーロードされています",
-    "Reject": "やめる",
+    "Reject": "拒否する",
     "Failed to set Direct Message status of room": "部屋のダイレクトメッセージステータスの設定に失敗しました",
     "Remove from Directory": "ディレクトリから消去する",
     "Enable them now": "今有効化する",
@@ -1433,5 +1433,31 @@
     "Go back": "戻る",
     "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "重複した issue の報告が発生しないようにするため、まず<existingIssuesLink>既存の issue を確認</existingIssuesLink>してあなたが行おうとしているのと同様の報告が見つかった場合はその issue を +1 してください。見つからなかった場合は、<newIssueLink>新しい issue を作成</newIssueLink>して報告を行ってください。",
     "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "バグが発生したり、共有したいフィードバックがある場合は、GitHub でお知らせください。",
-    "Report bugs & give feedback": "バグ報告とフィードバック"
+    "Report bugs & give feedback": "バグ報告とフィードバック",
+    "Everyone in this room is verified": "この部屋内の全員を検証済み",
+    "Verify all users in a room to ensure it's secure.": "この部屋内のすべてのユーザーが安全であることを確認しました。",
+    "You've successfully verified %(displayName)s!": "%(displayName)s は正常に検証されました。",
+    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "%(deviceName)s (%(deviceId)s) は正常に検証されました。",
+    "You've successfully verified your device!": "このデバイスは正常に検証されました。",
+    "You've successfully verified this user.": "このユーザーは正常に検証されました。",
+    "Reject & Ignore user": "拒否した上でこのユーザーを無視する",
+    "<userName/> invited you": "<userName/> があなたを招待しています",
+    "Do you want to join %(roomName)s?": "%(roomName)s に参加しますか？",
+    "Start chatting": "チャットを開始",
+    "<userName/> wants to chat": "<userName/> がチャット開始を求めています",
+    "Do you want to chat with %(user)s?": "%(user)s とのチャットを開始しますか？",
+    "Use the <a>Desktop app</a> to search encrypted messages": "<a>デスクトップアプリ</a>を使用すると暗号化されたメッセージを検索できます",
+    "You have no visible notifications in this room.": "この部屋に確認すべき通知はありません。",
+    "You’re all caught up": "確認するものはありません",
+    "Got it": "了解",
+    "Got It": "了解",
+    "Accepting…": "了承中…",
+    "Waiting for %(displayName)s to verify…": "%(displayName)s が検証するのを待っています…",
+    "Waiting for %(displayName)s to accept…": "%(displayName)s が了承するのを待っています…",
+    "Room avatar": "部屋のアバター",
+    "Start Verification": "検証を開始",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "セキュリティ強化するために、両者のデバイスでワンタイムコードを確認し、このユーザーを検証することができます。",
+    "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "あなたのメッセージは保護されており、あなたと宛先だけが保護を解除してメッセージを閲覧するための固有の鍵を持っています。",
+    "%(name)s wants to verify": "%(name)s が検証を求めています",
+    "You sent a verification request": "あなたが検証リクエストを送信しました"
 }

From f3042e3c187c5946a8f46946a83a1d2a34b6c9ea Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Mon, 9 Nov 2020 08:18:25 +0000
Subject: [PATCH 058/146] Translated using Weblate (Bulgarian)

Currently translated at 98.2% (2339 of 2380 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/bg/
---
 src/i18n/strings/bg.json | 144 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 143 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 980e3117eb..e03215cb04 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -2347,5 +2347,147 @@
     "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Всички сървъри за възбранени от участие! Тази стая вече не може да бъде използвана.",
     "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s промени сървърните разрешения за контрол на достъпа до тази стая.",
     "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Добавя ( ͡° ͜ʖ ͡°) в началото на текстовото съобщение",
-    "The call was answered on another device.": "На обаждането беше отговорено от друго устройство."
+    "The call was answered on another device.": "На обаждането беше отговорено от друго устройство.",
+    "This room is public": "Тази стая е публична",
+    "Move right": "Премести надясно",
+    "Move left": "Премести наляво",
+    "Revoke permissions": "Оттеглете привилегии",
+    "Take a picture": "Направете снимка",
+    "Unable to set up keys": "Неуспешна настройка на ключовете",
+    "Use your Security Key to continue.": "Използвайте ключа си за сигурност за да продължите.",
+    "Security Key": "Ключ за сигурност",
+    "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "Въведете защитната фраза или <button>използвайте ключа за сигурност</button> за да продължите.",
+    "Security Phrase": "Защитна фраза",
+    "Invalid Recovery Key": "Невалиден ключ за възстановяване",
+    "Wrong Recovery Key": "Грешен ключ за възстановяване",
+    "Looks good!": "Изглежда добре!",
+    "Wrong file type": "Грешен тип файл",
+    "Recent changes that have not yet been received": "Скорошни промени, които още не са били получени",
+    "The server is not configured to indicate what the problem is (CORS).": "Сървърът не е конфигуриран да укаже какъв е проблемът (CORS).",
+    "A connection error occurred while trying to contact the server.": "Възникнал е проблем с връзката при свързване към сървъра.",
+    "Your area is experiencing difficulties connecting to the internet.": "В районът ви има проблеми с връзката с интернет.",
+    "The server has denied your request.": "Сървърът е забранил заявката ви.",
+    "The server is offline.": "Сървърът е офлайн.",
+    "A browser extension is preventing the request.": "Разширение на браузъра блокира заявката.",
+    "Your firewall or anti-virus is blocking the request.": "Защитната ви стена (firewall) или антивирусен софтуер блокират заявката.",
+    "The server (%(serverName)s) took too long to respond.": "Сървърът %(serverName)s отне твърде дълго да отговори.",
+    "Your server isn't responding to some of your requests. Below are some of the most likely reasons.": "Сървърът ви не отговаря на някой от заявките ви. По-долу са някои от най-вероятните причини.",
+    "Server isn't responding": "Сървърът не отговаря",
+    "You're all caught up.": "Наваксали сте с всичко.",
+    "Data on this screen is shared with %(widgetDomain)s": "Данните на този екран са споделени с %(widgetDomain)s",
+    "Modal Widget": "Модално приспособление",
+    "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.": "Поканете някой по име, потребителско име (като <userId/>) или <a>споделете тази стая</a>.",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Поканете някой по име, имейл адрес, потребителско име (като <userId/>) или <a>споделете тази стая</a>.",
+    "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>": "Това няма да ги покани в %(communityName)s. За да поканите някой в %(communityName)s, кликнете <a>тук</a>",
+    "Start a conversation with someone using their name or username (like <userId/>).": "Започнете разговор с някой използвайки тяхното име или потребителско име (като <userId/>).",
+    "Start a conversation with someone using their name, email address or username (like <userId/>).": "Започнете разговор с някой използвайки тяхното име, имейл адрес или потребителско име (като <userId/>).",
+    "May include members not in %(communityName)s": "Може да съдържа членове, които не са в %(communityName)s",
+    "Invite by email": "Покани по имейл",
+    "Send feedback": "Изпрати обратна връзка",
+    "PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> to help us track down the problem.": "ПРОФЕСИОНАЛЕН СЪВЕТ: Ако ще съобщавате за проблем, изпратете и <debugLogsLink>логове за разработчици</debugLogsLink> за да ни помогнете да открием проблема.",
+    "Please view <existingIssuesLink>existing bugs on Github</existingIssuesLink> first. No match? <newIssueLink>Start a new one</newIssueLink>.": "Първо прегледайте <existingIssuesLink>съществуващите проблеми в Github</existingIssuesLink>. Няма подобни? <newIssueLink>Създайте нов</newIssueLink>.",
+    "Report a bug": "Съобщете за проблем",
+    "There are two ways you can provide feedback and help us improve %(brand)s.": "Има два начина да дадете обратна връзка и да ни помогнете да подобрим %(brand)s.",
+    "Comment": "Коментар",
+    "Add comment": "Добави коментар",
+    "Please go into as much detail as you like, so we can track down the problem.": "Моля, разкажете колкото подробно желаете, за да можем да открием проблема.",
+    "Tell us below how you feel about %(brand)s so far.": "Кажете ни какво мислите за %(brand)s към този момент.",
+    "Rate %(brand)s": "Оценете %(brand)s",
+    "Feedback sent": "Обратната връзка беше изпратена",
+    "Update community": "Обнови общността",
+    "There was an error updating your community. The server is unable to process your request.": "Възникна грешка при обновяването на общността. Сървърът не може да обработки заявката ви.",
+    "Block anyone not part of %(serverName)s from ever joining this room.": "Блокирай всеки, който не е част от %(serverName)s от присъединяване в тази стая.",
+    "Create a room in %(communityName)s": "Създай стая в %(communityName)s",
+    "You might disable this if the room will be used for collaborating with external teams who have their own homeserver. This cannot be changed later.": "Може да изключите това, ако стаята ще се използва за съвместна работа с външни екипи, имащи собствен сървър. Това не може да бъде променено по-късно.",
+    "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Може да включите това, ако стаята ще се използва само за съвместна работа на вътрешни екипи на сървъра ви. Това не може да бъде променено по-късно.",
+    "Your server requires encryption to be enabled in private rooms.": "Сървърът ви изисква в частните стаи да е включено шифроване.",
+    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Към частните стаи присъединяването е само с покана. Публичните могат да бъдат открити и присъединени от всеки в тази общност.",
+    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Към частните стаи присъединяването е само с покана. Публичните могат да бъдат открити и присъединени от всеки.",
+    "An image will help people identify your community.": "Снимката би помогнала на хората да идентифицират общността ви.",
+    "Add image (optional)": "Добавете снимка (незадължително)",
+    "Enter name": "Въведете име",
+    "What's the name of your community or team?": "Какво е името на общността или екипа ви?",
+    "You can change this later if needed.": "Може да промените това и по-късно, ако е нужно.",
+    "Use this when referencing your community to others. The community ID cannot be changed.": "Използвайте това когато се обръщате към общността сред други хора. Идентификатора не може да бъде променен.",
+    "Community ID: +<localpart />:%(domain)s": "Идентификатор на общност: +<localpart />:%(domain)s",
+    "There was an error creating your community. The name may be taken or the server is unable to process your request.": "Възникна грешка при създаването на общността. Името може да е заето или пък сървърът не може да обработи заявката.",
+    "Invite people to join %(communityName)s": "Поканете хора в %(communityName)s",
+    "Send %(count)s invites|one": "Изпрати %(count)s покана",
+    "Send %(count)s invites|other": "Изпрати %(count)s покани",
+    "People you know on %(brand)s": "Хора, които познаване в %(brand)s",
+    "Add another email": "Добави друг имейл",
+    "Download logs": "Изтегли на логове",
+    "Preparing to download logs": "Подготвяне за изтегляне на логове",
+    "Information": "Информация",
+    "This version of %(brand)s does not support searching encrypted messages": "Тази версия на %(brand)s не поддържа търсенето в шифровани съобщения",
+    "This version of %(brand)s does not support viewing some encrypted files": "Тази версия на %(brand)s не поддържа преглеждането на някои шифровани файлове",
+    "Use the <a>Desktop app</a> to search encrypted messages": "Използвайте <a>Desktop приложението</a> за да търсите в шифровани съобщения",
+    "Use the <a>Desktop app</a> to see all encrypted files": "Използвайте <a>Desktop приложението</a> за да видите всички шифровани файлове",
+    "Click to view edits": "Кликнете за да видите редакциите",
+    "Edited at %(date)s": "Редактирано на %(date)s",
+    "Message deleted on %(date)s": "Съобщението изтрито на %(date)s",
+    "Video conference started by %(senderName)s": "Видео конференцията беше стартирана от %(senderName)s",
+    "Video conference updated by %(senderName)s": "Видео конференцията беше обновена от %(senderName)s",
+    "Video conference ended by %(senderName)s": "Видео конференцията беше прекратена от %(senderName)s",
+    "Join the conference from the room information card on the right": "Присъединете се към конференцията от информацията за стаята в дясно",
+    "Join the conference at the top of this room": "Присъединете се към конференцията в горната част на стаята",
+    "Ignored attempt to disable encryption": "Опитът за изключване на шифроването беше игнориран",
+    "Room settings": "Настройки на стаята",
+    "Show files": "Покажи файловете",
+    "%(count)s people|other": "%(count)s човека",
+    "%(count)s people|one": "%(count)s човек",
+    "About": "Относно",
+    "Not encrypted": "Не е шифровано",
+    "Add widgets, bridges & bots": "Добави приспособления, мостове и ботове",
+    "Edit widgets, bridges & bots": "Промени приспособления, мостове и ботове",
+    "Widgets": "Приспособления",
+    "Unpin a widget to view it in this panel": "Разкачете приспособление за да го видите в този панел",
+    "Unpin": "Разкачи",
+    "You can only pin up to %(count)s widgets|other": "Може да закачите максимум %(count)s приспособления",
+    "Room Info": "Информация за стаята",
+    "Favourited": "В любими",
+    "Forget Room": "Забрави стаята",
+    "Notification options": "Настройки за уведомление",
+    "Mentions & Keywords": "Споменавания и ключови думи",
+    "Use default": "Използвай по подразбиране",
+    "Show previews of messages": "Показвай преглед на съобщенията",
+    "Show rooms with unread messages first": "Показвай стаи с непрочетени съобщения първи",
+    "%(count)s results|one": "%(count)s резултат",
+    "%(count)s results|other": "%(count)s резултата",
+    "Use the + to make a new room or explore existing ones below": "Използвайте + за да направите нова стая или да прегледате съществуващите",
+    "Explore all public rooms": "Прегледай всички публични стаи",
+    "Can't see what you’re looking for?": "Не намирате това, което търсите?",
+    "Custom Tag": "Собствен етикет",
+    "Explore public rooms": "Прегледай публични стаи",
+    "Explore community rooms": "Прегледай стаи от общността",
+    "Show Widgets": "Покажи приспособленията",
+    "Hide Widgets": "Скрий приспособленията",
+    "Remove messages sent by others": "Премахвай съобщения изпратени от други",
+    "Privacy": "Поверителност",
+    "Secure Backup": "Защитено резервно копие",
+    "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Настройте името на шрифт инсталиран в системата и %(brand)s ще се опита да го използва.",
+    "not ready": "не е готово",
+    "ready": "готово",
+    "Secret storage:": "Секретно складиране:",
+    "Backup key cached:": "Резервният ключ е кеширан:",
+    "Backup key stored:": "Резервният ключ е съхранен:",
+    "Back up your encryption keys with your account data in case you lose access to your sessions. Your keys will be secured with a unique Recovery Key.": "Правете резервно копие на ключовете за шифроване и данните в профила, в случай че загубите достъп до сесиите си. Ключовете ви ще бъдат защитени с уникален ключ за възстановяване.",
+    "Algorithm:": "Алгоритъм:",
+    "Backup version:": "Версия на резервното копие:",
+    "The operation could not be completed": "Операцията не можа да бъде завършена",
+    "Failed to save your profile": "Неуспешно запазване на профила ви",
+    "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "Вероятно сте ги конфигурирали в клиент различен от %(brand)s. Не можете да ги управлявате в %(brand)s, но те все пак важат.",
+    "There are advanced notifications which are not shown here.": "Съществуват по-сложни уведомления, които не са показани тук.",
+    "%(brand)s can't securely cache encrypted messages locally while running in a web browser. Use <desktopLink>%(brand)s Desktop</desktopLink> for encrypted messages to appear in search results.": "%(brand)s не може да кешира шифровани съобщения локално по сигурен начин когато работи в уеб браузър. Използвайте <desktopLink>%(brand)s Desktop </desktopLink> за да можете да търсите шифровани съобщения.",
+    "Master private key:": "Главен частен ключ:",
+    "not found in storage": "не е намерено в складирането",
+    "Cross-signing is not set up.": "Кръстосаното-подписване не е настроено.",
+    "Cross-signing is ready for use.": "Кръстосаното-подписване е готово за използване.",
+    "Your server isn't responding to some <a>requests</a>.": "Сървърът ви не отговаря на някои <a>заявки</a>.",
+    "%(senderName)s ended the call": "%(senderName)s приключи разговора",
+    "You ended the call": "Приключихте разговора",
+    "New version of %(brand)s is available": "Налична е нова версия на %(brand)s",
+    "Update %(brand)s": "Обнови %(brand)s",
+    "Enable desktop notifications": "Включете уведомления на работния плот",
+    "Don't miss a reply": "Не пропускайте отговор"
 }

From 462be2b6a04112e11814bd219c988085bd88bfb1 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 9 Nov 2020 13:45:33 +0000
Subject: [PATCH 059/146] Close context menu when user clicks the Home button

---
 src/components/structures/UserMenu.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/structures/UserMenu.tsx b/src/components/structures/UserMenu.tsx
index 4847d41fa8..ed5e0c2e55 100644
--- a/src/components/structures/UserMenu.tsx
+++ b/src/components/structures/UserMenu.tsx
@@ -203,6 +203,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
         ev.stopPropagation();
 
         defaultDispatcher.dispatch({action: 'view_home_page'});
+        this.setState({contextMenuPosition: null}); // also close the menu
     };
 
     private onCommunitySettingsClick = (ev: ButtonEvent) => {

From 27d276715e73822f4f44a84e1191bd9fcf5c4649 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 9 Nov 2020 13:53:28 +0000
Subject: [PATCH 060/146] Fix Skeleton UI showing up when not intended.

---
 src/components/views/rooms/RoomList.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx
index 62fd70e1ec..b099beee08 100644
--- a/src/components/views/rooms/RoomList.tsx
+++ b/src/components/views/rooms/RoomList.tsx
@@ -332,7 +332,7 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
             return p;
         }, [] as TagID[]);
 
-        const showSkeleton = tagOrder.every(tag => !this.state.sublists[tag]?.length);
+        const showSkeleton = Object.values(RoomListStore.instance.unfilteredLists).every(list => !list?.length);
 
         for (const orderedTagId of tagOrder) {
             const orderedRooms = this.state.sublists[orderedTagId] || [];

From 36ef9ec341cb352b1e0a04ed45c954324c21690c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 9 Nov 2020 14:21:45 +0000
Subject: [PATCH 061/146] Update styling of the Analytics toast to try and
 decrease number of users blindly pressing No

---
 res/css/_components.scss                     | 1 +
 src/components/structures/ToastContainer.tsx | 4 ++--
 src/i18n/strings/en_EN.json                  | 3 +--
 src/stores/ToastStore.ts                     | 1 +
 src/toasts/AnalyticsToast.tsx                | 3 ++-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 37d0e0d286..ae4b4b23fe 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -225,6 +225,7 @@
 @import "./views/settings/tabs/user/_SecurityUserSettingsTab.scss";
 @import "./views/settings/tabs/user/_VoiceUserSettingsTab.scss";
 @import "./views/terms/_InlineTermsAgreement.scss";
+@import "./views/toasts/_AnalyticsToast.scss";
 @import "./views/toasts/_NonUrgentEchoFailureToast.scss";
 @import "./views/verification/_VerificationShowSas.scss";
 @import "./views/voip/_CallContainer.scss";
diff --git a/src/components/structures/ToastContainer.tsx b/src/components/structures/ToastContainer.tsx
index 84473031fa..513cca82c3 100644
--- a/src/components/structures/ToastContainer.tsx
+++ b/src/components/structures/ToastContainer.tsx
@@ -55,11 +55,11 @@ export default class ToastContainer extends React.Component<{}, IState> {
         let toast;
         if (totalCount !== 0) {
             const topToast = this.state.toasts[0];
-            const {title, icon, key, component, props} = topToast;
+            const {title, icon, key, component, className, props} = topToast;
             const toastClasses = classNames("mx_Toast_toast", {
                 "mx_Toast_hasIcon": icon,
                 [`mx_Toast_icon_${icon}`]: icon,
-            });
+            }, className);
 
             let countIndicator;
             if (isStacked || this.state.countSeen > 0) {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index a56e22e5fc..bf07193acf 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -397,7 +397,7 @@
     "Unknown App": "Unknown App",
     "Help us improve %(brand)s": "Help us improve %(brand)s",
     "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.",
-    "I want to help": "I want to help",
+    "Yes": "Yes",
     "No": "No",
     "Review where you’re logged in": "Review where you’re logged in",
     "Verify all your sessions to ensure your account & messages are safe": "Verify all your sessions to ensure your account & messages are safe",
@@ -1355,7 +1355,6 @@
     "Verify by emoji": "Verify by emoji",
     "Almost there! Is your other session showing the same shield?": "Almost there! Is your other session showing the same shield?",
     "Almost there! Is %(displayName)s showing the same shield?": "Almost there! Is %(displayName)s showing the same shield?",
-    "Yes": "Yes",
     "Verify all users in a room to ensure it's secure.": "Verify all users in a room to ensure it's secure.",
     "In encrypted rooms, verify all users to ensure it’s secure.": "In encrypted rooms, verify all users to ensure it’s secure.",
     "You've successfully verified your device!": "You've successfully verified your device!",
diff --git a/src/stores/ToastStore.ts b/src/stores/ToastStore.ts
index 038aebc7c9..850c3cb026 100644
--- a/src/stores/ToastStore.ts
+++ b/src/stores/ToastStore.ts
@@ -25,6 +25,7 @@ export interface IToast<C extends ComponentClass> {
     title: string;
     icon?: string;
     component: C;
+    className?: string;
     props?: Omit<React.ComponentProps<C>, "toastKey">; // toastKey is injected by ToastContainer
 }
 
diff --git a/src/toasts/AnalyticsToast.tsx b/src/toasts/AnalyticsToast.tsx
index e0eda5fa48..5a7737b1a6 100644
--- a/src/toasts/AnalyticsToast.tsx
+++ b/src/toasts/AnalyticsToast.tsx
@@ -64,12 +64,13 @@ export const showToast = (policyUrl?: string) => {
                     ) : sub,
                 },
             ),
-            acceptLabel: _t("I want to help"),
+            acceptLabel: _t("Yes"),
             onAccept,
             rejectLabel: _t("No"),
             onReject,
         },
         component: GenericToast,
+        className: "mx_AnalyticsToast",
         priority: 10,
     });
 };

From 5dd0766d35ff658dac984479bdbe93f12acb1d6c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 9 Nov 2020 14:36:12 +0000
Subject: [PATCH 062/146] Add missing scss file

---
 res/css/views/toasts/_AnalyticsToast.scss | 27 +++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 res/css/views/toasts/_AnalyticsToast.scss

diff --git a/res/css/views/toasts/_AnalyticsToast.scss b/res/css/views/toasts/_AnalyticsToast.scss
new file mode 100644
index 0000000000..fdbe7f1c76
--- /dev/null
+++ b/res/css/views/toasts/_AnalyticsToast.scss
@@ -0,0 +1,27 @@
+/*
+Copyright 2020 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.
+*/
+
+.mx_AnalyticsToast {
+    .mx_AccessibleButton_kind_danger {
+        background: none;
+        color: $accent-color;
+    }
+
+    .mx_AccessibleButton_kind_primary {
+        background: $accent-color;
+        color: #ffffff;
+    }
+}

From 5bed02b6e82ecc5e4b63649975d1a2c469f1477b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 9 Nov 2020 15:50:35 +0000
Subject: [PATCH 063/146] Skip e2ee warn logout prompt if user has no megolm
 sessions to lose

---
 src/components/structures/UserMenu.tsx | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/UserMenu.tsx b/src/components/structures/UserMenu.tsx
index 4847d41fa8..54e1ba811a 100644
--- a/src/components/structures/UserMenu.tsx
+++ b/src/components/structures/UserMenu.tsx
@@ -190,11 +190,18 @@ export default class UserMenu extends React.Component<IProps, IState> {
         this.setState({contextMenuPosition: null}); // also close the menu
     };
 
-    private onSignOutClick = (ev: ButtonEvent) => {
+    private onSignOutClick = async (ev: ButtonEvent) => {
         ev.preventDefault();
         ev.stopPropagation();
 
-        Modal.createTrackedDialog('Logout from LeftPanel', '', LogoutDialog);
+        const cli = MatrixClientPeg.get();
+        if (!cli || !cli.isCryptoEnabled() || !(await cli.exportRoomKeys())?.length) {
+            // log out without user prompt if they have no local megolm sessions
+            dis.dispatch({action: 'logout'});
+        } else {
+            Modal.createTrackedDialog('Logout from LeftPanel', '', LogoutDialog);
+        }
+
         this.setState({contextMenuPosition: null}); // also close the menu
     };
 

From 6f3cdadcdb09843136438da19b017a97bb1fac97 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 9 Nov 2020 16:26:36 +0000
Subject: [PATCH 064/146] Upgrade matrix-js-sdk to 9.1.0

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index a4beaa696b..022aea69f2 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,7 @@
     "is-ip": "^2.0.0",
     "linkifyjs": "^2.1.9",
     "lodash": "^4.17.19",
-    "matrix-js-sdk": "9.1.0-rc.1",
+    "matrix-js-sdk": "9.1.0",
     "matrix-widget-api": "^0.1.0-beta.5",
     "minimist": "^1.2.5",
     "pako": "^1.0.11",
diff --git a/yarn.lock b/yarn.lock
index 04ceb32110..2f87826697 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6505,10 +6505,10 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-matrix-js-sdk@9.1.0-rc.1:
-  version "9.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.1.0-rc.1.tgz#cbdad0d272152a27bb32fe74e02ad069717d2554"
-  integrity sha512-Y0ftnH3HtMaNPFyfYqbrhS6aZkdQxxeluErFmOmpMTRGuMiIGrqhdWP8Z/MCZMRP4NPAh/dN2eW0vgqH9ij52A==
+matrix-js-sdk@9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.1.0.tgz#51a3240f6545c0ae42ca0db0c579d17476b0ca94"
+  integrity sha512-4swrPb93qF2lid9mqzCDPMIvUlgS/MIUVxxD0EfNQoapdekFtnf7pMimYs+lMpRk3VDfa01FEsUu1k0q8O+Utw==
   dependencies:
     "@babel/runtime" "^7.11.2"
     another-json "^0.2.0"

From e8d18b8b119154a51cc5f7c8fb3ee4027fc50ffc Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 9 Nov 2020 16:31:47 +0000
Subject: [PATCH 065/146] Prepare changelog for v3.8.0

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 035225b18a..13c5ba81ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [3.8.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.8.0) (2020-11-09)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.8.0-rc.1...v3.8.0)
+
+ * Upgrade JS SDK to 9.1.0
+
 Changes in [3.8.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.8.0-rc.1) (2020-11-04)
 =============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.7.1...v3.8.0-rc.1)

From 8edbc7c654c06f0c38cc8b25661dd702ec4273db Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 9 Nov 2020 16:31:48 +0000
Subject: [PATCH 066/146] v3.8.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 022aea69f2..6fd1489017 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "3.8.0-rc.1",
+  "version": "3.8.0",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From c4e2e2124f25ec2f30c632a5cbbd7062cc2d1813 Mon Sep 17 00:00:00 2001
From: XoseM <correoxm@disroot.org>
Date: Mon, 9 Nov 2020 12:56:08 +0000
Subject: [PATCH 067/146] Translated using Weblate (Galician)

Currently translated at 91.3% (2402 of 2629 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
---
 src/i18n/strings/gl.json | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 17de8cc096..9448042def 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -2574,5 +2574,27 @@
     "New version of %(brand)s is available": "Hai unha nova versión de %(brand)s dispoñible",
     "Update %(brand)s": "Actualizar %(brand)s",
     "Enable desktop notifications": "Activar notificacións de escritorio",
-    "Don't miss a reply": "Non perdas as réplicas"
+    "Don't miss a reply": "Non perdas as réplicas",
+    "Barbados": "Barbados",
+    "Bangladesh": "Bangladesh",
+    "Bahrain": "Bahrain",
+    "Bahamas": "Bahamas",
+    "Azerbaijan": "Azerbaixán",
+    "Austria": "Austria",
+    "Australia": "Australia",
+    "Aruba": "Aruba",
+    "Armenia": "Armenia",
+    "Argentina": "Arxentina",
+    "Antigua & Barbuda": "Antigua & Barbuda",
+    "Antarctica": "Antártida",
+    "Anguilla": "Anguilla",
+    "Angola": "Angola",
+    "Andorra": "Andorra",
+    "American Samoa": "Samoa americana",
+    "Algeria": "Alxeria",
+    "Albania": "Albania",
+    "Åland Islands": "Åland Islands",
+    "Afghanistan": "Afghanistán",
+    "United States": "EEUU de América",
+    "United Kingdom": "Reino Unido"
 }

From 46e01196f0f4e0f291716de669d5aaad6b270c7d Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 9 Nov 2020 16:33:48 +0000
Subject: [PATCH 068/146] Reset matrix-js-sdk back to develop branch

---
 package.json | 2 +-
 yarn.lock    | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 6fd1489017..048edea3fd 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,7 @@
     "is-ip": "^2.0.0",
     "linkifyjs": "^2.1.9",
     "lodash": "^4.17.19",
-    "matrix-js-sdk": "9.1.0",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
     "matrix-widget-api": "^0.1.0-beta.5",
     "minimist": "^1.2.5",
     "pako": "^1.0.11",
diff --git a/yarn.lock b/yarn.lock
index 2f87826697..23a32280c1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6505,10 +6505,9 @@ mathml-tag-names@^2.0.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-matrix-js-sdk@9.1.0:
+"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
   version "9.1.0"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.1.0.tgz#51a3240f6545c0ae42ca0db0c579d17476b0ca94"
-  integrity sha512-4swrPb93qF2lid9mqzCDPMIvUlgS/MIUVxxD0EfNQoapdekFtnf7pMimYs+lMpRk3VDfa01FEsUu1k0q8O+Utw==
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/5ac00e346593f29f324b3af8e322928a6e1c427a"
   dependencies:
     "@babel/runtime" "^7.11.2"
     another-json "^0.2.0"

From efc5e88443e4af8d3e8cf4e462b9d613bc0cee70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Mon, 9 Nov 2020 14:40:39 +0000
Subject: [PATCH 069/146] Translated using Weblate (Estonian)

Currently translated at 100.0% (2629 of 2629 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
---
 src/i18n/strings/et.json | 251 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 250 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index ad52b7df6a..03c3d2444c 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -2575,5 +2575,254 @@
     "Now, let's help you get started": "Nüüd näitame sulle, mida saad järgmiseks teha",
     "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Kutsu teist osapoolt tema nime, e-posti aadressi, kasutajanime (nagu <userId/>) alusel või <a>jaga seda jututuba</a>.",
     "Start a conversation with someone using their name, email address or username (like <userId/>).": "Alusta vestlust kasutades teise osapoole nime, e-posti aadressi või kasutajanime (näiteks <userId/>).",
-    "Invite by email": "Saada kutse e-kirjaga"
+    "Invite by email": "Saada kutse e-kirjaga",
+    "Zambia": "Sambia",
+    "Yemen": "Jeemen",
+    "Western Sahara": "Lääne-Sahara",
+    "Wallis & Futuna": "Wallis ja Futuna",
+    "Vietnam": "Vietnam",
+    "Venezuela": "Venezuela",
+    "Vatican City": "Vatikan",
+    "Vanuatu": "Vanuatu",
+    "Uzbekistan": "Usbekistan",
+    "Uruguay": "Uruguay",
+    "United Arab Emirates": "Araabia Ühendemiraadid",
+    "Ukraine": "Ukraina",
+    "Uganda": "Uganda",
+    "U.S. Virgin Islands": "USA Neitsisaared",
+    "Tuvalu": "Tuvalu",
+    "Turks & Caicos Islands": "Turks ja Caicos",
+    "Turkmenistan": "Türkmenistan",
+    "Turkey": "Türgi",
+    "Tunisia": "Tuneesia",
+    "Trinidad & Tobago": "Trinidad ja Tobago",
+    "Tonga": "Tonga",
+    "Tokelau": "Tokelau",
+    "Togo": "Togo",
+    "Timor-Leste": "Ida-Timor",
+    "Thailand": "Tai",
+    "Tanzania": "Tansaania",
+    "Tajikistan": "Tadžikistan",
+    "Taiwan": "Taiwan",
+    "São Tomé & Príncipe": "São Tomé ja Príncipe",
+    "Syria": "Süüria",
+    "Switzerland": "Šveits",
+    "Sweden": "Rootsi",
+    "Swaziland": "Svaasimaa",
+    "Svalbard & Jan Mayen": "Svalbard ja Jan Mayen",
+    "Suriname": "Suriname",
+    "Sudan": "Sudaan",
+    "St. Vincent & Grenadines": "Saint Vincent",
+    "St. Pierre & Miquelon": "Saint-Pierre ja Miquelon",
+    "St. Martin": "Saint-Martin",
+    "St. Lucia": "Saint Lucia",
+    "St. Kitts & Nevis": "Saint Kitts ja Nevis",
+    "St. Helena": "Saint Helena",
+    "St. Barthélemy": "Saint-Barthélemy",
+    "Sri Lanka": "Sri Lanka",
+    "Spain": "Hispaania",
+    "South Sudan": "Lõuna-Sudaan",
+    "South Korea": "Lõuna-Korea",
+    "South Georgia & South Sandwich Islands": "Lõuna-Georgia ja Lõuna-Sandwichi saared",
+    "South Africa": "Lõuna-Aafrika Vabariik",
+    "Somalia": "Somaalia",
+    "Solomon Islands": "Saalomoni Saared",
+    "Slovenia": "Sloveenia",
+    "Slovakia": "Slovakkia",
+    "Sint Maarten": "Sint Maarten",
+    "Singapore": "Singapur",
+    "Sierra Leone": "Sierra Leone",
+    "Seychelles": "Seišellid",
+    "Serbia": "Serbia",
+    "Senegal": "Senegal",
+    "Saudi Arabia": "Saudi Araabia",
+    "San Marino": "San Marino",
+    "Samoa": "Samoa",
+    "Réunion": "Réunion",
+    "Rwanda": "Rwanda",
+    "Russia": "Venemaa",
+    "Romania": "Rumeenia",
+    "Qatar": "Katar",
+    "Puerto Rico": "Puerto Rico",
+    "Portugal": "Portugal",
+    "Poland": "Poola",
+    "Pitcairn Islands": "Pitcairn",
+    "Philippines": "Filipiinid",
+    "Peru": "Peruu",
+    "Paraguay": "Paraguay",
+    "Papua New Guinea": "Paapua Uus-Guinea",
+    "Panama": "Panama",
+    "Palestine": "Palestiina",
+    "Palau": "Belau",
+    "Pakistan": "Pakistan",
+    "Oman": "Omaan",
+    "Norway": "Norra",
+    "Northern Mariana Islands": "Põhja-Mariaanid",
+    "North Korea": "Põhja-Korea",
+    "Norfolk Island": "Norfolk",
+    "Niue": "Niue",
+    "Nigeria": "Nigeeria",
+    "Niger": "Niger",
+    "Nicaragua": "Nicaragua",
+    "New Zealand": "Uus-Meremaa",
+    "New Caledonia": "Uus-Kaledoonia",
+    "Netherlands": "Holland",
+    "Nepal": "Nepal",
+    "Nauru": "Nauru",
+    "Namibia": "Namiibia",
+    "Myanmar": "Myanmar",
+    "Mozambique": "Mosambiik",
+    "Morocco": "Maroko",
+    "Montserrat": "Montserrat",
+    "Montenegro": "Montenegro",
+    "Mongolia": "Mongoolia",
+    "Monaco": "Monaco",
+    "Moldova": "Moldova",
+    "Micronesia": "Mikroneesia",
+    "Mexico": "Mehhiko",
+    "Mayotte": "Mayotte",
+    "Mauritius": "Mauritius",
+    "Mauritania": "Mauritaania",
+    "Martinique": "Martinique",
+    "Marshall Islands": "Marshalli Saared",
+    "Malta": "Malta",
+    "Mali": "Mali",
+    "Maldives": "Maldiivid",
+    "Malaysia": "Malaisia",
+    "Malawi": "Malawi",
+    "Madagascar": "Madagaskar",
+    "Macedonia": "Põhja-Makedoonia",
+    "Macau": "Macau",
+    "Luxembourg": "Luksemburg",
+    "Lithuania": "Leedu",
+    "Liechtenstein": "Liechtenstein",
+    "Libya": "Liibüa",
+    "Liberia": "Libeeria",
+    "Lesotho": "Lesotho",
+    "Lebanon": "Liibanon",
+    "Latvia": "Läti",
+    "Laos": "Laos",
+    "Kyrgyzstan": "Kõrgõzstan",
+    "Kuwait": "Kuveit",
+    "Kosovo": "Kosovo",
+    "Kiribati": "Kiribati",
+    "Kenya": "Keenia",
+    "Kazakhstan": "Kasahstan",
+    "Jordan": "Jordaania",
+    "Jersey": "Jersey",
+    "Japan": "Jaapan",
+    "Jamaica": "Jamaica",
+    "Italy": "Itaalia",
+    "Israel": "Iisrael",
+    "Isle of Man": "Mani saar",
+    "Ireland": "Iirimaa",
+    "Iraq": "Iraak",
+    "Iran": "Iraan",
+    "Indonesia": "Indoneesia",
+    "India": "India",
+    "Iceland": "Island",
+    "Hungary": "Ungari",
+    "Hong Kong": "Hongkong",
+    "Honduras": "Honduras",
+    "Heard & McDonald Islands": "Heard ja McDonald",
+    "Haiti": "Haiti",
+    "Guyana": "Guyana",
+    "Guinea-Bissau": "Guinea-Bissau",
+    "Guinea": "Guinea",
+    "Guernsey": "Guernsey",
+    "Guatemala": "Guatemala",
+    "Guam": "Guam",
+    "Guadeloupe": "Guadeloupe",
+    "Grenada": "Grenada",
+    "Greenland": "Gröönimaa",
+    "Greece": "Kreeka",
+    "Gibraltar": "Gibraltar",
+    "Ghana": "Ghana",
+    "Germany": "Saksamaa",
+    "Georgia": "Gruusia",
+    "Gambia": "Gambia",
+    "Gabon": "Gabon",
+    "French Southern Territories": "Prantsuse Lõunaalad",
+    "French Polynesia": "Prantsuse Polüneesia",
+    "French Guiana": "Prantsuse Guajaana",
+    "France": "Prantsusmaa",
+    "Zimbabwe": "Zimbabwe",
+    "Finland": "Soome",
+    "Fiji": "Fidži",
+    "Faroe Islands": "Fääri saared",
+    "Falkland Islands": "Falklandi (Malviini) saared",
+    "Ethiopia": "Etioopia",
+    "Estonia": "Eesti",
+    "Eritrea": "Eritrea",
+    "Equatorial Guinea": "Ekvatoriaal-Guinea",
+    "El Salvador": "El Salvador",
+    "Egypt": "Egiptus",
+    "Ecuador": "Ecuador",
+    "Dominican Republic": "Dominikaani Vabariik",
+    "Dominica": "Dominica",
+    "Djibouti": "Djibouti",
+    "Denmark": "Taani",
+    "Côte d’Ivoire": "Elevandiluurannik",
+    "Czech Republic": "Tšehhi",
+    "Cyprus": "Küpros",
+    "Curaçao": "Curaçao",
+    "Cuba": "Kuuba",
+    "Croatia": "Horvaatia",
+    "Costa Rica": "Costa Rica",
+    "Cook Islands": "Cooki saared",
+    "Congo - Kinshasa": "Kongo DV",
+    "Congo - Brazzaville": "Kongo Vabariik",
+    "Comoros": "Komoorid",
+    "Colombia": "Colombia",
+    "Cocos (Keeling) Islands": "Kookossaared",
+    "Christmas Island": "Jõulusaar",
+    "China": "Hiina",
+    "Chile": "Tšiili",
+    "Chad": "Tšaad",
+    "Central African Republic": "Kesk-Aafrika Vabariik",
+    "Cayman Islands": "Kaimanisaared",
+    "Caribbean Netherlands": "Bonaire, Sint Eustatius ja Saba",
+    "Cape Verde": "Roheneemesaared",
+    "Canada": "Kanada",
+    "Cameroon": "Kamerun",
+    "Cambodia": "Kambodža",
+    "Burundi": "Burundi",
+    "Burkina Faso": "Burkina Faso",
+    "Bulgaria": "Bulgaaria",
+    "Brunei": "Brunei",
+    "British Virgin Islands": "Briti Neitsisaared",
+    "British Indian Ocean Territory": "Briti India ookeani ala",
+    "Brazil": "Brasiilia",
+    "Bouvet Island": "Bouvet’ saar",
+    "Botswana": "Botswana",
+    "Bosnia": "Bosnia ja Hertsegoviina",
+    "Bolivia": "Boliivia",
+    "Bhutan": "Bhutan",
+    "Bermuda": "Bermuda",
+    "Benin": "Benin",
+    "Belize": "Belize",
+    "Belgium": "Belgia",
+    "Belarus": "Valgevene",
+    "Barbados": "Barbados",
+    "Bangladesh": "Bangladesh",
+    "Bahrain": "Bahrein",
+    "Bahamas": "Bahama",
+    "Azerbaijan": "Aserbaidžaan",
+    "Austria": "Austria",
+    "Australia": "Austraalia",
+    "Aruba": "Aruba",
+    "Armenia": "Armeenia",
+    "Argentina": "Argentina",
+    "Antigua & Barbuda": "Antigua ja Barbuda",
+    "Antarctica": "Antarktis",
+    "Anguilla": "Anguilla",
+    "Angola": "Angola",
+    "Andorra": "Andorra",
+    "American Samoa": "Ameerika Samoa",
+    "Algeria": "Alžeeria",
+    "Albania": "Albaania",
+    "Åland Islands": "Ahvenamaa",
+    "Afghanistan": "Afganistan",
+    "United States": "Ameerika Ühendriigid",
+    "United Kingdom": "Suurbritannia"
 }

From 7af9b68f7245a678d56df66975198e3b22b5c153 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Mon, 9 Nov 2020 19:06:28 +0000
Subject: [PATCH 070/146] Translated using Weblate (Hungarian)

Currently translated at 91.5% (2407 of 2629 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index f35b67cfaf..72a6811727 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2574,5 +2574,32 @@
     "There are two ways you can provide feedback and help us improve %(brand)s.": "Van két lehetőséged, hogy visszajelezz vagy segíts jobbá tenni ezt: %(brand)s.",
     "Comment": "Megjegyzés",
     "Add comment": "Megjegyzés hozzáadása",
-    "Please go into as much detail as you like, so we can track down the problem.": "Ahhoz, hogy megérthessük a problémát olyan részletesen írd le ahogy csak szeretnéd."
+    "Please go into as much detail as you like, so we can track down the problem.": "Ahhoz, hogy megérthessük a problémát olyan részletesen írd le ahogy csak szeretnéd.",
+    "Bermuda": "Bermuda",
+    "Benin": "Benin",
+    "Belize": "Belize",
+    "Belgium": "Belgium",
+    "Belarus": "Fehéroroszország",
+    "Barbados": "Barbados",
+    "Bangladesh": "Banglades",
+    "Bahrain": "Bahrain",
+    "Bahamas": "Bahamák",
+    "Azerbaijan": "Azerbajdzsán",
+    "Austria": "Ausztria",
+    "Australia": "Ausztrália",
+    "Aruba": "Aruba",
+    "Armenia": "Armenia",
+    "Argentina": "Argentína",
+    "Antigua & Barbuda": "Antigua és Barbuda",
+    "Antarctica": "Antarktisz",
+    "Anguilla": "Anguilla",
+    "Angola": "Angola",
+    "Andorra": "Andorra",
+    "American Samoa": "Amerikai Szamoa",
+    "Algeria": "Algéria",
+    "Albania": "Albánia",
+    "Åland Islands": "Åland-szigetek",
+    "Afghanistan": "Afganisztán",
+    "United States": "Egyesült Államok",
+    "United Kingdom": "Egyesült Királyság"
 }

From f5e9b5e96cbfd2ed2a3aada73587fe23db727818 Mon Sep 17 00:00:00 2001
From: Marcelo Filho <marceloaof@protonmail.com>
Date: Mon, 9 Nov 2020 20:47:07 +0000
Subject: [PATCH 071/146] Translated using Weblate (Portuguese (Brazil))

Currently translated at 94.8% (2494 of 2629 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pt_BR/
---
 src/i18n/strings/pt_BR.json | 116 +++++++++++++++++++++++++++++++++++-
 1 file changed, 115 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 1d720702cf..8e0c3eea0b 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -2505,5 +2505,119 @@
     "Invite by email": "Convidar por e-mail",
     "Use the + to make a new room or explore existing ones below": "Clique em + para criar uma nova sala ou explore as salas existentes abaixo",
     "New version of %(brand)s is available": "Uma nova versão do %(brand)s está disponível",
-    "Update %(brand)s": "Atualizar o %(brand)s"
+    "Update %(brand)s": "Atualizar o %(brand)s",
+    "Jordan": "Jordânia",
+    "Japan": "Japão",
+    "Jamaica": "Jamaica",
+    "Italy": "Itália",
+    "Israel": "Israel",
+    "Ireland": "Irlanda",
+    "Iraq": "Iraque",
+    "Iran": "Irã",
+    "Indonesia": "Indonésia",
+    "India": "Índia",
+    "Iceland": "Islândia",
+    "Hungary": "Hungria",
+    "Hong Kong": "Hong Kong",
+    "Honduras": "Honduras",
+    "Haiti": "Haiti",
+    "Guyana": "Guiana",
+    "Guinea-Bissau": "Guiné-Bissau",
+    "Comoros": "Comores",
+    "Vietnam": "Vietnã",
+    "Venezuela": "Venezuela",
+    "Uruguay": "Uruguai",
+    "United Arab Emirates": "Emirados Árabes Unidos",
+    "Ukraine": "Ucrânia",
+    "Uganda": "Uganda",
+    "Turkey": "Turquia",
+    "Spain": "Espanha",
+    "South Sudan": "Sudão do Sul",
+    "South Korea": "Coreia do Sul",
+    "South Africa": "África do Sul",
+    "Somalia": "Somália",
+    "Solomon Islands": "Ilhas Salomão",
+    "Slovenia": "Eslovênia",
+    "Slovakia": "Eslováquia",
+    "Singapore": "Singapura",
+    "Sierra Leone": "Serra Leoa",
+    "Serbia": "Sérvia",
+    "Senegal": "Senegal",
+    "Saudi Arabia": "Arábia Saudita",
+    "Russia": "Rússia",
+    "Romania": "Romênia",
+    "Puerto Rico": "Porto Rico",
+    "Portugal": "Portugal",
+    "Poland": "Polônia",
+    "Peru": "Peru",
+    "Paraguay": "Paraguai",
+    "Panama": "Panamá",
+    "Palestine": "Palestina",
+    "Pakistan": "Paquistão",
+    "Norway": "Noruega",
+    "North Korea": "Coreia do Norte",
+    "Niger": "Níger",
+    "Nigeria": "Nigéria",
+    "Nicaragua": "Nicarágua",
+    "New Zealand": "Nova Zelândia",
+    "Nepal": "Nepal",
+    "Nauru": "Nauru",
+    "Zambia": "Zâmbia",
+    "Zimbabwe": "Zimbábue",
+    "France": "França",
+    "Egypt": "Egito",
+    "Ecuador": "Equador",
+    "Denmark": "Dinamarca",
+    "Côte d’Ivoire": "Costa do Marfim",
+    "Cyprus": "Chipre",
+    "Cuba": "Cuba",
+    "Croatia": "Croácia",
+    "Costa Rica": "Costa Rica",
+    "Colombia": "Colômbia",
+    "China": "China",
+    "Chile": "Chile",
+    "Chad": "Chade",
+    "Cape Verde": "Cabo Verde",
+    "Canada": "Canadá",
+    "Cameroon": "Camarões",
+    "Cambodia": "Camboja",
+    "Burundi": "Burundi",
+    "Burkina Faso": "Burkina Faso",
+    "Bulgaria": "Bulgária",
+    "Brunei": "Brunei",
+    "British Virgin Islands": "Ilhas Virgens Britânicas",
+    "British Indian Ocean Territory": "Território Britânico do Oceano Índico",
+    "Brazil": "Brasil",
+    "Bouvet Island": "Ilha Bouvet",
+    "Botswana": "Botsuana",
+    "Bosnia": "Bósnia e Herzegovina",
+    "Bolivia": "Bolívia",
+    "Bhutan": "Butão",
+    "Bermuda": "Bermudas",
+    "Benin": "Benim",
+    "Belize": "Belize",
+    "Belgium": "Bélgica",
+    "Belarus": "Bielorrússia",
+    "Barbados": "Barbados",
+    "Bangladesh": "Bangladesh",
+    "Bahrain": "Bahrein",
+    "Bahamas": "Bahamas",
+    "Azerbaijan": "Azerbaijão",
+    "Austria": "Áustria",
+    "Australia": "Austrália",
+    "Aruba": "Aruba",
+    "Armenia": "Armênia",
+    "Argentina": "Argentina",
+    "Antigua & Barbuda": "Antígua e Barbuda",
+    "Antarctica": "Antártica",
+    "Anguilla": "Anguilla",
+    "Angola": "Angola",
+    "Andorra": "Andorra",
+    "American Samoa": "Samoa Americana",
+    "Algeria": "Argélia",
+    "Albania": "Albânia",
+    "Åland Islands": "Ilhas Aland",
+    "Afghanistan": "Afeganistão",
+    "United States": "Estados Unidos",
+    "United Kingdom": "Reino Unido"
 }

From ab8dad50e68727a8083888270321c2cbad4b796f Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Mon, 9 Nov 2020 21:16:40 +0000
Subject: [PATCH 072/146] Translated using Weblate (Italian)

Currently translated at 90.5% (2380 of 2629 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
---
 src/i18n/strings/it.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 36ba1477e6..77881bcb24 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2576,5 +2576,6 @@
     "New version of %(brand)s is available": "Nuova versione di %(brand)s disponibile",
     "Update %(brand)s": "Aggiorna %(brand)s",
     "Enable desktop notifications": "Attiva le notifiche desktop",
-    "Don't miss a reply": "Non perdere una risposta"
+    "Don't miss a reply": "Non perdere una risposta",
+    "Modal Widget": "Widget modale"
 }

From a5d827c44608a41f2cc9cc39213e852059505493 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 10 Nov 2020 01:22:30 +0000
Subject: [PATCH 073/146] Update src/components/views/rooms/RoomList.tsx

Co-authored-by: Travis Ralston <travpc@gmail.com>
---
 src/components/views/rooms/RoomList.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx
index b099beee08..d952c137cd 100644
--- a/src/components/views/rooms/RoomList.tsx
+++ b/src/components/views/rooms/RoomList.tsx
@@ -332,6 +332,7 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
             return p;
         }, [] as TagID[]);
 
+        // show a skeleton UI if the user is in no rooms
         const showSkeleton = Object.values(RoomListStore.instance.unfilteredLists).every(list => !list?.length);
 
         for (const orderedTagId of tagOrder) {

From 65b8f27b260210bd7cb305ca03f8f274a05b3d1e Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 9 Nov 2020 21:14:20 -0700
Subject: [PATCH 074/146] Disable buttons when required by MSC2790

---
 .../views/dialogs/ModalWidgetDialog.tsx       | 36 ++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/ModalWidgetDialog.tsx b/src/components/views/dialogs/ModalWidgetDialog.tsx
index 6ce3230a7a..c8a736e8a6 100644
--- a/src/components/views/dialogs/ModalWidgetDialog.tsx
+++ b/src/components/views/dialogs/ModalWidgetDialog.tsx
@@ -23,6 +23,11 @@ import {
     IModalWidgetCloseRequest,
     IModalWidgetOpenRequestData,
     IModalWidgetReturnData,
+    ISetModalButtonEnabledActionRequest,
+    IWidgetApiAcknowledgeResponseData,
+    IWidgetApiErrorResponseData,
+    BuiltInModalButtonID,
+    ModalButtonID,
     ModalButtonKind,
     Widget,
     WidgetApiFromWidgetAction,
@@ -31,6 +36,7 @@ import {StopGapWidgetDriver} from "../../../stores/widgets/StopGapWidgetDriver";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import RoomViewStore from "../../../stores/RoomViewStore";
 import {OwnProfileStore} from "../../../stores/OwnProfileStore";
+import { arrayFastClone } from "../../../utils/arrays";
 
 interface IProps {
     widgetDefinition: IModalWidgetOpenRequestData;
@@ -40,15 +46,19 @@ interface IProps {
 
 interface IState {
     messaging?: ClientWidgetApi;
+    disabledButtonIds: ModalButtonID[];
 }
 
 const MAX_BUTTONS = 3;
 
 export default class ModalWidgetDialog extends React.PureComponent<IProps, IState> {
     private readonly widget: Widget;
+    private readonly possibleButtons: ModalButtonID[];
     private appFrame: React.RefObject<HTMLIFrameElement> = React.createRef();
 
-    state: IState = {};
+    state: IState = {
+        disabledButtonIds: [],
+    };
 
     constructor(props) {
         super(props);
@@ -58,6 +68,7 @@ export default class ModalWidgetDialog extends React.PureComponent<IProps, IStat
             creatorUserId: MatrixClientPeg.get().getUserId(),
             id: `modal_${this.props.sourceWidgetId}`,
         });
+        this.possibleButtons = (this.props.widgetDefinition.buttons || []).map(b => b.id);
     }
 
     public componentDidMount() {
@@ -79,12 +90,35 @@ export default class ModalWidgetDialog extends React.PureComponent<IProps, IStat
     private onLoad = () => {
         this.state.messaging.once("ready", this.onReady);
         this.state.messaging.on(`action:${WidgetApiFromWidgetAction.CloseModalWidget}`, this.onWidgetClose);
+        this.state.messaging.on(`action:${WidgetApiFromWidgetAction.SetModalButtonEnabled}`, this.onButtonEnableToggle);
     };
 
     private onWidgetClose = (ev: CustomEvent<IModalWidgetCloseRequest>) => {
         this.props.onFinished(true, ev.detail.data);
     }
 
+    private onButtonEnableToggle = (ev: CustomEvent<ISetModalButtonEnabledActionRequest>) => {
+        ev.preventDefault();
+        const isClose = ev.detail.data.button === BuiltInModalButtonID.Close;
+        if (isClose || !this.possibleButtons.includes(ev.detail.data.button)) {
+            return this.state.messaging.transport.reply(ev.detail, {
+                error: {message: "Invalid button"},
+            } as IWidgetApiErrorResponseData);
+        }
+
+        let buttonIds: ModalButtonID[];
+        if (ev.detail.data.enabled) {
+            buttonIds = arrayFastClone(this.state.disabledButtonIds).filter(i => i !== ev.detail.data.button);
+        } else {
+            // use a set to swap the operation to avoid memory leaky arrays.
+            const tempSet = new Set(this.state.disabledButtonIds);
+            tempSet.add(ev.detail.data.button);
+            buttonIds = Array.from(tempSet);
+        }
+        this.setState({disabledButtonIds: buttonIds});
+        this.state.messaging.transport.reply(ev.detail, {} as IWidgetApiAcknowledgeResponseData);
+    };
+
     public render() {
         const templated = this.widget.getCompleteUrl({
             currentRoomId: RoomViewStore.getRoomId(),

From 220a0bc2a0c028fb8a023ed93934c5d4ab3ab8a7 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Tue, 10 Nov 2020 04:04:09 +0000
Subject: [PATCH 075/146] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2629 of 2629 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
---
 src/i18n/strings/zh_Hant.json | 251 +++++++++++++++++++++++++++++++++-
 1 file changed, 250 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index afefbb1bc0..dbcfb743c5 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2577,5 +2577,254 @@
     "New version of %(brand)s is available": "%(brand)s 的新版本已可使用",
     "Update %(brand)s": "更新 %(brand)s",
     "Enable desktop notifications": "啟用桌面通知",
-    "Don't miss a reply": "不要錯過回覆"
+    "Don't miss a reply": "不要錯過回覆",
+    "Zimbabwe": "辛巴威",
+    "Zambia": "尚比亞",
+    "Yemen": "葉門",
+    "Western Sahara": "西撒哈拉",
+    "Wallis & Futuna": "瓦利斯和富圖那",
+    "Vietnam": "越南",
+    "Venezuela": "委內瑞拉",
+    "Vatican City": "梵蒂岡",
+    "Vanuatu": "萬那杜",
+    "Uzbekistan": "烏茲別克",
+    "Uruguay": "烏拉圭",
+    "United Arab Emirates": "阿拉伯聯合大公國",
+    "Ukraine": "烏克蘭",
+    "Uganda": "烏干達",
+    "U.S. Virgin Islands": "美屬維京群島",
+    "Tuvalu": "吐瓦魯",
+    "Turks & Caicos Islands": "土克凱可群島",
+    "Turkmenistan": "土庫曼",
+    "Turkey": "土耳其",
+    "Tunisia": "突尼西亞",
+    "Trinidad & Tobago": "千里達及托巴哥",
+    "Tonga": "東加",
+    "Tokelau": "托克勞",
+    "Togo": "多哥",
+    "Timor-Leste": "東帝汶",
+    "Thailand": "泰國",
+    "Tanzania": "坦尚尼亞",
+    "Tajikistan": "塔吉克",
+    "Taiwan": "台灣",
+    "São Tomé & Príncipe": "聖多美普林西比",
+    "Syria": "敘利亞",
+    "Switzerland": "瑞士",
+    "Sweden": "瑞典",
+    "Swaziland": "史瓦帝尼",
+    "Svalbard & Jan Mayen": "斯瓦巴和揚馬延",
+    "Suriname": "蘇利南",
+    "Sudan": "蘇丹",
+    "St. Vincent & Grenadines": "聖文森及格瑞那丁",
+    "St. Pierre & Miquelon": "聖皮埃與密克隆",
+    "St. Martin": "聖馬丁",
+    "St. Lucia": "聖露西亞",
+    "St. Kitts & Nevis": "聖克里斯多福及尼維斯",
+    "St. Helena": "聖赫勒拿",
+    "St. Barthélemy": "聖巴瑟米",
+    "Sri Lanka": "斯里蘭卡",
+    "Spain": "西班牙",
+    "South Sudan": "南蘇丹",
+    "South Korea": "南韓",
+    "South Georgia & South Sandwich Islands": "南喬治亞與南桑威奇群島",
+    "South Africa": "南非",
+    "Somalia": "索馬利亞",
+    "Solomon Islands": "索羅門群島",
+    "Slovenia": "斯洛維尼亞",
+    "Slovakia": "斯洛伐克",
+    "Sint Maarten": "荷屬聖馬丁",
+    "Singapore": "新加坡",
+    "Sierra Leone": "獅子山",
+    "Seychelles": "塞席爾",
+    "Serbia": "塞爾維亞",
+    "Senegal": "塞內加爾",
+    "Saudi Arabia": "沙烏地阿拉伯",
+    "San Marino": "聖馬利諾",
+    "Samoa": "薩摩亞",
+    "Réunion": "留尼旺",
+    "Rwanda": "盧安達",
+    "Russia": "俄羅斯",
+    "Romania": "羅馬尼亞",
+    "Qatar": "卡達",
+    "Puerto Rico": "波多黎各",
+    "Portugal": "葡萄牙",
+    "Poland": "波蘭",
+    "Pitcairn Islands": "皮特肯群島",
+    "Philippines": "菲律賓",
+    "Peru": "秘魯",
+    "Paraguay": "巴拉圭",
+    "Papua New Guinea": "巴布亞紐幾內亞",
+    "Panama": "巴拿馬",
+    "Palestine": "巴勒斯坦",
+    "Palau": "帛琉",
+    "Pakistan": "巴基斯坦",
+    "Oman": "阿曼",
+    "Norway": "挪威",
+    "Northern Mariana Islands": "北馬利安納群島",
+    "North Korea": "北韓",
+    "Norfolk Island": "諾福克島",
+    "Niue": "紐埃",
+    "Nigeria": "奈及利亞",
+    "Niger": "尼日",
+    "Nicaragua": "尼加拉瓜",
+    "New Zealand": "紐西蘭",
+    "New Caledonia": "新喀里多尼亞",
+    "Netherlands": "荷蘭",
+    "Nepal": "尼泊爾",
+    "Nauru": "諾魯",
+    "Namibia": "納米比亞",
+    "Myanmar": "緬甸",
+    "Mozambique": "莫三比克",
+    "Morocco": "摩洛哥",
+    "Montserrat": "蒙哲臘",
+    "Montenegro": "蒙特內哥羅",
+    "Mongolia": "蒙古",
+    "Monaco": "摩納哥",
+    "Moldova": "摩爾多瓦",
+    "Micronesia": "密克羅尼西亞",
+    "Mexico": "墨西哥",
+    "Mayotte": "馬約特",
+    "Mauritius": "模里西斯",
+    "Mauritania": "茅利塔尼亞",
+    "Martinique": "馬丁尼克",
+    "Marshall Islands": "馬紹爾群島",
+    "Malta": "馬爾他",
+    "Mali": "馬利",
+    "Maldives": "馬爾地夫",
+    "Malaysia": "馬來西亞",
+    "Malawi": "馬拉威",
+    "Madagascar": "馬達加斯加",
+    "Macedonia": "馬其頓",
+    "Macau": "澳門",
+    "Luxembourg": "盧森堡",
+    "Lithuania": "立陶宛",
+    "Liechtenstein": "列支敦斯登",
+    "Libya": "利比亞",
+    "Liberia": "賴比瑞亞",
+    "Lesotho": "賴索托",
+    "Lebanon": "黎巴嫩",
+    "Latvia": "拉脫維亞",
+    "Laos": "寮國",
+    "Kyrgyzstan": "吉爾吉斯",
+    "Kuwait": "科威特",
+    "Kosovo": "科索沃",
+    "Kiribati": "吉里巴斯",
+    "Kenya": "肯亞",
+    "Kazakhstan": "哈薩克",
+    "Jordan": "約旦",
+    "Jersey": "澤西",
+    "Japan": "日本",
+    "Jamaica": "牙買加",
+    "Italy": "義大利",
+    "Israel": "以色列",
+    "Isle of Man": "曼島",
+    "Ireland": "愛爾蘭",
+    "Iraq": "伊拉克",
+    "Iran": "伊朗",
+    "Indonesia": "印度尼西亞",
+    "India": "印度",
+    "Iceland": "冰島",
+    "Hungary": "匈牙利",
+    "Hong Kong": "香港",
+    "Honduras": "宏都拉斯",
+    "Heard & McDonald Islands": "赫德島和麥克唐納群島",
+    "Haiti": "海地",
+    "Guyana": "蓋亞那",
+    "Guinea-Bissau": "幾內亞比索",
+    "Guinea": "幾內亞",
+    "Guernsey": "根西",
+    "Guatemala": "瓜地馬拉",
+    "Guam": "關島",
+    "Guadeloupe": "瓜地洛普",
+    "Grenada": "格瑞那達",
+    "Greenland": "格陵蘭",
+    "Greece": "希臘",
+    "Gibraltar": "直布羅陀",
+    "Ghana": "迦納",
+    "Germany": "德國",
+    "Georgia": "喬治亞",
+    "Gambia": "甘比亞",
+    "Gabon": "加彭",
+    "French Southern Territories": "法屬南部領地",
+    "French Polynesia": "法屬玻里尼西亞",
+    "French Guiana": "法屬圭亞那",
+    "France": "法國",
+    "Finland": "芬蘭",
+    "Fiji": "斐濟",
+    "Faroe Islands": "法羅群島",
+    "Falkland Islands": "福克蘭群島",
+    "Ethiopia": "衣索比亞",
+    "Estonia": "愛沙尼亞",
+    "Eritrea": "厄利垂亞",
+    "Equatorial Guinea": "赤道幾內亞",
+    "El Salvador": "薩爾瓦多",
+    "Egypt": "埃及",
+    "Ecuador": "厄瓜多",
+    "Dominican Republic": "多明尼加",
+    "Dominica": "多米尼克",
+    "Djibouti": "吉布地",
+    "Denmark": "丹麥",
+    "Côte d’Ivoire": "象牙海岸",
+    "Czech Republic": "捷克",
+    "Cyprus": "賽普勒斯",
+    "Curaçao": "古拉索",
+    "Cuba": "古巴",
+    "Croatia": "克羅埃西亞",
+    "Costa Rica": "哥斯大黎加",
+    "Cook Islands": "庫克群島",
+    "Congo - Kinshasa": "剛果 - 金夏沙",
+    "Congo - Brazzaville": "剛果 - 布拉薩",
+    "Comoros": "葛摩",
+    "Colombia": "哥倫比亞",
+    "Cocos (Keeling) Islands": "科科斯（基林）群島",
+    "Christmas Island": "聖誕島",
+    "China": "中國",
+    "Chile": "智利",
+    "Chad": "查德",
+    "Central African Republic": "中非共和國",
+    "Cayman Islands": "開曼群島",
+    "Caribbean Netherlands": "荷屬加勒比",
+    "Cape Verde": "維德角",
+    "Canada": "加拿大",
+    "Cameroon": "喀麥隆",
+    "Cambodia": "柬埔寨",
+    "Burundi": "蒲隆地",
+    "Burkina Faso": "布吉納法索",
+    "Bulgaria": "保加利亞",
+    "Brunei": "汶萊",
+    "British Virgin Islands": "英屬維京群島",
+    "British Indian Ocean Territory": "英屬印度洋屬地",
+    "Brazil": "巴西",
+    "Bouvet Island": "布威島",
+    "Botswana": "波札那",
+    "Bosnia": "波士尼亞",
+    "Bolivia": "玻利維亞",
+    "Bhutan": "不丹",
+    "Bermuda": "百慕達",
+    "Benin": "貝南",
+    "Belize": "貝里斯",
+    "Belgium": "比利時",
+    "Belarus": "白俄羅斯",
+    "Barbados": "巴貝多",
+    "Bangladesh": "孟加拉",
+    "Bahrain": "巴林",
+    "Bahamas": "巴哈馬",
+    "Azerbaijan": "亞塞拜然",
+    "Austria": "奧地利",
+    "Australia": "澳洲",
+    "Aruba": "阿魯巴",
+    "Armenia": "亞美尼亞",
+    "Argentina": "阿根廷",
+    "Antigua & Barbuda": "安地卡及巴布達",
+    "Antarctica": "南極洲",
+    "Anguilla": "安吉拉",
+    "Angola": "安哥拉",
+    "Andorra": "安道爾",
+    "American Samoa": "美屬薩摩亞",
+    "Algeria": "阿爾及利亞",
+    "Albania": "阿爾巴尼亞",
+    "Åland Islands": "奧蘭",
+    "Afghanistan": "阿富汗",
+    "United States": "美國",
+    "United Kingdom": "英國"
 }

From f045c257e3af9b0eaefb5f69e3610de5b20672e4 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Tue, 10 Nov 2020 08:09:14 +0000
Subject: [PATCH 076/146] Translated using Weblate (Bulgarian)

Currently translated at 89.5% (2353 of 2629 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/bg/
---
 src/i18n/strings/bg.json | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index e03215cb04..4e4c5c5760 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -2489,5 +2489,19 @@
     "New version of %(brand)s is available": "Налична е нова версия на %(brand)s",
     "Update %(brand)s": "Обнови %(brand)s",
     "Enable desktop notifications": "Включете уведомления на работния плот",
-    "Don't miss a reply": "Не пропускайте отговор"
+    "Don't miss a reply": "Не пропускайте отговор",
+    "User menu": "Потребителско меню",
+    "Search rooms": "Търси стаи",
+    "Save your Security Key": "Запази ключа за сигурност",
+    "Confirm Security Phrase": "Потвърди фразата за сигурност",
+    "Set a Security Phrase": "Настрой фраза за сигурност",
+    "You can also set up Secure Backup & manage your keys in Settings.": "Също така, може да конфигурирате защитено резервно копиране и да управлявате ключовете си от Настройки.",
+    "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "Ако се откажете сега, може да загубите достъп до шифрованите съобщения и данни, в случай че загубите достъп до тази сесия.",
+    "Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.": "Запазете ключа за сигурност на сигурно място, като password manager или сейф, понеже се използва за предпазване на шифрованите данни.",
+    "Enter a security phrase only you know, as it’s used to safeguard your data. To be secure, you shouldn’t re-use your account password.": "Въведете фраза за сигурност, която знаете само вие. Тя ще се използва за предпазване на данните ви. За да е по-сигурно, не използвайте паролата за профила си.",
+    "Use a secret phrase only you know, and optionally save a Security Key to use for backup.": "Използвайте секретна фраза, която знаете само вие. При необходимост запазете и ключа за сигурност за резервното копие.",
+    "Enter a Security Phrase": "Въведете фраза за сигурност",
+    "We’ll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": "Ще генерираме ключ за сигурност, който да съхраните на сигурно място, като password manager или сейф.",
+    "Generate a Security Key": "Генерирай ключ за сигурност",
+    "Safeguard against losing access to encrypted messages & data by backing up encryption keys on your server.": "Предпазете се от загуба на достъп до шифрованите съобщения и данни като направите резервно копие на ключовете за шифроване върху сървъра."
 }

From 80bb091cc597aced3354cc5496ec676a97b1eba2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 10 Nov 2020 10:00:55 +0000
Subject: [PATCH 077/146] Iterate PR

---
 res/css/views/rooms/_EventTile.scss                  |  1 +
 src/components/views/elements/MiniAvatarUploader.tsx |  6 +++---
 src/components/views/rooms/EventTile.js              | 11 ++++++-----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 80ede1152d..429ac7ed4b 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -124,6 +124,7 @@ $left-gutter: 64px;
     .mx_EventTile_line {
         margin-right: 0;
         grid-column: 1 / 3;
+        // override default padding of mx_EventTile_line so that we can be centered
         padding: 0 !important;
     }
 
diff --git a/src/components/views/elements/MiniAvatarUploader.tsx b/src/components/views/elements/MiniAvatarUploader.tsx
index 903826c3e6..b5e117b42a 100644
--- a/src/components/views/elements/MiniAvatarUploader.tsx
+++ b/src/components/views/elements/MiniAvatarUploader.tsx
@@ -39,14 +39,14 @@ const MiniAvatarUploader: React.FC<IProps> = ({ hasAvatar, hasAvatarLabel, noAva
 
     useTimeout(() => {
         setShow(true);
-    }, 3_000); // show after 3 seconds
+    }, 3000); // show after 3 seconds
     useTimeout(() => {
         setShow(false);
-    }, 13_000); // hide after being shown for 10 seconds
+    }, 13000); // hide after being shown for 10 seconds
 
     const uploadRef = useRef<HTMLInputElement>();
 
-    const label = hasAvatar || busy ? hasAvatarLabel : noAvatarLabel;
+    const label = (hasAvatar || busy) ? hasAvatarLabel : noAvatarLabel;
 
     return <React.Fragment>
         <input
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 9060ddb02b..c358ef610d 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -21,6 +21,7 @@ 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 { _t, _td } from '../../../languageHandler';
 import * as TextForEvent from "../../../TextForEvent";
 import * as sdk from "../../../index";
@@ -646,13 +647,13 @@ export default class EventTile extends React.Component {
 
         // Info messages are basically information about commands processed on a room
         const isBubbleMessage = eventType.startsWith("m.key.verification") ||
-            (eventType === "m.room.message" && msgtype && msgtype.startsWith("m.key.verification")) ||
-            (eventType === "m.room.create") ||
-            (eventType === "m.room.encryption") ||
+            (eventType === EventType.RoomMessage && msgtype && msgtype.startsWith("m.key.verification")) ||
+            (eventType === EventType.RoomCreate) ||
+            (eventType === EventType.RoomEncryption) ||
             (tileHandler === "messages.MJitsiWidgetEvent");
         let isInfoMessage = (
-            !isBubbleMessage && eventType !== 'm.room.message' &&
-            eventType !== 'm.sticker' && eventType !== 'm.room.create'
+            !isBubbleMessage && eventType !== EventType.RoomMessage &&
+            eventType !== EventType.Sticker && eventType !== EventType.RoomCreate
         );
 
         // If we're showing hidden events in the timeline, we should use the

From db3f125e261c74220af2e5726ad2cebb7cd28416 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 10 Nov 2020 12:03:50 +0000
Subject: [PATCH 078/146] Change how we expose Role in User Info and hide in
 DMs

---
 src/components/views/right_panel/UserInfo.tsx | 134 ++++++------------
 src/i18n/strings/en_EN.json                   |   2 +-
 2 files changed, 48 insertions(+), 88 deletions(-)

diff --git a/src/components/views/right_panel/UserInfo.tsx b/src/components/views/right_panel/UserInfo.tsx
index f8be6327bf..66b689ddb9 100644
--- a/src/components/views/right_panel/UserInfo.tsx
+++ b/src/components/views/right_panel/UserInfo.tsx
@@ -51,7 +51,6 @@ import BaseCard from "./BaseCard";
 import {E2EStatus} from "../../../utils/ShieldUtils";
 import ImageView from "../elements/ImageView";
 import Spinner from "../elements/Spinner";
-import IconButton from "../elements/IconButton";
 import PowerSelector from "../elements/PowerSelector";
 import MemberAvatar from "../avatars/MemberAvatar";
 import PresenceLabel from "../rooms/PresenceLabel";
@@ -1028,24 +1027,15 @@ const PowerLevelSection: React.FC<{
     roomPermissions: IRoomPermissions;
     powerLevels: IPowerLevelsContent;
 }> = ({user, room, roomPermissions, powerLevels}) => {
-    const [isEditing, setEditing] = useState(false);
-    if (isEditing) {
-        return (<PowerLevelEditor
-            user={user} room={room} roomPermissions={roomPermissions}
-            onFinished={() => setEditing(false)} />);
+    if (roomPermissions.canEdit) {
+        return (<PowerLevelEditor user={user} room={room} roomPermissions={roomPermissions} />);
     } else {
         const powerLevelUsersDefault = powerLevels.users_default || 0;
         const powerLevel = parseInt(user.powerLevel, 10);
-        const modifyButton = roomPermissions.canEdit ?
-            (<IconButton icon="edit" onClick={() => setEditing(true)} />) : null;
         const role = textualPowerLevel(powerLevel, powerLevelUsersDefault);
-        const label = _t("<strong>%(role)s</strong> in %(roomName)s",
-            {role, roomName: room.name},
-            {strong: label => <strong>{label}</strong>},
-        );
         return (
             <div className="mx_UserInfo_profileField">
-                <div className="mx_UserInfo_roleDescription">{label}{modifyButton}</div>
+                <div className="mx_UserInfo_roleDescription">{role}</div>
             </div>
         );
     }
@@ -1055,20 +1045,15 @@ const PowerLevelEditor: React.FC<{
     user: User;
     room: Room;
     roomPermissions: IRoomPermissions;
-    onFinished(): void;
-}> = ({user, room, roomPermissions, onFinished}) => {
+}> = ({user, room, roomPermissions}) => {
     const cli = useContext(MatrixClientContext);
 
-    const [isUpdating, setIsUpdating] = useState(false);
     const [selectedPowerLevel, setSelectedPowerLevel] = useState(parseInt(user.powerLevel, 10));
-    const [isDirty, setIsDirty] = useState(false);
-    const onPowerChange = useCallback((powerLevel) => {
-        setIsDirty(true);
-        setSelectedPowerLevel(parseInt(powerLevel, 10));
-    }, [setSelectedPowerLevel, setIsDirty]);
+    const onPowerChange = useCallback(async (powerLevelStr: string) => {
+        const powerLevel = parseInt(powerLevelStr, 10);
+        setSelectedPowerLevel(powerLevel);
 
-    const changePowerLevel = useCallback(async () => {
-        const _applyPowerChange = (roomId, target, powerLevel, powerLevelEvent) => {
+        const applyPowerChange = (roomId, target, powerLevel, powerLevelEvent) => {
             return cli.setPowerLevel(roomId, target, parseInt(powerLevel), powerLevelEvent).then(
                 function() {
                     // NO-OP; rely on the m.room.member event coming down else we could
@@ -1084,64 +1069,42 @@ const PowerLevelEditor: React.FC<{
             );
         };
 
-        try {
-            if (!isDirty) {
-                return;
-            }
+        const roomId = user.roomId;
+        const target = user.userId;
 
-            setIsUpdating(true);
+        const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
+        if (!powerLevelEvent) return;
 
-            const powerLevel = selectedPowerLevel;
+        const myUserId = cli.getUserId();
+        const myPower = powerLevelEvent.getContent().users[myUserId];
+        if (myPower && parseInt(myPower) === powerLevel) {
+            const {finished} = Modal.createTrackedDialog('Promote to PL100 Warning', '', QuestionDialog, {
+                title: _t("Warning!"),
+                description:
+                    <div>
+                        { _t("You will not be able to undo this change as you are promoting the user " +
+                            "to have the same power level as yourself.") }<br />
+                        { _t("Are you sure?") }
+                    </div>,
+                button: _t("Continue"),
+            });
 
-            const roomId = user.roomId;
-            const target = user.userId;
-
-            const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
-            if (!powerLevelEvent) return;
-
-            if (!powerLevelEvent.getContent().users) {
-                _applyPowerChange(roomId, target, powerLevel, powerLevelEvent);
-                return;
-            }
-
-            const myUserId = cli.getUserId();
+            const [confirmed] = await finished;
+            if (!confirmed) return;
+        } else if (myUserId === target) {
             // If we are changing our own PL it can only ever be decreasing, which we cannot reverse.
-            if (myUserId === target) {
-                try {
-                    if (!(await warnSelfDemote())) return;
-                } catch (e) {
-                    console.error("Failed to warn about self demotion: ", e);
-                }
-                await _applyPowerChange(roomId, target, powerLevel, powerLevelEvent);
-                return;
+            try {
+                if (!(await warnSelfDemote())) return;
+            } catch (e) {
+                console.error("Failed to warn about self demotion: ", e);
             }
-
-            const myPower = powerLevelEvent.getContent().users[myUserId];
-            if (parseInt(myPower) === powerLevel) {
-                const {finished} = Modal.createTrackedDialog('Promote to PL100 Warning', '', QuestionDialog, {
-                    title: _t("Warning!"),
-                    description:
-                        <div>
-                            { _t("You will not be able to undo this change as you are promoting the user " +
-                                "to have the same power level as yourself.") }<br />
-                            { _t("Are you sure?") }
-                        </div>,
-                    button: _t("Continue"),
-                });
-
-                const [confirmed] = await finished;
-                if (!confirmed) return;
-            }
-            await _applyPowerChange(roomId, target, powerLevel, powerLevelEvent);
-        } finally {
-            onFinished();
         }
-    }, [user.roomId, user.userId, cli, selectedPowerLevel, isDirty, setIsUpdating, onFinished, room]);
+
+        await applyPowerChange(roomId, target, powerLevel, powerLevelEvent);
+    }, [user.roomId, user.userId, cli, room]);
 
     const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
     const powerLevelUsersDefault = powerLevelEvent ? powerLevelEvent.getContent().users_default : 0;
-    const buttonOrSpinner = isUpdating ? <Spinner w={16} h={16} /> :
-        <IconButton icon="check" onClick={changePowerLevel} />;
 
     return (
         <div className="mx_UserInfo_profileField">
@@ -1151,9 +1114,7 @@ const PowerLevelEditor: React.FC<{
                 maxValue={roomPermissions.modifyLevelMax}
                 usersDefault={powerLevelUsersDefault}
                 onChange={onPowerChange}
-                disabled={isUpdating}
             />
-            {buttonOrSpinner}
         </div>
     );
 };
@@ -1343,13 +1304,17 @@ const BasicUserInfo: React.FC<{
     }
 
     let memberDetails;
-    if (room && member.roomId) {
-        memberDetails = <PowerLevelSection
-            powerLevels={powerLevels}
-            user={member}
-            room={room}
-            roomPermissions={roomPermissions}
-        />;
+    // hide the Roles section for DMs as it doesn't make sense there
+    if (room && member.roomId && !DMRoomMap.shared().getUserIdForRoomId(member.roomId)) {
+        memberDetails = <div className="mx_UserInfo_container">
+            <h3>{ _t("Role") }</h3>
+            <PowerLevelSection
+                powerLevels={powerLevels}
+                user={member}
+                room={room}
+                roomPermissions={roomPermissions}
+            />
+        </div>;
     }
 
     // only display the devices list if our client supports E2E
@@ -1419,12 +1384,7 @@ const BasicUserInfo: React.FC<{
     );
 
     return <React.Fragment>
-        { memberDetails &&
-        <div className="mx_UserInfo_container mx_UserInfo_separator mx_UserInfo_memberDetailsContainer">
-            <div className="mx_UserInfo_memberDetails">
-                { memberDetails }
-            </div>
-        </div> }
+        { memberDetails }
 
         { securitySection }
         <UserOptionsSection
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 5fec27c7f6..f6f58c7a1d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1589,7 +1589,6 @@
     "Remove this user from community?": "Remove this user from community?",
     "Failed to withdraw invitation": "Failed to withdraw invitation",
     "Failed to remove user from community": "Failed to remove user from community",
-    "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> in %(roomName)s",
     "Failed to change power level": "Failed to change power level",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.",
     "Are you sure?": "Are you sure?",
@@ -1597,6 +1596,7 @@
     "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?",
     "Deactivate user": "Deactivate user",
     "Failed to deactivate user": "Failed to deactivate user",
+    "Role": "Role",
     "This client does not support end-to-end encryption.": "This client does not support end-to-end encryption.",
     "Security": "Security",
     "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what %(brand)s supports. Try with a different client.": "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what %(brand)s supports. Try with a different client.",

From 5fb86f74d7fe15dec4b0ec38ae37484d40889a06 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 10 Nov 2020 12:06:56 +0000
Subject: [PATCH 079/146] Remove unused IconButton

---
 res/css/_components.scss                    |  1 -
 res/css/views/elements/_IconButton.scss     | 55 ---------------------
 res/css/views/right_panel/_UserInfo.scss    | 14 ------
 src/components/views/elements/IconButton.js | 34 -------------
 4 files changed, 104 deletions(-)
 delete mode 100644 res/css/views/elements/_IconButton.scss
 delete mode 100644 src/components/views/elements/IconButton.js

diff --git a/res/css/_components.scss b/res/css/_components.scss
index 0b46df9bd8..ca4db2cdcb 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -110,7 +110,6 @@
 @import "./views/elements/_EventListSummary.scss";
 @import "./views/elements/_Field.scss";
 @import "./views/elements/_FormButton.scss";
-@import "./views/elements/_IconButton.scss";
 @import "./views/elements/_ImageView.scss";
 @import "./views/elements/_InfoTooltip.scss";
 @import "./views/elements/_InlineSpinner.scss";
diff --git a/res/css/views/elements/_IconButton.scss b/res/css/views/elements/_IconButton.scss
deleted file mode 100644
index d8ebbeb65e..0000000000
--- a/res/css/views/elements/_IconButton.scss
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-Copyright 2019 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.
-*/
-
-.mx_IconButton {
-    width: 32px;
-    height: 32px;
-    border-radius: 100%;
-    background-color: $accent-bg-color;
-    // don't shrink or grow if in a flex container
-    flex: 0 0 auto;
-
-    &.mx_AccessibleButton_disabled {
-        background-color: none;
-
-        &::before {
-            background-color: lightgrey;
-        }
-    }
-
-    &:hover {
-        opacity: 90%;
-    }
-
-    &::before {
-        content: "";
-        display: block;
-        width: 100%;
-        height: 100%;
-        mask-repeat: no-repeat;
-        mask-position: center;
-        mask-size: 55%;
-        background-color: $accent-color;
-    }
-
-    &.mx_IconButton_icon_check::before {
-        mask-image: url('$(res)/img/feather-customised/check.svg');
-    }
-
-    &.mx_IconButton_icon_edit::before {
-        mask-image: url('$(res)/img/feather-customised/edit.svg');
-    }
-}
diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss
index f20c9b7868..87420ae4e7 100644
--- a/res/css/views/right_panel/_UserInfo.scss
+++ b/res/css/views/right_panel/_UserInfo.scss
@@ -173,26 +173,12 @@ limitations under the License.
 
         margin: 6px 0;
 
-        .mx_IconButton, .mx_Spinner {
-            margin-left: 20px;
-            width: 16px;
-            height: 16px;
-
-            &::before {
-                mask-size: 80%;
-            }
-        }
-
         .mx_UserInfo_roleDescription {
             display: flex;
             justify-content: center;
             align-items: center;
             // try to make it the same height as the dropdown
             margin: 11px 0 12px 0;
-
-            .mx_IconButton {
-                margin-left: 6px;
-            }
         }
 
         .mx_Field {
diff --git a/src/components/views/elements/IconButton.js b/src/components/views/elements/IconButton.js
deleted file mode 100644
index ef7b4a8399..0000000000
--- a/src/components/views/elements/IconButton.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2019 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 React from 'react';
-import PropTypes from 'prop-types';
-import AccessibleButton from "./AccessibleButton";
-
-export default function IconButton(props) {
-    const {icon, className, ...restProps} = props;
-
-    let newClassName = (className || "") + " mx_IconButton";
-    newClassName = newClassName + " mx_IconButton_icon_" + icon;
-
-    const allProps = Object.assign({}, restProps, {className: newClassName});
-
-    return React.createElement(AccessibleButton, allProps);
-}
-
-IconButton.propTypes = Object.assign({
-    icon: PropTypes.string,
-}, AccessibleButton.propTypes);

From dc304d4ad83fdad44a1de36a1cacbf4fa0419298 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 10 Nov 2020 15:55:07 +0000
Subject: [PATCH 080/146] Fix drag drop file to upload for Safari

---
 src/components/structures/RoomView.tsx | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index 1c2bf3a000..c19272fb6a 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -1147,16 +1147,9 @@ export default class RoomView extends React.Component<IProps, IState> {
 
         ev.dataTransfer.dropEffect = 'none';
 
-        const items = [...ev.dataTransfer.items];
-        if (items.length >= 1) {
-            const isDraggingFiles = items.every(function(item) {
-                return item.kind == 'file';
-            });
-
-            if (isDraggingFiles) {
-                this.setState({ draggingFile: true });
-                ev.dataTransfer.dropEffect = 'copy';
-            }
+        if (ev.dataTransfer.types.includes("Files") || ev.dataTransfer.types.includes("application/x-moz-file")) {
+            this.setState({ draggingFile: true });
+            ev.dataTransfer.dropEffect = 'copy';
         }
     };
 

From 36aa80fb64ce8b281fcffae98d2eba282da03798 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Tue, 10 Nov 2020 18:29:28 +0000
Subject: [PATCH 081/146] Update src/components/views/elements/Validation.tsx

Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/elements/Validation.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/elements/Validation.tsx b/src/components/views/elements/Validation.tsx
index c45a745918..31f7c866b1 100644
--- a/src/components/views/elements/Validation.tsx
+++ b/src/components/views/elements/Validation.tsx
@@ -33,7 +33,7 @@ interface IRule<T, D = void> {
 interface IArgs<T, D = void> {
     rules: IRule<T, D>[];
     description(this: T, derivedData: D): React.ReactChild;
-    hideDescriptionIfValid?: Boolean;
+    hideDescriptionIfValid?: boolean;
     deriveData?(data: Data): Promise<D>;
 }
 

From db85d2c48a1603850f6b3602c38f76141472cf16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20Mesk=C3=B3?= <meskobalazs@gmail.com>
Date: Tue, 10 Nov 2020 17:50:44 +0000
Subject: [PATCH 082/146] Translated using Weblate (Hungarian)

Currently translated at 93.3% (2465 of 2642 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 72a6811727..dfdd150a36 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2601,5 +2601,29 @@
     "Åland Islands": "Åland-szigetek",
     "Afghanistan": "Afganisztán",
     "United States": "Egyesült Államok",
-    "United Kingdom": "Egyesült Királyság"
+    "United Kingdom": "Egyesült Királyság",
+    "Ghana": "Ghána",
+    "Germany": "Németország",
+    "Georgia": "Grúzia",
+    "Gambia": "Gambia",
+    "Gabon": "Gabon",
+    "French Southern Territories": "Francia déli és antarktiszi területek",
+    "French Polynesia": "Francia Polinézia",
+    "French Guiana": "Francia Guyana",
+    "France": "Franciaország",
+    "Finland": "Finnország",
+    "Fiji": "Fidzsi-szigetek",
+    "Faroe Islands": "Feröer",
+    "Falkland Islands": "Falkland-szigetek",
+    "Ethiopia": "Etiópia",
+    "Estonia": "Észtország",
+    "Eritrea": "Eritrea",
+    "Equatorial Guinea": "Egyenlítői-Guinea",
+    "El Salvador": "Salvador",
+    "Egypt": "Egyiptom",
+    "Ecuador": "Ecuador",
+    "Dominican Republic": "Dominikai Köztársaság",
+    "Dominica": "Dominikai Közösség",
+    "Djibouti": "Dzsibuti",
+    "Denmark": "Dánia"
 }

From eedd897a73cafba6e8d4b91c894c7fe8aaf7d706 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Tue, 10 Nov 2020 17:39:08 +0000
Subject: [PATCH 083/146] Translated using Weblate (Hungarian)

Currently translated at 93.3% (2465 of 2642 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index dfdd150a36..9460c89089 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2625,5 +2625,41 @@
     "Dominican Republic": "Dominikai Köztársaság",
     "Dominica": "Dominikai Közösség",
     "Djibouti": "Dzsibuti",
-    "Denmark": "Dánia"
+    "Denmark": "Dánia",
+    "Côte d’Ivoire": "Elefántcsontpart",
+    "Czech Republic": "Cseh Köztársaság",
+    "Cyprus": "Ciprus",
+    "Curaçao": "Curaçao",
+    "Cuba": "Kuba",
+    "Croatia": "Horvát",
+    "Costa Rica": "Costa Rica",
+    "Cook Islands": "Cook-szigetek",
+    "Congo - Kinshasa": "Kongó - Kinshasa",
+    "Congo - Brazzaville": "Kongó - Brazzaville",
+    "Comoros": "Comore-szigetek",
+    "Colombia": "Kolumbia",
+    "Cocos (Keeling) Islands": "Kókusz-szigetek",
+    "Christmas Island": "Karácsony-szigetek",
+    "China": "Kína",
+    "Chile": "Chile",
+    "Chad": "Csád",
+    "Central African Republic": "Közép-afrikai Köztársaság",
+    "Cayman Islands": "Kajmán-szigetek",
+    "Caribbean Netherlands": "Karibi Hollandia",
+    "Cape Verde": "Zöld-fok",
+    "Canada": "Kanada",
+    "Cameroon": "Kamerun",
+    "Cambodia": "Kambodzsa",
+    "Burundi": "Burundi",
+    "Burkina Faso": "Burkina Faso",
+    "Bulgaria": "Bulgária",
+    "Brunei": "Brunei",
+    "British Virgin Islands": "Brit Virgin-szigetek",
+    "British Indian Ocean Territory": "Brit Indiai-óceáni Terület",
+    "Brazil": "Brazília",
+    "Bouvet Island": "Bouvet-sziget",
+    "Botswana": "Botswana",
+    "Bosnia": "Bosznia",
+    "Bolivia": "Bolívia",
+    "Bhutan": "Bhután"
 }

From 61ee77b97d269b0af5f832919b7253afc0e9f5dd Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Tue, 10 Nov 2020 16:26:25 +0000
Subject: [PATCH 084/146] Translated using Weblate (Italian)

Currently translated at 100.0% (2642 of 2642 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
---
 src/i18n/strings/it.json | 266 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 265 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 77881bcb24..4df5fd0a39 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2577,5 +2577,269 @@
     "Update %(brand)s": "Aggiorna %(brand)s",
     "Enable desktop notifications": "Attiva le notifiche desktop",
     "Don't miss a reply": "Non perdere una risposta",
-    "Modal Widget": "Widget modale"
+    "Modal Widget": "Widget modale",
+    "%(creator)s created this DM.": "%(creator)s ha creato questo MD.",
+    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "I messaggi in questa stanza sono cifrati end-to-end. Quando qualcuno entra puoi verificarlo nel suo profilo, ti basta toccare il suo avatar.",
+    "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Qui i messaggi sono cifrati end-to-end. Verifica %(displayName)s nel suo profilo - tocca il suo avatar.",
+    "This is the start of <roomName/>.": "Questo è l'inizio di <roomName/>.",
+    "Add a photo, so people can easily spot your room.": "Aggiungi una foto, in modo che le persone notino facilmente la stanza.",
+    "%(displayName)s created this room.": "%(displayName)s ha creato questa stanza.",
+    "You created this room.": "Hai creato questa stanza.",
+    "<a>Add a topic</a> to help people know what it is about.": "<a>Aggiungi un argomento</a> per aiutare le persone a capire di cosa si parla.",
+    "Topic: %(topic)s ": "Argomento: %(topic)s ",
+    "Topic: %(topic)s (<a>edit</a>)": "Argomento: %(topic)s (<a>modifica</a>)",
+    "This is the beginning of your direct message history with <displayName/>.": "Questo è l'inizio della tua cronologia di messaggi diretti con <displayName/>.",
+    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Solo voi due siete in questa conversazione, a meno che uno di voi non inviti qualcuno.",
+    "Call Paused": "Chiamata in pausa",
+    "Takes the call in the current room off hold": "Riprende la chiamata nella stanza attuale",
+    "Places the call in the current room on hold": "Mette in pausa la chiamata nella stanza attuale",
+    "Zimbabwe": "Zimbabwe",
+    "Zambia": "Zambia",
+    "Yemen": "Yemen",
+    "Western Sahara": "Sahara Occidentale",
+    "Wallis & Futuna": "Wallis e Futuna",
+    "Vietnam": "Vietnam",
+    "Venezuela": "Venezuela",
+    "Vatican City": "Città del Vaticano",
+    "Vanuatu": "Vanuatu",
+    "Uzbekistan": "Uzbekistan",
+    "Uruguay": "Uruguay",
+    "United Arab Emirates": "Emirati Arabi Uniti",
+    "Ukraine": "Ucraina",
+    "Uganda": "Uganda",
+    "U.S. Virgin Islands": "Isole Vergini americane",
+    "Tuvalu": "Tuvalu",
+    "Turks & Caicos Islands": "Turks e Caicos",
+    "Turkmenistan": "Turkmenistan",
+    "Turkey": "Turchia",
+    "Tunisia": "Tunisia",
+    "Trinidad & Tobago": "Trinidad e Tobago",
+    "Tonga": "Tonga",
+    "Tokelau": "Tokelau",
+    "Togo": "Togo",
+    "Timor-Leste": "Timor Est",
+    "Thailand": "Tailandia",
+    "Tanzania": "Tanzania",
+    "Tajikistan": "Tagikistan",
+    "Taiwan": "Taiwan",
+    "São Tomé & Príncipe": "São Tomé e Príncipe",
+    "Syria": "Siria",
+    "Switzerland": "Svizzera",
+    "Sweden": "Svezia",
+    "Swaziland": "eSwatini",
+    "Svalbard & Jan Mayen": "Svalbard e Jan Mayen",
+    "Suriname": "Suriname",
+    "Sudan": "Sudan",
+    "St. Vincent & Grenadines": "Saint Vincent e Grenadine",
+    "St. Pierre & Miquelon": "Saint-Pierre e Miquelon",
+    "St. Martin": "Saint Martin",
+    "St. Lucia": "Saint Lucia",
+    "St. Kitts & Nevis": "Saint Kitts e Nevis",
+    "St. Helena": "Sant'Elena",
+    "St. Barthélemy": "Saint-Barthélemy",
+    "Sri Lanka": "Sri Lanka",
+    "Spain": "Spagna",
+    "South Sudan": "Sudan del Sud",
+    "South Korea": "Corea del Sud",
+    "South Georgia & South Sandwich Islands": "Georgia del Sud e Isole Sandwich Australi",
+    "South Africa": "Sudafrica",
+    "Somalia": "Somalia",
+    "Solomon Islands": "Isole Solomone",
+    "Slovenia": "Slovenia",
+    "Slovakia": "Slovacchia",
+    "Sint Maarten": "Sint Maarten",
+    "Singapore": "Singapore",
+    "Sierra Leone": "Sierra Leone",
+    "Seychelles": "Seychelles",
+    "Serbia": "Serbia",
+    "Senegal": "Senegal",
+    "Saudi Arabia": "Arabia Saudita",
+    "San Marino": "San Marino",
+    "Samoa": "Samoa",
+    "Réunion": "Riunione",
+    "Rwanda": "Ruanda",
+    "Russia": "Russia",
+    "Romania": "Romania",
+    "Qatar": "Qatar",
+    "Puerto Rico": "Puerto Rico",
+    "Portugal": "Portogallo",
+    "Poland": "Polonia",
+    "Pitcairn Islands": "Isole Pitcairn",
+    "Philippines": "Filippine",
+    "Peru": "Peru",
+    "Paraguay": "Paraguay",
+    "Papua New Guinea": "Papua Nuova Guinea",
+    "Panama": "Panama",
+    "Palestine": "Palestina",
+    "Palau": "Palau",
+    "Pakistan": "Pakistan",
+    "Oman": "Oman",
+    "Norway": "Norvegia",
+    "Northern Mariana Islands": "Isole Marianne Settentrionali",
+    "North Korea": "Corea del Nord",
+    "Norfolk Island": "Isola Norfolk",
+    "Niue": "Niue",
+    "Nigeria": "Nigeria",
+    "Niger": "Niger",
+    "Nicaragua": "Nicaragua",
+    "New Zealand": "Nuova Zelanda",
+    "New Caledonia": "Nuova Caledonia",
+    "Netherlands": "Paesi Bassi",
+    "Nepal": "Nepal",
+    "Nauru": "Nauru",
+    "Namibia": "Namibia",
+    "Myanmar": "Birmania",
+    "Mozambique": "Mozambico",
+    "Morocco": "Marocco",
+    "Montserrat": "Montserrat",
+    "Montenegro": "Montenegro",
+    "Mongolia": "Mongolia",
+    "Monaco": "Monaco",
+    "Moldova": "Moldavia",
+    "Micronesia": "Micronesia",
+    "Mexico": "Messico",
+    "Mayotte": "Maiotta",
+    "Mauritius": "Mauritius",
+    "Mauritania": "Mauritania",
+    "Martinique": "Martinica",
+    "Marshall Islands": "Isole Marshall",
+    "Malta": "Malta",
+    "Mali": "Mali",
+    "Maldives": "Maldive",
+    "Malaysia": "Malesia",
+    "Malawi": "Malawi",
+    "Madagascar": "Madagascar",
+    "Macedonia": "Macedonia",
+    "Macau": "Macau",
+    "Luxembourg": "Lussemburgo",
+    "Lithuania": "Lituania",
+    "Liechtenstein": "Liechtenstein",
+    "Libya": "Libia",
+    "Liberia": "Liberia",
+    "Lesotho": "Lesotho",
+    "Lebanon": "Libano",
+    "Latvia": "Lettonia",
+    "Laos": "Laos",
+    "Kyrgyzstan": "Kirghizistan",
+    "Kuwait": "Kuwait",
+    "Kosovo": "Kosovo",
+    "Kiribati": "Kiribati",
+    "Kenya": "Kenya",
+    "Kazakhstan": "Kazakistan",
+    "Jordan": "Giordania",
+    "Jersey": "Baliato di Jersey",
+    "Japan": "Giappone",
+    "Jamaica": "Giamaica",
+    "Italy": "Italia",
+    "Israel": "Israele",
+    "Isle of Man": "Isola di Man",
+    "Ireland": "Irlanda",
+    "Iraq": "Iraq",
+    "Iran": "Iran",
+    "Indonesia": "Indonesia",
+    "India": "India",
+    "Iceland": "Islanda",
+    "Hungary": "Ungheria",
+    "Hong Kong": "Hong Kong",
+    "Honduras": "Honduras",
+    "Heard & McDonald Islands": "Isole Heard e McDonald",
+    "Haiti": "Haiti",
+    "Guyana": "Guyana",
+    "Guinea-Bissau": "Guinea-Bissau",
+    "Guinea": "Guinea",
+    "Guernsey": "Guernsey",
+    "Guatemala": "Guatemala",
+    "Guam": "Guam",
+    "Guadeloupe": "Guadalupa",
+    "Grenada": "Grenada",
+    "Greenland": "Groenlandia",
+    "Greece": "Grecia",
+    "Gibraltar": "Gibilterra",
+    "Ghana": "Ghana",
+    "Germany": "Germania",
+    "Georgia": "Georgia",
+    "Gambia": "Gambia",
+    "Gabon": "Gabon",
+    "French Southern Territories": "Terre australi e antartiche francesi",
+    "French Polynesia": "Polinesia Francese",
+    "French Guiana": "Guiana Francese",
+    "France": "Francia",
+    "Finland": "Finlandia",
+    "Fiji": "Figi",
+    "Faroe Islands": "Isole Faroe",
+    "Falkland Islands": "Isole Falkland",
+    "Ethiopia": "Etiopia",
+    "Estonia": "Estonia",
+    "Eritrea": "Eritrea",
+    "Equatorial Guinea": "Guinea Equatoriale",
+    "El Salvador": "El Salvador",
+    "Egypt": "Egitto",
+    "Ecuador": "Ecuador",
+    "Dominican Republic": "Repubblica Dominicana",
+    "Dominica": "Dominica",
+    "Djibouti": "Gibuti",
+    "Denmark": "Danimarca",
+    "Côte d’Ivoire": "Costa d'Avorio",
+    "Czech Republic": "Repubblica Ceca",
+    "Cyprus": "Cipro",
+    "Curaçao": "Curaçao",
+    "Cuba": "Cuba",
+    "Croatia": "Croazia",
+    "Costa Rica": "Costa Rica",
+    "Cook Islands": "Isole Cook",
+    "Congo - Kinshasa": "Congo - Kinshasa",
+    "Congo - Brazzaville": "Congo - Brazzaville",
+    "Comoros": "Comore",
+    "Colombia": "Colombia",
+    "Cocos (Keeling) Islands": "Isole Cocos (Keeling)",
+    "Christmas Island": "Isola di Natale",
+    "China": "Cina",
+    "Chile": "Cile",
+    "Chad": "Ciad",
+    "Central African Republic": "Repubblica Centrafricana",
+    "Cayman Islands": "Isole Cayman",
+    "Caribbean Netherlands": "Paesi Bassi caraibici",
+    "Cape Verde": "Capo Verde",
+    "Canada": "Canada",
+    "Cameroon": "Camerun",
+    "Cambodia": "Cambogia",
+    "Burundi": "Burundi",
+    "Burkina Faso": "Burkina Faso",
+    "Bulgaria": "Bulgaria",
+    "Brunei": "Brunei",
+    "British Virgin Islands": "Isole Vergini britanniche",
+    "British Indian Ocean Territory": "Territorio britannico dell'Oceano Indiano",
+    "Brazil": "Brasile",
+    "Bouvet Island": "Isola Bouvet",
+    "Botswana": "Botswana",
+    "Bosnia": "Bosnia",
+    "Bolivia": "Bolivia",
+    "Bhutan": "Bhutan",
+    "Bermuda": "Bermuda",
+    "Benin": "Benin",
+    "Belize": "Belize",
+    "Belgium": "Belgio",
+    "Belarus": "Bielorussia",
+    "Barbados": "Barbados",
+    "Bangladesh": "Bangladesh",
+    "Bahrain": "Bahrein",
+    "Bahamas": "Bahamas",
+    "Azerbaijan": "Azerbaigian",
+    "Austria": "Austria",
+    "Australia": "Australia",
+    "Aruba": "Aruba",
+    "Armenia": "Armenia",
+    "Argentina": "Argentina",
+    "Antigua & Barbuda": "Antigua e Barbuda",
+    "Antarctica": "Antartide",
+    "Anguilla": "Anguilla",
+    "Angola": "Angola",
+    "Andorra": "Andorra",
+    "American Samoa": "Samoa Americane",
+    "Algeria": "Algeria",
+    "Albania": "Albania",
+    "Åland Islands": "Isole Åland",
+    "Afghanistan": "Afghanistan",
+    "United States": "Stati Uniti",
+    "United Kingdom": "Regno Unito"
 }

From 1ba4c93e4db15ea809793231e491af403224c4a2 Mon Sep 17 00:00:00 2001
From: Kaede <contact+element_translations@kaede.ch>
Date: Tue, 10 Nov 2020 16:24:22 +0000
Subject: [PATCH 085/146] Translated using Weblate (Japanese)

Currently translated at 52.0% (1374 of 2642 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ja/
---
 src/i18n/strings/ja.json | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index cc38ef5d39..4ab5bc0de2 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -649,7 +649,7 @@
     "Incorrect password": "間違ったパスワード",
     "Deactivate Account": "アカウントを無効にする",
     "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "これにより、あなたのアカウントは永久に使用できなくなります。ログインできなくなり、誰も同じユーザーIDを再登録できなくなります。これにより、参加しているすべてのルームから退室し、 IDサーバからあなたのアカウントの詳細が削除されます。<b>この操作は元に戻すことができません。</b>",
-    "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "アカウントを無効にしても、<b>送信されたメッセージはデフォルトではなくなりません。</b>メッセージを忘れてしまった場合は、下のボックスにチェックを入れてください。",
+    "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "アカウントを無効にしても、<b>送信されたメッセージはデフォルトでは忘れられません。</b>メッセージを忘れさせたい場合は、下のボックスにチェックを入れてください。",
     "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Matrixのメッセージの可視性は電子メールと似ています。メッセージを忘れると、新規または未登録のユーザーと共有することができませんが、既にこれらのメッセージにアクセスしている登録ユーザーは、依然としてそのコピーにアクセスできます。",
     "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "アカウントを無効する際、送信したすべてのメッセージを削除(<b>警告:</b>これにより、今後のユーザーは会話履歴の全文を見ることができなくなります)",
     "To continue, please enter your password:": "続行するには、パスワードを入力してください:",
@@ -1459,5 +1459,12 @@
     "For extra security, verify this user by checking a one-time code on both of your devices.": "セキュリティ強化するために、両者のデバイスでワンタイムコードを確認し、このユーザーを検証することができます。",
     "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "あなたのメッセージは保護されており、あなたと宛先だけが保護を解除してメッセージを閲覧するための固有の鍵を持っています。",
     "%(name)s wants to verify": "%(name)s が検証を求めています",
-    "You sent a verification request": "あなたが検証リクエストを送信しました"
+    "You sent a verification request": "あなたが検証リクエストを送信しました",
+    "This account has been deactivated.": "このアカウントは、無効化されています。",
+    "Forget Room": "部屋を忘れる",
+    "Forget this room": "部屋を忘れる",
+    "Recently Direct Messaged": "最近ダイレクトメッセージで会話したユーザー",
+    "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.": "この部屋に誰かを招待したい場合は、招待したいユーザーの名前、（ <userId/> の様な）ユーザー名、またはメールアドレスを指定するか、<a>この部屋を共有</a>してください。",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "この部屋に誰かを招待したい場合は、招待したいユーザーの名前、メールアドレス、または（ <userId/> の様な）ユーザー名を指定するか、<a>この部屋を共有</a>してください。",
+    "Upgrade your encryption": "暗号化をアップグレード"
 }

From a447033dacc12c8adbb44460be30a0526a692949 Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Tue, 10 Nov 2020 14:32:17 +0000
Subject: [PATCH 086/146] Translated using Weblate (Albanian)

Currently translated at 99.8% (2637 of 2642 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
---
 src/i18n/strings/sq.json | 266 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 265 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 148e373b98..82644d85a3 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -2570,5 +2570,269 @@
     "New version of %(brand)s is available": "Ka gati një version të ri të %(brand)s",
     "Update %(brand)s": "Përditësoni %(brand)s",
     "Enable desktop notifications": "Aktivizoni njoftime desktopi",
-    "Don't miss a reply": "Mos humbni asnjë përgjigje"
+    "Don't miss a reply": "Mos humbni asnjë përgjigje",
+    "Paraguay": "Paraguai",
+    "Guyana": "Guajanë",
+    "Central African Republic": "Republika e Afrikës Qendrore",
+    "Nauru": "Nauru",
+    "Belarus": "Bjellorusi",
+    "Kyrgyzstan": "Kirgizstan",
+    "Macedonia": "Maqedoni",
+    "North Korea": "Kore e Veriut",
+    "Eritrea": "Eritre",
+    "Congo - Kinshasa": "Kongo-Kinshasa",
+    "Panama": "Panama",
+    "Spain": "Spanjë",
+    "Liberia": "Liberi",
+    "Mozambique": "Mozambik",
+    "Zimbabwe": "Zimbabve",
+    "China": "Kinë",
+    "United Kingdom": "Mbretëria e Bashkuar",
+    "Ethiopia": "Etiopi",
+    "Swaziland": "Svaziland",
+    "Marshall Islands": "Ishujt Marshall",
+    "Haiti": "Haiti",
+    "Slovakia": "Sllovaki",
+    "Equatorial Guinea": "Guinea Ekuatoriale",
+    "Anguilla": "Anguila",
+    "%(creator)s created this DM.": "%(creator)s krijoi këtë DM.",
+    "Peru": "Peru",
+    "Seychelles": "Sejshelle",
+    "St. Lucia": "Shën-Luçia",
+    "Solomon Islands": "Ishujt Solomon",
+    "Micronesia": "Mikronezi",
+    "Wallis & Futuna": "Uallis & Futuna",
+    "United States": "Shtetet e Bashkuara",
+    "Philippines": "Filipine",
+    "New Zealand": "Zelandë e Re",
+    "St. Vincent & Grenadines": "Shën Vincent dhe Grenadine",
+    "Afghanistan": "Afganistan",
+    "Benin": "Benin",
+    "Cook Islands": "Ishujt Kuk",
+    "Bahamas": "Bahamas",
+    "Yemen": "Jemen",
+    "Curaçao": "Kurasëo",
+    "Guam": "Guam",
+    "Albania": "Shqipëri",
+    "Tajikistan": "Taxhikistan",
+    "Moldova": "Moldavi",
+    "Gambia": "Gambia",
+    "Nicaragua": "Nikaragua",
+    "Lebanon": "Liban",
+    "Armenia": "Armeni",
+    "%(displayName)s created this room.": "%(displayName)s krijoi këtë dhomë.",
+    "Romania": "Rumani",
+    "Kazakhstan": "Kazakistan",
+    "St. Barthélemy": "Shën Bartolome",
+    "Sierra Leone": "Sierra Leone",
+    "Kuwait": "Kuvajt",
+    "Vanuatu": "Vanuatu",
+    "Gibraltar": "Gjibraltar",
+    "Trinidad & Tobago": "Trinidad e Tobago",
+    "Uruguay": "Uruguaj",
+    "Croatia": "Kroaci",
+    "Cocos (Keeling) Islands": "Ishujt Kokos (Kiling)",
+    "Norfolk Island": "Ishujt Norfolk",
+    "Somalia": "Somali",
+    "British Virgin Islands": "Ishujt e Virgjër Britanikë",
+    "Azerbaijan": "Azerbajxhan",
+    "Tokelau": "Tokelau",
+    "Slovenia": "Slloveni",
+    "Malaysia": "Malajzi",
+    "Guinea": "Guine",
+    "Ecuador": "Ekuador",
+    "St. Kitts & Nevis": "Shën Kits dhe Nevis",
+    "Vietnam": "Vietnam",
+    "Nepal": "Nepal",
+    "Colombia": "Kolumbi",
+    "Kenya": "Kenia",
+    "Madagascar": "Madagaskar",
+    "Italy": "Itali",
+    "Taiwan": "Taivan",
+    "Jersey": "Xhërsi",
+    "Rwanda": "Ruandë",
+    "Martinique": "Martinikë",
+    "Denmark": "Danimarkë",
+    "Bahrain": "Bahrein",
+    "Places the call in the current room on hold": "E kalon në pritje thirrjen në dhomën aktuale",
+    "Finland": "Finlandë",
+    "Papua New Guinea": "Papua Guinea e Re",
+    "Botswana": "Botsvanë",
+    "Egypt": "Egjipt",
+    "Norway": "Norvegji",
+    "Netherlands": "Hollandë",
+    "Russia": "Rusi",
+    "Topic: %(topic)s ": "Temë: %(topic)s ",
+    "Vatican City": "Vatikan",
+    "Caribbean Netherlands": "Karaibet Holandeze",
+    "Tonga": "Tonga",
+    "Christmas Island": "Ishulli i Krishtlindjeve",
+    "Poland": "Poloni",
+    "Tuvalu": "Tuvalu",
+    "Senegal": "Senegal",
+    "France": "Francë",
+    "Niger": "Niger",
+    "Sint Maarten": "Shën Martin",
+    "You created this room.": "Krijuat këtë dhomë.",
+    "Iran": "Iran",
+    "Burkina Faso": "Burkina Faso",
+    "Palau": "Palau",
+    "Nigeria": "Nigeri",
+    "Chile": "Kili",
+    "French Southern Territories": "Territoret Frënge Jugore",
+    "India": "Indi",
+    "Heard & McDonald Islands": "Ishulli Hërd dhe Ishujt Mekdonald",
+    "Barbados": "Barbados",
+    "Réunion": "Reunion",
+    "Sudan": "Sudan",
+    "Malta": "Maltë",
+    "Guernsey": "Gërnsi",
+    "Brazil": "Brazil",
+    "Qatar": "Katar",
+    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Mesazhet në këtë dhomë fshehtëzohen skaj-më-skaj. Kur njerëzit hyjnë, mund t’i verifikoni te profili i tyre, thjesht prekni mbi avatarin përkatës.",
+    "Comoros": "Komore",
+    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Në këtë bisedë jeni vetëm ju të dy, veç nëse cilido qoftë prej jush ftoi dikë tjetër të vijë.",
+    "Guinea-Bissau": "Guinea-Bisau",
+    "Dominican Republic": "Republika Dominikane",
+    "Georgia": "Xhorxhia",
+    "Faroe Islands": "Ishujt Faroe",
+    "Guadeloupe": "Guadalupë",
+    "Czech Republic": "Republika Çeke",
+    "Topic: %(topic)s (<a>edit</a>)": "Temë: %(topic)s (<a>përpunojeni</a>)",
+    "Bulgaria": "Bullgari",
+    "Add a photo, so people can easily spot your room.": "Shtoni një foto, që njerëzit ta dallojnë kollaj dhomën tuaj.",
+    "El Salvador": "Salvador",
+    "Zambia": "Zambia",
+    "Cayman Islands": "Ishujt Kajman",
+    "Congo - Brazzaville": "Kongo-Brazavil",
+    "This is the beginning of your direct message history with <displayName/>.": "Ky është fillimi i historikut të mesazheve tuaja të drejtpërdrejta me <displayName/>.",
+    "Singapore": "Singapor",
+    "Costa Rica": "Kosta Rika",
+    "Ghana": "Ganë",
+    "Call Paused": "Thirrja u Ndal",
+    "Mayotte": "Majot",
+    "Cape Verde": "Kepi i Gjelbërt",
+    "Belize": "Belize",
+    "Jamaica": "Xhamajkë",
+    "Indonesia": "Indonezi",
+    "Mexico": "Meksikë",
+    "Monaco": "Monako",
+    "Cuba": "Kubë",
+    "Uganda": "Ugandë",
+    "Latvia": "Letoni",
+    "Namibia": "Namibi",
+    "Greenland": "Groenlandë",
+    "Syria": "Siri",
+    "Svalbard & Jan Mayen": "Svalbard & Jan-Majen",
+    "Turkmenistan": "Turkmenistan",
+    "Lesotho": "Lesoto",
+    "Australia": "Australi",
+    "Serbia": "Serbi",
+    "Cameroon": "Kamerun",
+    "Ireland": "Irlandë",
+    "Guatemala": "Guatemalë",
+    "Fiji": "Fixhi",
+    "Libya": "Libi",
+    "Tanzania": "Tanzani",
+    "Lithuania": "Lituani",
+    "This is the start of <roomName/>.": "Ky është fillimi i <roomName/>.",
+    "Antarctica": "Antarktidë",
+    "Germany": "Gjermani",
+    "<a>Add a topic</a> to help people know what it is about.": "<a>Shtoni një temë</a>, për t’i ndihmuar njerëzit se përse bëhet fjalë.",
+    "Switzerland": "Zvicër",
+    "Maldives": "Maldive",
+    "Bhutan": "Butan",
+    "Luxembourg": "Luksemburg",
+    "St. Martin": "Shën-Martin",
+    "Cyprus": "Qipro",
+    "Niue": "Niue",
+    "Iraq": "Irak",
+    "Bermuda": "Bermuda",
+    "Takes the call in the current room off hold": "E heq nga pritja thirrjen në dhomën aktuale",
+    "French Polynesia": "Polinezia Frënge",
+    "Mauritius": "Mauricius",
+    "Grenada": "Grenadë",
+    "Portugal": "Portugali",
+    "Burundi": "Burundi",
+    "St. Pierre & Miquelon": "Shën Pier dhe Mikelon",
+    "South Africa": "Afrikë e Jugut",
+    "Morocco": "Marok",
+    "Malawi": "Malaui",
+    "Côte d’Ivoire": "Bregu i Fildishtë",
+    "Kosovo": "Kosovë",
+    "Thailand": "Tailandë",
+    "Macau": "Makau",
+    "Montenegro": "Mal i Zi",
+    "Angola": "Angolë",
+    "Northern Mariana Islands": "Ishujt Veriorë Mariana",
+    "Honduras": "Honduras",
+    "Japan": "Japoni",
+    "American Samoa": "Samoa Amerikane",
+    "South Georgia & South Sandwich Islands": "Xhorxhia Jugore dhe Ishujt Snduiç të Jugut",
+    "Palestine": "Palestinë",
+    "Austria": "Austri",
+    "Suriname": "Surinam",
+    "Kiribati": "Kiribati",
+    "Iceland": "Islandë",
+    "St. Helena": "Shën Helenë",
+    "Sri Lanka": "Sri Lanka",
+    "Myanmar": "Mianmar",
+    "Oman": "Oman",
+    "Western Sahara": "Sahara Perëndimore",
+    "Bouvet Island": "Ishulli Bouve",
+    "Bolivia": "Bolivi",
+    "Israel": "Izrael",
+    "Timor-Leste": "Timori Lindor",
+    "Belgium": "Belgjikë",
+    "Ukraine": "Ukrainë",
+    "Turks & Caicos Islands": "Ishujt Turks & Kaikos",
+    "Montserrat": "Monserrat",
+    "Samoa": "Samoa",
+    "United Arab Emirates": "Emiratet e Bashkuara Arabe",
+    "British Indian Ocean Territory": "Territoret Britanike të Oqeanit Indian",
+    "Pakistan": "Pakistan",
+    "South Korea": "Kore e Jugut",
+    "Jordan": "Jordani",
+    "Puerto Rico": "Porto Riko",
+    "Turkey": "Turqi",
+    "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Mesazhet këtu fshehtëzohen skaj-më-skaj. Verifikoni %(displayName)s te profili përkatës - prekni mbi avatarin përkatës.",
+    "Antigua & Barbuda": "Antigua e Barbuda",
+    "French Guiana": "Guajana Frënge",
+    "Hong Kong": "Hong Kong",
+    "Mongolia": "Mongoli",
+    "Canada": "Kanada",
+    "Greece": "Greqi",
+    "Tunisia": "Tunizi",
+    "Liechtenstein": "Lihtenshtein",
+    "Algeria": "Algjeri",
+    "Åland Islands": "Ishujt Aland",
+    "Mali": "Mali",
+    "Pitcairn Islands": "Ishujt Pitkern",
+    "Andorra": "Andorrë",
+    "Hungary": "Hungari",
+    "Bosnia": "Bosnjë-Hercegovinë",
+    "Argentina": "Argjentinë",
+    "Togo": "Togo",
+    "Djibouti": "Xhibut",
+    "Aruba": "Aruba",
+    "Chad": "Çad",
+    "Estonia": "Estoni",
+    "Laos": "Laos",
+    "São Tomé & Príncipe": "Sao-Tome e Prinsipe",
+    "San Marino": "San Marino",
+    "Cambodia": "Kamboxhia",
+    "Uzbekistan": "Uzbekistan",
+    "Gabon": "Gabon",
+    "Brunei": "Brunei",
+    "South Sudan": "Sudan i Jugut",
+    "Venezuela": "Venezuelë",
+    "New Caledonia": "Kaledoni e Re",
+    "Saudi Arabia": "Arabi Saudite",
+    "Isle of Man": "Ishulli Man",
+    "Dominica": "Dominikë",
+    "U.S. Virgin Islands": "Ishujt e Virgjër Amerikanë",
+    "Mauritania": "Mauritani",
+    "Bangladesh": "Bangladesh",
+    "Falkland Islands": "Ishujt Falkland",
+    "Sweden": "Suedi"
 }

From f74f77e170d8c7baea4106280ed6f73d2fb28e00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Tue, 10 Nov 2020 16:48:42 +0000
Subject: [PATCH 087/146] Translated using Weblate (Estonian)

Currently translated at 100.0% (2642 of 2642 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
---
 src/i18n/strings/et.json | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 03c3d2444c..9e9500bad9 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -2824,5 +2824,20 @@
     "Åland Islands": "Ahvenamaa",
     "Afghanistan": "Afganistan",
     "United States": "Ameerika Ühendriigid",
-    "United Kingdom": "Suurbritannia"
+    "United Kingdom": "Suurbritannia",
+    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Sõnumid siin jututoas on läbivalt krüptitud. Kui uued kasutajad liituvad, siis klõpsides nende tunnuspilti saad kontrollida nende profiili.",
+    "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Sõnumid siin jututoas on läbivalt krüptitud. Klõpsides tunnuspilti saad kontrollida kasutaja %(displayName)s profiili.",
+    "%(creator)s created this DM.": "%(creator)s alustas seda otsesuhtlust.",
+    "This is the start of <roomName/>.": "See on <roomName/> jututoa algus.",
+    "Add a photo, so people can easily spot your room.": "Selle, et teised märkaks sinu jututuba lihtsamini, palun lisa üks pilt.",
+    "%(displayName)s created this room.": "%(displayName)s lõi selle jututoa.",
+    "You created this room.": "Sa lõid selle jututoa.",
+    "<a>Add a topic</a> to help people know what it is about.": "Selleks, et teised teaks millega on tegemist, palun <a>lisa teema</a>.",
+    "Topic: %(topic)s ": "Teema: %(topic)s ",
+    "Topic: %(topic)s (<a>edit</a>)": "Teema: %(topic)s (<a>muudetud</a>)",
+    "This is the beginning of your direct message history with <displayName/>.": "See on sinu ja kasutaja <displayName/> otsesuhtluse ajaloo algus.",
+    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Seni kuni emb-kumb teist kolmandaid osapooli liituma ei kutsu, olete siin vestluses vaid teie kahekesi.",
+    "Call Paused": "Kõne on ajutiselt peatatud",
+    "Takes the call in the current room off hold": "Võtab selles jututoas ootel oleva kõne",
+    "Places the call in the current room on hold": "Jätab kõne selles jututoas ootele"
 }

From 33783c443018bc16159755fc02aa4ac9392145f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20Mesk=C3=B3?= <meskobalazs@gmail.com>
Date: Wed, 11 Nov 2020 10:23:40 +0000
Subject: [PATCH 088/146] Translated using Weblate (Hungarian)

Currently translated at 99.6% (2634 of 2642 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 170 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 169 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 9460c89089..2c8f04e273 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2661,5 +2661,173 @@
     "Botswana": "Botswana",
     "Bosnia": "Bosznia",
     "Bolivia": "Bolívia",
-    "Bhutan": "Bhután"
+    "Bhutan": "Bhután",
+    "Topic: %(topic)s (<a>edit</a>)": "Téma: %(topic)s (<a>szerkesztés</a>)",
+    "This is the beginning of your direct message history with <displayName/>.": "Ez a közvetlen üzeneteinek előzményeinek eleje a következővel: <displayName/>.",
+    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Csak ketten vannak ebben a beszélgetésben, hacsak valamelyikőjük nem hív meg valakit, hogy csatlakozzon.",
+    "Call Paused": "Hívás szüneteltetve",
+    "Takes the call in the current room off hold": "Visszaveszi tartásból a jelenlegi szoba hívását",
+    "Places the call in the current room on hold": "Tartásba teszi a jelenlegi szoba hívását",
+    "Zimbabwe": "Zimbabwe",
+    "Zambia": "Zambia",
+    "Yemen": "Jemen",
+    "Western Sahara": "Nyugat-Szahara",
+    "Wallis & Futuna": "Wallis és Futuna",
+    "Vietnam": "Vietnám",
+    "Venezuela": "Venezuela",
+    "Vatican City": "Vatikán",
+    "Vanuatu": "Vanuatu",
+    "Uzbekistan": "Üzbegisztán",
+    "Uruguay": "Uruguay",
+    "United Arab Emirates": "Egyesült Arab Emírségek",
+    "Ukraine": "Ukrajna",
+    "Uganda": "Uganda",
+    "U.S. Virgin Islands": "Amerikai Virgin-szigetek",
+    "Tuvalu": "Tuvalu",
+    "Turks & Caicos Islands": "Turks- és Caicos-szigetek",
+    "Turkmenistan": "Türkmenisztán",
+    "Turkey": "Törökország",
+    "Tunisia": "Tunézia",
+    "Trinidad & Tobago": "Trinidad és Tobago",
+    "Tonga": "Tonga",
+    "Tokelau": "Tokelau-szigetek",
+    "Togo": "Togo",
+    "Timor-Leste": "Kelet-Timor",
+    "Thailand": "Thaiföld",
+    "Tanzania": "Tanzánia",
+    "Tajikistan": "Tádzsikisztán",
+    "Taiwan": "Tajvan",
+    "São Tomé & Príncipe": "São Tomé és Príncipe",
+    "Syria": "Szíria",
+    "Switzerland": "Svájc",
+    "Sweden": "Svédország",
+    "Swaziland": "Szváziföld",
+    "Svalbard & Jan Mayen": "Svalbard és Jan Mayen-sziget",
+    "Suriname": "Suriname",
+    "Sudan": "Szudán",
+    "St. Vincent & Grenadines": "Saint Vincent és a Grenadine-szigetek",
+    "St. Pierre & Miquelon": "Saint-Pierre és Miquelon",
+    "St. Helena": "Szent Ilona",
+    "St. Martin": "Saint-Martin",
+    "St. Lucia": "Saint Lucia",
+    "St. Kitts & Nevis": "Saint Kitts és Nevis",
+    "St. Barthélemy": "Saint-Barthélemy",
+    "Sri Lanka": "Srí Lanka",
+    "Spain": "Spanyolország",
+    "South Sudan": "Dél-Szudán",
+    "South Korea": "Dél-Korea",
+    "South Georgia & South Sandwich Islands": "Déli-Georgia és Déli-Sandwich-szigetek",
+    "South Africa": "Dél-afrikai Köztársaság",
+    "Somalia": "Szomália",
+    "Solomon Islands": "Salamon-szigetek",
+    "Slovenia": "Szlovénia",
+    "Slovakia": "Szlovákia",
+    "Sint Maarten": "Sint Maarten",
+    "Singapore": "Szingapúr",
+    "Sierra Leone": "Sierra Leone",
+    "Seychelles": "Seychelle-szigetek",
+    "Serbia": "Szerbia",
+    "Senegal": "Szenegál",
+    "Saudi Arabia": "Szaúd-Arábia",
+    "San Marino": "San Marino",
+    "Samoa": "Szamoa",
+    "Réunion": "Réunion",
+    "Rwanda": "Ruanda",
+    "Russia": "Oroszország",
+    "Romania": "Románia",
+    "Qatar": "Katar",
+    "Puerto Rico": "Puerto Rico",
+    "Portugal": "Portugália",
+    "Poland": "Lengyelország",
+    "Pitcairn Islands": "Pitcairn-szigetek",
+    "Philippines": "Fülöp-szigetek",
+    "Peru": "Peru",
+    "Paraguay": "Paraguay",
+    "Papua New Guinea": "Pápua Új-Guinea",
+    "Panama": "Panama",
+    "Palestine": "Palesztína",
+    "Palau": "Palau",
+    "Pakistan": "Pakisztán",
+    "Oman": "Omán",
+    "Norway": "Norvégia",
+    "Northern Mariana Islands": "Északi-Mariana-szigetek",
+    "North Korea": "Észak-Korea",
+    "Norfolk Island": "Norfolk-sziget",
+    "Niue": "Niue",
+    "Nigeria": "Nigéria",
+    "Niger": "Niger",
+    "Nicaragua": "Nicaragua",
+    "New Zealand": "Új-Zéland",
+    "New Caledonia": "Új-Kaledónia",
+    "Netherlands": "Hollandia",
+    "Nepal": "Nepál",
+    "Nauru": "Nauru",
+    "Namibia": "Namíbia",
+    "Myanmar": "Mianmar",
+    "Mozambique": "Mozambik",
+    "Morocco": "Marokkó",
+    "Montserrat": "Montserrat",
+    "Montenegro": "Montenegró",
+    "Mongolia": "Mongólia",
+    "Monaco": "Monaco",
+    "Moldova": "Moldova",
+    "Micronesia": "Mikronézia",
+    "Mexico": "Mexikó",
+    "Mayotte": "Mayotte",
+    "Mauritius": "Mauritius",
+    "Mauritania": "Mauritánia",
+    "Martinique": "Martinique",
+    "Marshall Islands": "Marshall-szigetek",
+    "Malta": "Málta",
+    "Mali": "Mali",
+    "Maldives": "Maldív-szigetek",
+    "Malaysia": "Malajzia",
+    "Malawi": "Malawi",
+    "Madagascar": "Madagaszkár",
+    "Macedonia": "Észak-Macedónia",
+    "Macau": "Makaó",
+    "Luxembourg": "Luxembourg",
+    "Lithuania": "Litvánia",
+    "Liechtenstein": "Liechtenstein",
+    "Libya": "Líbia",
+    "Liberia": "Libéria",
+    "Lesotho": "Lesotho",
+    "Lebanon": "Libanon",
+    "Latvia": "Lettország",
+    "Laos": "Laosz",
+    "Kyrgyzstan": "Kirgizisztán",
+    "Kuwait": "Kuvait",
+    "Kosovo": "Koszovó",
+    "Kiribati": "Kiribati",
+    "Kenya": "Kenya",
+    "Kazakhstan": "Kazahsztán",
+    "Jordan": "Jordánia",
+    "Jersey": "Jersey",
+    "Japan": "Japán",
+    "Jamaica": "Jamaica",
+    "Italy": "Olaszország",
+    "Israel": "Izrael",
+    "Isle of Man": "Man",
+    "Ireland": "Írország",
+    "Iraq": "Irak",
+    "Iran": "Irán",
+    "Indonesia": "Indonézia",
+    "India": "India",
+    "Iceland": "Izland",
+    "Hungary": "Magyarország",
+    "Hong Kong": "Hong Kong",
+    "Honduras": "Honduras",
+    "Heard & McDonald Islands": "Heard-sziget és McDonald-szigetek",
+    "Haiti": "Haiti",
+    "Guyana": "Guyana",
+    "Guinea-Bissau": "Bissau-Guinea",
+    "Guinea": "Guinea",
+    "Guernsey": "Guernsey",
+    "Guatemala": "Guatemala",
+    "Guam": "Guam",
+    "Guadeloupe": "Guadeloupe",
+    "Grenada": "Grenada",
+    "Greenland": "Grönland",
+    "Greece": "Görögország",
+    "Gibraltar": "Gibraltár"
 }

From d558260d5796be81bdda68ff3328f87744ec1941 Mon Sep 17 00:00:00 2001
From: Marcelo Filho <marceloaof@protonmail.com>
Date: Tue, 10 Nov 2020 20:53:37 +0000
Subject: [PATCH 089/146] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2642 of 2642 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pt_BR/
---
 src/i18n/strings/pt_BR.json | 152 +++++++++++++++++++++++++++++++++++-
 1 file changed, 151 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 8e0c3eea0b..c1e95d7c0b 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -2619,5 +2619,155 @@
     "Åland Islands": "Ilhas Aland",
     "Afghanistan": "Afeganistão",
     "United States": "Estados Unidos",
-    "United Kingdom": "Reino Unido"
+    "United Kingdom": "Reino Unido",
+    "French Southern Territories": "Territórios Austrais e Antárticos Franceses",
+    "Congo - Brazzaville": "Congo",
+    "Czech Republic": "República Tcheca",
+    "Congo - Kinshasa": "República Democrática do Congo",
+    "U.S. Virgin Islands": "Ilhas Virgens Americanas",
+    "Tuvalu": "Tuvalu",
+    "Turks & Caicos Islands": "Ilhas Turcas e Caicos",
+    "St. Pierre & Miquelon": "São Pedro e Miquelon",
+    "Turkmenistan": "Turcomenistão",
+    "Tokelau": "Tokelau",
+    "Tajikistan": "Tajiquistão",
+    "Swaziland": "Suazilândia",
+    "Svalbard & Jan Mayen": "Svalbard e Jan Mayen",
+    "St. Vincent & Grenadines": "São Vicente e Granadinas",
+    "St. Martin": "São Martinho",
+    "St. Kitts & Nevis": "São Cristóvão e Nevis",
+    "Seychelles": "Seychelles",
+    "Netherlands": "Países Baixos",
+    "Kazakhstan": "Cazaquistão",
+    "Jersey": "Jersey",
+    "Heard & McDonald Islands": "Ilha Heard e Ilhas McDonald",
+    "Dominica": "Dominica",
+    "Caribbean Netherlands": "Países Baixos Caribenhos",
+    "South Georgia & South Sandwich Islands": "Ilhas Geórgia do Sul e Sandwich do Sul",
+    "Sint Maarten": "São Martinho",
+    "Libya": "Líbia",
+    "Liberia": "Libéria",
+    "Lesotho": "Lesoto",
+    "Lebanon": "Líbano",
+    "Latvia": "Letônia",
+    "Laos": "Laos",
+    "Kyrgyzstan": "Quirguistão",
+    "Kuwait": "Kuwait",
+    "Kosovo": "Kosovo",
+    "Kiribati": "Kiribati",
+    "Tunisia": "Tunísia",
+    "Trinidad & Tobago": "Trindade e Tobago",
+    "Tonga": "Tonga",
+    "Togo": "Togo",
+    "Timor-Leste": "Timor-Leste",
+    "Thailand": "Tailândia",
+    "Tanzania": "Tanzânia",
+    "Taiwan": "Taiwan",
+    "São Tomé & Príncipe": "São Tomé e Príncipe",
+    "Syria": "Síria",
+    "Switzerland": "Suíça",
+    "Sweden": "Suécia",
+    "Suriname": "Suriname",
+    "Sudan": "Sudão",
+    "St. Lucia": "Santa Lúcia",
+    "St. Helena": "Santa Helena",
+    "St. Barthélemy": "São Bartolomeu",
+    "Sri Lanka": "Sri Lanka",
+    "San Marino": "San Marino",
+    "Samoa": "Samoa",
+    "Réunion": "Reunião",
+    "Rwanda": "Ruanda",
+    "Qatar": "Catar",
+    "Pitcairn Islands": "Ilhas Pitcairn",
+    "Philippines": "Filipinas",
+    "Montserrat": "Montserrat",
+    "Macedonia": "Macedônia",
+    "Papua New Guinea": "Papua-Nova Guiné",
+    "Palau": "Palau",
+    "Oman": "Omã",
+    "Northern Mariana Islands": "Ilhas Marianas do Norte",
+    "Norfolk Island": "Ilha Norfolk",
+    "Niue": "Niue",
+    "New Caledonia": "Nova Caledônia",
+    "Namibia": "Namíbia",
+    "Myanmar": "Myanmar",
+    "Mozambique": "Moçambique",
+    "Morocco": "Marrocos",
+    "Montenegro": "Montenegro",
+    "Mongolia": "Mongólia",
+    "Monaco": "Mônaco",
+    "Moldova": "Moldávia",
+    "Micronesia": "Micronésia",
+    "Mexico": "México",
+    "Mayotte": "Mayotte",
+    "Mauritius": "Maurício",
+    "Mauritania": "Mauritânia",
+    "Martinique": "Martinica",
+    "Marshall Islands": "Ilhas Marshall",
+    "Malta": "Malta",
+    "Mali": "Mali",
+    "Maldives": "Maldivas",
+    "Malaysia": "Malásia",
+    "Malawi": "Malawi",
+    "Madagascar": "Madagascar",
+    "Macau": "Macau",
+    "Luxembourg": "Luxemburgo",
+    "Lithuania": "Lituânia",
+    "Liechtenstein": "Liechtenstein",
+    "Kenya": "Quênia",
+    "Isle of Man": "Ilha de Man",
+    "Guinea": "Guiné",
+    "Guernsey": "Guernsey",
+    "Guatemala": "Guatemala",
+    "Guam": "Guam",
+    "Guadeloupe": "Guadalupe",
+    "Grenada": "Granada",
+    "Greenland": "Groenlândia",
+    "Greece": "Grécia",
+    "Gibraltar": "Gibraltar",
+    "Ghana": "Gana",
+    "Germany": "Alemanha",
+    "Georgia": "Geórgia",
+    "Gambia": "Gâmbia",
+    "Gabon": "Gabão",
+    "French Polynesia": "Polinésia Francesa",
+    "French Guiana": "Guiana Francesa",
+    "Finland": "Finlândia",
+    "Fiji": "Fiji",
+    "Faroe Islands": "Ilhas Faroé",
+    "Falkland Islands": "Ilhas Malvinas",
+    "Ethiopia": "Etiópia",
+    "Estonia": "Estônia",
+    "Eritrea": "Eritreia",
+    "Equatorial Guinea": "Guiné Equatorial",
+    "El Salvador": "El Salvador",
+    "Dominican Republic": "República Dominicana",
+    "Djibouti": "Djibouti",
+    "Curaçao": "Curaçao",
+    "Cook Islands": "Ilhas Cook",
+    "Cocos (Keeling) Islands": "Ilhas Cocos (Keeling)",
+    "Christmas Island": "Ilha Christmas",
+    "Central African Republic": "República Centro-Africana",
+    "Cayman Islands": "Ilhas Cayman",
+    "%(creator)s created this DM.": "%(creator)s criou esta conversa.",
+    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "As mensagens nesta sala são criptografadas de ponta a ponta. Quando as pessoas entrarem na conversa, você poderá confirmá-las em seus perfis. Basta clicar em suas fotos de perfil.",
+    "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "As mensagens aqui são criptografadas de ponta a ponta. Confirme o perfil de %(displayName)s - clique em sua foto de perfil.",
+    "This is the start of <roomName/>.": "Este é o início de <roomName/>.",
+    "Add a photo, so people can easily spot your room.": "Adicione uma imagem para que as pessoas possam identificar facilmente sua sala.",
+    "%(displayName)s created this room.": "%(displayName)s criou esta sala.",
+    "You created this room.": "Você criou esta sala.",
+    "<a>Add a topic</a> to help people know what it is about.": "<a>Adicione uma descrição</a> para ajudar as pessoas a saber do que se trata essa conversa.",
+    "Topic: %(topic)s ": "Descrição: %(topic)s ",
+    "Topic: %(topic)s (<a>edit</a>)": "Descrição: %(topic)s (<a>editar</a>)",
+    "This is the beginning of your direct message history with <displayName/>.": "Este é o início do seu histórico da conversa com <displayName/>.",
+    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Apenas vocês dois estão nesta conversa, a menos que algum de vocês convide mais alguém.",
+    "Call Paused": "Chamada em pausa",
+    "Takes the call in the current room off hold": "Retoma a chamada na sala atual",
+    "Places the call in the current room on hold": "Pausa a chamada na sala atual",
+    "Yemen": "Iêmen",
+    "Western Sahara": "Saara Ocidental",
+    "Wallis & Futuna": "Wallis e Futuna",
+    "Vatican City": "Cidade do Vaticano",
+    "Vanuatu": "Vanuatu",
+    "Uzbekistan": "Uzbequistão"
 }

From 802be32ff16218dd9efa0c33cabd278abe349140 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Wed, 11 Nov 2020 02:10:13 +0000
Subject: [PATCH 090/146] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2642 of 2642 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
---
 src/i18n/strings/zh_Hant.json | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index dbcfb743c5..dcddb54496 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2826,5 +2826,20 @@
     "Åland Islands": "奧蘭",
     "Afghanistan": "阿富汗",
     "United States": "美國",
-    "United Kingdom": "英國"
+    "United Kingdom": "英國",
+    "%(creator)s created this DM.": "%(creator)s 建立了此直接訊息。",
+    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "此聊天適中的訊息為端到端加密。當人們加入，您可以在他們的個人檔案中驗證他們，只要點擊他們的大頭照就可以了。",
+    "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "此處的訊息為端到端加密。請在他們的個人檔案中驗證 %(displayName)s，只要點擊他們的大頭照就可以了。",
+    "This is the start of <roomName/>.": "這是 <roomName/> 的開頭。",
+    "Add a photo, so people can easily spot your room.": "新增圖片，這樣人們就可以輕鬆發現您的聊天室。",
+    "%(displayName)s created this room.": "%(displayName)s 建立了此聊天室。",
+    "You created this room.": "您建立了此聊天室。",
+    "<a>Add a topic</a> to help people know what it is about.": "<a>新增主題</a>以協助人們了解這裡在做什麼。",
+    "Topic: %(topic)s ": "主題：%(topic)s ",
+    "Topic: %(topic)s (<a>edit</a>)": "主題：%(topic)s（<a>編輯</a>）",
+    "This is the beginning of your direct message history with <displayName/>.": "這是使用 <displayName/> 傳送的您的直接訊息歷史紀錄的開頭。",
+    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "除非你們兩個其中一個邀請任何人加入，否則只會有你們兩個在此對話中。",
+    "Call Paused": "通話已暫停",
+    "Takes the call in the current room off hold": "讓目前聊天室中的通話保持等候接聽的狀態",
+    "Places the call in the current room on hold": "在目前的聊天室撥打通話並等候接聽"
 }

From c67b0b14ed0fa4c2043a93969a5e55b5d5e60d46 Mon Sep 17 00:00:00 2001
From: XoseM <correoxm@disroot.org>
Date: Wed, 11 Nov 2020 06:06:26 +0000
Subject: [PATCH 091/146] Translated using Weblate (Galician)

Currently translated at 92.5% (2446 of 2642 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
---
 src/i18n/strings/gl.json | 48 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 9448042def..1134f138ea 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -2596,5 +2596,51 @@
     "Åland Islands": "Åland Islands",
     "Afghanistan": "Afghanistán",
     "United States": "EEUU de América",
-    "United Kingdom": "Reino Unido"
+    "United Kingdom": "Reino Unido",
+    "Ecuador": "Ecuador",
+    "Dominican Republic": "República Dominicana",
+    "Dominica": "Dominica",
+    "Djibouti": "Djibouti",
+    "Denmark": "Dinamarca",
+    "Côte d’Ivoire": "Costa de Marfil",
+    "Czech Republic": "República Checa",
+    "Cyprus": "Chipre",
+    "Curaçao": "Curaçao",
+    "Cuba": "Cuba",
+    "Croatia": "Croacia",
+    "Costa Rica": "Costa Rica",
+    "Cook Islands": "Cook Islands",
+    "Congo - Kinshasa": "Congo - Kinshasa",
+    "Congo - Brazzaville": "Congo - Brazzaville",
+    "Comoros": "Comoros",
+    "Colombia": "Colombia",
+    "Cocos (Keeling) Islands": "Cocos (Keeling) Islands",
+    "Christmas Island": "Christmas Island",
+    "China": "China",
+    "Chile": "Chile",
+    "Chad": "Chad",
+    "Central African Republic": "República Centroafricana",
+    "Cayman Islands": "Illas caimán",
+    "Caribbean Netherlands": "Paises baixos do Caribe",
+    "Cape Verde": "Cabo Verde",
+    "Canada": "Canadá",
+    "Cameroon": "Camerún",
+    "Cambodia": "Cambodia",
+    "Burundi": "Burundi",
+    "Burkina Faso": "Burkina Faso",
+    "Bulgaria": "Bulgaria",
+    "Brunei": "Brunei",
+    "British Virgin Islands": "British Virgin Islands",
+    "British Indian Ocean Territory": "British Indian Ocean Territory",
+    "Brazil": "Brasil",
+    "Bouvet Island": "Illa Bouvet",
+    "Botswana": "Botswana",
+    "Bosnia": "Bosnia",
+    "Bolivia": "Bolivia",
+    "Bhutan": "Bután",
+    "Bermuda": "Bermuda",
+    "Benin": "Benín",
+    "Belize": "Belice",
+    "Belgium": "Bélxica",
+    "Belarus": "Belarús"
 }

From 979faf23e85bdf1c2d4ec05cbdff2428a1d4e30e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 11 Nov 2020 16:49:51 +0000
Subject: [PATCH 092/146] Fix poorly i18n'd string

---
 src/components/views/settings/EventIndexPanel.js | 12 +++++++-----
 src/i18n/strings/en_EN.json                      |  5 ++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js
index 8598a2a966..1fe18cb207 100644
--- a/src/components/views/settings/EventIndexPanel.js
+++ b/src/components/views/settings/EventIndexPanel.js
@@ -129,11 +129,13 @@ export default class EventIndexPanel extends React.Component {
             eventIndexingSettings = (
                 <div>
                     <div className='mx_SettingsTab_subsectionText'>
-                        {_t( "Securely cache encrypted messages locally for them " +
-                             "to appear in search results, using ")
-                        } {formatBytes(this.state.eventIndexSize, 0)}
-                        {_t( " to store messages from ")}
-                        {formatCountLong(this.state.roomCount)} {_t("rooms.")}
+                        {_t("Securely cache encrypted messages locally for them " +
+                             "to appear in search results, using %(size)s to store messages from %(count)s rooms.",
+                            {
+                                size: formatBytes(this.state.eventIndexSize, 0),
+                                count: formatCountLong(this.state.roomCount),
+                            },
+                        )}
                     </div>
                     <div>
                         <AccessibleButton kind="primary" onClick={this._onManage}>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 830d3cdee4..110c51163f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -935,9 +935,8 @@
     "Failed to set display name": "Failed to set display name",
     "Encryption": "Encryption",
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.",
-    "Securely cache encrypted messages locally for them to appear in search results, using ": "Securely cache encrypted messages locally for them to appear in search results, using ",
-    " to store messages from ": " to store messages from ",
-    "rooms.": "rooms.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|one": "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s room.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|other": "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.",
     "Manage": "Manage",
     "Securely cache encrypted messages locally for them to appear in search results.": "Securely cache encrypted messages locally for them to appear in search results.",
     "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.": "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.",

From 71e2536d02363f1d1469f03b5cc8d222d33fb5d6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 11 Nov 2020 16:51:56 +0000
Subject: [PATCH 093/146] sort file i18n

---
 src/i18n/strings/en_EN.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 110c51163f..c8c7eece57 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -935,8 +935,8 @@
     "Failed to set display name": "Failed to set display name",
     "Encryption": "Encryption",
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|one": "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s room.",
     "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|other": "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|one": "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s room.",
     "Manage": "Manage",
     "Securely cache encrypted messages locally for them to appear in search results.": "Securely cache encrypted messages locally for them to appear in search results.",
     "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.": "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.",

From b2366c38ba27e826b2401963013c4ae56e108af4 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 11 Nov 2020 16:54:11 +0000
Subject: [PATCH 094/146] Fix the feedback not closing without feedback/countly

---
 src/components/views/dialogs/FeedbackDialog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/FeedbackDialog.js b/src/components/views/dialogs/FeedbackDialog.js
index 2515377709..cbe26af6cc 100644
--- a/src/components/views/dialogs/FeedbackDialog.js
+++ b/src/components/views/dialogs/FeedbackDialog.js
@@ -48,8 +48,8 @@ export default (props) => {
                 title: _t('Feedback sent'),
                 description: _t('Thank you!'),
             });
-            props.onFinished();
         }
+        props.onFinished();
     };
 
     const brand = SdkConfig.get().brand;

From 1a2bd55c099391092de573f92cea48f270957354 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 11 Nov 2020 15:17:34 +0000
Subject: [PATCH 095/146] Fix New Room Intro invite to this room button

---
 src/components/views/rooms/NewRoomIntro.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/NewRoomIntro.tsx b/src/components/views/rooms/NewRoomIntro.tsx
index 27404eef12..be4ecaffb3 100644
--- a/src/components/views/rooms/NewRoomIntro.tsx
+++ b/src/components/views/rooms/NewRoomIntro.tsx
@@ -99,6 +99,10 @@ const NewRoomIntro = () => {
             });
         }
 
+        const onInviteClick = () => {
+            dis.dispatch({ action: "view_invite", roomId });
+        };
+
         const avatarUrl = room.currentState.getStateEvents(EventType.RoomAvatar, "")?.getContent()?.url;
         body = <React.Fragment>
             <MiniAvatarUploader
@@ -116,7 +120,7 @@ const NewRoomIntro = () => {
             })}</p>
             <p>{topicText}</p>
             <div className="mx_NewRoomIntro_buttons">
-                <AccessibleButton className="mx_NewRoomIntro_inviteButton" kind="primary">
+                <AccessibleButton className="mx_NewRoomIntro_inviteButton" kind="primary" onClick={onInviteClick}>
                     {_t("Invite to this room")}
                 </AccessibleButton>
             </div>

From d5c399dfd9f5265230f44fb92fd124a12fdbc5ce Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 11 Nov 2020 12:56:20 +0000
Subject: [PATCH 096/146] Fix Left Panel layout being wrong when filtering with
 0 rooms

---
 src/components/structures/LeftPanel.tsx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/LeftPanel.tsx b/src/components/structures/LeftPanel.tsx
index 4445ff3ff8..52d461edcc 100644
--- a/src/components/structures/LeftPanel.tsx
+++ b/src/components/structures/LeftPanel.tsx
@@ -46,6 +46,7 @@ interface IProps {
 }
 
 interface IState {
+    isFiltering: boolean;
     showBreadcrumbs: boolean;
     showGroupFilterPanel: boolean;
 }
@@ -70,6 +71,7 @@ export default class LeftPanel extends React.Component<IProps, IState> {
         super(props);
 
         this.state = {
+            isFiltering: !!RoomListStore.instance.getFirstNameFilterCondition(),
             showBreadcrumbs: BreadcrumbsStore.instance.visible,
             showGroupFilterPanel: SettingsStore.getValue('TagPanel.enableTagPanel'),
         };
@@ -102,9 +104,10 @@ export default class LeftPanel extends React.Component<IProps, IState> {
     };
 
     private onBreadcrumbsUpdate = () => {
-        const newVal = BreadcrumbsStore.instance.visible;
-        if (newVal !== this.state.showBreadcrumbs) {
-            this.setState({showBreadcrumbs: newVal});
+        const showBreadcrumbs = BreadcrumbsStore.instance.visible;
+        const isFiltering = !!RoomListStore.instance.getFirstNameFilterCondition();
+        if (showBreadcrumbs !== this.state.showBreadcrumbs || isFiltering !== this.state.isFiltering) {
+            this.setState({showBreadcrumbs, isFiltering});
 
             // Update the sticky headers too as the breadcrumbs will be popping in or out.
             if (!this.listContainerRef.current) return; // ignore: no headers to sticky

From 187901004d0a97818b95f2a184cb731f9b5bd2e8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 11 Nov 2020 13:01:40 +0000
Subject: [PATCH 097/146] Fix the Join rooms prompt not showing up due to
 missing updates

---
 src/components/structures/LeftPanel.tsx | 9 +++------
 src/components/views/rooms/RoomList.tsx | 9 ++++++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/structures/LeftPanel.tsx b/src/components/structures/LeftPanel.tsx
index 52d461edcc..4445ff3ff8 100644
--- a/src/components/structures/LeftPanel.tsx
+++ b/src/components/structures/LeftPanel.tsx
@@ -46,7 +46,6 @@ interface IProps {
 }
 
 interface IState {
-    isFiltering: boolean;
     showBreadcrumbs: boolean;
     showGroupFilterPanel: boolean;
 }
@@ -71,7 +70,6 @@ export default class LeftPanel extends React.Component<IProps, IState> {
         super(props);
 
         this.state = {
-            isFiltering: !!RoomListStore.instance.getFirstNameFilterCondition(),
             showBreadcrumbs: BreadcrumbsStore.instance.visible,
             showGroupFilterPanel: SettingsStore.getValue('TagPanel.enableTagPanel'),
         };
@@ -104,10 +102,9 @@ export default class LeftPanel extends React.Component<IProps, IState> {
     };
 
     private onBreadcrumbsUpdate = () => {
-        const showBreadcrumbs = BreadcrumbsStore.instance.visible;
-        const isFiltering = !!RoomListStore.instance.getFirstNameFilterCondition();
-        if (showBreadcrumbs !== this.state.showBreadcrumbs || isFiltering !== this.state.isFiltering) {
-            this.setState({showBreadcrumbs, isFiltering});
+        const newVal = BreadcrumbsStore.instance.visible;
+        if (newVal !== this.state.showBreadcrumbs) {
+            this.setState({showBreadcrumbs: newVal});
 
             // Update the sticky headers too as the breadcrumbs will be popping in or out.
             if (!this.listContainerRef.current) return; // ignore: no headers to sticky
diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx
index d952c137cd..3e9a8ac102 100644
--- a/src/components/views/rooms/RoomList.tsx
+++ b/src/components/views/rooms/RoomList.tsx
@@ -58,6 +58,7 @@ interface IProps {
 
 interface IState {
     sublists: ITagMap;
+    isNameFiltering: boolean;
 }
 
 const TAG_ORDER: TagID[] = [
@@ -183,6 +184,7 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
 
         this.state = {
             sublists: {},
+            isNameFiltering: !!RoomListStore.instance.getFirstNameFilterCondition(),
         };
 
         this.dispatcherRef = defaultDispatcher.register(this.onAction);
@@ -253,7 +255,8 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
             return CustomRoomTagStore.getTags()[t];
         });
 
-        let doUpdate = arrayHasDiff(previousListIds, newListIds);
+        const isNameFiltering = !!RoomListStore.instance.getFirstNameFilterCondition();
+        let doUpdate = this.state.isNameFiltering !== isNameFiltering || arrayHasDiff(previousListIds, newListIds);
         if (!doUpdate) {
             // so we didn't have the visible sublists change, but did the contents of those
             // sublists change significantly enough to break the sticky headers? Probably, so
@@ -275,7 +278,7 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
             const newSublists = objectWithOnly(newLists, newListIds);
             const sublists = objectShallowClone(newSublists, (k, v) => arrayFastClone(v));
 
-            this.setState({sublists}, () => {
+            this.setState({sublists, isNameFiltering}, () => {
                 this.props.onResize();
             });
         }
@@ -370,7 +373,7 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
     public render() {
         let explorePrompt: JSX.Element;
         if (!this.props.isMinimized) {
-            if (RoomListStore.instance.getFirstNameFilterCondition()) {
+            if (this.state.isNameFiltering) {
                 explorePrompt = <div className="mx_RoomList_explorePrompt">
                     <div>{_t("Can't see what you’re looking for?")}</div>
                     <AccessibleButton kind="link" onClick={this.onExplore}>

From d3fee540c5b8223b80301791e9bb38ac19dd68ca Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 11 Nov 2020 13:08:09 +0000
Subject: [PATCH 098/146] Update Room List filter copy

---
 src/components/structures/RoomSearch.tsx | 4 ++--
 src/i18n/strings/en_EN.json              | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/RoomSearch.tsx b/src/components/structures/RoomSearch.tsx
index 526aecddd7..a64e40bc65 100644
--- a/src/components/structures/RoomSearch.tsx
+++ b/src/components/structures/RoomSearch.tsx
@@ -148,7 +148,7 @@ export default class RoomSearch extends React.PureComponent<IProps, IState> {
                 onBlur={this.onBlur}
                 onChange={this.onChange}
                 onKeyDown={this.onKeyDown}
-                placeholder={_t("Search")}
+                placeholder={_t("Filter")}
                 autoComplete="off"
             />
         );
@@ -164,7 +164,7 @@ export default class RoomSearch extends React.PureComponent<IProps, IState> {
         if (this.props.isMinimized) {
             icon = (
                 <AccessibleButton
-                    title={_t("Search rooms")}
+                    title={_t("Filter rooms and people")}
                     className="mx_RoomSearch_icon mx_RoomSearch_minimizedHandle"
                     onClick={this.openSearch}
                 />
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 830d3cdee4..701bee457f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2372,8 +2372,9 @@
     "Find a room… (e.g. %(exampleRoom)s)": "Find a room… (e.g. %(exampleRoom)s)",
     "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.",
     "Explore rooms in %(communityName)s": "Explore rooms in %(communityName)s",
+    "Filter": "Filter",
     "Clear filter": "Clear filter",
-    "Search rooms": "Search rooms",
+    "Filter rooms and people": "Filter rooms and people",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.",
     "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please <a>contact your service administrator</a> to continue using the service.": "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please <a>contact your service administrator</a> to continue using the service.",
     "Your message wasn't sent because this homeserver has exceeded a resource limit. Please <a>contact your service administrator</a> to continue using the service.": "Your message wasn't sent because this homeserver has exceeded a resource limit. Please <a>contact your service administrator</a> to continue using the service.",

From a481f3bdf1d6be30538185fda44718acb9d3863b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 11 Nov 2020 13:21:20 +0000
Subject: [PATCH 099/146] Iterate the filtering prompt

---
 res/css/views/rooms/_RoomList.scss      |  9 ++++++-
 src/components/views/rooms/RoomList.tsx | 35 ++++++++++++++++++++++---
 src/i18n/strings/en_EN.json             |  1 +
 3 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/res/css/views/rooms/_RoomList.scss b/res/css/views/rooms/_RoomList.scss
index 78e7307bc0..6ea99585d2 100644
--- a/res/css/views/rooms/_RoomList.scss
+++ b/res/css/views/rooms/_RoomList.scss
@@ -33,7 +33,6 @@ limitations under the License.
 
     div:first-child {
         font-weight: $font-semi-bold;
-        margin-bottom: 8px;
     }
 
     .mx_AccessibleButton {
@@ -41,6 +40,7 @@ limitations under the License.
         position: relative;
         padding: 0 0 0 24px;
         font-size: inherit;
+        margin-top: 8px;
 
         &::before {
             content: '';
@@ -53,6 +53,13 @@ limitations under the License.
             mask-position: center;
             mask-size: contain;
             mask-repeat: no-repeat;
+        }
+
+        &.mx_RoomList_explorePrompt_startChat::before {
+            mask-image: url('$(res)/img/element-icons/feedback.svg');
+        }
+
+        &.mx_RoomList_explorePrompt_explore::before {
             mask-image: url('$(res)/img/element-icons/roomlist/explore.svg');
         }
     }
diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx
index 3e9a8ac102..de54fabc53 100644
--- a/src/components/views/rooms/RoomList.tsx
+++ b/src/components/views/rooms/RoomList.tsx
@@ -284,6 +284,10 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
         }
     };
 
+    private onStartChat = () => {
+        dis.dispatch({action: "view_create_chat"});
+    };
+
     private onExplore = () => {
         dis.fire(Action.ViewRoomDirectory);
     };
@@ -335,8 +339,9 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
             return p;
         }, [] as TagID[]);
 
-        // show a skeleton UI if the user is in no rooms
-        const showSkeleton = Object.values(RoomListStore.instance.unfilteredLists).every(list => !list?.length);
+        // 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] || [];
@@ -376,7 +381,18 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
             if (this.state.isNameFiltering) {
                 explorePrompt = <div className="mx_RoomList_explorePrompt">
                     <div>{_t("Can't see what you’re looking for?")}</div>
-                    <AccessibleButton kind="link" onClick={this.onExplore}>
+                    <AccessibleButton
+                        className="mx_RoomList_explorePrompt_startChat"
+                        kind="link"
+                        onClick={this.onStartChat}
+                    >
+                        {_t("Start a new chat")}
+                    </AccessibleButton>
+                    <AccessibleButton
+                        className="mx_RoomList_explorePrompt_explore"
+                        kind="link"
+                        onClick={this.onExplore}
+                    >
                         {_t("Explore all public rooms")}
                     </AccessibleButton>
                 </div>;
@@ -388,7 +404,18 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
                 if (unfilteredRooms.length < 1 && unfilteredHistorical < 1) {
                     explorePrompt = <div className="mx_RoomList_explorePrompt">
                         <div>{_t("Use the + to make a new room or explore existing ones below")}</div>
-                        <AccessibleButton kind="link" onClick={this.onExplore}>
+                        <AccessibleButton
+                            className="mx_RoomList_explorePrompt_startChat"
+                            kind="link"
+                            onClick={this.onStartChat}
+                        >
+                            {_t("Start a new chat")}
+                        </AccessibleButton>
+                        <AccessibleButton
+                            className="mx_RoomList_explorePrompt_explore"
+                            kind="link"
+                            onClick={this.onExplore}
+                        >
                             {_t("Explore all public rooms")}
                         </AccessibleButton>
                     </div>;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 701bee457f..3bfa962216 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1391,6 +1391,7 @@
     "Historical": "Historical",
     "Custom Tag": "Custom Tag",
     "Can't see what you’re looking for?": "Can't see what you’re looking for?",
+    "Start a new chat": "Start a new chat",
     "Explore all public rooms": "Explore all public rooms",
     "Use the + to make a new room or explore existing ones below": "Use the + to make a new room or explore existing ones below",
     "%(count)s results|other": "%(count)s results",

From d0513406ee1d78ca82f144a8e72f59a23050965a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 11 Nov 2020 13:36:17 +0000
Subject: [PATCH 100/146] Pass filter text when clicking explore/dm prompt

---
 src/RoomInvite.js                             |   4 +-
 src/components/structures/MatrixChat.tsx      |   7 +-
 src/components/structures/RoomDirectory.js    |   4 +-
 src/components/views/dialogs/InviteDialog.js  | 230 ++++++++++--------
 .../views/elements/DirectorySearchBox.js      |  30 ++-
 src/components/views/rooms/RoomList.tsx       |   6 +-
 6 files changed, 153 insertions(+), 128 deletions(-)

diff --git a/src/RoomInvite.js b/src/RoomInvite.js
index 7eb7f5dbb2..06d3fb04e8 100644
--- a/src/RoomInvite.js
+++ b/src/RoomInvite.js
@@ -40,11 +40,11 @@ export function inviteMultipleToRoom(roomId, addrs) {
     return inviter.invite(addrs).then(states => Promise.resolve({states, inviter}));
 }
 
-export function showStartChatInviteDialog() {
+export function showStartChatInviteDialog(initialText) {
     // This dialog handles the room creation internally - we don't need to worry about it.
     const InviteDialog = sdk.getComponent("dialogs.InviteDialog");
     Modal.createTrackedDialog(
-        'Start DM', '', InviteDialog, {kind: KIND_DM},
+        'Start DM', '', InviteDialog, {kind: KIND_DM, initialText},
         /*className=*/null, /*isPriority=*/false, /*isStatic=*/true,
     );
 }
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index 22cd73eff7..b2c94e4a8b 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -653,8 +653,9 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             }
             case Action.ViewRoomDirectory: {
                 const RoomDirectory = sdk.getComponent("structures.RoomDirectory");
-                Modal.createTrackedDialog('Room directory', '', RoomDirectory, {},
-                    'mx_RoomDirectory_dialogWrapper', false, true);
+                Modal.createTrackedDialog('Room directory', '', RoomDirectory, {
+                    initialText: payload.initialText,
+                }, 'mx_RoomDirectory_dialogWrapper', false, true);
 
                 // View the welcome or home page if we need something to look at
                 this.viewSomethingBehindModal();
@@ -677,7 +678,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 this.chatCreateOrReuse(payload.user_id);
                 break;
             case 'view_create_chat':
-                showStartChatInviteDialog();
+                showStartChatInviteDialog(payload.initialText || "");
                 break;
             case 'view_invite':
                 showRoomInviteDialog(payload.roomId);
diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js
index ece70e3a8f..e3323b05fa 100644
--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@@ -44,6 +44,7 @@ function track(action) {
 
 export default class RoomDirectory extends React.Component {
     static propTypes = {
+        initialText: PropTypes.string,
         onFinished: PropTypes.func.isRequired,
     };
 
@@ -61,7 +62,7 @@ export default class RoomDirectory extends React.Component {
             error: null,
             instanceId: undefined,
             roomServer: MatrixClientPeg.getHomeserverName(),
-            filterString: null,
+            filterString: this.props.initialText || "",
             selectedCommunityId: SettingsStore.getValue("feature_communities_v2_prototypes")
                 ? selectedCommunityId
                 : null,
@@ -686,6 +687,7 @@ export default class RoomDirectory extends React.Component {
                     onJoinClick={this.onJoinFromSearchClick}
                     placeholder={placeholder}
                     showJoinButton={showJoinButton}
+                    initialText={this.props.initialText}
                 />
                 {dropdown}
             </div>;
diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index 99878569d3..9b7c5803a1 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -308,10 +308,14 @@ export default class InviteDialog extends React.PureComponent {
 
         // The room ID this dialog is for. Only required for KIND_INVITE.
         roomId: PropTypes.string,
+
+        // Initial value to populate the filter with
+        initialText: PropTypes.string,
     };
 
     static defaultProps = {
         kind: KIND_DM,
+        initialText: "",
     };
 
     _debounceTimer: number = null;
@@ -338,7 +342,7 @@ export default class InviteDialog extends React.PureComponent {
 
         this.state = {
             targets: [], // array of Member objects (see interface above)
-            filterText: "",
+            filterText: this.props.initialText,
             recents: InviteDialog.buildRecents(alreadyInvited),
             numRecentsShown: INITIAL_ROOMS_SHOWN,
             suggestions: this._buildSuggestions(alreadyInvited),
@@ -356,6 +360,12 @@ export default class InviteDialog extends React.PureComponent {
         this._editorRef = createRef();
     }
 
+    componentDidMount() {
+        if (this.props.initialText) {
+            this._updateSuggestions(this.props.initialText);
+        }
+    }
+
     static buildRecents(excludedTargetIds: Set<string>): {userId: string, user: RoomMember, lastActive: number} {
         const rooms = DMRoomMap.shared().getUniqueRoomsWithIndividuals(); // map of userId => js-sdk Room
 
@@ -687,6 +697,115 @@ export default class InviteDialog extends React.PureComponent {
         }
     };
 
+    _updateSuggestions = async (term) => {
+        MatrixClientPeg.get().searchUserDirectory({term}).then(async r => {
+            if (term !== this.state.filterText) {
+                // Discard the results - we were probably too slow on the server-side to make
+                // these results useful. This is a race we want to avoid because we could overwrite
+                // more accurate results.
+                return;
+            }
+
+            if (!r.results) r.results = [];
+
+            // While we're here, try and autocomplete a search result for the mxid itself
+            // if there's no matches (and the input looks like a mxid).
+            if (term[0] === '@' && term.indexOf(':') > 1) {
+                try {
+                    const profile = await MatrixClientPeg.get().getProfileInfo(term);
+                    if (profile) {
+                        // If we have a profile, we have enough information to assume that
+                        // the mxid can be invited - add it to the list. We stick it at the
+                        // top so it is most obviously presented to the user.
+                        r.results.splice(0, 0, {
+                            user_id: term,
+                            display_name: profile['displayname'],
+                            avatar_url: profile['avatar_url'],
+                        });
+                    }
+                } catch (e) {
+                    console.warn("Non-fatal error trying to make an invite for a user ID");
+                    console.warn(e);
+
+                    // Add a result anyways, just without a profile. We stick it at the
+                    // top so it is most obviously presented to the user.
+                    r.results.splice(0, 0, {
+                        user_id: term,
+                        display_name: term,
+                        avatar_url: null,
+                    });
+                }
+            }
+
+            this.setState({
+                serverResultsMixin: r.results.map(u => ({
+                    userId: u.user_id,
+                    user: new DirectoryMember(u),
+                })),
+            });
+        }).catch(e => {
+            console.error("Error searching user directory:");
+            console.error(e);
+            this.setState({serverResultsMixin: []}); // clear results because it's moderately fatal
+        });
+
+        // Whenever we search the directory, also try to search the identity server. It's
+        // all debounced the same anyways.
+        if (!this.state.canUseIdentityServer) {
+            // The user doesn't have an identity server set - warn them of that.
+            this.setState({tryingIdentityServer: true});
+            return;
+        }
+        if (term.indexOf('@') > 0 && Email.looksValid(term) && SettingsStore.getValue(UIFeature.IdentityServer)) {
+            // Start off by suggesting the plain email while we try and resolve it
+            // to a real account.
+            this.setState({
+                // per above: the userId is a lie here - it's just a regular identifier
+                threepidResultsMixin: [{user: new ThreepidMember(term), userId: term}],
+            });
+            try {
+                const authClient = new IdentityAuthClient();
+                const token = await authClient.getAccessToken();
+                if (term !== this.state.filterText) return; // abandon hope
+
+                const lookup = await MatrixClientPeg.get().lookupThreePid(
+                    'email',
+                    term,
+                    undefined, // callback
+                    token,
+                );
+                if (term !== this.state.filterText) return; // abandon hope
+
+                if (!lookup || !lookup.mxid) {
+                    // We weren't able to find anyone - we're already suggesting the plain email
+                    // as an alternative, so do nothing.
+                    return;
+                }
+
+                // We append the user suggestion to give the user an option to click
+                // the email anyways, and so we don't cause things to jump around. In
+                // theory, the user would see the user pop up and think "ah yes, that
+                // person!"
+                const profile = await MatrixClientPeg.get().getProfileInfo(lookup.mxid);
+                if (term !== this.state.filterText || !profile) return; // abandon hope
+                this.setState({
+                    threepidResultsMixin: [...this.state.threepidResultsMixin, {
+                        user: new DirectoryMember({
+                            user_id: lookup.mxid,
+                            display_name: profile.displayname,
+                            avatar_url: profile.avatar_url,
+                        }),
+                        userId: lookup.mxid,
+                    }],
+                });
+            } catch (e) {
+                console.error("Error searching identity server:");
+                console.error(e);
+                this.setState({threepidResultsMixin: []}); // clear results because it's moderately fatal
+            }
+        }
+    };
+
     _updateFilter = (e) => {
         const term = e.target.value;
         this.setState({filterText: term});
@@ -697,113 +816,8 @@ export default class InviteDialog extends React.PureComponent {
         if (this._debounceTimer) {
             clearTimeout(this._debounceTimer);
         }
-        this._debounceTimer = setTimeout(async () => {
-            MatrixClientPeg.get().searchUserDirectory({term}).then(async r => {
-                if (term !== this.state.filterText) {
-                    // Discard the results - we were probably too slow on the server-side to make
-                    // these results useful. This is a race we want to avoid because we could overwrite
-                    // more accurate results.
-                    return;
-                }
-
-                if (!r.results) r.results = [];
-
-                // While we're here, try and autocomplete a search result for the mxid itself
-                // if there's no matches (and the input looks like a mxid).
-                if (term[0] === '@' && term.indexOf(':') > 1) {
-                    try {
-                        const profile = await MatrixClientPeg.get().getProfileInfo(term);
-                        if (profile) {
-                            // If we have a profile, we have enough information to assume that
-                            // the mxid can be invited - add it to the list. We stick it at the
-                            // top so it is most obviously presented to the user.
-                            r.results.splice(0, 0, {
-                                user_id: term,
-                                display_name: profile['displayname'],
-                                avatar_url: profile['avatar_url'],
-                            });
-                        }
-                    } catch (e) {
-                        console.warn("Non-fatal error trying to make an invite for a user ID");
-                        console.warn(e);
-
-                        // Add a result anyways, just without a profile. We stick it at the
-                        // top so it is most obviously presented to the user.
-                        r.results.splice(0, 0, {
-                            user_id: term,
-                            display_name: term,
-                            avatar_url: null,
-                        });
-                    }
-                }
-
-                this.setState({
-                    serverResultsMixin: r.results.map(u => ({
-                        userId: u.user_id,
-                        user: new DirectoryMember(u),
-                    })),
-                });
-            }).catch(e => {
-                console.error("Error searching user directory:");
-                console.error(e);
-                this.setState({serverResultsMixin: []}); // clear results because it's moderately fatal
-            });
-
-            // Whenever we search the directory, also try to search the identity server. It's
-            // all debounced the same anyways.
-            if (!this.state.canUseIdentityServer) {
-                // The user doesn't have an identity server set - warn them of that.
-                this.setState({tryingIdentityServer: true});
-                return;
-            }
-            if (term.indexOf('@') > 0 && Email.looksValid(term) && SettingsStore.getValue(UIFeature.IdentityServer)) {
-                // Start off by suggesting the plain email while we try and resolve it
-                // to a real account.
-                this.setState({
-                    // per above: the userId is a lie here - it's just a regular identifier
-                    threepidResultsMixin: [{user: new ThreepidMember(term), userId: term}],
-                });
-                try {
-                    const authClient = new IdentityAuthClient();
-                    const token = await authClient.getAccessToken();
-                    if (term !== this.state.filterText) return; // abandon hope
-
-                    const lookup = await MatrixClientPeg.get().lookupThreePid(
-                        'email',
-                        term,
-                        undefined, // callback
-                        token,
-                    );
-                    if (term !== this.state.filterText) return; // abandon hope
-
-                    if (!lookup || !lookup.mxid) {
-                        // We weren't able to find anyone - we're already suggesting the plain email
-                        // as an alternative, so do nothing.
-                        return;
-                    }
-
-                    // We append the user suggestion to give the user an option to click
-                    // the email anyways, and so we don't cause things to jump around. In
-                    // theory, the user would see the user pop up and think "ah yes, that
-                    // person!"
-                    const profile = await MatrixClientPeg.get().getProfileInfo(lookup.mxid);
-                    if (term !== this.state.filterText || !profile) return; // abandon hope
-                    this.setState({
-                        threepidResultsMixin: [...this.state.threepidResultsMixin, {
-                            user: new DirectoryMember({
-                                user_id: lookup.mxid,
-                                display_name: profile.displayname,
-                                avatar_url: profile.avatar_url,
-                            }),
-                            userId: lookup.mxid,
-                        }],
-                    });
-                } catch (e) {
-                    console.error("Error searching identity server:");
-                    console.error(e);
-                    this.setState({threepidResultsMixin: []}); // clear results because it's moderately fatal
-                }
-            }
+        this._debounceTimer = setTimeout(() => {
+            this._updateSuggestions(term);
         }, 150); // 150ms debounce (human reaction time + some)
     };
 
diff --git a/src/components/views/elements/DirectorySearchBox.js b/src/components/views/elements/DirectorySearchBox.js
index c2e8e4fd68..644b69417b 100644
--- a/src/components/views/elements/DirectorySearchBox.js
+++ b/src/components/views/elements/DirectorySearchBox.js
@@ -20,8 +20,8 @@ import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 
 export default class DirectorySearchBox extends React.Component {
-    constructor() {
-        super();
+    constructor(props) {
+        super(props);
         this._collectInput = this._collectInput.bind(this);
         this._onClearClick = this._onClearClick.bind(this);
         this._onChange = this._onChange.bind(this);
@@ -31,7 +31,7 @@ export default class DirectorySearchBox extends React.Component {
         this.input = null;
 
         this.state = {
-            value: '',
+            value: this.props.initialText || '',
         };
     }
 
@@ -90,15 +90,20 @@ export default class DirectorySearchBox extends React.Component {
         }
 
         return <div className={`mx_DirectorySearchBox ${this.props.className} mx_textinput`}>
-                <input type="text" name="dirsearch" value={this.state.value}
-                    className="mx_textinput_icon mx_textinput_search"
-                    ref={this._collectInput}
-                    onChange={this._onChange} onKeyUp={this._onKeyUp}
-                    placeholder={this.props.placeholder} autoFocus
-                />
-                { joinButton }
-                <AccessibleButton className="mx_DirectorySearchBox_clear" onClick={this._onClearClick}></AccessibleButton>
-            </div>;
+            <input
+                type="text"
+                name="dirsearch"
+                value={this.state.value}
+                className="mx_textinput_icon mx_textinput_search"
+                ref={this._collectInput}
+                onChange={this._onChange}
+                onKeyUp={this._onKeyUp}
+                placeholder={this.props.placeholder}
+                autoFocus
+            />
+            { joinButton }
+            <AccessibleButton className="mx_DirectorySearchBox_clear" onClick={this._onClearClick} />
+        </div>;
     }
 }
 
@@ -109,4 +114,5 @@ DirectorySearchBox.propTypes = {
     onJoinClick: PropTypes.func,
     placeholder: PropTypes.string,
     showJoinButton: PropTypes.bool,
+    initialText: PropTypes.string,
 };
diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx
index de54fabc53..6e677f2b01 100644
--- a/src/components/views/rooms/RoomList.tsx
+++ b/src/components/views/rooms/RoomList.tsx
@@ -285,11 +285,13 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
     };
 
     private onStartChat = () => {
-        dis.dispatch({action: "view_create_chat"});
+        const initialText = RoomListStore.instance.getFirstNameFilterCondition()?.search;
+        dis.dispatch({ action: "view_create_chat", initialText });
     };
 
     private onExplore = () => {
-        dis.fire(Action.ViewRoomDirectory);
+        const initialText = RoomListStore.instance.getFirstNameFilterCondition()?.search;
+        dis.dispatch({ action: Action.ViewRoomDirectory, initialText });
     };
 
     private renderCommunityInvites(): TemporaryTile[] {

From 0bee4bd72bbdde493a0eed3a55d07944e219897d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 11 Nov 2020 13:45:50 +0000
Subject: [PATCH 101/146] Update `Confirm` password placeholder

---
 src/components/views/auth/RegistrationForm.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/auth/RegistrationForm.js b/src/components/views/auth/RegistrationForm.js
index 419443984a..5245d1a921 100644
--- a/src/components/views/auth/RegistrationForm.js
+++ b/src/components/views/auth/RegistrationForm.js
@@ -461,7 +461,7 @@ export default class RegistrationForm extends React.Component {
             ref={field => this[FIELD_PASSWORD_CONFIRM] = field}
             type="password"
             autoComplete="new-password"
-            label={_t("Confirm")}
+            label={_t("Confirm password")}
             value={this.state.passwordConfirm}
             onChange={this.onPasswordConfirmChange}
             onValidate={this.onPasswordConfirmValidate}

From b3ccabbe6bfdfae580862307c6739b06652f6118 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 11 Nov 2020 14:00:40 +0000
Subject: [PATCH 102/146] Clear recaptcha error on reattempts

---
 src/components/views/auth/CaptchaForm.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/views/auth/CaptchaForm.js b/src/components/views/auth/CaptchaForm.js
index 5cce93f0b8..e2d7d594fa 100644
--- a/src/components/views/auth/CaptchaForm.js
+++ b/src/components/views/auth/CaptchaForm.js
@@ -102,6 +102,10 @@ export default class CaptchaForm extends React.Component {
         console.log("Loaded recaptcha script.");
         try {
             this._renderRecaptcha(DIV_ID);
+            // clear error if re-rendered
+            this.setState({
+                errorText: null,
+            });
             CountlyAnalytics.instance.track("onboarding_grecaptcha_loaded");
         } catch (e) {
             this.setState({

From edb5e10506cd79349adff8e7d16dc8810b311abd Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 11 Nov 2020 15:07:57 +0000
Subject: [PATCH 103/146] Iterate registration to simplify it based on
 usertesting

---
 .../auth/_InteractiveAuthEntryComponents.scss | 29 +++++++++
 res/img/element-icons/email-prompt.svg        | 13 ++++
 .../structures/auth/Registration.js           | 63 ++++++++++++-------
 .../auth/InteractiveAuthEntryComponents.js    |  8 +--
 src/components/views/auth/RegistrationForm.js | 32 ----------
 5 files changed, 86 insertions(+), 59 deletions(-)
 create mode 100644 res/img/element-icons/email-prompt.svg

diff --git a/res/css/views/auth/_InteractiveAuthEntryComponents.scss b/res/css/views/auth/_InteractiveAuthEntryComponents.scss
index 05cddf2c48..0a5ac9b2bc 100644
--- a/res/css/views/auth/_InteractiveAuthEntryComponents.scss
+++ b/res/css/views/auth/_InteractiveAuthEntryComponents.scss
@@ -14,6 +14,35 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+.mx_InteractiveAuthEntryComponents_emailWrapper {
+    padding-right: 60px;
+    position: relative;
+    margin-top: 32px;
+    margin-bottom: 32px;
+
+    &::before, &::after {
+        position: absolute;
+        width: 116px;
+        height: 116px;
+        content: "";
+        right: -10px;
+    }
+
+    &::before {
+        background-color: rgba(244, 246, 250, 0.91);
+        border-radius: 50%;
+        top: -20px;
+    }
+
+    &::after {
+        background-image: url('$(res)/img/element-icons/email-prompt.svg');
+        background-repeat: no-repeat;
+        background-position: center;
+        background-size: contain;
+        top: -25px;
+    }
+}
+
 .mx_InteractiveAuthEntryComponents_msisdnWrapper {
     text-align: center;
 }
diff --git a/res/img/element-icons/email-prompt.svg b/res/img/element-icons/email-prompt.svg
new file mode 100644
index 0000000000..19b8f82449
--- /dev/null
+++ b/res/img/element-icons/email-prompt.svg
@@ -0,0 +1,13 @@
+<svg width="57" height="77" viewBox="0 0 57 77" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.55298 38.9352H4C1.79086 38.9352 0 40.726 0 42.9352V72.0304C0 74.2396 1.79086 76.0304 4 76.0304H53C55.2091 76.0304 57 74.2396 57 72.0304V42.9352C57 40.726 55.2091 38.9352 53 38.9352H51.365V41.6473H5.55298V38.9352ZM26.9753 61.3068L3.10141 43.4482C2.33137 42.8721 2.73876 41.6474 3.70041 41.6474H28.459H53.3841C54.3282 41.6474 54.7464 42.8352 54.0107 43.4268L31.8776 61.2212C30.4545 62.3653 28.4374 62.4005 26.9753 61.3068Z" fill="#8A8C8E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M49.5885 33.0898C48.9384 33.2156 48.2703 33.2911 47.5885 33.3119V34.706V44.4238V54.1415H49.5885V44.4238V34.706V33.0898ZM36.5604 14.2706H13.7177C10.9562 14.2706 8.71765 16.5092 8.71765 19.2706V34.706V44.4238V54.1415H10.7177V44.4238V34.706V19.2706C10.7177 17.6138 12.0608 16.2706 13.7177 16.2706H35.5616C35.8354 15.571 36.1706 14.9022 36.5604 14.2706Z" fill="#8A8C8E"/>
+<path d="M16.6589 30.5414H37.4826" stroke="#8A8C8E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<line x1="16.2706" y1="37.8708" x2="40.6473" y2="37.8708" stroke="#8A8C8E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<line x1="16.2706" y1="44.812" x2="40.6473" y2="44.812" stroke="#8A8C8E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<circle cx="47.2003" cy="20.8237" r="9.71771" fill="#FE2928"/>
+<rect x="45.812" y="14.5765" width="2.77649" height="8.32946" rx="1" fill="white"/>
+<rect x="45.812" y="24.2943" width="2.77649" height="2.77649" rx="1" fill="white"/>
+<line x1="27.3766" y1="1" x2="27.3766" y2="10.106" stroke="#8A8C8E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<line x1="34.3179" y1="6.55298" x2="34.3179" y2="10.106" stroke="#8A8C8E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<line x1="20.4354" y1="6.55298" x2="20.4354" y2="10.106" stroke="#8A8C8E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/components/structures/auth/Registration.js b/src/components/structures/auth/Registration.js
index 630e04da9c..777d57344d 100644
--- a/src/components/structures/auth/Registration.js
+++ b/src/components/structures/auth/Registration.js
@@ -502,17 +502,9 @@ export default class Registration extends React.Component {
             return null;
         }
 
-        // If we're on a different phase, we only show the server type selector,
-        // which is always shown if we allow custom URLs at all.
-        // (if there's a fatal server error, we need to show the full server
-        // config as the user may need to change servers to resolve the error).
-        if (PHASES_ENABLED && this.state.phase !== PHASE_SERVER_DETAILS && !this.state.serverErrorIsFatal) {
-            return <div>
-                <ServerTypeSelector
-                    selected={this.state.serverType}
-                    onChange={this.onServerTypeChange}
-                />
-            </div>;
+        // Hide the server picker once the user is doing UI Auth unless encountered a fatal server error
+        if (this.state.phase !== PHASE_SERVER_DETAILS && this.state.doingUIAuth && !this.state.serverErrorIsFatal) {
+            return null;
         }
 
         const serverDetailsProps = {};
@@ -582,17 +574,6 @@ export default class Registration extends React.Component {
                 <Spinner />
             </div>;
         } else if (this.state.flows.length) {
-            let onEditServerDetailsClick = null;
-            // If custom URLs are allowed and we haven't selected the Free server type, wire
-            // up the server details edit link.
-            if (
-                PHASES_ENABLED &&
-                !SdkConfig.get()['disable_custom_urls'] &&
-                this.state.serverType !== ServerType.FREE
-            ) {
-                onEditServerDetailsClick = this.onEditServerDetailsClick;
-            }
-
             return <RegistrationForm
                 defaultUsername={this.state.formVals.username}
                 defaultEmail={this.state.formVals.email}
@@ -600,7 +581,6 @@ export default class Registration extends React.Component {
                 defaultPhoneNumber={this.state.formVals.phoneNumber}
                 defaultPassword={this.state.formVals.password}
                 onRegisterClick={this.onFormSubmit}
-                onEditServerDetailsClick={onEditServerDetailsClick}
                 flows={this.state.flows}
                 serverConfig={this.props.serverConfig}
                 canSubmit={!this.state.serverErrorIsFatal}
@@ -686,11 +666,48 @@ export default class Registration extends React.Component {
                 { regDoneText }
             </div>;
         } else {
+            let yourMatrixAccountText = _t('Create your Matrix account on %(serverName)s', {
+                serverName: this.props.serverConfig.hsName,
+            });
+            if (this.props.serverConfig.hsNameIsDifferent) {
+                const TextWithTooltip = sdk.getComponent("elements.TextWithTooltip");
+
+                yourMatrixAccountText = _t('Create your Matrix account on <underlinedServerName />', {}, {
+                    'underlinedServerName': () => {
+                        return <TextWithTooltip
+                            class="mx_Login_underlinedServerName"
+                            tooltip={this.props.serverConfig.hsUrl}
+                        >
+                            {this.props.serverConfig.hsName}
+                        </TextWithTooltip>;
+                    },
+                });
+            }
+
+            // If custom URLs are allowed, user is not doing UIA flows and they haven't selected the Free server type,
+            // wire up the server details edit link.
+            let editLink = null;
+            if (PHASES_ENABLED &&
+                !SdkConfig.get()['disable_custom_urls'] &&
+                this.state.serverType !== ServerType.FREE &&
+                !this.state.doingUIAuth
+            ) {
+                editLink = (
+                    <a className="mx_AuthBody_editServerDetails" href="#" onClick={this.onEditServerDetailsClick}>
+                        {_t('Change')}
+                    </a>
+                );
+            }
+
             body = <div>
                 <h2>{ _t('Create your account') }</h2>
                 { errorText }
                 { serverDeadSection }
                 { this.renderServerComponent() }
+                <h3>
+                    {yourMatrixAccountText}
+                    {editLink}
+                </h3>
                 { this.renderRegisterComponent() }
                 { goBack }
                 { signIn }
diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.js b/src/components/views/auth/InteractiveAuthEntryComponents.js
index f49e6959fb..6628ca7120 100644
--- a/src/components/views/auth/InteractiveAuthEntryComponents.js
+++ b/src/components/views/auth/InteractiveAuthEntryComponents.js
@@ -421,12 +421,12 @@ export class EmailIdentityAuthEntry extends React.Component {
             return <Spinner />;
         } else {
             return (
-                <div>
-                    <p>{ _t("An email has been sent to %(emailAddress)s",
-                        { emailAddress: (sub) => <i>{ this.props.inputs.emailAddress }</i> },
+                <div className="mx_InteractiveAuthEntryComponents_emailWrapper">
+                    <p>{ _t("A confirmation email has been sent to %(emailAddress)s",
+                        { emailAddress: (sub) => <b>{ this.props.inputs.emailAddress }</b> },
                     ) }
                     </p>
-                    <p>{ _t("Please check your email to continue registration.") }</p>
+                    <p>{ _t("Open the link in the email to continue registration.") }</p>
                 </div>
             );
         }
diff --git a/src/components/views/auth/RegistrationForm.js b/src/components/views/auth/RegistrationForm.js
index 5245d1a921..70c1017427 100644
--- a/src/components/views/auth/RegistrationForm.js
+++ b/src/components/views/auth/RegistrationForm.js
@@ -51,7 +51,6 @@ export default class RegistrationForm extends React.Component {
         defaultUsername: PropTypes.string,
         defaultPassword: PropTypes.string,
         onRegisterClick: PropTypes.func.isRequired, // onRegisterClick(Object) => ?Promise
-        onEditServerDetailsClick: PropTypes.func,
         flows: PropTypes.arrayOf(PropTypes.object).isRequired,
         serverConfig: PropTypes.instanceOf(ValidatedServerConfig).isRequired,
         canSubmit: PropTypes.bool,
@@ -513,33 +512,6 @@ export default class RegistrationForm extends React.Component {
     }
 
     render() {
-        let yourMatrixAccountText = _t('Create your Matrix account on %(serverName)s', {
-            serverName: this.props.serverConfig.hsName,
-        });
-        if (this.props.serverConfig.hsNameIsDifferent) {
-            const TextWithTooltip = sdk.getComponent("elements.TextWithTooltip");
-
-            yourMatrixAccountText = _t('Create your Matrix account on <underlinedServerName />', {}, {
-                'underlinedServerName': () => {
-                    return <TextWithTooltip
-                        class="mx_Login_underlinedServerName"
-                        tooltip={this.props.serverConfig.hsUrl}
-                    >
-                        {this.props.serverConfig.hsName}
-                    </TextWithTooltip>;
-                },
-            });
-        }
-
-        let editLink = null;
-        if (this.props.onEditServerDetailsClick) {
-            editLink = <a className="mx_AuthBody_editServerDetails"
-                href="#" onClick={this.props.onEditServerDetailsClick}
-            >
-                {_t('Change')}
-            </a>;
-        }
-
         const registerButton = (
             <input className="mx_Login_submit" type="submit" value={_t("Register")} disabled={!this.props.canSubmit} />
         );
@@ -575,10 +547,6 @@ export default class RegistrationForm extends React.Component {
 
         return (
             <div>
-                <h3>
-                    {yourMatrixAccountText}
-                    {editLink}
-                </h3>
                 <form onSubmit={this.onSubmit}>
                     <div className="mx_AuthBody_fieldRow">
                         {this.renderUsername()}

From a2958f8f99e9b142cac482d888d6f9fcc0bc2e53 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 11 Nov 2020 16:45:46 +0000
Subject: [PATCH 104/146] i18n

---
 src/i18n/strings/en_EN.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3bfa962216..d9bdd82c42 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2211,8 +2211,8 @@
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.",
     "Please review and accept all of the homeserver's policies": "Please review and accept all of the homeserver's policies",
     "Please review and accept the policies of this homeserver:": "Please review and accept the policies of this homeserver:",
-    "An email has been sent to %(emailAddress)s": "An email has been sent to %(emailAddress)s",
-    "Please check your email to continue registration.": "Please check your email to continue registration.",
+    "A confirmation email has been sent to %(emailAddress)s": "A confirmation email has been sent to %(emailAddress)s",
+    "Open the link in the email to continue registration.": "Open the link in the email to continue registration.",
     "Token incorrect": "Token incorrect",
     "A text message has been sent to %(msisdn)s": "A text message has been sent to %(msisdn)s",
     "Please enter the code it contains:": "Please enter the code it contains:",
@@ -2249,8 +2249,6 @@
     "Enter username": "Enter username",
     "Email (optional)": "Email (optional)",
     "Phone (optional)": "Phone (optional)",
-    "Create your Matrix account on %(serverName)s": "Create your Matrix account on %(serverName)s",
-    "Create your Matrix account on <underlinedServerName />": "Create your Matrix account on <underlinedServerName />",
     "Register": "Register",
     "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.",
     "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.",
@@ -2474,6 +2472,8 @@
     "<a>Log in</a> to your new account.": "<a>Log in</a> to your new account.",
     "You can now close this window or <a>log in</a> to your new account.": "You can now close this window or <a>log in</a> to your new account.",
     "Registration Successful": "Registration Successful",
+    "Create your Matrix account on %(serverName)s": "Create your Matrix account on %(serverName)s",
+    "Create your Matrix account on <underlinedServerName />": "Create your Matrix account on <underlinedServerName />",
     "Create your account": "Create your account",
     "Use Recovery Key or Passphrase": "Use Recovery Key or Passphrase",
     "Use Recovery Key": "Use Recovery Key",

From 0911007c77e35efbc0fd00712ffcdcfcaf025034 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 11 Nov 2020 17:12:27 +0000
Subject: [PATCH 105/146] fix issue with server selector introduced in this PR

---
 src/components/structures/auth/Registration.js | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/auth/Registration.js b/src/components/structures/auth/Registration.js
index 777d57344d..80bf3b72cd 100644
--- a/src/components/structures/auth/Registration.js
+++ b/src/components/structures/auth/Registration.js
@@ -507,6 +507,19 @@ export default class Registration extends React.Component {
             return null;
         }
 
+        // If we're on a different phase, we only show the server type selector,
+        // which is always shown if we allow custom URLs at all.
+        // (if there's a fatal server error, we need to show the full server
+        // config as the user may need to change servers to resolve the error).
+        if (PHASES_ENABLED && this.state.phase !== PHASE_SERVER_DETAILS && !this.state.serverErrorIsFatal) {
+            return <div>
+                <ServerTypeSelector
+                    selected={this.state.serverType}
+                    onChange={this.onServerTypeChange}
+                />
+            </div>;
+        }
+
         const serverDetailsProps = {};
         if (PHASES_ENABLED) {
             serverDetailsProps.onAfterSubmit = this.onServerDetailsNextPhaseClick;
@@ -704,10 +717,10 @@ export default class Registration extends React.Component {
                 { errorText }
                 { serverDeadSection }
                 { this.renderServerComponent() }
-                <h3>
+                { this.state.phase !== PHASE_SERVER_DETAILS && <h3>
                     {yourMatrixAccountText}
                     {editLink}
-                </h3>
+                </h3> }
                 { this.renderRegisterComponent() }
                 { goBack }
                 { signIn }

From 2adc578d285c2b81671e3b7ffa334b1135cdc446 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 11 Nov 2020 17:31:30 +0000
Subject: [PATCH 106/146] mark the onClick prop required on AccessibleButton

---
 src/components/views/elements/AccessibleButton.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/elements/AccessibleButton.tsx b/src/components/views/elements/AccessibleButton.tsx
index ae822204df..e634057a21 100644
--- a/src/components/views/elements/AccessibleButton.tsx
+++ b/src/components/views/elements/AccessibleButton.tsx
@@ -39,7 +39,7 @@ interface IProps extends React.InputHTMLAttributes<Element> {
     tabIndex?: number;
     disabled?: boolean;
     className?: string;
-    onClick?(e?: ButtonEvent): void;
+    onClick(e?: ButtonEvent): void;
 }
 
 interface IAccessibleButtonProps extends React.InputHTMLAttributes<Element> {

From 296fc307a9acd52cfc45596a3dfd6876d2d21423 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20Mesk=C3=B3?= <meskobalazs@gmail.com>
Date: Wed, 11 Nov 2020 10:38:41 +0000
Subject: [PATCH 107/146] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2642 of 2642 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 42 ++++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 2c8f04e273..0ecd4db0c3 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -241,8 +241,8 @@
     "This room": "Ebben a szobában",
     "This room is not accessible by remote Matrix servers": "Ez a szoba távoli Matrix szerverről nem érhető el",
     "To use it, just wait for autocomplete results to load and tab through them.": "A használatához csak várd meg az automatikus kiegészítési találatok betöltését, majd Tabbal választhatsz közülük.",
-    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Megpróbáltam betölteni a szoba megadott időpontjának megfelelő  adatait, de nincs jogod a kérdéses üzenetek megjelenítéséhez.",
-    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Megpróbáltam betölteni a szoba megadott időpontjának megfelelő  adatait, de nem találom.",
+    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Megpróbálta betölteni a szoba megadott időpontjának megfelelő adatait, de nincs joga a kérdéses üzenetek megjelenítéséhez.",
+    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Megpróbálta betölteni a szoba megadott időpontjának megfelelő adatait, de az nem található.",
     "Unable to add email address": "Az e-mail címet nem sikerült hozzáadni",
     "Unable to remove contact information": "A névjegy információkat nem sikerült törölni",
     "Unable to verify email address.": "Az e-mail cím ellenőrzése sikertelen.",
@@ -444,7 +444,7 @@
     "Matrix ID": "Matrix azonosító",
     "Matrix Room ID": "Szoba Matrix azonosító",
     "email address": "E-mail cím",
-    "Try using one of the following valid address types: %(validTypesList)s.": "Próbáld meg valamelyik  érvényes cím típust: %(validTypesList)s.",
+    "Try using one of the following valid address types: %(validTypesList)s.": "Próbálja meg valamelyik érvényes címtípust: %(validTypesList)s.",
     "You have entered an invalid address.": "Érvénytelen címet adtál meg.",
     "Failed to remove '%(roomName)s' from %(groupId)s": "A(z) %(groupId)s csoportból nem sikerült törölni: %(roomName)s",
     "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Biztos, hogy törlöd a(z) %(roomName)s szobát a(z) %(groupId)s csoportból?",
@@ -915,7 +915,7 @@
     "Avoid sequences": "Kerüld a sorozatokat",
     "Avoid recent years": "Kerüld a közeli éveket",
     "Avoid years that are associated with you": "Kerüld azokat az éveket amik összefüggésbe hozhatók veled",
-    "Avoid dates and years that are associated with you": "Kerüld  a dátumokat és évszámokat amik összefüggésbe hozhatók veled",
+    "Avoid dates and years that are associated with you": "Kerülje azon dátumokat és évszámokat, amelyek összefüggésbe hozhatók Önnel",
     "Capitalization doesn't help very much": "A nagybetűk nem igazán segítenek",
     "All-uppercase is almost as easy to guess as all-lowercase": "A csupa nagybetűset majdnem olyan könnyű kitalálni mint a csupa kisbetűset",
     "Reversed words aren't much harder to guess": "A megfordított betűrendet sem sokkal nehezebb kitalálni",
@@ -960,7 +960,7 @@
     "Custom user status messages": "Egyedi felhasználói állapot üzenet",
     "Set a new status...": "Új állapot beállítása...",
     "Clear status": "Állapot törlése",
-    "Unable to load commit detail: %(msg)s": "Sikertelen betöltés részletek: \n%(msg)s",
+    "Unable to load commit detail: %(msg)s": "A véglegesítés részleteinek betöltése sikertelen: %(msg)s",
     "Unrecognised address": "Ismeretlen cím",
     "User %(user_id)s may or may not exist": "%(user_id)s felhasználó lehet, hogy nem létezik",
     "The following users may not exist": "Az alábbi felhasználók lehet, hogy nem léteznek",
@@ -968,7 +968,7 @@
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Az alábbi Matrix ID-koz nem sikerül megtalálni a profilokat - így is meghívod őket?",
     "Invite anyway and never warn me again": "Mindenképpen meghív és ne figyelmeztess többet",
     "Invite anyway": "Mindenképpen meghív",
-    "Whether or not you're logged in (we don't record your username)": "Akár be vagy jelentkezve, akár nem; nem tároljuk a felhasználónevedet",
+    "Whether or not you're logged in (we don't record your username)": "Be van-e jelentkezve (nem tároljuk a felhasználónevét)",
     "Upgrades a room to a new version": "Szoba fejlesztése új verzióra",
     "Sets the room name": "Szobanév beállítása",
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s fejlesztette a szobát.",
@@ -1126,7 +1126,7 @@
     "Pizza": "Pizza",
     "Cake": "Sütemény",
     "Heart": "Szív",
-    "Smiley": "Smiley",
+    "Smiley": "Mosoly",
     "Robot": "Robot",
     "Hat": "Kalap",
     "Glasses": "Szemüveg",
@@ -1239,7 +1239,7 @@
     "You cannot modify widgets in this room.": "Nem módosíthatod a kisalkalmazásokat a szobában.",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s visszavonta %(targetDisplayName)s a szobába való belépéséhez szükséges meghívóját.",
     "Upgrade this room to the recommended room version": "A szoba fejlesztése a javasolt verzióra",
-    "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "A szoba verziója:  <roomVersion />, amit a Matrix szerver <i>instabilnak</i> tekint.",
+    "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "A szoba verziója: <roomVersion />, amelyet a Matrix-kiszolgáló <i>instabilnak</i> tekint.",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "A szoba fejlesztése bezárja ezt a szobát és új, frissített verzióval ugyanezen a néven létrehoz egy újat.",
     "Failed to revoke invite": "A meghívó visszavonása sikertelen",
     "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "A meghívót nem lehet visszavonni. Vagy a szervernek átmenetileg problémái vannak vagy nincs megfelelő jogosultságod a meghívó visszavonásához.",
@@ -1475,7 +1475,7 @@
     "Use an identity server in Settings to receive invites directly in %(brand)s.": "Állíts be azonosítási szervert a Beállításokban, hogy közvetlen meghívókat kaphass %(brand)sba.",
     "Share this email in Settings to receive invites directly in %(brand)s.": "Oszd meg a Beállításokban ezt az e-mail címet, hogy közvetlen meghívókat kaphass %(brand)sba.",
     "Error changing power level": "A hozzáférési szint változtatásnál hiba történt",
-    "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "A felhasználó  hozzáférési szint változtatásakor hiba történt. Ellenőrizd, hogy elegendő jogod van-e hozzá és próbáld újra.",
+    "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "Hiba történt a felhasználó hozzáférési szintjének változtatásakor. Ellenőrizze, hogy elegendő joga van-e hozzá és próbálja újra.",
     "Bold": "Félkövér",
     "Italics": "Dőlt",
     "Strikethrough": "Áthúzott",
@@ -1597,11 +1597,11 @@
     "This is your list of users/servers you have blocked - don't leave the room!": "Ez az általad tiltott felhasználók/szerverek listája - ne hagyd el ezt a szobát!",
     "Ignored/Blocked": "Figyelmen kívül hagyott/Tiltott",
     "Error adding ignored user/server": "Hiba a felhasználó/szerver hozzáadásánál a figyelmen kívül hagyandók listájához",
-    "Something went wrong. Please try again or view your console for hints.": "Valami nem sikerült. Kérjük próbáld újra vagy nézd meg  a konzolt a hiba okának felderítéséhez.",
+    "Something went wrong. Please try again or view your console for hints.": "Valami nem sikerült. Próbálja újra vagy nézze meg a konzolt a hiba okának felderítéséhez.",
     "Error subscribing to list": "A listára való feliratkozásnál hiba történt",
     "Error removing ignored user/server": "Hiba a felhasználó/szerver törlésénél a figyelmen kívül hagyandók listájából",
     "Error unsubscribing from list": "A listáról való leiratkozásnál hiba történt",
-    "Please try again or view your console for hints.": "Kérjük próbáld újra vagy nézd meg  a konzolt a hiba okának felderítéséhez.",
+    "Please try again or view your console for hints.": "Próbálja újra vagy nézze meg a konzolt a hiba okának felderítéséhez.",
     "None": "Semmi",
     "Ban list rules - %(roomName)s": "Tiltási lista szabályok - %(roomName)s",
     "Server rules": "Szerver szabályok",
@@ -1802,7 +1802,7 @@
     "Manage": "Kezelés",
     "Securely cache encrypted messages locally for them to appear in search results.": "A titkosított üzenetek kereséséhez azokat biztonságos módon helyileg kell tárolnod.",
     "Enable": "Engedélyez",
-    "%(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>.": "A  %(brand)sból a titkosított üzenetek biztonságos helyi tárolásához hiányzik néhány dolog. Ha kísérletezni szeretnél ezzel a lehetőséggel fordíts le egy saját %(brand)sot a <nativeLink>kereső komponens hozzáadásával</nativeLink>.",
+    "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.": "A %(brand)sból a titkosított üzenetek biztonságos helyi tárolásához hiányzik néhány dolog. Ha kísérletezni szeretne ezzel a lehetőséggel, akkor fordítson le egy saját %(brand)s Desktopot a <nativeLink>kereső komponens hozzáadásával</nativeLink>.",
     "Message search": "Üzenet keresése",
     "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Ez a szoba összeköti az üzeneteket a következő platformokkal, <a>tudj meg többet.</a>",
     "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Ez a szoba egy platformmal sem köt össze üzeneteket. <a>Tudj meg többet.</a>",
@@ -1840,7 +1840,7 @@
     "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!": "FIGYELEM: KULCSELLENŐRZÉS SIKERTELEN! %(userId)s aláírási kulcsa és a %(deviceId)s munkamenet ujjlenyomata „%(fprint)s”, ami nem egyezik meg a megadott ujjlenyomattal: „%(fingerprint)s”. Ez azt is jelentheti, hogy a kommunikációt lehallgatják!",
     "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "A megadott aláírási kulcs megegyezik %(userId)s felhasználótól kapott aláírási kulccsal ebben a munkamenetben: %(deviceId)s. A munkamenet ellenőrzöttnek lett jelölve.",
     "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.": "Jelenleg a jelszó változtatás minden munkamenet végpontok közötti titkosító kulcsait alaphelyzetbe állítja, ezáltal a titkosított üzenetek olvashatatlanok lesznek, hacsak először nem mented ki a szobák kulcsait és töltöd vissza jelszóváltoztatás után. A jövőben ezt egyszerűsítjük majd.",
-    "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.": "Ez az munkamenet <b>nem menti el a kulcsaidat</b>, de van létező mentésed ahonnan vissza  tudsz állni és továbbléphetsz.",
+    "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.": "Ez az munkamenet <b>nem menti el a kulcsait</b>, de van létező mentése, amelyből vissza tud állni és amihez hozzá tud adni a továbbiakban.",
     "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Állítsd be ezen az munkameneten a Kulcs Mentést kijelentkezés előtt, hogy ne veszíts el olyan kulcsot ami csak ezen az eszközön van meg.",
     "Connect this session to Key Backup": "Munkamenet csatlakoztatása a Kulcs Mentéshez",
     "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "A mentésnek <verify>ismeretlen</verify> munkamenetből származó aláírása van ezzel az azonosítóval: %(deviceId)s",
@@ -1871,7 +1871,7 @@
     "Encrypted by an unverified session": "Ellenőrizetlen munkamenet titkosította",
     "Encrypted by a deleted session": "Törölt munkamenet által lett titkosítva",
     "Waiting for %(displayName)s to accept…": "%(displayName)s felhasználóra várakozás az elfogadáshoz…",
-    "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Az üzeneted biztonságban van  és csak neked és a címzetteknek van meg az egyedi kulcs a visszafejtéshez.",
+    "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Az üzenete biztonságban van, és csak Ön és a címzettek rendelkeznek a visszafejtéshez szükséges egyedi kulcsokkal.",
     "Your messages are not secure": "Az üzeneteid nincsenek biztonságban",
     "One of the following may be compromised:": "Valamelyik az alábbiak közül kompromittált:",
     "Your homeserver": "Matrix szervered",
@@ -2012,7 +2012,7 @@
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "A felhasználó által használt munkamenetek ellenőrzése egyenként, a eszközök közti aláírással hitelesített eszközökben nem bízol meg.",
     "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "A nyilvánosságra hozott címeket bárki bármelyik szerveren használhatja a szobádba való belépéshez. A cím közzétételéhez először helyi címnek kell beállítani.",
     "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Állíts be címet ehhez a szobához, hogy a felhasználók a matrix szervereden megtalálhassák (%(localDomain)s)",
-    "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "A titkosított szobákban az üzeneted biztonságban van  és csak neked és a címzetteknek van meg az egyedi kulcs a visszafejtéshez.",
+    "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "A titkosított szobákban az üzenete biztonságban van, és csak Ön és a címzettek rendelkeznek a visszafejtéshez szükséges egyedi kulcsokkal.",
     "Verify all users in a room to ensure it's secure.": "Ellenőrizd a szoba összes tagját, hogy meggyőződhess a biztonságról.",
     "In encrypted rooms, verify all users to ensure it’s secure.": "Titkosított szobákban ellenőrizd a szoba összes tagját, hogy meggyőződhess a biztonságról.",
     "Verified": "Hitelesített",
@@ -2566,7 +2566,7 @@
     "Invite by email": "Meghívás e-maillel",
     "Welcome %(name)s": "Üdv %(name)s",
     "Add a photo so people know it's you.": "Hogy másik megismerhessenek adj hozzá egy fényképet.",
-    "Great, that'll help people know it's you": "Szuper, ez segíteni eldönteni másoknak, hogy te te vagy",
+    "Great, that'll help people know it's you": "Nagyszerű, ez segíteni eldönteni másoknak, hogy tényleg Ön az",
     "Send feedback": "Visszajelzés küldése",
     "PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> to help us track down the problem.": "Tipp: Ha hibajegyet készítesz, légyszíves segíts a probléma feltárásában azzal, hogy elküldöd a <debugLogsLink>részletes naplót</debugLogsLink>.",
     "Please view <existingIssuesLink>existing bugs on Github</existingIssuesLink> first. No match? <newIssueLink>Start a new one</newIssueLink>.": "Először nézd meg, hogy <existingIssuesLink>van-e már jegy róla a Github-on</existingIssuesLink>. Nincs? <newIssueLink>Adj fel egy új jegyet</newIssueLink>.",
@@ -2829,5 +2829,13 @@
     "Grenada": "Grenada",
     "Greenland": "Grönland",
     "Greece": "Görögország",
-    "Gibraltar": "Gibraltár"
+    "Gibraltar": "Gibraltár",
+    "%(creator)s created this DM.": "%(creator)s hozta létre ezt az üzenetet.",
+    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "A szobában lévő üzenetek végpontok között titkosítottak. Ha emberek csatlakoznak, akkor ellenőrizheti őket a profiljukon, csak kattintson a profilképükre.",
+    "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Az üzenetek végpontok között titkosítottak. Ellenőrizze %(displayName)s személyazonosságát a profilján – koppintson a profilképére.",
+    "This is the start of <roomName/>.": "Ez a(z) <roomName/> kezdete.",
+    "Add a photo, so people can easily spot your room.": "Adjon hozzá egy fényképet, hogy könnyen felismerjék a szobáját.",
+    "%(displayName)s created this room.": "%(displayName)s hozta létre ezt a szobát.",
+    "You created this room.": "Ön hozta létre ezt a szobát.",
+    "<a>Add a topic</a> to help people know what it is about.": "<a>Adjon meg egy témát</a>, hogy az emberek tudják, hogy miről van szó."
 }

From 0fa20d150f5effbfc2a03860bf37cb53baf92121 Mon Sep 17 00:00:00 2001
From: Marcelo Filho <marceloaof@protonmail.com>
Date: Wed, 11 Nov 2020 18:27:50 +0000
Subject: [PATCH 108/146] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2642 of 2642 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pt_BR/
---
 src/i18n/strings/pt_BR.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index c1e95d7c0b..11853e6ee4 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -1829,7 +1829,7 @@
     "Change settings": "Alterar configurações",
     "Send %(eventType)s events": "Enviar eventos de %(eventType)s",
     "Roles & Permissions": "Papeis & Permissões",
-    "Select the roles required to change various parts of the room": "Selecione as permissões necessárias para alterar várias partes da sala",
+    "Select the roles required to change various parts of the room": "Selecione os papeis necessários para alterar várias partes da sala",
     "Emoji picker": "Enviar emoji",
     "Room %(name)s": "Sala %(name)s",
     "No recently visited rooms": "Nenhuma sala foi visitada recentemente",
@@ -2769,5 +2769,6 @@
     "Wallis & Futuna": "Wallis e Futuna",
     "Vatican City": "Cidade do Vaticano",
     "Vanuatu": "Vanuatu",
-    "Uzbekistan": "Uzbequistão"
+    "Uzbekistan": "Uzbequistão",
+    "Role": "Função"
 }

From 63624d8e44ad215b92f9ecc68d515d9bb9ec56f6 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 12 Nov 2020 02:45:15 +0000
Subject: [PATCH 109/146] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2642 of 2642 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
---
 src/i18n/strings/zh_Hant.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index dcddb54496..6929c5e95e 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2841,5 +2841,6 @@
     "Only the two of you are in this conversation, unless either of you invites anyone to join.": "除非你們兩個其中一個邀請任何人加入，否則只會有你們兩個在此對話中。",
     "Call Paused": "通話已暫停",
     "Takes the call in the current room off hold": "讓目前聊天室中的通話保持等候接聽的狀態",
-    "Places the call in the current room on hold": "在目前的聊天室撥打通話並等候接聽"
+    "Places the call in the current room on hold": "在目前的聊天室撥打通話並等候接聽",
+    "Role": "角色"
 }

From 58f2e323d495a6afdf758c6b91ba00d4ee3acd8f Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Thu, 12 Nov 2020 02:29:40 +0000
Subject: [PATCH 110/146] Translated using Weblate (Esperanto)

Currently translated at 93.3% (2465 of 2642 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/eo/
---
 src/i18n/strings/eo.json | 109 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 108 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 7157c7db7c..082925c280 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -2538,5 +2538,112 @@
     "Add comment": "Aldoni komenton",
     "Please go into as much detail as you like, so we can track down the problem.": "Bonvolu detaligi tiel multe, kiel vi volas, por ke ni povu pli facile trovi la problemon.",
     "Tell us below how you feel about %(brand)s so far.": "Diru al ni, kion vi ĝis nun pensas pri %(brand)s.",
-    "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Pratipoj de la 2-a versio de komunumoj. Bezonas konforman hejmservilon. Tre eksperimenta – uzu nur zorge."
+    "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Pratipoj de la 2-a versio de komunumoj. Bezonas konforman hejmservilon. Tre eksperimenta – uzu nur zorge.",
+    "Uzbekistan": "Uzbekujo",
+    "United Arab Emirates": "Unuiĝinaj Arabaj Emirlandoj",
+    "Ukraine": "Ukrainujo",
+    "Uganda": "Ugando",
+    "Turkey": "Turkujo",
+    "Tunisia": "Tunizio",
+    "Tajikistan": "Taĝikujo",
+    "Malta": "Malto",
+    "Mali": "Malio",
+    "Maldives": "Maldivoj",
+    "Malaysia": "Malajzio",
+    "Luxembourg": "Luksemburgo",
+    "Lithuania": "Litovujo",
+    "Liechtenstein": "Liĥtenŝtejno",
+    "Latvia": "Latvujo",
+    "Laos": "Laoso",
+    "Kyrgyzstan": "Kirgizujo",
+    "Kosovo": "Kosovo",
+    "Kenya": "Kenjo",
+    "Kazakhstan": "Kazaĥujo",
+    "Japan": "Japanujo",
+    "Jamaica": "Jamajko",
+    "Italy": "Italujo",
+    "Israel": "Israelo",
+    "Isle of Man": "Manksujo",
+    "Ireland": "Irlando",
+    "Iraq": "Irako",
+    "Iran": "Irano",
+    "Indonesia": "Indonezio",
+    "India": "Barato",
+    "Iceland": "Islando",
+    "Hungary": "Hungarujo",
+    "Hong Kong": "Honkongo",
+    "Honduras": "Honduro",
+    "Haiti": "Haitio",
+    "Guatemala": "Gvatemalo",
+    "Grenada": "Grenado",
+    "Greenland": "Gronlando",
+    "Greece": "Grekujo",
+    "Gibraltar": "Ĝibraltaro",
+    "Germany": "Germanujo",
+    "France": "Francujo",
+    "Finland": "Finlando",
+    "Fiji": "Fiĝio",
+    "Ethiopia": "Etiopujo",
+    "Estonia": "Estonujo",
+    "Eritrea": "Eritreo",
+    "Equatorial Guinea": "Ekvatora Gvineo",
+    "El Salvador": "Salvadoro",
+    "Egypt": "Egiptujo",
+    "Ecuador": "Ekvadoro",
+    "Dominican Republic": "Dominika Respubliko",
+    "Dominica": "Dominiko",
+    "Denmark": "Danujo",
+    "Côte d’Ivoire": "Ebur-Bordo",
+    "Czech Republic": "Ĉeĥujo",
+    "Cyprus": "Kipro",
+    "Cuba": "Kubo",
+    "Croatia": "Kroatujo",
+    "Costa Rica": "Kostariko",
+    "Cook Islands": "Insuloj de Cook",
+    "Comoros": "Komoroj",
+    "Colombia": "Kolombio",
+    "Christmas Island": "Kristnaskinsulo",
+    "China": "Ĉinujo",
+    "Chile": "Ĉilio",
+    "Chad": "Ĉado",
+    "Central African Republic": "Centr-Afriko",
+    "Cape Verde": "Kaboverdo",
+    "Canada": "Kanado",
+    "Cameroon": "Kameruno",
+    "Cambodia": "Kamboĝo",
+    "Burundi": "Burundo",
+    "Bulgaria": "Bulgarujo",
+    "Brunei": "Brunejo",
+    "British Virgin Islands": "Britaj Virgulininsuloj",
+    "Brazil": "Brazilo",
+    "Botswana": "Cvanujo",
+    "Bosnia": "Bosnujo",
+    "Bolivia": "Bolivio",
+    "Bhutan": "Butano",
+    "Bermuda": "Bermudo",
+    "Benin": "Benino",
+    "Belize": "Belizo",
+    "Belgium": "Belgujo",
+    "Belarus": "Belorusujo",
+    "Barbados": "Barbado",
+    "Bangladesh": "Bangladeŝo",
+    "Bahrain": "Barejno",
+    "Bahamas": "Bahamoj",
+    "Azerbaijan": "Azerbajĝano",
+    "Austria": "Aŭstrujo",
+    "Australia": "Aŭstralio",
+    "Aruba": "Arubo",
+    "Armenia": "Armenujo",
+    "Argentina": "Argentino",
+    "Antigua & Barbuda": "Antigvo kaj Barbudo",
+    "Antarctica": "Antarkto",
+    "Angola": "Angolo",
+    "Andorra": "Andoro",
+    "American Samoa": "Usona Samoo",
+    "Algeria": "Alĝerio",
+    "Albania": "Albanujo",
+    "Åland Islands": "Alando",
+    "Afghanistan": "Afganujo",
+    "United States": "Usono",
+    "United Kingdom": "Britujo"
 }

From cd95e683a699b8d4d7b92842ea5fc6565afe59c7 Mon Sep 17 00:00:00 2001
From: XoseM <correoxm@disroot.org>
Date: Thu, 12 Nov 2020 07:25:14 +0000
Subject: [PATCH 111/146] Translated using Weblate (Galician)

Currently translated at 100.0% (2642 of 2642 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
---
 src/i18n/strings/gl.json | 207 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 202 insertions(+), 5 deletions(-)

diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 1134f138ea..b6bacfcb07 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -168,7 +168,7 @@
     "Authentication": "Autenticación",
     "Last seen": "Visto por última vez",
     "Failed to set display name": "Fallo ao establecer o nome público",
-    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s  %(fullYear)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
     "Mirror local video feed": "Copiar fonte de vídeo local",
     "Cannot add any more widgets": "Non pode engadir máis trebellos",
     "The maximum permitted number of widgets have already been added to this room.": "Xa se lle engadiron o número máximo de trebellos a esta sala.",
@@ -547,7 +547,7 @@
     "<not supported>": "<non soportado>",
     "Import E2E room keys": "Importar chaves E2E da sala",
     "Cryptography": "Criptografía",
-    "Analytics": "Analytics",
+    "Analytics": "Análise",
     "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s recolle información analítica anónima para permitirnos mellorar a aplicación.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "A intimidade impórtanos, así que non recollemos información personal ou identificable nos datos dos nosos análises.",
     "Learn more about how we use analytics.": "Saber máis sobre como utilizamos analytics.",
@@ -639,7 +639,7 @@
     "Failed to add tag %(tagName)s to room": "Fallo ao engadir a etiqueta %(tagName)s a sala",
     "Key request sent.": "Petición de chave enviada.",
     "Flair": "Popularidade",
-    "Showing flair for these communities:": "Mostrar a popularidade destas comunidades:",
+    "Showing flair for these communities:": "Mostrando a popularidade destas comunidades:",
     "Display your community flair in rooms configured to show it.": "Mostrar a popularidade da túa comunidade nas salas configuradas para que a mostren.",
     "Did you know: you can use communities to filter your %(brand)s experience!": "Sabías que podes usar as comunidades para filtrar a túa experiencia en %(brand)s!",
     "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Para establecer un filtro, arrastra un avatar da comunidade sobre o panel de filtros na parte esquerda da pantalla. Podes premer nun avatar no panel de filtrado en calquera momento para ver só salas e xente asociada a esa comunidade.",
@@ -1884,7 +1884,7 @@
     "Message layout": "Disposición da mensaxe",
     "Compact": "Compacta",
     "Modern": "Moderna",
-    "Power level": "Nivel de permisos",
+    "Power level": "Nivel responsabilidade",
     "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Verifica este dispositivo para marcalo como confiable. Confiando neste dispositivo permite que ti e outras usuarias estedes máis tranquilas ao utilizar mensaxes cifradas.",
     "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Ao verificar este dispositivo marcaralo como confiable, e as usuarias que confiaron en ti tamén confiarán nel.",
     "Waiting for partner to confirm...": "Agardando a que o contacto confirme...",
@@ -2642,5 +2642,202 @@
     "Benin": "Benín",
     "Belize": "Belice",
     "Belgium": "Bélxica",
-    "Belarus": "Belarús"
+    "Belarus": "Belarús",
+    "Places the call in the current room on hold": "Pon en pausa a chamada da sala actual",
+    "Takes the call in the current room off hold": "Acepta a chamada na sala actual",
+    "%(creator)s created this DM.": "%(creator)s creou esta MD.",
+    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "As mensaxes desta sala están cifradas de extremo-a-extremo. Cando se unan, podes verificar as persoas no seu perfil, tocando no seu avatar.",
+    "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Aquí as mensaxes están cifradas de extremo-a-extre. Verifica a %(displayName)s no seu perfil - toca no seu avatar.",
+    "Role": "Rol",
+    "This is the start of <roomName/>.": "Este é o comezo de <roomName/>.",
+    "Add a photo, so people can easily spot your room.": "Engade unha foto para que se poida identificar a sala facilmente.",
+    "%(displayName)s created this room.": "%(displayName)s creou esta sala.",
+    "You created this room.": "Creaches esta sala.",
+    "<a>Add a topic</a> to help people know what it is about.": "<a>Engade un tema</a> para axudarlle á xente que coñeza de que trata.",
+    "Topic: %(topic)s ": "Asunto: %(topic)s ",
+    "Topic: %(topic)s (<a>edit</a>)": "Asunto: %(topic)s (<a>editar</a>)",
+    "This is the beginning of your direct message history with <displayName/>.": "Este é o comezo do teu historial de conversa con <displayName/>.",
+    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Só vós as dúas estades nesta conversa, a non ser que convidedes a alguén máis.",
+    "Call Paused": "Chamada en pausa",
+    "Zimbabwe": "Zimbabue",
+    "Zambia": "Zambia",
+    "Yemen": "Yemen",
+    "Western Sahara": "Sahara Occidental",
+    "Wallis & Futuna": "Wallis & Futuna",
+    "Vietnam": "Vietnam",
+    "Venezuela": "Venezuela",
+    "Vatican City": "Cidade do Vaticano",
+    "Vanuatu": "Vanuatu",
+    "Uzbekistan": "Uzbekistan",
+    "Uruguay": "Uruguai",
+    "United Arab Emirates": "Emiratos Árabes Unidos",
+    "Ukraine": "Ucraína",
+    "Uganda": "Uganda",
+    "U.S. Virgin Islands": "U.S. Virgin Islands",
+    "Tuvalu": "Tuvalu",
+    "Turks & Caicos Islands": "Turks & Caicos Islands",
+    "Turkmenistan": "Turkmenistán",
+    "Turkey": "Turquía",
+    "Tunisia": "Túnez",
+    "Trinidad & Tobago": "Trinidad & Tobago",
+    "Tonga": "Tonga",
+    "Tokelau": "Tokelau",
+    "Togo": "Togo",
+    "Timor-Leste": "Timor-Leste",
+    "Thailand": "Tailandia",
+    "Tanzania": "Tanzania",
+    "Tajikistan": "Tajikistan",
+    "Taiwan": "Taiwan",
+    "São Tomé & Príncipe": "Santo Tomé e Príncipe",
+    "Syria": "Siria",
+    "Switzerland": "Suiza",
+    "Sweden": "Suecia",
+    "Swaziland": "Suazilandia",
+    "Svalbard & Jan Mayen": "Svalbard & Jan Mayen",
+    "Suriname": "Surinam",
+    "Sudan": "Sudán",
+    "St. Vincent & Grenadines": "St. Vincent & Grenadines",
+    "St. Pierre & Miquelon": "St. Pierre & Miquelon",
+    "St. Martin": "St. Martin",
+    "St. Lucia": "St. Lucia",
+    "St. Kitts & Nevis": "St. Kitts & Nevis",
+    "St. Helena": "St. Helena",
+    "St. Barthélemy": "St. Barthélemy",
+    "Sri Lanka": "Sri Lanka",
+    "Spain": "España",
+    "South Sudan": "Sudán do Sur",
+    "South Korea": "Corea do Sur",
+    "South Georgia & South Sandwich Islands": "Illas South Georgia & South Sandwich",
+    "South Africa": "África do Sur",
+    "Somalia": "Somalia",
+    "Solomon Islands": "Illas Salomón",
+    "Slovenia": "Eslovenia",
+    "Slovakia": "Eslovaquia",
+    "Sint Maarten": "Sint Maarten",
+    "Singapore": "Singapur",
+    "Sierra Leone": "Serra Leona",
+    "Seychelles": "Seichelles",
+    "Serbia": "Serbia",
+    "Senegal": "Senegal",
+    "Saudi Arabia": "Arabia Saudita",
+    "San Marino": "San Marino",
+    "Samoa": "Samoa",
+    "Réunion": "Reunión",
+    "Rwanda": "Ruanda",
+    "Russia": "Rusia",
+    "Romania": "Romanía",
+    "Qatar": "Catar",
+    "Puerto Rico": "Porto Rico",
+    "Portugal": "Portugal",
+    "Poland": "Polonia",
+    "Pitcairn Islands": "Illas Pitcairn",
+    "Philippines": "Filipinas",
+    "Peru": "Perú",
+    "Paraguay": "Paraguai",
+    "Papua New Guinea": "Papua Nova Guinea",
+    "Panama": "Panamá",
+    "Palestine": "Palestina",
+    "Palau": "Palau",
+    "Pakistan": "Paquistán",
+    "Oman": "Omán",
+    "Norway": "Noruega",
+    "Northern Mariana Islands": "Illas Marianas do Norte",
+    "North Korea": "Corea do Norte",
+    "Norfolk Island": "Illa Norfolk",
+    "Niue": "Niue",
+    "Nigeria": "Nixeria",
+    "Niger": "Níxer",
+    "Nicaragua": "Nicaragua",
+    "New Zealand": "Nova Zelanda",
+    "New Caledonia": "Nova Caledonia",
+    "Netherlands": "Paises Baixos",
+    "Nepal": "Nepal",
+    "Nauru": "Nauru",
+    "Namibia": "Namibia",
+    "Myanmar": "Myanmar",
+    "Mozambique": "Mozambique",
+    "Morocco": "Marrocos",
+    "Montserrat": "Montserrat",
+    "Montenegro": "Montenegro",
+    "Mongolia": "Mongolia",
+    "Monaco": "Mónaco",
+    "Moldova": "Moldavia",
+    "Micronesia": "Micronesia",
+    "Mexico": "México",
+    "Mayotte": "Mayotte",
+    "Mauritius": "Mauricio",
+    "Mauritania": "Mauritania",
+    "Martinique": "Martinica",
+    "Marshall Islands": "Illas Marshall",
+    "Malta": "Malta",
+    "Mali": "Mali",
+    "Maldives": "Maldivas",
+    "Malaysia": "Malaisia",
+    "Malawi": "Malawi",
+    "Madagascar": "Madagascar",
+    "Macedonia": "Macedonia",
+    "Macau": "Macau",
+    "Luxembourg": "Luxemburgo",
+    "Lithuania": "Lituania",
+    "Liechtenstein": "Liechtenstein",
+    "Libya": "Libia",
+    "Liberia": "Liberia",
+    "Lesotho": "Lesoto",
+    "Lebanon": "Líbano",
+    "Latvia": "Letonia",
+    "Laos": "Laos",
+    "Kyrgyzstan": "Kyrgyzstan",
+    "Kuwait": "Kuwait",
+    "Kosovo": "Kosovo",
+    "Kiribati": "Kiribati",
+    "Kenya": "Kenia",
+    "Kazakhstan": "Kazakhstan",
+    "Jordan": "Xordania",
+    "Jersey": "Jersey",
+    "Japan": "Xapón",
+    "Jamaica": "Xamaica",
+    "Italy": "Italia",
+    "Israel": "Israel",
+    "Isle of Man": "Illa de Man",
+    "Ireland": "Irlanda",
+    "Iraq": "Iraq",
+    "Iran": "Irán",
+    "Indonesia": "Indonesia",
+    "India": "India",
+    "Iceland": "Islandia",
+    "Hungary": "Hungría",
+    "Hong Kong": "Hong Kong",
+    "Honduras": "Honduras",
+    "Heard & McDonald Islands": "Heard & McDonald Islands",
+    "Haiti": "Haiti",
+    "Guyana": "Guyana",
+    "Guinea-Bissau": "Guinea-Bissau",
+    "Guinea": "Guinea",
+    "Guernsey": "Guernsey",
+    "Guatemala": "Guatemala",
+    "Guam": "Goam",
+    "Guadeloupe": "Guadalupe",
+    "Grenada": "Granada",
+    "Greenland": "Groenlandia",
+    "Greece": "Grecia",
+    "Gibraltar": "Xibraltar",
+    "Ghana": "Ghana",
+    "Germany": "Alemaña",
+    "Georgia": "Xeorxia",
+    "Gambia": "Gambia",
+    "Gabon": "Gabón",
+    "French Southern Territories": "French Southern Territories",
+    "French Polynesia": "Polinesia francesa",
+    "French Guiana": "Guaiana Francesa",
+    "France": "Francia",
+    "Finland": "Finlandia",
+    "Fiji": "Fiji",
+    "Faroe Islands": "Illas Feroe",
+    "Falkland Islands": "Illas Falkland",
+    "Ethiopia": "Etiopía",
+    "Estonia": "Estonia",
+    "Eritrea": "Eritrea",
+    "Equatorial Guinea": "Guinea Ecuatorial",
+    "El Salvador": "O Salvador",
+    "Egypt": "Exipto"
 }

From 8d16a08f3459018982f6de92111c84ef1e80146f Mon Sep 17 00:00:00 2001
From: Xose M <xosem@disroot.org>
Date: Thu, 12 Nov 2020 07:24:28 +0000
Subject: [PATCH 112/146] Translated using Weblate (Galician)

Currently translated at 100.0% (2642 of 2642 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
---
 src/i18n/strings/gl.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index b6bacfcb07..f536de32e9 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -169,7 +169,7 @@
     "Last seen": "Visto por última vez",
     "Failed to set display name": "Fallo ao establecer o nome público",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
-    "Mirror local video feed": "Copiar fonte de vídeo local",
+    "Mirror local video feed": "Replicar a fonte de vídeo local",
     "Cannot add any more widgets": "Non pode engadir máis trebellos",
     "The maximum permitted number of widgets have already been added to this room.": "Xa se lle engadiron o número máximo de trebellos a esta sala.",
     "Add a widget": "Engadir un trebello",
@@ -643,7 +643,7 @@
     "Display your community flair in rooms configured to show it.": "Mostrar a popularidade da túa comunidade nas salas configuradas para que a mostren.",
     "Did you know: you can use communities to filter your %(brand)s experience!": "Sabías que podes usar as comunidades para filtrar a túa experiencia en %(brand)s!",
     "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Para establecer un filtro, arrastra un avatar da comunidade sobre o panel de filtros na parte esquerda da pantalla. Podes premer nun avatar no panel de filtrado en calquera momento para ver só salas e xente asociada a esa comunidade.",
-    "Deops user with given id": "Degradar á usuaria con ese ID",
+    "Deops user with given id": "Degrada usuaria co id proporcionado",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Visto por %(displayName)s(%(userName)s en %(dateTime)s",
     "Code": "Código",
     "Unable to join community": "Non te puideches unir a comunidade",

From fa156ad9f8847ec6064af3b338eee8e2fe544116 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Thu, 12 Nov 2020 07:13:46 +0000
Subject: [PATCH 113/146] Translated using Weblate (Bulgarian)

Currently translated at 89.9% (2377 of 2642 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/bg/
---
 src/i18n/strings/bg.json | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 4e4c5c5760..e4010e8b64 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -2503,5 +2503,32 @@
     "Enter a Security Phrase": "Въведете фраза за сигурност",
     "We’ll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": "Ще генерираме ключ за сигурност, който да съхраните на сигурно място, като password manager или сейф.",
     "Generate a Security Key": "Генерирай ключ за сигурност",
-    "Safeguard against losing access to encrypted messages & data by backing up encryption keys on your server.": "Предпазете се от загуба на достъп до шифрованите съобщения и данни като направите резервно копие на ключовете за шифроване върху сървъра."
+    "Safeguard against losing access to encrypted messages & data by backing up encryption keys on your server.": "Предпазете се от загуба на достъп до шифрованите съобщения и данни като направите резервно копие на ключовете за шифроване върху сървъра.",
+    "Now, let's help you get started": "Нека ви помогнем да започнете",
+    "Welcome %(name)s": "Добре дошли, %(name)s",
+    "Add a photo so people know it's you.": "Добавете снимка, за да може другите хора да знаят, че сте вие.",
+    "Great, that'll help people know it's you": "Чудесно, това ще позволи на хората да знаят, че сте вие",
+    "Starting microphone...": "Стартиране на микрофона...",
+    "Starting camera...": "Стартиране на камерата...",
+    "Call connecting...": "Свързване на разговор...",
+    "Calling...": "Звънене...",
+    "You do not have permission to create rooms in this community.": "Нямате привилегии да създавате стаи в тази общност.",
+    "Cannot create rooms in this community": "Не можете да създавате стаи в тази общност",
+    "Community and user menu": "Меню за общността и потребителя",
+    "User settings": "Потребителски настройки",
+    "Community settings": "Настройки на общност",
+    "Failed to find the general chat for this community": "Неуспешно откриване на основния чат за тази общност",
+    "Create community": "Създай общност",
+    "Explore rooms in %(communityName)s": "Преглед на стаи в %(communityName)s",
+    "%(brand)s Android": "%(brand)s за Android",
+    "You have no visible notifications in this room.": "Нямате видими уведомления за тази стая.",
+    "You’re all caught up": "Наваксали сте с всичко",
+    "Attach files from chat or just drag and drop them anywhere in a room.": "Прикачете файлове от чата или ги издърпайте и пуснете в стаята.",
+    "No files visible in this room": "Няма видими файлове в тази стая",
+    "Away": "Отсъства",
+    "%(brand)s iOS": "%(brand)s за iOS",
+    "%(brand)s Desktop": "%(brand)s Desktop",
+    "%(brand)s Web": "Уеб версия на %(brand)s",
+    "Enter the location of your Element Matrix Services homeserver. It may use your own domain name or be a subdomain of <a>element.io</a>.": "Въведете адреса на вашия Element Matrix Services сървър. Той или използва ваш собствен домейн или е поддомейн на <a>element.io</a>.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use %(brand)s with an existing Matrix account on a different homeserver.": "Може да използвате опцията за собствен сървър, за да влезете в друг Matrix сървър, чрез указване на адреса му. Това позволява да използвате %(brand)s с Matrix профил съществуващ на друг сървър."
 }

From a32fba515e519bbff95b3c2a1e502ba98798d1b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Wed, 11 Nov 2020 19:35:27 +0000
Subject: [PATCH 114/146] Translated using Weblate (Estonian)

Currently translated at 100.0% (2642 of 2642 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
---
 src/i18n/strings/et.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 9e9500bad9..fac161e616 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -2839,5 +2839,6 @@
     "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Seni kuni emb-kumb teist kolmandaid osapooli liituma ei kutsu, olete siin vestluses vaid teie kahekesi.",
     "Call Paused": "Kõne on ajutiselt peatatud",
     "Takes the call in the current room off hold": "Võtab selles jututoas ootel oleva kõne",
-    "Places the call in the current room on hold": "Jätab kõne selles jututoas ootele"
+    "Places the call in the current room on hold": "Jätab kõne selles jututoas ootele",
+    "Role": "Roll"
 }

From f1121c1b6e2024afc216459b06d0f9793de11a30 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 12 Nov 2020 11:09:08 +0000
Subject: [PATCH 115/146] Fix vertical centering of the Homepage and button
 layout

---
 res/css/structures/_HomePage.scss | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/res/css/structures/_HomePage.scss b/res/css/structures/_HomePage.scss
index 45aa34d3b5..9f72213d1a 100644
--- a/res/css/structures/_HomePage.scss
+++ b/res/css/structures/_HomePage.scss
@@ -26,9 +26,10 @@ limitations under the License.
 
 .mx_HomePage_default {
     text-align: center;
+    display: flex;
 
     .mx_HomePage_default_wrapper {
-        padding: 25vh 0 12px;
+        margin: auto;
     }
 
     img {
@@ -55,7 +56,7 @@ limitations under the License.
     }
 
     .mx_HomePage_default_buttons {
-        margin: 80px auto 0;
+        margin: 60px auto 0;
         width: fit-content;
 
         .mx_AccessibleButton {
@@ -63,7 +64,7 @@ limitations under the License.
 
             width: 160px;
             height: 132px;
-            margin: 0 20px;
+            margin: 20px;
             position: relative;
             display: inline-block;
             border-radius: 8px;

From 4bcb9323550b4ea242432cdcdc897c61c461b282 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 12 Nov 2020 11:33:44 -0700
Subject: [PATCH 116/146] Update widget-api

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 048edea3fd..620f854be4 100644
--- a/package.json
+++ b/package.json
@@ -79,7 +79,7 @@
     "linkifyjs": "^2.1.9",
     "lodash": "^4.17.19",
     "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
-    "matrix-widget-api": "^0.1.0-beta.5",
+    "matrix-widget-api": "^0.1.0-beta.7",
     "minimist": "^1.2.5",
     "pako": "^1.0.11",
     "parse5": "^5.1.1",
diff --git a/yarn.lock b/yarn.lock
index 23a32280c1..a7b12ad8da 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6532,10 +6532,10 @@ matrix-react-test-utils@^0.2.2:
   resolved "https://registry.yarnpkg.com/matrix-react-test-utils/-/matrix-react-test-utils-0.2.2.tgz#c87144d3b910c7edc544a6699d13c7c2bf02f853"
   integrity sha512-49+7gfV6smvBIVbeloql+37IeWMTD+fiywalwCqk8Dnz53zAFjKSltB3rmWHso1uecLtQEcPtCijfhzcLXAxTQ==
 
-matrix-widget-api@^0.1.0-beta.5:
-  version "0.1.0-beta.5"
-  resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.5.tgz#dd7f24a177aa590d812bd4e92e2c3ac225c5557e"
-  integrity sha512-J3GBJtVMFuEM/EWFylc0IlkPjdgmWxrkGYPaZ0LSmxp+OlNJxYfnWPR6F6HveW+Z8C1i0vq+BTueofSqKv2zDg==
+matrix-widget-api@^0.1.0-beta.7:
+  version "0.1.0-beta.7"
+  resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.7.tgz#36f7ed968fe526b25f95bd643b9ff6e53f718083"
+  integrity sha512-aUyOoCgLs6+6Wxug19npJVMwZl7WCgj2EmXs0mw24bz5zOp5coRyuRvwA1gX0Rqh+AuW4vNcjC+iwwJxuvOQvg==
   dependencies:
     events "^3.2.0"
 

From 1b6e47c01b8596b1c77c116301f27f0cad9ff213 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 12 Nov 2020 11:52:47 -0700
Subject: [PATCH 117/146] Update widget-api again

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 620f854be4..a015728256 100644
--- a/package.json
+++ b/package.json
@@ -79,7 +79,7 @@
     "linkifyjs": "^2.1.9",
     "lodash": "^4.17.19",
     "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
-    "matrix-widget-api": "^0.1.0-beta.7",
+    "matrix-widget-api": "^0.1.0-beta.8",
     "minimist": "^1.2.5",
     "pako": "^1.0.11",
     "parse5": "^5.1.1",
diff --git a/yarn.lock b/yarn.lock
index a7b12ad8da..3c163b7c2f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6532,10 +6532,10 @@ matrix-react-test-utils@^0.2.2:
   resolved "https://registry.yarnpkg.com/matrix-react-test-utils/-/matrix-react-test-utils-0.2.2.tgz#c87144d3b910c7edc544a6699d13c7c2bf02f853"
   integrity sha512-49+7gfV6smvBIVbeloql+37IeWMTD+fiywalwCqk8Dnz53zAFjKSltB3rmWHso1uecLtQEcPtCijfhzcLXAxTQ==
 
-matrix-widget-api@^0.1.0-beta.7:
-  version "0.1.0-beta.7"
-  resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.7.tgz#36f7ed968fe526b25f95bd643b9ff6e53f718083"
-  integrity sha512-aUyOoCgLs6+6Wxug19npJVMwZl7WCgj2EmXs0mw24bz5zOp5coRyuRvwA1gX0Rqh+AuW4vNcjC+iwwJxuvOQvg==
+matrix-widget-api@^0.1.0-beta.8:
+  version "0.1.0-beta.8"
+  resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.8.tgz#17e85c03c46353373890b869b1fd46162bdb0026"
+  integrity sha512-sWqyWs0RQqny/BimZUOxUd9BTJBzQmJlJ1i3lsSh1JBygV+aK5xQsONL97fc4i6/nwQPK72uCVDF+HwTtkpAbQ==
   dependencies:
     events "^3.2.0"
 

From f5676ebd98a4141e2f84ad8dfd04e86dbc01f70e Mon Sep 17 00:00:00 2001
From: notramo <notramo@protonmail.com>
Date: Thu, 12 Nov 2020 18:46:59 +0000
Subject: [PATCH 118/146] Translated using Weblate (Hungarian)

Currently translated at 99.8% (2638 of 2641 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 65 ++++++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 0ecd4db0c3..c0b54941c8 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -281,7 +281,7 @@
     "You are already in a call.": "Már hívásban vagy.",
     "You cannot place a call with yourself.": "Nem hívhatod fel saját magadat.",
     "You cannot place VoIP calls in this browser.": "Nem indíthatsz VoIP hívást ebben a böngészőben.",
-    "You do not have permission to post to this room": "Nincs jogod írni ebben a szobában",
+    "You do not have permission to post to this room": "Nincs jogod üzenetet küldeni ebbe a szobába",
     "You have <a>disabled</a> URL previews by default.": "Az URL előnézet alapból <a>tiltva</a> van.",
     "You have <a>enabled</a> URL previews by default.": "Az URL előnézet alapból <a>engedélyezve</a> van.",
     "You have no visible notifications": "Nincsenek látható értesítéseid",
@@ -379,7 +379,7 @@
     "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Ezzel a folyamattal kimentheted a titkosított szobák üzeneteihez tartozó kulcsokat egy helyi fájlba. Ez után be tudod tölteni ezt a fájlt egy másik Matrix kliensbe, így az a kliens is vissza tudja fejteni az üzeneteket.",
     "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "A kimentett fájlal bárki el tudja olvasni a titkosított üzeneteket amiket te is, ezért tartsd biztonságban. Ehhez segítségül írj be egy jelmondatot amivel a kimentett adatok titkosításra kerülnek. Az adatok betöltése csak a jelmondat megadásával lehetséges később.",
     "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Ezzel a folyamattal lehetőséged van betölteni a titkosítási kulcsokat amiket egy másik Matrix kliensből mentettél ki. Ez után minden üzenetet vissza tudsz fejteni amit a másik kliens tudott.",
-    "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Biztos hogy eltávolítod (törlöd) ezt az eseményt? Figyelem, ha törlöd vagy megváltoztatod a szoba nevét vagy a témát ez a változtatás érvényét vesztheti.",
+    "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Biztos hogy eltávolítod (törlöd) ezt az eseményt? Figyelem, ha törlöd, vagy megváltoztatod a szoba nevét vagy a témát ez a változtatás érvényét vesztheti.",
     "If you have previously used a more recent version of %(brand)s, your session may be incompatible with this version. Close this window and return to the more recent version.": "Ha egy újabb %(brand)s verziót használtál valószínűleg ez kapcsolat nem lesz kompatibilis vele. Zárd be az ablakot és térj vissza az újabb verzióhoz.",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Ha nem állítasz be e-mail címet nem fogod tudni a jelszavadat alaphelyzetbe állítani. Biztos vagy benne?",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Azonosítás céljából egy harmadik félhez leszel irányítva (%(integrationsUrl)s). Folytatod?",
@@ -396,8 +396,8 @@
     "PM": "du.",
     "To get started, please pick a username!": "Az induláshoz válassz egy felhasználói nevet!",
     "Unable to create widget.": "Nem lehet kisalkalmazást létrehozni.",
-    "You are not in this room.": "Nem vagy ebben a szobában.",
-    "You do not have permission to do that in this room.": "Nincs jogod ezt tenni ebben a szobában.",
+    "You are not in this room.": "Nem vagy tagja ennek a szobának.",
+    "You do not have permission to do that in this room.": "Nincs jogsultságod ezt tenni ebben a szobában.",
     "Example": "Példa",
     "Create": "Létrehoz",
     "Featured Rooms:": "Kiemelt szobák:",
@@ -821,7 +821,7 @@
     "Link to selected message": "Hivatkozás a kijelölt üzenetre",
     "COPY": "Másol",
     "Share Message": "Üzenet megosztása",
-    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "Az olyan titkosított szobákban, mint ez is, az URL előnézet alapértelmezetten ki van kapcsolva, hogy biztosított legyen, hogy a Matrix szerver (ahol az előnézet készül) ne tudjon információt gyűjteni arról, hogy milyen linkeket látsz ebben a szobában.",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "A titkosított szobákban, mint például ez is, az URL előnézet alapértelmezetten ki van kapcsolva, hogy biztosított legyen, hogy a Matrix szerver (ahol az előnézet készül) ne tudjon információt gyűjteni arról, hogy milyen linkeket látsz ebben a szobában.",
     "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "Ha valaki URL linket helyez az üzenetébe, lehetőség van egy előnézet megjelenítésére amivel további információt kaphatunk a linkről, mint cím, leírás és a weboldal képe.",
     "The email field must not be blank.": "Az e-mail mező nem lehet üres.",
     "The phone number field must not be blank.": "A telefonszám mező nem lehet üres.",
@@ -850,12 +850,12 @@
     "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please <a>contact your service administrator</a> to continue using the service.": "Az üzeneted nincs elküldve, mert ez a Matrix szerver elérte a havi aktív felhasználói korlátot. A szolgáltatás további igénybevétele végett kérlek <a>vedd fel a kapcsolatot a szolgáltatás adminisztrátorával</a>.",
     "Your message wasn't sent because this homeserver has exceeded a resource limit. Please <a>contact your service administrator</a> to continue using the service.": "Az üzeneted nem került elküldésre mert ez a Matrix szerver túllépte valamelyik erőforrás korlátját. A szolgáltatás további igénybevétele végett kérlek <a>vedd fel a kapcsolatot a szolgáltatás adminisztrátorával</a>.",
     "Please <a>contact your service administrator</a> to continue using this service.": "A szolgáltatás további használatához kérlek <a>vedd fel a kapcsolatot a szolgáltatás adminisztrátorával</a>.",
-    "Sorry, your homeserver is too old to participate in this room.": "Sajnáljuk, a Matrix szervered nem elég friss ahhoz, hogy részt vegyen ebben a szobában.",
+    "Sorry, your homeserver is too old to participate in this room.": "Sajnáljuk, a Matrix szervered túl régi verziójú ahhoz, hogy részt vegyen ebben a szobában.",
     "Please contact your homeserver administrator.": "Kérlek vedd fel a kapcsolatot a Matrix szerver adminisztrátorával.",
     "Legal": "Jogi",
     "This room has been replaced and is no longer active.": "Ezt a szobát lecseréltük és nem aktív többé.",
     "The conversation continues here.": "A beszélgetés itt folytatódik.",
-    "This room is a continuation of another conversation.": "Ebben a szobában folytatódik egy másik beszélgetés.",
+    "This room is a continuation of another conversation.": "Ez a szoba egy másik beszélgetés folytatása.",
     "Click here to see older messages.": "Ide kattintva megnézheted a régi üzeneteket.",
     "Failed to upgrade room": "A szoba fejlesztése sikertelen",
     "The room upgrade could not be completed": "A szoba fejlesztését nem sikerült befejezni",
@@ -992,7 +992,7 @@
     "You've successfully verified this user.": "Sikeresen ellenőrizted ezt a felhasználót.",
     "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Az üzenetek a felhasználóval végponttól végpontig titkosítva vannak és azt más nem tudja elolvasni.",
     "Got It": "Értem",
-    "Verify this user by confirming the following number appears on their screen.": "Ellenőrizd a felhasználót azzal, hogy megerősíted az alábbi számok jelentek meg a képernyőjén.",
+    "Verify this user by confirming the following number appears on their screen.": "Ellenőrizd a felhasználót azáltal, hogy megbizonyosodtok arról, hogy az alábbi számok jelentek meg az ő képernyőjén is.",
     "Yes": "Igen",
     "No": "Nem",
     "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "E-mail üzenetet küldtünk neked, amivel a címedet ellenőrizzük. Kérlek kövesd az ott leírt lépéseket és kattints az alábbi gombra.",
@@ -1047,7 +1047,7 @@
     "Room Name": "Szoba neve",
     "Room Topic": "Szoba témája",
     "Join": "Belép",
-    "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Ellenőrizd ezt a felhasználót, hogy megbízhatónak tekinthessük. Megbízható felhasználók további nyugalmat jelenthetnek ha végpontól végpontig titkosítást használsz.",
+    "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Ellenőrizd ezt a felhasználót, hogy megbízhatónak lehessen tekinteni. Megbízható felhasználók további nyugalmat jelenthetnek ha végpontól végpontig titkosítást használsz.",
     "Waiting for partner to confirm...": "Várakozás a partner megerősítésére...",
     "Incoming Verification Request": "Bejövő Hitelesítési Kérés",
     "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "A duplikált jegyek elkerülése végett kérünk <existingIssuesLink>nézd meg a létező jegyeket</existingIssuesLink> először (és adj neki +1-et) vagy <newIssueLink>készíts egy új jegyet</newIssueLink> ha nem találsz hasonlót.",
@@ -1094,7 +1094,7 @@
     "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s megtiltotta a vendég felhasználóknak, hogy belépjenek a szobába.",
     "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s a vendég felhasználók belépési jogait erre állította át: %(rule)s",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Szobák csoportosítása és szűrése egyedi címkékkel (frissíts, hogy a változások érvényre jussanak)",
-    "Verify this user by confirming the following emoji appear on their screen.": "Hitelesítheted a felhasználót, ha megerősíted, hogy az alábbi emodzsi az ami megjelent a képernyőjén.",
+    "Verify this user by confirming the following emoji appear on their screen.": "Hitelesítheted a felhasználót, ha megerősíted, hogy az alábbi emojikat lehet látni az ő képernyőjén is.",
     "Unable to find a supported verification method.": "Nem található támogatott hitelesítési eljárás.",
     "Dog": "Kutya",
     "Cat": "Macska",
@@ -1191,8 +1191,8 @@
     "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Ha bármilyen hibába botlasz vagy szeretnél visszajelzést küldeni nekünk, kérjük oszd meg velünk a GitHub-on.",
     "Changes your display nickname in the current room only": "Csak ebben a szobában változtatja meg a becenevedet",
     "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s engedélyezte a kitűzőket ebben a szobában az alábbi közösséghez: %(groups)s.",
-    "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s letiltotta a kitűzőket ebben a szobában az alábbi közösséghez: %(groups)s.",
-    "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s engedélyezte a kitűzőket ebben a szobában az alábbi közösséghez: %(newGroups)s és letiltotta ehhez a közösséghez: %(oldGroups)s.",
+    "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s kikapcsolta a kitűzőket ebben a szobában az alábbi közösséghez: %(groups)s.",
+    "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s engedélyezte a kitűzőket ebben a szobában az alábbi közösséghez: %(newGroups)s és kikapcsolta ehhez a közösséghez: %(oldGroups)s.",
     "Show read receipts sent by other users": "Mások által küldött olvasási visszajelzések mutatása",
     "Scissors": "Ollók",
     "Error updating main address": "Az elsődleges cím frissítése sikertelen",
@@ -1823,7 +1823,7 @@
     "Session already verified!": "A munkamenet már ellenőrizve volt!",
     "WARNING: Session already verified, but keys do NOT MATCH!": "FIGYELEM: A munkamenet már ellenőrizve van de a kulcsok NEM EGYEZNEK!",
     "Never send encrypted messages to unverified sessions from this session": "Sose küldj titkosított üzenetet ellenőrizetlen munkamenetbe ebből a munkamenetből",
-    "Never send encrypted messages to unverified sessions in this room from this session": "Sose küldjön titkosított üzeneteket ellenőrizetlen munkamenetekbe ebben a szobában ebből a munkamenetből",
+    "Never send encrypted messages to unverified sessions in this room from this session": "Ebbe a szobába soha ne küldjön titkosított üzeneteket ellenőrizetlen munkamenetek számára ebből a munkamenetből",
     "How fast should messages be downloaded.": "Milyen gyorsan legyenek az üzenetek letöltve.",
     "Waiting for %(displayName)s to verify…": "%(displayName)s felhasználóra várakozás az ellenőrzéshez…",
     "They match": "Egyeznek",
@@ -1896,9 +1896,9 @@
     "Verify session": "Munkamenet ellenőrzése",
     "Session name": "Munkamenet neve",
     "Session key": "Munkamenet kulcs",
-    "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "A felhasználót ellenőrizve a munkamenet megbízhatónak lesz jelölve és ugyanakkor a munkamenetedet is megbízhatónak fogja jelölni náluk.",
-    "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Eszköz ellenőrzése és beállítás megbízhatónak. Az eszközben való megbízás megnyugtató lehet, ha végpontok közötti titkosítást használsz.",
-    "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Az eszköz ellenőrzése megbízhatónak fogja jelezni az eszközt és azok akik téged ellenőriztek megbíznak majd ebben az eszközödben.",
+    "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "A felhasználó ellenőrzése által az ő munkamenete megbízhatónak lesz jelölve, és a te munkameneted is megbízhatónak lesz jelölve nála.",
+    "Verify this device to mark it as trusted. Trusting this device gives you and other users extra peace of mind when using end-to-end encrypted messages.": "Eszköz ellenőrzése és beállítás megbízhatóként. Az eszközben való megbízás megnyugtató lehet, ha végpontok közötti titkosítást használsz.",
+    "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Az eszköz ellenőrzése megbízhatónak fogja jelezni az eszközt és azok a felhasználók, akik téged ellenőriztek, megbíznak majd ebben az eszközödben.",
     "This will allow you to return to your account after signing out, and sign in on other sessions.": "Ezzel visszatérhetsz a fiókodba miután kijelentkeztél majd vissza egy másik munkamenetbe.",
     "Cancel entering passphrase?": "Megszakítod a jelmondat bevitelét?",
     "Recovery key mismatch": "A visszaállítási kulcs nem megfelelő",
@@ -1912,7 +1912,7 @@
     "You have been logged out of all sessions and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "Kijelentkeztettünk minden eszközödből és nem kapsz értesítéseket sem. Az értesítések újra engedélyezéséhez jelentkezz be újra az eszközökön.",
     "Regain access to your account and recover encryption keys stored in this session. Without them, you won’t be able to read all of your secure messages in any session.": "Szerezd vissza a hozzáférést a fiókodhoz és állítsd vissza az elmentett titkosítási kulcsokat ebben a munkamenetben. Ezek nélkül egyetlen munkamenetben sem tudod elolvasni a titkosított üzeneteidet.",
     "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.": "Figyelmeztetés: A személyes adataid (beleértve a titkosító kulcsokat is) továbbra is az eszközön vannak tárolva. Ha az eszközt nem használod tovább vagy másik fiókba szeretnél bejelentkezni, töröld őket.",
-    "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Fejleszd ezt a munkamenetet, hogy más munkamenetet tudj vele hitelesíteni amivel hozzáférnek a titkosított üzenetekhez és megbízhatónak lesznek jelölve más felhasználók számára.",
+    "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Fejleszd ezt a munkamenetet, hogy más munkameneteket is tudj vele hitelesíteni, azért, hogy azok hozzáférhessenek a titkosított üzenetekhez és megbízhatónak legyenek jelölve más felhasználók számára.",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "A másolatot tartsd biztonságos helyen, mint pl. egy jelszókezelő (vagy széf).",
     "Your recovery key": "Visszaállítási kulcsod",
     "Copy": "Másol",
@@ -2013,8 +2013,8 @@
     "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "A nyilvánosságra hozott címeket bárki bármelyik szerveren használhatja a szobádba való belépéshez. A cím közzétételéhez először helyi címnek kell beállítani.",
     "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Állíts be címet ehhez a szobához, hogy a felhasználók a matrix szervereden megtalálhassák (%(localDomain)s)",
     "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "A titkosított szobákban az üzenete biztonságban van, és csak Ön és a címzettek rendelkeznek a visszafejtéshez szükséges egyedi kulcsokkal.",
-    "Verify all users in a room to ensure it's secure.": "Ellenőrizd a szoba összes tagját, hogy meggyőződhess a biztonságról.",
-    "In encrypted rooms, verify all users to ensure it’s secure.": "Titkosított szobákban ellenőrizd a szoba összes tagját, hogy meggyőződhess a biztonságról.",
+    "Verify all users in a room to ensure it's secure.": "Ellenőrizd a szoba összes tagját, hogy meggyőződhess a biztonságról!",
+    "In encrypted rooms, verify all users to ensure it’s secure.": "Titkosított szobákban ellenőrizd a szoba összes tagját, hogy meggyőződhess a biztonságról!",
     "Verified": "Hitelesített",
     "Verification cancelled": "Ellenőrzés megszakítva",
     "Compare emoji": "Emodzsik összehasonlítása",
@@ -2110,9 +2110,9 @@
     "There was a problem communicating with the server. Please try again.": "A szerverrel való kommunikációval probléma történt. Kérlek próbáld újra.",
     "Sign in with SSO": "Belépés SSO-val",
     "Welcome to %(appName)s": "Üdvözöl az %(appName)s",
-    "Liberate your communication": "Szabadítsd fel a kommunikációdat",
-    "Send a Direct Message": "Közvetlen üzenet küldése",
-    "Explore Public Rooms": "Nyilvános szobák felderítése",
+    "Liberate your communication": "Kommunikálj szabadon",
+    "Send a Direct Message": "Személyes üzenet küldése",
+    "Explore Public Rooms": "Nyilvános szobák felfedezése",
     "Create a Group Chat": "Készíts Csoportos Beszélgetést",
     "Self-verification request": "Ön ellenőrzés kérése",
     "Cancel replying to a message": "Üzenet válasz megszakítása",
@@ -2413,14 +2413,14 @@
     "You’re all caught up": "Mindent elolvastál",
     "You have no visible notifications in this room.": "Nincsenek látható értesítéseid ebben a szobában.",
     "%(brand)s Android": "%(brand)s Android",
-    "Explore public rooms": "Nyilvános szobák felderítése",
+    "Explore public rooms": "Nyilvános szobák felfedezése",
     "Unexpected server error trying to leave the room": "Váratlan szerver hiba lépett fel a szobából való kilépés közben",
     "Error leaving room": "A szoba elhagyásakor hiba történt",
     "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Közösségek v2 prototípus. Kompatibilis matrix szervert igényel. Erősen kísérleti állapotban van - körültekintően használd.",
     "Uploading logs": "Napló feltöltése folyamatban",
     "Downloading logs": "Napló letöltése folyamatban",
     "Can't see what you’re looking for?": "Nem találod amit keresel?",
-    "Explore all public rooms": "Fedezd fel a nyilvános szobákat",
+    "Explore all public rooms": "Az összes nyilvános szoba felfedezése",
     "%(count)s results|other": "%(count)s találat",
     "Information": "Információ",
     "Preparing to download logs": "Napló előkészítése feltöltéshez",
@@ -2496,7 +2496,7 @@
     "You don't have permission to remove the call from the room": "A konferencia hívás törléséhez nincs jogosultságod",
     "Start a conversation with someone using their name or username (like <userId/>).": "Indíts beszélgetést valakivel és használd hozzá a nevét vagy a felhasználói nevét (mint <userId/>).",
     "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>": "Ez nem hívja meg őket ebbe a közösségbe: %(communityName)s. Hogy meghívj valakit ebbe a közösségbe: %(communityName)s kattints <a>ide</a>",
-    "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.": "Hívj meg valakit a nevével, felhasználói nevével (pl. <userId/>) vagy <a>oszd meg ezt a szobát</a>.",
+    "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.": "Hívj meg valakit a nevét, vagy felhasználónevét (például <userId/>) megadva, vagy <a>oszd meg ezt a szobát</a>.",
     "Add widgets, bridges & bots": "Widget-ek, hidak, és botok hozzáadása",
     "You can only pin 2 widgets at a time": "Egyszerre csak 2 widget-et lehet kitűzni",
     "Minimize widget": "Widget minimalizálása",
@@ -2561,11 +2561,11 @@
     "Enable desktop notifications": "Asztali értesítések engedélyezése",
     "Don't miss a reply": "Ne szalassz el egy választ se",
     "Now, let's help you get started": "És most segítünk az indulásban",
-    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Hívj meg valakit a nevével, e-mail címéve, felhasználói nevével (pl. <userId/>) vagy <a>oszd meg ezt a szobát</a>.",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Hívj meg valakit a nevét, e-mail címét, vagy felhasználónevét (például <userId/>) megadva, vagy <a>oszd meg ezt a szobát</a>.",
     "Start a conversation with someone using their name, email address or username (like <userId/>).": "Indíts beszélgetést valakivel és használd hozzá a nevét, e-mail címét vagy a felhasználói nevét (mint <userId/>).",
     "Invite by email": "Meghívás e-maillel",
     "Welcome %(name)s": "Üdv %(name)s",
-    "Add a photo so people know it's you.": "Hogy másik megismerhessenek adj hozzá egy fényképet.",
+    "Add a photo so people know it's you.": "Állíts be egy fényképet, hogy mások könnyebben megismerhessenek!",
     "Great, that'll help people know it's you": "Nagyszerű, ez segíteni eldönteni másoknak, hogy tényleg Ön az",
     "Send feedback": "Visszajelzés küldése",
     "PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> to help us track down the problem.": "Tipp: Ha hibajegyet készítesz, légyszíves segíts a probléma feltárásában azzal, hogy elküldöd a <debugLogsLink>részletes naplót</debugLogsLink>.",
@@ -2831,11 +2831,12 @@
     "Greece": "Görögország",
     "Gibraltar": "Gibraltár",
     "%(creator)s created this DM.": "%(creator)s hozta létre ezt az üzenetet.",
-    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "A szobában lévő üzenetek végpontok között titkosítottak. Ha emberek csatlakoznak, akkor ellenőrizheti őket a profiljukon, csak kattintson a profilképükre.",
+    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "A szobában lévő üzenetek végpontok között titkosítottak. Amikor majd csatlakoznak a felhasználók, ellenőrizheted őket a profiljukban, amit a profilképükre kattintással nyithatsz meg.",
     "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Az üzenetek végpontok között titkosítottak. Ellenőrizze %(displayName)s személyazonosságát a profilján – koppintson a profilképére.",
     "This is the start of <roomName/>.": "Ez a(z) <roomName/> kezdete.",
-    "Add a photo, so people can easily spot your room.": "Adjon hozzá egy fényképet, hogy könnyen felismerjék a szobáját.",
-    "%(displayName)s created this room.": "%(displayName)s hozta létre ezt a szobát.",
-    "You created this room.": "Ön hozta létre ezt a szobát.",
-    "<a>Add a topic</a> to help people know what it is about.": "<a>Adjon meg egy témát</a>, hogy az emberek tudják, hogy miről van szó."
+    "Add a photo, so people can easily spot your room.": "Állíts be egy fényképet, hogy az emberek könnyebben felismerjék a szobát!",
+    "%(displayName)s created this room.": "%(displayName)s készítette ezt a szobát.",
+    "You created this room.": "Te készítetted ezt a szobát.",
+    "<a>Add a topic</a> to help people know what it is about.": "<a>Állítsd be a szoba témáját</a>, hogy az emberek tudják, hogy miről van itt szó.",
+    "Topic: %(topic)s ": "Téma: %(topic)s "
 }

From 795a7bfa3349c8288d7fcceeae19ca1de5980779 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Thu, 12 Nov 2020 18:19:54 +0000
Subject: [PATCH 119/146] Translated using Weblate (Esperanto)

Currently translated at 95.1% (2514 of 2641 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/eo/
---
 src/i18n/strings/eo.json | 54 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 53 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 082925c280..3545565fa3 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -2645,5 +2645,57 @@
     "Åland Islands": "Alando",
     "Afghanistan": "Afganujo",
     "United States": "Usono",
-    "United Kingdom": "Britujo"
+    "United Kingdom": "Britujo",
+    "Sri Lanka": "Srilanko",
+    "Spain": "Hispanujo",
+    "South Korea": "Sud-Koreujo",
+    "South Africa": "Sud-Afriko",
+    "Somalia": "Somalujo",
+    "Solomon Islands": "Salomonoj",
+    "Slovenia": "Slovenujo",
+    "Slovakia": "Slovakujo",
+    "Singapore": "Singapuro",
+    "Sierra Leone": "Sieraleono",
+    "Seychelles": "Sejŝeloj",
+    "Serbia": "Serbujo",
+    "Senegal": "Senegalo",
+    "Saudi Arabia": "Sauda Arabujo",
+    "San Marino": "Sanmarino",
+    "Samoa": "Samoo",
+    "Rwanda": "Ruando",
+    "Russia": "Rusujo",
+    "Romania": "Rumanujo",
+    "Qatar": "Kataro",
+    "Puerto Rico": "Portoriko",
+    "Portugal": "Portugalujo",
+    "Poland": "Polujo",
+    "Philippines": "Filipinoj",
+    "Peru": "Peruo",
+    "Paraguay": "Paragvajo",
+    "Papua New Guinea": "Papuo-Nov-Gvineo",
+    "Panama": "Panamo",
+    "Palestine": "Palestino",
+    "Palau": "Palaŭo",
+    "Pakistan": "Pakistano",
+    "Oman": "Omano",
+    "Norway": "Norvegujo",
+    "North Korea": "Nord-Koreujo",
+    "Niue": "Niuo",
+    "Nigeria": "Niĝerio",
+    "Niger": "Niĝero",
+    "New Zealand": "Nov-Zelando",
+    "New Caledonia": "Nova Kaledonio",
+    "Netherlands": "Nederlando",
+    "Nepal": "Nepalo",
+    "Nauru": "Nauro",
+    "Namibia": "Namibio",
+    "Myanmar": "Birmo",
+    "Mozambique": "Mozambiko",
+    "Morocco": "Maroko",
+    "Montserrat": "Moncerato",
+    "Montenegro": "Montenegro",
+    "Caribbean Netherlands": "Kariba Nederlando",
+    "Burkina Faso": "Burkino",
+    "Bouvet Island": "Buvet-Insulo",
+    "Anguilla": "Angvilo"
 }

From 8ab4ffce63b89b23f0765cd714086d0379c172ae Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Thu, 12 Nov 2020 11:59:09 +0000
Subject: [PATCH 120/146] Translated using Weblate (Italian)

Currently translated at 100.0% (2641 of 2641 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
---
 src/i18n/strings/it.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 4df5fd0a39..c0f6fecfea 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2841,5 +2841,8 @@
     "Åland Islands": "Isole Åland",
     "Afghanistan": "Afghanistan",
     "United States": "Stati Uniti",
-    "United Kingdom": "Regno Unito"
+    "United Kingdom": "Regno Unito",
+    "Role": "Ruolo",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|one": "Salva in cache i messaggi cifrati localmente in modo che appaiano nei risultati di ricerca, usando %(size)s per salvarli da %(count)s stanza.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|other": "Salva in cache i messaggi cifrati localmente in modo che appaiano nei risultati di ricerca, usando %(size)s per salvarli da %(count)s stanze."
 }

From fca979a4b27cde802a65f71f06ed0e5fef4178f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Thu, 12 Nov 2020 10:59:56 +0000
Subject: [PATCH 121/146] Translated using Weblate (Estonian)

Currently translated at 100.0% (2641 of 2641 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
---
 src/i18n/strings/et.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index fac161e616..5546fa2b36 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -2840,5 +2840,7 @@
     "Call Paused": "Kõne on ajutiselt peatatud",
     "Takes the call in the current room off hold": "Võtab selles jututoas ootel oleva kõne",
     "Places the call in the current room on hold": "Jätab kõne selles jututoas ootele",
-    "Role": "Roll"
+    "Role": "Roll",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|one": "Selleks, et sisu saaks otsingus kasutada, puhverda krüptitud sõnumid kohalikus seadmes turvaliselt. %(count)s jututoa andmete salvestamiseks kulub hetkel %(size)s.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|other": "Selleks, et sisu saaks otsingus kasutada, puhverda krüptitud sõnumid kohalikus seadmes turvaliselt. %(count)s jututoa andmete salvestamiseks kulub hetkel %(size)s."
 }

From 75888fb7b63d03809a3263a74148bf837f1a27dc Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 13 Nov 2020 00:16:58 +0000
Subject: [PATCH 122/146] Fix BaseAvatar sometimes messing up and duplicating
 the url

---
 src/components/views/avatars/BaseAvatar.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/views/avatars/BaseAvatar.tsx b/src/components/views/avatars/BaseAvatar.tsx
index 245c50576a..799a559263 100644
--- a/src/components/views/avatars/BaseAvatar.tsx
+++ b/src/components/views/avatars/BaseAvatar.tsx
@@ -51,7 +51,8 @@ const calculateUrls = (url, urls) => {
         _urls = urls || [];
 
         if (url) {
-            _urls.unshift(url); // put in urls[0]
+            // copy urls and put url first
+            _urls = [url, ..._urls];
         }
     }
 

From 3545fb3b652bc546fc6bb361515ed0849d05b878 Mon Sep 17 00:00:00 2001
From: notramo <notramo@protonmail.com>
Date: Thu, 12 Nov 2020 21:28:46 +0000
Subject: [PATCH 123/146] Translated using Weblate (Hungarian)

Currently translated at 99.8% (2638 of 2641 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index c0b54941c8..3759725354 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -69,7 +69,7 @@
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s megváltoztatta a témát erre \"%(topic)s\".",
     "Changes your display nickname": "Megváltoztatja a becenevedet",
     "Click here to fix": "A javításhoz kattints ide",
-    "Click to mute audio": "Hang némításhoz kattints ide",
+    "Click to mute audio": "Hang némításához kattints ide",
     "Click to mute video": "A videó kikapcsoláshoz kattints ide",
     "click to reveal": "Megjelenítéshez kattints ide",
     "Click to unmute video": "Videó bekapcsoláshoz kattints ide",
@@ -183,7 +183,7 @@
     "Passwords can't be empty": "A jelszó nem lehet üres",
     "Permissions": "Jogosultságok",
     "Phone": "Telefon",
-    "Please check your email and click on the link it contains. Once this is done, click continue.": "Ellenőrizd az e-mail-edet és kattints a benne lévő linkre. Ha ez megvan, kattints a folytatásra.",
+    "Please check your email and click on the link it contains. Once this is done, click continue.": "Ellenőrizd az e-mail-edet és kattints a benne lévő linkre! Ha ez megvan, kattints a folytatásra!",
     "Power level must be positive integer.": "A szintnek pozitív egésznek kell lennie.",
     "Private Chat": "Privát csevegés",
     "Privileged Users": "Privilegizált felhasználók",
@@ -573,7 +573,7 @@
     "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s megváltoztatta az avatarját",
     "%(items)s and %(count)s others|other": "%(items)s és még %(count)s másik",
     "%(items)s and %(count)s others|one": "%(items)s és még egy másik",
-    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Az e-mail leküldésre került ide: %(emailAddress)s. Ha követte a levélben lévő linket kattints alább.",
+    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Az e-mail leküldésre került ide: %(emailAddress)s. Ha megnyitottad az abban lévő linket, kattints alább.",
     "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "%(roomName)s szoba láthatóságát nem lehet frissíteni ebben a közösségben: %(groupId)s.",
     "Visibility in Room List": "Láthatóság a szoba listában",
     "Visible to everyone": "Mindenki számára látható",
@@ -685,7 +685,7 @@
     "Resend": "Küldés újra",
     "Room not found": "A szoba nem található",
     "Messages containing my display name": "A profilnevemet tartalmazó üzenetek",
-    "Messages in one-to-one chats": "Személyes beszélgetések üzenetei",
+    "Messages in one-to-one chats": "Közvetlen beszélgetések üzenetei",
     "Unavailable": "Elérhetetlen",
     "View Decrypted Source": "Visszafejtett forrás megjelenítése",
     "Failed to update keywords": "Nem lehet frissíteni a kulcsszavakat",
@@ -1369,7 +1369,7 @@
     "Upload all": "Mindet feltölt",
     "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Az új (%(newAccountId)s) fiókod elkészült, de jelenleg egy másik fiókba (%(loggedInUserId)s) vagy bejelentkezve.",
     "Continue with previous account": "Folytatás az előző fiókkal",
-    "Edited at %(date)s. Click to view edits.": "Szerkesztve ekkor: %(date)s. A szerkesztések megtekintéséhez kattints.",
+    "Edited at %(date)s. Click to view edits.": "Szerkesztve ekkor: %(date)s. A szerkesztések megtekintéséhez kattints!",
     "Message edits": "Üzenet szerkesztések",
     "Upgrading this room requires closing down the current instance of the room and creating a new room in its place. To give room members the best possible experience, we will:": "A szoba frissítéséhez be kell zárnod ezt a szobát és egy újat kell nyitnod e helyett. A szoba tagjainak a legjobb felhasználói élmény nyújtásához az alábbit fogjuk tenni:",
     "Loading room preview": "Szoba előnézetének a betöltése",
@@ -1862,7 +1862,7 @@
     "This user has not verified all of their sessions.": "Ez a felhasználó még nem ellenőrizte az összes munkamenetét.",
     "You have not verified this user.": "Még nem ellenőrizted ezt a felhasználót.",
     "You have verified this user. This user has verified all of their sessions.": "Ezt a felhasználót ellenőrizted. Ez a felhasználó hitelesítette az összes munkamenetét.",
-    "Someone is using an unknown session": "Valaki ismeretlen munkamenetet használ",
+    "Someone is using an unknown session": "Valaki ellenőrizetlen munkamenetet használ",
     "Mod": "Mod",
     "Your key share request has been sent - please check your other sessions for key share requests.": "A kulcs megosztás kérésed el lett küldve - ellenőrizd a többi munkamenetedet a kulcskérések után.",
     "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.": "Kulcs megosztás kérés automatikusan el lett küldve neked a másik munkamenetekből. Ha elutasítottad vagy bezártad a kérést másik munkamenetedben, ide kattintva újrakérheted őket ehhez a munkamenethez.",
@@ -2111,7 +2111,7 @@
     "Sign in with SSO": "Belépés SSO-val",
     "Welcome to %(appName)s": "Üdvözöl az %(appName)s",
     "Liberate your communication": "Kommunikálj szabadon",
-    "Send a Direct Message": "Személyes üzenet küldése",
+    "Send a Direct Message": "Közvetlen üzenet küldése",
     "Explore Public Rooms": "Nyilvános szobák felfedezése",
     "Create a Group Chat": "Készíts Csoportos Beszélgetést",
     "Self-verification request": "Ön ellenőrzés kérése",
@@ -2181,7 +2181,7 @@
     "QR Code": "QR kód",
     "To continue, use Single Sign On to prove your identity.": "A folytatáshoz a személyazonosságod megerősítéséhez használd az egyszeri bejelentkezést.",
     "Confirm to continue": "Erősítsd meg a továbblépéshez",
-    "Click the button below to confirm your identity.": "A személyazonosságod megerősítéséhez kattints az alábbi gombra.",
+    "Click the button below to confirm your identity.": "A személyazonosságod megerősítéséhez kattints a lenti gombra!",
     "Confirm encryption setup": "Erősítsd meg a titkosítási beállításokat",
     "Click the button below to confirm setting up encryption.": "Az alábbi gomb megnyomásával erősítsd meg, hogy megadod a titkosítási beállításokat.",
     "Dismiss read marker and jump to bottom": "Az olvasottak jel eltűntetése és ugrás a végére",
@@ -2449,7 +2449,7 @@
     "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Privát szobák csak meghívóval találhatók meg és meghívóval lehet belépni. A nyilvános szobákat a közösség bármely tagja megtalálhatja és be is léphet.",
     "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Beállíthatod, ha a szobát csak egy belső csoport használja majd a matrix szervereden. Ezt később nem lehet megváltoztatni.",
     "You might disable this if the room will be used for collaborating with external teams who have their own homeserver. This cannot be changed later.": "Ne engedélyezd ezt, ha a szobát külső csapat is használja másik matrix szerverről. Később nem lehet megváltoztatni.",
-    "Block anyone not part of %(serverName)s from ever joining this room.": "A szobába való belépés megtagadása mindenkitől ki nem ezt a matrix szervert használja: %(serverName)s.",
+    "Block anyone not part of %(serverName)s from ever joining this room.": "A szobába ne léphessenek be azok, akik nem ezen a szerveren vannak: %(serverName)s.",
     "There was an error updating your community. The server is unable to process your request.": "A közösség módosításakor hiba történt. A szerver nem tudja feldolgozni a kérést.",
     "Update community": "Közösség módosítása",
     "May include members not in %(communityName)s": "Olyan tagok is lehetnek akik nincsenek ebben a közösségben: %(communityName)s",
@@ -2831,7 +2831,7 @@
     "Greece": "Görögország",
     "Gibraltar": "Gibraltár",
     "%(creator)s created this DM.": "%(creator)s hozta létre ezt az üzenetet.",
-    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "A szobában lévő üzenetek végpontok között titkosítottak. Amikor majd csatlakoznak a felhasználók, ellenőrizheted őket a profiljukban, amit a profilképükre kattintással nyithatsz meg.",
+    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "A szobában lévő üzenetek végpontok között titkosítottak. Miután csatlakoztak a felhasználók, ellenőrizheted őket a profiljukban, amit a profilképükre kattintással nyithatsz meg.",
     "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Az üzenetek végpontok között titkosítottak. Ellenőrizze %(displayName)s személyazonosságát a profilján – koppintson a profilképére.",
     "This is the start of <roomName/>.": "Ez a(z) <roomName/> kezdete.",
     "Add a photo, so people can easily spot your room.": "Állíts be egy fényképet, hogy az emberek könnyebben felismerjék a szobát!",

From dd5ca31a5bebf5e8a11a99dc5ba70955afc3afd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20Mesk=C3=B3?= <meskobalazs@gmail.com>
Date: Thu, 12 Nov 2020 21:02:38 +0000
Subject: [PATCH 124/146] Translated using Weblate (Hungarian)

Currently translated at 99.8% (2638 of 2641 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 174 +++++++++++++++++++--------------------
 1 file changed, 87 insertions(+), 87 deletions(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 3759725354..8dbac80bc3 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -20,14 +20,14 @@
     "Account": "Fiók",
     "Access Token:": "Elérési kulcs:",
     "Active call (%(roomName)s)": "Hívás folyamatban (%(roomName)s)",
-    "Add": "Hozzáad",
+    "Add": "Hozzáadás",
     "Add a topic": "Téma megadása",
     "Admin": "Admin",
     "Admin Tools": "Admin. Eszközök",
     "No Microphones detected": "Nem található mikrofon",
     "No Webcams detected": "Nem található webkamera",
     "No media permissions": "Nincs media jogosultság",
-    "You may need to manually permit %(brand)s to access your microphone/webcam": "Lehet hogy manuálisan kell engedélyezned a %(brand)s-nak a hozzáférést a mikrofonhoz ás webkamerához",
+    "You may need to manually permit %(brand)s to access your microphone/webcam": "Lehet hogy kézileg kell engedélyeznie a %(brand)snak, hogy hozzáférjen a mikrofonjához és webkamerájához",
     "Default Device": "Alapértelmezett eszköz",
     "Microphone": "Mikrofon",
     "Camera": "Kamera",
@@ -50,12 +50,12 @@
     "Anyone who knows the room's link, apart from guests": "A vendégeken kívül bárki aki ismeri a szoba link-jét",
     "Anyone who knows the room's link, including guests": "Bárki aki tudja a szoba link-jét, még a vendégek is",
     "Are you sure?": "Biztos?",
-    "Are you sure you want to leave the room '%(roomName)s'?": "Biztos elhagyod a szobát '%(roomName)s'?",
-    "Are you sure you want to reject the invitation?": "Biztos elutasítod a meghívást?",
+    "Are you sure you want to leave the room '%(roomName)s'?": "Biztos, hogy elhagyja a(z) „%(roomName)s” szobát?",
+    "Are you sure you want to reject the invitation?": "Biztos, hogy elutasítja a meghívást?",
     "Attachment": "Csatolmány",
     "Autoplay GIFs and videos": "GIF-ek és videók automatikus lejátszása",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s kitiltotta őt: %(targetName)s.",
-    "Ban": "Kitilt",
+    "Ban": "Kitiltás",
     "Banned users": "Kitiltott felhasználók",
     "Bans user with given id": "Kitiltja a megadott azonosítójú felhasználót",
     "Call Timeout": "Hívás időtúllépés",
@@ -108,7 +108,7 @@
     "Failed to kick": "Kirúgás nem sikerült",
     "Failed to leave room": "A szobát nem sikerült elhagyni",
     "Failed to load timeline position": "Az idővonal pozíciót nem sikerült betölteni",
-    "Failed to mute user": "A felhasználót nem sikerült hallgatásra bírni",
+    "Failed to mute user": "A felhasználót némítása sikertelen",
     "Failed to reject invite": "A meghívót nem sikerült elutasítani",
     "Failed to reject invitation": "A meghívót nem sikerült elutasítani",
     "Failed to send email": "E-mail nem sikerült elküldeni",
@@ -128,8 +128,8 @@
     "Hangup": "Megszakít",
     "Historical": "Archív",
     "Home": "Kezdőlap",
-    "Homeserver is": "Matrix szerver:",
-    "Identity Server is": "Azonosítási szerver:",
+    "Homeserver is": "Matrix-kiszolgáló:",
+    "Identity Server is": "Azonosítási kiszolgáló:",
     "I have verified my email address": "Ellenőriztem az e-mail címemet",
     "Import": "Betöltés",
     "Import E2E room keys": "E2E szoba kulcsok betöltése",
@@ -138,7 +138,7 @@
     "Incoming voice call from %(name)s": "Bejövő hívás: %(name)s",
     "Incorrect username and/or password.": "Helytelen felhasználó és/vagy jelszó.",
     "Incorrect verification code": "Hibás azonosítási kód",
-    "Invalid Email Address": "Hibás e-mail cím",
+    "Invalid Email Address": "Érvénytelen e-mail-cím",
     "Invalid file%(extra)s": "Hibás fájl%(extra)s",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s meghívta: %(targetName)s.",
     "Invited": "Meghívva",
@@ -159,7 +159,7 @@
     "Logout": "Kilép",
     "Low priority": "Alacsony prioritás",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s láthatóvá tette a szoba új üzeneteit nekik minden szoba tagnak, a meghívásuk idejétől kezdve.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s láthatóvá tette a szoba új üzeneteit minden szoba tagnak, a csatlakozásuk idejétől kezdve.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s láthatóvá tette a szoba új üzeneteit minden szobatagnak, a csatlakozásuk idejétől kezdve.",
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s láthatóvá tette a szoba új üzeneteit minden szoba tagnak.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s mindenki számára láthatóvá tette a szoba új üzeneteit.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s elérhetővé tette a szoba új üzeneteit nekik ismeretlen (%(visibility)s).",
@@ -214,19 +214,19 @@
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s képet küldött.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s meghívót küldött %(targetDisplayName)s felhasználónak, hogy lépjen be a szobába.",
     "Server error": "Szerver hiba",
-    "Server may be unavailable, overloaded, or search timed out :(": "A szerver elérhetetlen, túlterhelt vagy a keresés túllépte az időkorlátot :(",
+    "Server may be unavailable, overloaded, or search timed out :(": "A kiszolgáló elérhetetlen, túlterhelt vagy a keresés túllépte az időkorlátot :(",
     "Server may be unavailable, overloaded, or you hit a bug.": "A kiszolgáló elérhetetlen, túlterhelt vagy hibára futott.",
     "Server unavailable, overloaded, or something else went wrong.": "A szerver elérhetetlen, túlterhelt vagy valami más probléma van.",
     "Session ID": "Kapcsolat azonosító",
     "%(senderName)s set a profile picture.": "%(senderName)s profil képet állított be.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s a megjelenítési nevét megváltoztatta erre: %(displayName)s.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s erre változtatta a megjelenítési nevét: %(displayName)s.",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Az időbélyegek 12 órás formátumban mutatása (pl.: 2:30pm)",
     "Signed Out": "Kijelentkezett",
     "Sign in": "Bejelentkezés",
     "Sign out": "Kijelentkezés",
-    "%(count)s of your messages have not been sent.|other": "Néhány üzeneted nem lett elküldve.",
+    "%(count)s of your messages have not been sent.|other": "Néhány üzenete nem lett elküldve.",
     "Someone": "Valaki",
-    "Start authentication": "Azonosítás indítása",
+    "Start authentication": "Hitelesítés indítása",
     "Submit": "Elküld",
     "Success": "Sikeres",
     "The phone number entered looks invalid": "A megadott telefonszám érvénytelennek tűnik",
@@ -251,7 +251,7 @@
     "Unable to capture screen": "A képernyő felvétele sikertelen",
     "Unable to enable Notifications": "Az értesítések engedélyezése sikertelen",
     "unknown caller": "ismeretlen hívó",
-    "Unmute": "Némítás kikapcsolása",
+    "Unmute": "Némítás visszavonása",
     "Unnamed Room": "Névtelen szoba",
     "Uploading %(filename)s and %(count)s others|zero": "%(filename)s feltöltése",
     "Uploading %(filename)s and %(count)s others|one": "%(filename)s és még %(count)s db másik feltöltése",
@@ -443,7 +443,7 @@
     "Failed to add the following rooms to %(groupId)s:": "A következő szobák hozzáadása a(z) %(groupId)s csoporthoz sikertelen:",
     "Matrix ID": "Matrix azonosító",
     "Matrix Room ID": "Szoba Matrix azonosító",
-    "email address": "E-mail cím",
+    "email address": "E-mail-cím",
     "Try using one of the following valid address types: %(validTypesList)s.": "Próbálja meg valamelyik érvényes címtípust: %(validTypesList)s.",
     "You have entered an invalid address.": "Érvénytelen címet adtál meg.",
     "Failed to remove '%(roomName)s' from %(groupId)s": "A(z) %(groupId)s csoportból nem sikerült törölni: %(roomName)s",
@@ -456,13 +456,13 @@
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Figyelem: minden személy akit hozzáadsz a közösséghez mindenki számára látható lesz, aki ismeri a közösség azonosítóját",
     "Invite new community members": "Új tagok meghívása a közösségbe",
     "Invite to Community": "Meghívás a közösségbe",
-    "Which rooms would you like to add to this community?": "Melyik szobákat szeretnéd hozzáadni a közösséghez?",
+    "Which rooms would you like to add to this community?": "Mely szobákat szeretné hozzáadni a közösséghez?",
     "Add rooms to the community": "Szobák hozzáadása a közösséghez",
     "Add to community": "Hozzáadás a közösséghez",
     "Failed to invite users to community": "A felhasználók meghívása a közösségbe sikertelen",
     "Communities": "Közösségek",
     "Unpin Message": "Üzenet levétele",
-    "Jump to message": "Üzenetre ugrás",
+    "Jump to message": "Ugrás az üzenetre",
     "No pinned messages.": "Nincsenek kitűzött üzenetek.",
     "Loading...": "Betöltés...",
     "Unnamed room": "Névtelen szoba",
@@ -501,10 +501,10 @@
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Készíts közösséget hogy egybegyűjtsd a felhasználókat és szobákat! Készíts egy saját kezdőlapot amivel meghatározhatod magad a Matrix univerzumában.",
     "And %(count)s more...|other": "És még %(count)s...",
     "Something went wrong whilst creating your community": "Valami nem sikerült a közösség létrehozásánál",
-    "Mention": "Említ",
+    "Mention": "Megemlítés",
     "Invite": "Meghív",
     "Delete Widget": "Kisalkalmazás törlése",
-    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "A kisalkalmazás törlése minden felhasználót érint a szobában. Tényleg törölni szeretnéd?",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "A kisalkalmazás törlése minden felhasználót érint a szobában. Biztos, hogy törölni akarja?",
     "Mirror local video feed": "Helyi videó folyam tükrözése",
     "Failed to withdraw invitation": "Nem sikerült visszavonni a meghívót",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "A közösségi azonosítók csak az alábbi karaktereket tartalmazhatják: a-z, 0-9 vagy '=_-./'",
@@ -544,7 +544,7 @@
     "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s %(count)s alkalommal elutasította a meghívóit",
     "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s elutasította a meghívóit",
     "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s meghívóit %(count)s alkalommal visszavonták",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)s visszavonták a meghívóit",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)s visszavonták a meghívásukat",
     "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)s meghívóit %(count)s alkalommal vonták vissza",
     "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)s meghívóit visszavonták",
     "were invited %(count)s times|other": "%(count)s alkalommal lett meghívva",
@@ -722,7 +722,7 @@
     "I understand the risks and wish to continue": "Megértettem a kockázatot és folytatom",
     "Direct Chat": "Közvetlen csevegés",
     "The server may be unavailable or overloaded": "A szerver nem elérhető vagy túlterhelt",
-    "Reject": "Elutasít",
+    "Reject": "Elutasítás",
     "Failed to set Direct Message status of room": "Nem lehet beállítani a szoba közvetlen beszélgetés státuszát",
     "Monday": "Hétfő",
     "All messages (noisy)": "Minden üzenet (hangos)",
@@ -795,14 +795,14 @@
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "A böngésződ tárhelyének a törlése megoldhatja a problémát, de ezzel kijelentkezel és a titkosított beszélgetések előzményei olvashatatlanná válnak.",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Nem lehet betölteni azt az eseményt amire válaszoltál, mert vagy nem létezik, vagy nincs jogod megnézni.",
     "Collapse Reply Thread": "Beszélgetés szál becsukása",
-    "Enable widget screenshots on supported widgets": "Ahol az a kisalkalmazásban támogatott ott képernyőkép készítés engedélyezése",
+    "Enable widget screenshots on supported widgets": "Ahol az a kisalkalmazásban támogatott, ott engedélyezze a képernyőképeket",
     "Send analytics data": "Analitikai adatok küldése",
     "Muted Users": "Elnémított felhasználók",
     "Terms and Conditions": "Általános Szerződési Feltételek",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "A %(homeserverDomain)s szerver használatának folytatásához el kell olvasnod és el kell fogadnod az általános szerződési feltételeket.",
     "Review terms and conditions": "Általános Szerződési Feltételek elolvasása",
     "To continue, please enter your password:": "Folytatáshoz add meg a jelszavad:",
-    "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Ez végleg használhatatlanná teszi a fiókodat. Ezután nem fogsz tudni bejelentkezni, és más sem tud majd ezzel az azonosítóval fiókot létrehozni. Minden szobából amibe beléptél ki fogsz lépni, és törölni fogja minden fiók adatod az személyazonosságod biztosító szerverről. <b>Ez a művelet visszafordíthatatlan.</b>",
+    "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Ez végleg használhatatlanná teszi a fiókját. Ezután nem fog tudni bejelentkezni, és más sem tud majd ezzel az azonosítóval fiókot létrehozni. Minden szobából amibe belépett ki fogsz lépni, és törölni fogja minden fiókadatát az azonosítási kiszolgálóról. <b>Ez a művelet visszafordíthatatlan.</b>",
     "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "A fiókod felfüggesztése <b>nem jelenti alapértelmezetten azt, hogy az általad küldött üzenetek elfelejtődnek.</b> Ha törölni szeretnéd az általad küldött üzeneteket, pipáld be a jelölőnégyzetet alul.",
     "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Az üzenetek láthatósága a Matrix-ban hasonlít az emailhez. Az általad küldött üzenet törlése azt jelenti, hogy nem osztjuk meg új-, vagy vendég felhasználóval de a már regisztrált felhasználók akik már hozzáfértek az üzenethez továbbra is elérik a saját másolatukat.",
     "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Kérlek töröld az összes általam küldött üzenetet amikor a fiókomat felfüggesztem (<b>Figyelem:</b> ez azt eredményezheti, hogy a jövőbeni felhasználók csak részleges beszélgetést látnak majd)",
@@ -834,7 +834,7 @@
     "This event could not be displayed": "Az eseményt nem lehet megjeleníteni",
     "Permission Required": "Jogosultság szükséges",
     "You do not have permission to start a conference call in this room": "Nincs jogosultságod konferencia hívást kezdeményezni ebben a szobában",
-    "A call is currently being placed!": "A hívás indítás alatt!",
+    "A call is currently being placed!": "A hívás indítás alatt van!",
     "Failed to remove widget": "A kisalkalmazás törlése sikertelen",
     "An error ocurred whilst trying to remove the widget from the room": "A kisalkalmazás szobából való törlése közben hiba történt",
     "System Alerts": "Rendszer figyelmeztetések",
@@ -868,7 +868,7 @@
     "%(brand)s now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "3-, 5-ször kevesebb memóriát használ a %(brand)s azzal, hogy csak akkor tölti be az információkat a felhasználókról amikor arra szükség van. Kérlek várd meg amíg újraszinkronizáljuk a szerverrel!",
     "Updating %(brand)s": "%(brand)s frissítése",
     "You've previously used %(brand)s on %(host)s with lazy loading of members enabled. In this version lazy loading is disabled. As the local cache is not compatible between these two settings, %(brand)s needs to resync your account.": "Előzőleg a szoba tagság késleltetett betöltésének engedélyével itt használtad a %(brand)sot: %(host)s. Ebben a verzióban viszont a késleltetett betöltés nem engedélyezett. Mivel a két gyorsítótár nem kompatibilis egymással így %(brand)snak újra kell szinkronizálnia a fiókot.",
-    "If the other version of %(brand)s is still open in another tab, please close it as using %(brand)s on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Ha a másik %(brand)s verzió fut még egy másik fülön, kérlek zárd be, mivel ha ugyanott használod a %(brand)sot bekapcsolt késleltetett betöltéssel és kikapcsolva is akkor problémák adódhatnak.",
+    "If the other version of %(brand)s is still open in another tab, please close it as using %(brand)s on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Ha a másik %(brand)s verzió még fut egy másik fülön, akkor zárja be, mert ha egy gépen használja a %(brand)sot úgy, hogy az egyiken be van kapcsolva a késleltetett betöltés, a másikon pedig ki, akkor problémák adódhatnak.",
     "Incompatible local cache": "A helyi gyorsítótár nem kompatibilis ezzel a verzióval",
     "Clear cache and resync": "Gyorsítótár törlése és újraszinkronizálás",
     "Please review and accept the policies of this homeserver:": "Kérlek nézd át és fogadd el a Matrix szerver felhasználói feltételeit:",
@@ -919,8 +919,8 @@
     "Capitalization doesn't help very much": "A nagybetűk nem igazán segítenek",
     "All-uppercase is almost as easy to guess as all-lowercase": "A csupa nagybetűset majdnem olyan könnyű kitalálni mint a csupa kisbetűset",
     "Reversed words aren't much harder to guess": "A megfordított betűrendet sem sokkal nehezebb kitalálni",
-    "Predictable substitutions like '@' instead of 'a' don't help very much": "Megjósolható helyettesítések mint az „a” helyett a „@” nem sokat segítenek",
-    "Add another word or two. Uncommon words are better.": "Adj hozzá még egy-két szót. A ritkán használt szavak jobbak.",
+    "Predictable substitutions like '@' instead of 'a' don't help very much": "A kiszámítható helyettesítések, mint az „a” helyett a „@”, nem sokat segítenek",
+    "Add another word or two. Uncommon words are better.": "Adjon hozzá még egy-két szót. A ritkán használt szavak jobbak.",
     "Repeats like \"aaa\" are easy to guess": "Ismétlések mint az „aaa” könnyen kitalálhatók",
     "Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"": "Az „abcabcabc” sorozatot csak kicsivel nehezebb kitalálni mint az „abc”-t",
     "Sequences like abc or 6543 are easy to guess": "Az olyan mint az abc vagy 6543 sorokat könnyű kitalálni",
@@ -967,7 +967,7 @@
     "Prompt before sending invites to potentially invalid matrix IDs": "Vélhetően hibás Matrix ID-kra való meghívó küldés előtt figyelmeztessen",
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Az alábbi Matrix ID-koz nem sikerül megtalálni a profilokat - így is meghívod őket?",
     "Invite anyway and never warn me again": "Mindenképpen meghív és ne figyelmeztess többet",
-    "Invite anyway": "Mindenképpen meghív",
+    "Invite anyway": "Meghívás mindenképp",
     "Whether or not you're logged in (we don't record your username)": "Be van-e jelentkezve (nem tároljuk a felhasználónevét)",
     "Upgrades a room to a new version": "Szoba fejlesztése új verzióra",
     "Sets the room name": "Szobanév beállítása",
@@ -981,7 +981,7 @@
     "Show a placeholder for removed messages": "Helykitöltő mutatása a törölt szövegek helyett",
     "Show join/leave messages (invites/kicks/bans unaffected)": "Mutasd a be-, kilépéseket (meghívók/kirúgások/kitiltások üzeneteit nem érinti)",
     "Show avatar changes": "Profilkép változás mutatása",
-    "Show display name changes": "Megjelenítési név változás mutatása",
+    "Show display name changes": "Megjelenítendő nevek változásának megjelenítése",
     "Show avatars in user and room mentions": "Profilkép mutatása a felhasználó és szoba említéseknél",
     "Enable big emoji in chat": "Nagy Emodzsik engedélyezése a csevegésekben",
     "Send typing notifications": "Gépelés visszajelzés küldése",
@@ -995,7 +995,7 @@
     "Verify this user by confirming the following number appears on their screen.": "Ellenőrizd a felhasználót azáltal, hogy megbizonyosodtok arról, hogy az alábbi számok jelentek meg az ő képernyőjén is.",
     "Yes": "Igen",
     "No": "Nem",
-    "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "E-mail üzenetet küldtünk neked, amivel a címedet ellenőrizzük. Kérlek kövesd az ott leírt lépéseket és kattints az alábbi gombra.",
+    "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "E-mail üzenetet küldtünk Önnek, hogy ellenőrizzük a címét. Kövesse az ott leírt utasításokat, és kattintson az alábbi gombra.",
     "Email Address": "E-mail cím",
     "Backing up %(sessionsRemaining)s keys...": "Kulcsok biztonsági mentése... (%(sessionsRemaining)s)",
     "All keys backed up": "Minden kulcs elmentve",
@@ -1082,7 +1082,7 @@
     "Starting backup...": "Mentés indul...",
     "A new recovery passphrase and key for Secure Messages have been detected.": "A Biztonságos üzenetekhez új visszaállítási jelmondatot és kulcsot észleltünk.",
     "Recovery Method Removed": "Visszaállítási eljárás törölve",
-    "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Ha nem te törölted a visszaállítási eljárást, akkor egy támadó hozzá akar férni a fiókodhoz. Azonnal változtasd meg a jelszavadat és állíts be egy visszaállítási eljárást a Beállításokban.",
+    "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Ha nem Ön törölte a visszaállítási módot, akkor egy támadó hozzá akar férni a fiókjához. Azonnal változtassa meg a jelszavát, és állítson be egy visszaállítási módot a Beállításokban.",
     "Chat with %(brand)s Bot": "Csevegés a %(brand)s Robottal",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "A(z) „%(fileName)s” mérete nagyobb mint amekkorát a Matrix-kiszolgáló enged feltölteni",
     "Gets or sets the room topic": "Lekérdezi vagy beállítja a szoba témáját",
@@ -1094,7 +1094,7 @@
     "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s megtiltotta a vendég felhasználóknak, hogy belépjenek a szobába.",
     "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s a vendég felhasználók belépési jogait erre állította át: %(rule)s",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Szobák csoportosítása és szűrése egyedi címkékkel (frissíts, hogy a változások érvényre jussanak)",
-    "Verify this user by confirming the following emoji appear on their screen.": "Hitelesítheted a felhasználót, ha megerősíted, hogy az alábbi emojikat lehet látni az ő képernyőjén is.",
+    "Verify this user by confirming the following emoji appear on their screen.": "Hitelesítheti a felhasználót, ha megerősíti, hogy az alábbi emodzsi jelenik meg a képernyőjén.",
     "Unable to find a supported verification method.": "Nem található támogatott hitelesítési eljárás.",
     "Dog": "Kutya",
     "Cat": "Macska",
@@ -1186,7 +1186,7 @@
     "For maximum security, this should be different from your account password.": "A maximális biztonság érdekében ez térjen el a felhasználói fióknál használt jelszótól.",
     "Your keys are being backed up (the first backup could take a few minutes).": "A kulcsaid mentése folyamatban van (az első mentés több percig is eltarthat).",
     "Success!": "Sikeres!",
-    "Allow Peer-to-Peer for 1:1 calls": "Ponttól-pontig kapcsolat engedélyezése az 1:1 hívásokban",
+    "Allow Peer-to-Peer for 1:1 calls": "Egyenrangú kapcsolat engedélyezése az 1:1 hívásokban",
     "Credits": "Közreműködők",
     "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Ha bármilyen hibába botlasz vagy szeretnél visszajelzést küldeni nekünk, kérjük oszd meg velünk a GitHub-on.",
     "Changes your display nickname in the current room only": "Csak ebben a szobában változtatja meg a becenevedet",
@@ -1229,7 +1229,7 @@
     "Send %(eventType)s events": "%(eventType)s esemény küldése",
     "Select the roles required to change various parts of the room": "A szoba bizonyos beállításainak megváltoztatásához szükséges szerep kiválasztása",
     "Enable encryption?": "Titkosítás engedélyezése?",
-    "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "Ha egyszer engedélyezve lett, a szoba titkosítását nem lehet kikapcsolni. A titkosított szobákban küldött üzenetek a szerver számára nem, csak a szoba tagjai számára láthatók. A titkosítás bekapcsolása megakadályoz sok botot és hidat a megfelelő működésben. <a>Tudj meg többet a titkosításról.</a>",
+    "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "Ha egyszer engedélyezve lett, a szoba titkosítását nem lehet kikapcsolni. A titkosított szobákban küldött üzenetek a kiszolgáló számára nem, csak a szoba tagjai számára láthatók. A titkosítás bekapcsolása megakadályoz sok botot és hidat a megfelelő működésben. <a>Tudjon meg többet a titkosításról.</a>",
     "Power level": "Hozzáférési szint",
     "Want more than a community? <a>Get your own server</a>": "Többet szeretnél, mint egy közösség? <a>Szerezz saját szervert</a>",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "A legjobb élmény eléréséhez kérlek telepíts <chromeLink>Chrome-ot</chromeLink>, <firefoxLink>Firefoxot</firefoxLink> vagy <safariLink>Safarit</safariLink>.",
@@ -1248,7 +1248,7 @@
     "Maximize apps": "Alkalmazások teljes méretűvé nyitása",
     "A widget would like to verify your identity": "A kisalkalmazás ellenőrizné a személyazonosságodat",
     "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.": "A kisalkalmazás itt: %(widgetUrl)s ellenőrizni szeretné a személyazonosságodat. Ha ezt engedélyezed a kisalkalmazás ellenőrizheti a felhasználói azonosítódat de nem viselkedhet úgy mintha te lennél.",
-    "Remember my selection for this widget": "Jegyezd meg a választásomat ehhez a kisalkalmazáshoz",
+    "Remember my selection for this widget": "Jegyezze meg a választásomat ehhez a kisalkalmazáshoz",
     "Deny": "Megtilt",
     "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)snak nem sikerült a protokoll listát beszereznie a Matrix szervertől. Lehet, hogy a Matrix szerver túl öreg ahhoz, hogy támogasson hálózatot harmadik féltől.",
     "%(brand)s failed to get the public room list.": "%(brand)snak nem sikerült beszereznie a nyilvános szoba listát.",
@@ -1276,7 +1276,7 @@
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "A fájl <b>túl nagy</b> a feltöltéshez. A fájlméret korlát %(limit)s.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Néhány fájl <b>túl nagy</b>, hogy fel lehessen tölteni. A fájlméret korlát %(limit)s.",
     "Upload %(count)s other files|other": "Feltölt %(count)s másik fájlt",
-    "Upload %(count)s other files|one": "Feltölt %(count)s másik fájlt",
+    "Upload %(count)s other files|one": "%(count)s másik fájl feltöltése",
     "Cancel All": "Mindent megszakít",
     "Upload Error": "Feltöltési hiba",
     "The server does not support the room version specified.": "A kiszolgáló nem támogatja a megadott szobaverziót.",
@@ -1300,9 +1300,9 @@
     "You were banned from %(roomName)s by %(memberName)s": "Téged kitiltott %(memberName)s ebből a szobából: %(roomName)s",
     "Something went wrong with your invite to %(roomName)s": "A meghívóddal ebbe a szobába: %(roomName)s valami baj történt",
     "You can only join it with a working invite.": "Csak érvényes meghívóval tudsz csatlakozni.",
-    "You can still join it because this is a public room.": "Mivel a szoba nyilvános megpróbálhatsz csatlakozni.",
+    "You can still join it because this is a public room.": "Mivel a szoba nyilvános, így csatlakozhat.",
     "Join the discussion": "Beszélgetéshez csatlakozás",
-    "Try to join anyway": "Mindennek ellenére próbálj csatlakozni",
+    "Try to join anyway": "Csatlakozás mindenképp",
     "Do you want to chat with %(user)s?": "%(user)s felhasználóval szeretnél beszélgetni?",
     "Do you want to join %(roomName)s?": "%(roomName)s szobába szeretnél belépni?",
     "<userName/> invited you": "<userName/> meghívott",
@@ -1359,7 +1359,7 @@
     "Set a new custom sound": "Új egyedi hang beállítása",
     "Browse": "Böngész",
     "Use lowercase letters, numbers, dashes and underscores only": "Csak kisbetűt, számokat, kötőjeleket és aláhúzásokat használj",
-    "Cannot reach identity server": "Az azonosítási szerver nem érhető el",
+    "Cannot reach identity server": "Az azonosítási kiszolgáló nem érhető el",
     "You can register, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Tudsz regisztrálni, de néhány funkció nem lesz elérhető amíg az azonosítási szerver újra elérhető lesz. Ha ezt a figyelmeztetést folyamatosan látod, ellenőrizd a beállításokat vagy vedd fel a kapcsolatot a szerver adminisztrátorával.",
     "You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "A jelszavadat újra beállíthatod, de néhány funkció nem lesz elérhető amíg az azonosítási szerver újra elérhető lesz. Ha ezt a figyelmeztetést folyamatosan látod, ellenőrizd a beállításokat vagy vedd fel a kapcsolatot a szerver adminisztrátorával.",
     "You can log in, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Beléphetsz, de néhány funkció nem lesz elérhető amíg az azonosítási szerver újra elérhető lesz. Ha ezt a figyelmeztetést folyamatosan látod, ellenőrizd a beállításokat vagy vedd fel a kapcsolatot a szerver adminisztrátorával.",
@@ -1423,8 +1423,8 @@
     "Only continue if you trust the owner of the server.": "Csak akkor lépj tovább, ha megbízol a kiszolgáló tulajdonosában.",
     "Disconnect from the identity server <idserver />?": "Bontod a kapcsolatot ezzel az azonosítási szerverrel: <idserver />?",
     "Disconnect": "Kapcsolat bontása",
-    "Identity Server (%(server)s)": "Azonosítás Szerver (%(server)s)",
-    "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "A kapcsolatok kereséséhez és, hogy megtaláljanak ismerősök ezt a szervert használod: <server></server>. A használt azonosítási szervert alább tudod megváltoztatni.",
+    "Identity Server (%(server)s)": "Azonosítási kiszolgáló (%(server)s)",
+    "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "A kapcsolatok kereséséhez és hogy megtalálják az ismerősei, ezt a kiszolgálót használja: <server></server>. A használt azonosítási kiszolgálót alább tudja megváltoztatni.",
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Jelenleg nem használsz azonosítási szervert. Ahhoz, hogy e-mail cím, vagy egyéb azonosító alapján megtalálhassanak az ismerőseid, vagy te megtalálhasd őket, be kell állítanod egy azonosítási szervert.",
     "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Ha az azonosítási szerverrel bontod a kapcsolatot az azt fogja eredményezni, hogy más felhasználók nem találnak rád és nem tudsz másokat meghívni e-mail cím vagy telefonszám alapján.",
     "Enter a new identity server": "Új azonosítási szerver hozzáadása",
@@ -1455,17 +1455,17 @@
     "Do not use an identity server": "Az azonosítási szerver mellőzése",
     "Upgrade the room": "Szoba fejlesztése",
     "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "E-mail cím beállítása a fiók visszaállításához. E-mail cím vagy telefonszám, hogy ismerősök megtalálhassanak.",
-    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "E-mail cím beállítása a fiók visszaállításához. E-mail cím, hogy ismerősök megtalálhassanak.",
+    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "E-mail-cím beállítása a fiók helyreállításához. Az e-mail-címet arra is használhatja, hogy megtalálhassák az ismerősei.",
     "Enter your custom homeserver URL <a>What does this mean?</a>": "Add meg a matrix szervered URL-jét <a>Mit jelent ez?</a>",
     "Enter your custom identity server URL <a>What does this mean?</a>": "Add meg az azonosítási szervered URL-jét <a>Mit jelent ez?</a>",
     "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Használj azonosítási szervert az e-mail címmel való meghíváshoz. <default> Használd az alapértelmezett szervert (%(defaultIdentityServerName)s)</default> vagy adj meg mást a <settings>Beállításokban</settings>.",
-    "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Használj azonosítási szervert e-mail címmel való meghíváshoz. Megadása a <settings>Beállításokban</settings>.",
+    "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Használjon egy azonosítási kiszolgálót az e-maillel történő meghíváshoz. Kezelés a <settings>Beállításokban</settings>.",
     "Enable room encryption": "Szoba titkosításának bekapcsolása",
     "Use an identity server": "Azonosítási kiszolgáló használata",
-    "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Egy azonosítási kiszolgáló használata az e-maillel történő meghíváshoz. Kattints a folytatáshoz az alapértelmezett azonosítási kiszolgáló (%(defaultIdentityServerName)s) használatához, vagy állítsd be a Beállításokban.",
+    "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Használjon egy azonosítási kiszolgálót az e-maillel történő meghíváshoz. Kattintson a folytatásra az alapértelmezett azonosítási kiszolgáló (%(defaultIdentityServerName)s) használatához, vagy állítsa be a Beállításokban.",
     "Use an identity server to invite by email. Manage in Settings.": "Egy azonosítási kiszolgáló használata az e-maillel történő meghíváshoz. Módosítás a Beállításokban.",
     "Deactivate user?": "Felhasználó felfüggesztése?",
-    "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "A felhasználó felfüggesztése a felhasználót kijelentkezteti és megakadályozza, hogy vissza tudjon lépni. Továbbá kilép minden szobából aminek tagja volt. Ezt nem lehet visszavonni. Biztos, hogy felfüggeszted ezt a felhasználót?",
+    "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "A felhasználó deaktiválása a felhasználót kijelentkezteti és megakadályozza, hogy vissza tudjon lépni. Továbbá kilépteti minden szobából, amelynek tagja volt. Ezt nem lehet visszavonni. Biztos, hogy deaktiválja ezt a felhasználót?",
     "Deactivate user": "Felhasználó felfüggesztése",
     "Sends a message as plain text, without interpreting it as markdown": "Az üzenet elküldése sima szövegként anélkül, hogy „markdown” formázásként értelmezné",
     "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "A meghívód ellenőrzésekor az alábbi hibát kaptuk: %(errcode)s. Ezt az információt megpróbálhatod eljuttatni a szoba gazdájának.",
@@ -1523,7 +1523,7 @@
     "Topic (optional)": "Téma (nem kötelező)",
     "Make this room public": "A szoba legyen nyilvános",
     "Hide advanced": "Haladó elrejtése",
-    "Show advanced": "Haladó megmutatása",
+    "Show advanced": "Speciális megjelenítése",
     "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Más szervereken lévő felhasználók belépésének letiltása-csak helyi szoba (Ezt a beállítást később nem lehet megváltoztatni!)",
     "Close dialog": "Ablak bezárása",
     "Show previews/thumbnails for images": "Előnézet/bélyegkép mutatása a képekhez",
@@ -1543,7 +1543,7 @@
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "A matrix szerveren hiányzik a captcha-hoz a nyilvános kulcs. Kérlek értesítsd a matrix szerver adminisztrátorát.",
     "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "1 üzenetet törölsz ettől a felhasználótól: %(user)s. Ezt nem lehet visszavonni. Folytatod?",
     "Remove %(count)s messages|one": "1 üzenet törlése",
-    "Your email address hasn't been verified yet": "Az e-mail címed még nincs ellenőrizve",
+    "Your email address hasn't been verified yet": "Az e-mail-címe még nincs ellenőrizve",
     "Click the link in the email you received to verify and then click continue again.": "Ellenőrzéshez kattints a linkre az e-mailben amit kaptál és itt kattints a folytatásra újra.",
     "Add Email Address": "E-mail cím hozzáadása",
     "Add Phone Number": "Telefonszám hozzáadása",
@@ -1560,7 +1560,7 @@
     "DuckDuckGo Results": "DuckDuckGo találatok",
     "Quick Reactions": "Gyors Reakció",
     "Frequently Used": "Gyakran Használt",
-    "Smileys & People": "Smiley-k és emberek",
+    "Smileys & People": "Mosolyok és emberek",
     "Animals & Nature": "Állatok és természet",
     "Food & Drink": "Étel és ital",
     "Activities": "Mozgás",
@@ -1583,7 +1583,7 @@
     "Trust": "Megbízom benne",
     "Message Actions": "Üzenet Műveletek",
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
-    "You verified %(name)s": "Ellenőrizted: %(name)s",
+    "You verified %(name)s": "Ellenőrizte: %(name)s",
     "You cancelled verifying %(name)s": "Az ellenőrzést megszakítottad ehhez: %(name)s",
     "%(name)s cancelled verifying": "%(name)s megszakította az ellenőrzést",
     "You accepted": "Elfogadtad",
@@ -1634,12 +1634,12 @@
     "Any of the following data may be shared:": "Az alábbi adatok közül bármelyik megosztásra kerülhet:",
     "Your display name": "Megjelenítési neved",
     "Your avatar URL": "Profilképed URL-je",
-    "Your user ID": "Felhasználói azonosítód",
+    "Your user ID": "A felhasználói azonosítója",
     "Your theme": "Témád",
     "%(brand)s URL": "%(brand)s URL",
     "Room ID": "Szoba azonosító",
     "Widget ID": "Kisalkalmazás azonosító",
-    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Ennek a kisalkalmazásnak a használata adatot oszthat meg <helpIcon /> %(widgetDomain)s domain-nel és az Integrációs Menedzserrel.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Ennek a kisalkalmazásnak a használata adatot oszthat meg <helpIcon /> a(z) %(widgetDomain)s oldallal és az Integrációkezelővel.",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Ennek a kisalkalmazásnak a használata adatot oszthat meg <helpIcon /> %(widgetDomain)s domain-nel.",
     "Widget added by": "A kisalkalmazást hozzáadta",
     "This widget may use cookies.": "Ez a kisalkalmazás sütiket használhat.",
@@ -1650,7 +1650,7 @@
     "Remove for me": "Visszavonás magamtól",
     "Connecting to integration manager...": "Kapcsolódás az integrációs menedzserhez...",
     "Cannot connect to integration manager": "A kapcsolódás az integrációs menedzserhez sikertelen",
-    "The integration manager is offline or it cannot reach your homeserver.": "Az integrációs menedzser nem működik vagy nem éri el a matrix szerveredet.",
+    "The integration manager is offline or it cannot reach your homeserver.": "Az integrációkezelő nem működik, vagy nem éri el a Matrix-kiszolgálóját.",
     "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Használj Integrációs Menedzsert <b>(%(serverName)s)</b> a botok, kisalkalmazások és matrica csomagok kezeléséhez.",
     "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Használj Integrációs Menedzsert a botok, kisalkalmazások és matrica csomagok kezeléséhez.",
     "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integrációs Menedzser megkapja a konfigurációt, módosíthat kisalkalmazásokat, szobához meghívót küldhet és a hozzáférési szintet beállíthatja helyetted.",
@@ -1741,8 +1741,8 @@
     "This bridge is managed by <user />.": "Ezt a hidat ez a felhasználó kezeli: <user />.",
     "Suggestions": "Javaslatok",
     "Failed to find the following users": "Az alábbi felhasználók nem találhatók",
-    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Az alábbi felhasználók nem léteznek vagy hibásan vannak megadva és nem lehet őket meghívni: %(csvNames)s",
-    "Lock": "Zár",
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Az alábbi felhasználók nem léteznek vagy hibásan vannak megadva, és nem lehet őket meghívni: %(csvNames)s",
+    "Lock": "Zárolás",
     "a few seconds ago": "néhány másodperce",
     "about a minute ago": "percekkel ezelőtt",
     "%(num)s minutes ago": "%(num)s perccel ezelőtt",
@@ -1779,7 +1779,7 @@
     "Hint: Begin your message with <code>//</code> to start it with a slash.": "Tipp: Ez üzenetedet kezd ezzel: <code>//</code>, ha perjellel szeretnéd kezdeni.",
     "Send as message": "Üzenet küldése",
     "This room is end-to-end encrypted": "Ez a szoba végpontok közötti titkosítást használ",
-    "Everyone in this room is verified": "A szobába mindenki ellenőrizve van",
+    "Everyone in this room is verified": "A szobában mindenki ellenőrizve van",
     "Invite only": "Csak meghívóval",
     "Send a reply…": "Válasz küldése…",
     "Send a message…": "Üzenet küldése…",
@@ -1790,7 +1790,7 @@
     "Set up encryption": "Titkosítás beállítása",
     "Verify this session": "Munkamenet ellenőrzése",
     "Encryption upgrade available": "A titkosítási fejlesztés elérhető",
-    "Enable message search in encrypted rooms": "Üzenetek keresésének engedélyezése titkosított szobákban",
+    "Enable message search in encrypted rooms": "Üzenetek keresésének bekapcsolása a titkosított szobákban",
     "Review": "Átnéz",
     "This bridge was provisioned by <user />.": "Ezt a hidat az alábbi felhasználó készítette: <user />.",
     "Workspace: %(networkName)s": "Munkahely: %(networkName)s",
@@ -1800,7 +1800,7 @@
     " to store messages from ": " üzenetek tárolásához ",
     "rooms.": "szobából.",
     "Manage": "Kezelés",
-    "Securely cache encrypted messages locally for them to appear in search results.": "A titkosított üzenetek kereséséhez azokat biztonságos módon helyileg kell tárolnod.",
+    "Securely cache encrypted messages locally for them to appear in search results.": "A titkosított üzenetek kereséséhez azokat biztonságos módon, helyileg kell tárolnia.",
     "Enable": "Engedélyez",
     "%(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>.": "A %(brand)sból a titkosított üzenetek biztonságos helyi tárolásához hiányzik néhány dolog. Ha kísérletezni szeretne ezzel a lehetőséggel, akkor fordítson le egy saját %(brand)s Desktopot a <nativeLink>kereső komponens hozzáadásával</nativeLink>.",
     "Message search": "Üzenet keresése",
@@ -1814,7 +1814,7 @@
     "If disabled, messages from encrypted rooms won't appear in search results.": "Ha nincs engedélyezve akkor a titkosított szobák üzenetei nem jelennek meg a keresések között.",
     "Disable": "Tiltás",
     "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "%(brand)s a kereshetőség érdekében a titkosított üzeneteket biztonságos módon helyileg tárolja:",
-    "Space used:": "Hely felhasználva:",
+    "Space used:": "Felhasznált hely:",
     "Indexed messages:": "Indexált üzenetek:",
     "Restore your key backup to upgrade your encryption": "A titkosítás fejlesztéséhez allítsd vissza a kulcs mentést",
     "Setting up keys": "Kulcsok beállítása",
@@ -1919,8 +1919,8 @@
     "Make a copy of your recovery key": "Készíts másolatot a visszaállítási kulcsodról",
     "Without setting up Secure Message Recovery, you won't be able to restore your encrypted message history if you log out or use another session.": "A Biztonságos Üzenet Visszaállítás beállítása nélkül kijelentkezés után vagy másik munkamenetet használva nem tudod visszaállítani a titkosított üzeneteidet.",
     "Create key backup": "Kulcs mentés készítése",
-    "This session is encrypting history using the new recovery method.": "Ez a munkamenet az új visszaállítási metódussal titkosítja a régi üzeneteket.",
-    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "A munkamenet észrevette, hogy a visszaállítási jelmondat és a kulcs a Biztonságos üzenetekhez törölve lett.",
+    "This session is encrypting history using the new recovery method.": "Ez a munkamenet az új visszaállítási módszerrel titkosítja a régi üzeneteket.",
+    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "A munkamenet észrevette, hogy a Biztonságos üzenetek visszaállítási jelmondata és kulcsa törölve lett.",
     "If you did this accidentally, you can setup Secure Messages on this session which will re-encrypt this session's message history with a new recovery method.": "Ha véletlenül tetted, beállíthatod a Biztonságos Üzeneteket ezen a munkameneten ami újra titkosítja a régi üzeneteket az visszaállítási eljárással.",
     "Indexed rooms:": "Indexált szobák:",
     "Message downloading sleep time(ms)": "Üzenet letöltés alvási idő (ms)",
@@ -1963,7 +1963,7 @@
     "Show rooms with unread notifications first": "Olvasatlan üzeneteket tartalmazó szobák megjelenítése elől",
     "Show shortcuts to recently viewed rooms above the room list": "Gyorselérési gombok megjelenítése a nemrég meglátogatott szobákhoz a szoba lista felett",
     "Sign In or Create Account": "Bejelentkezés vagy fiók létrehozása",
-    "Use your account or create a new one to continue.": "A folytatáshoz használd a fiókodat, vagy hozz létre egy újat.",
+    "Use your account or create a new one to continue.": "A folytatáshoz használja a fiókját, vagy hozzon létre egy újat.",
     "Create Account": "Fiók létrehozása",
     "Displays information about a user": "A felhasználóról információ megjelenítése",
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Matrix-szal kapcsolatos biztonsági hibák jelentésével kapcsolatban kérlek olvasd el a Matrix.org <a>Biztonsági hiba közzétételi szabályzatot</a>.",
@@ -1986,7 +1986,7 @@
     "Custom theme URL": "Egyedi téma URL",
     "Add theme": "Téma hozzáadása",
     "Manually Verify by Text": "Manuális szöveges ellenőrzés",
-    "Interactively verify by Emoji": "Közös ellenőrzés Emodzsival",
+    "Interactively verify by Emoji": "Közös ellenőrzés emodzsival",
     "Self signing private key:": "Titkos önaláíró kulcs:",
     "cached locally": "helyben gyorsítótárazott",
     "not found locally": "helyben nem található",
@@ -2004,7 +2004,7 @@
     "Can't find this server or its room list": "A szerver vagy a szoba listája nem található",
     "All rooms": "Minden szoba",
     "Your server": "Matrix szervered",
-    "Are you sure you want to remove <b>%(serverName)s</b>": "Biztos, hogy törölni szeretnéd: <b>%(serverName)s</b>",
+    "Are you sure you want to remove <b>%(serverName)s</b>": "Biztos, hogy eltávolítja: <b>%(serverName)s</b>",
     "Remove server": "Szerver törlése",
     "Matrix": "Matrix",
     "Add a new server": "Új szerver hozzáadása",
@@ -2051,7 +2051,7 @@
     "New line": "Új sor",
     "Navigate recent messages to edit": "Friss üzenetekben navigálás a szerkesztéshez",
     "Jump to start/end of the composer": "Az üzenet elejére/végére ugrás a szerkesztőben",
-    "Navigate composer history": "A szerkesztő korábbi üzeneteiben navigálás",
+    "Navigate composer history": "Navigálás a szerkesztő előzményeiben",
     "Toggle microphone mute": "Mikrofon némítás be/ki",
     "Toggle video on/off": "Videó be/ki",
     "Jump to room search": "A szoba keresésre ugrás",
@@ -2079,17 +2079,17 @@
     "Session backup key:": "Munkamenet másolat kulcs:",
     "Use Single Sign On to continue": "A folytatáshoz használd az egyszeri bejelentkezést (SSO)",
     "Single Sign On": "Egyszeri bejelentkezés",
-    "%(name)s is requesting verification": "A(z) %(name)s ellenőrzést kér",
+    "%(name)s is requesting verification": "%(name)s ellenőrzést kér",
     "Sends a message as html, without interpreting it as markdown": "Az üzenet elküldése html szövegként anélkül, hogy „markdown” formázásként értelmezné",
-    "Confirm the emoji below are displayed on both sessions, in the same order:": "Erősítsd meg, hogy az alábbi emodzsik mindkét munkamenetben azonos sorrendben jelentek meg:",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "Erősítse meg, hogy az alábbi emodzsik mindkét munkamenetben azonos sorrendben jelentek meg:",
     "Verify this session by confirming the following number appears on its screen.": "Ellenőrizd ezt a munkamenetet azzal, hogy megerősíted, hogy az alábbi szám jelent meg a kijelzőjén.",
-    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Az ellenőrzéshez a másik munkamenetedre várakozunk, %(deviceName)s (%(deviceId)s)…",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Az ellenőrzéshez a másik munkamenetére – %(deviceName)s (%(deviceId)s) – várunk…",
     "From %(deviceName)s (%(deviceId)s)": "Innen: %(deviceName)s (%(deviceId)s)",
     "well formed": "helyes formátum",
     "unexpected type": "váratlan típus",
     "Confirm deleting these sessions": "Megerősíted ennek a munkamenetnek a törlését",
     "Click the button below to confirm deleting these sessions.|other": "Ezeknek a munkamenetek törlésének a megerősítéséhez kattints a gombra lent.",
-    "Click the button below to confirm deleting these sessions.|one": "Ennek a munkamenet törlésének a megerősítéséhez kattints a gombra lent.",
+    "Click the button below to confirm deleting these sessions.|one": "A munkamenet törlésének megerősítéséhez kattintson a lenti gombra.",
     "Delete sessions|other": "Munkamenetek törlése",
     "Delete sessions|one": "Munkamenet törlése",
     "Waiting for you to accept on your other session…": "Az elfogadást várjuk a másik munkamenetedből…",
@@ -2140,7 +2140,7 @@
     "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "A mentést nem lehet visszafejteni ezzel a visszaállítási jelmondattal: kérlek ellenőrizd, hogy a megfelelő visszaállítási jelmondatot adtad-e meg.",
     "Syncing...": "Szinkronizálás…",
     "Signing In...": "Bejelentkezés…",
-    "If you've joined lots of rooms, this might take a while": "Ha sok szobában vagy benn ez eltarthat egy darabig",
+    "If you've joined lots of rooms, this might take a while": "Ha sok szobához csatlakozott, ez eltarthat egy darabig",
     "Great! This recovery passphrase looks strong enough.": "Nagyszerű! Ez a visszaállítási jelmondat elég erősnek tűnik.",
     "Enter a recovery passphrase": "Visszaállítási jelmondat megadása",
     "Enter your recovery passphrase a second time to confirm it.": "A megerősítéshez add meg a visszaállítási jelmondatot még egyszer.",
@@ -2168,7 +2168,7 @@
     "Fetching keys from server...": "Kulcsok lekérdezése a szerverről…",
     "%(completed)s of %(total)s keys restored": "%(completed)s/%(total)s kulcs visszaállítva",
     "Keys restored": "Kulcsok visszaállítva",
-    "Successfully restored %(sessionCount)s keys": "Kulcsok (%(sessionCount)s) sikeresen visszaállítva",
+    "Successfully restored %(sessionCount)s keys": "%(sessionCount)s kulcs sikeresen visszaállítva",
     "You signed in to a new session without verifying it:": "Ellenőrzés nélkül jelentkeztél be egy új munkamenetbe:",
     "Verify your other session using one of the options below.": "Ellenőrizd a másik munkameneted a lenti lehetőségek egyikével.",
     "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Hívj meg valakit a nevével, felhasználónevével (mint <userId/>), e-mail címével vagy <a>oszd meg ezt a szobát</a>.",
@@ -2179,7 +2179,7 @@
     "Message deleted": "Üzenet törölve",
     "Message deleted by %(name)s": "%(name)s törölte ezt az üzenetet",
     "QR Code": "QR kód",
-    "To continue, use Single Sign On to prove your identity.": "A folytatáshoz a személyazonosságod megerősítéséhez használd az egyszeri bejelentkezést.",
+    "To continue, use Single Sign On to prove your identity.": "A folytatáshoz, használja az egyszeri bejelentkezést, hogy megerősítse a személyazonosságát.",
     "Confirm to continue": "Erősítsd meg a továbblépéshez",
     "Click the button below to confirm your identity.": "A személyazonosságod megerősítéséhez kattints a lenti gombra!",
     "Confirm encryption setup": "Erősítsd meg a titkosítási beállításokat",
@@ -2189,7 +2189,7 @@
     "Upload a file": "Fájl feltöltése",
     "Room name or address": "A szoba neve vagy címe",
     "Joins room with given address": "Megadott címmel csatlakozik a szobához",
-    "Unrecognised room address:": "Ismeretlen szoba cím:",
+    "Unrecognised room address:": "Ismeretlen szobacím:",
     "Font scaling": "Betű nagyítás",
     "Font size": "Betűméret",
     "IRC display name width": "IRC megjelenítési név szélessége",
@@ -2259,7 +2259,7 @@
     "Use Recovery Key or Passphrase": "Használd a visszaállítási kulcsot vagy jelmondatot",
     "Use Recovery Key": "Használd a Visszaállítási Kulcsot",
     "Use the improved room list (will refresh to apply changes)": "Használd a fejlesztett szoba listát (a változások életbe lépéséhez újra fog tölteni)",
-    "Use custom size": "Egyedi méret használata",
+    "Use custom size": "Egyéni méret használata",
     "Use a system font": "Rendszer betűtípus használata",
     "System font name": "Rendszer betűtípus neve",
     "Hey you. You're the best!": "Hé te! Te vagy a legjobb!",
@@ -2342,7 +2342,7 @@
     "You can also set up Secure Backup & manage your keys in Settings.": "A Biztonsági mentést és a kulcsok kezelését beállíthatod a Beállításokban.",
     "Set up Secure backup": "Biztonsági mentés beállítása",
     "Set a Security Phrase": "Biztonsági Jelmondat beállítása",
-    "Confirm Security Phrase": "Biztonsági Jelmondat megerősítése",
+    "Confirm Security Phrase": "Biztonsági jelmondat megerősítése",
     "Save your Security Key": "Ments el a Biztonsági Kulcsodat",
     "Use your account to sign in to the latest version": "A legutolsó verzióba való bejelentkezéshez használd a fiókodat",
     "We’re excited to announce Riot is now Element": "Izgatottan jelentjük, hogy a Riot mostantól Element",
@@ -2351,7 +2351,7 @@
     "Enable experimental, compact IRC style layout": "Egyszerű (kísérleti) IRC stílusú kinézet engedélyezése",
     "Unknown caller": "Ismeretlen hívó",
     "Incoming voice call": "Bejövő hanghívás",
-    "Incoming video call": "Bejövő videó hívás",
+    "Incoming video call": "Bejövő videóhívás",
     "Incoming call": "Bejövő hívás",
     "There are advanced notifications which are not shown here.": "Vannak haladó értesítési beállítások amik itt nem jelennek meg.",
     "Appearance Settings only affect this %(brand)s session.": "A megjelenítési beállítások csak erre az %(brand)s munkamenetre lesznek érvényesek.",
@@ -2374,10 +2374,10 @@
     "This room is public": "Ez egy nyilvános szoba",
     "Away": "Távol",
     "Are you sure you want to cancel entering passphrase?": "Biztos vagy benne, hogy megszakítod a jelmondat bevitelét?",
-    "Enable advanced debugging for the room list": "Kibővített hibakeresés bekapcsolása a szoba listához",
+    "Enable advanced debugging for the room list": "Speciális hibakeresés bekapcsolása a szobalistához",
     "%(brand)s can't securely cache encrypted messages locally while running in a web browser. Use <desktopLink>%(brand)s Desktop</desktopLink> for encrypted messages to appear in search results.": "A(z) %(brand)s nem képes a web böngészőben futva biztonságosan elmenteni a titkosított üzeneteket helyben. Használd az <desktopLink>Asztali %(brand)s</desktopLink> alkalmazást ahhoz, hogy az üzenetekben való keresésekkor a titkosított üzenetek is megjelenhessenek.",
     "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "Valószínűleg egy %(brand)s klienstől eltérő programmal konfiguráltad. %(brand)s kliensben nem tudod módosítani de attól még érvényesek.",
-    "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Add meg a rendszer által használt font nevét és %(brand)s megpróbálja majd azt használni.",
+    "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Adja meg a rendszer által használt betűkészlet nevét és az %(brand)s megpróbálja azt használni.",
     "Add users and servers you want to ignore here. Use asterisks to have %(brand)s match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "A figyelmen kívül hagyandó felhasználókat és szervereket itt add meg. %(brand)s kliensben használj csillagot hogy a helyén minden karakterre illeszkedjen a kifejezés. Például: <code>@bot:*</code> figyelmen kívül fog hagyni minden „bot” nevű felhasználót bármely szerverről.",
     "Low priority rooms show up at the bottom of your room list in a dedicated section at the bottom of your room list": "Az alacsony prioritású szobák egy külön helyen a szobalista alján fognak megjelenni",
     "Custom Tag": "Egyedi címke",
@@ -2394,10 +2394,10 @@
     "Change notification settings": "Értesítési beállítások megváltoztatása",
     "Your server isn't responding to some <a>requests</a>.": "A szervered nem válaszol néhány <a>kérésre</a>.",
     "You're all caught up.": "Mindent elolvastál.",
-    "Server isn't responding": "A szerver nem válaszol",
+    "Server isn't responding": "A kiszolgáló nem válaszol",
     "Your server isn't responding to some of your requests. Below are some of the most likely reasons.": "A szervered néhány kérésre nem válaszol. Alább felsorolunk pár lehetséges okot.",
     "The server (%(serverName)s) took too long to respond.": "A szervernek (%(serverName)s) túl hosszú időbe telt válaszolni.",
-    "Your firewall or anti-virus is blocking the request.": "A tűzfalad vagy víruskeresőd blokkolja a kérést.",
+    "Your firewall or anti-virus is blocking the request.": "A tűzfala vagy víruskeresője blokkolja a kérést.",
     "A browser extension is preventing the request.": "Egy böngésző kiterjesztés megakadályozza a kérést.",
     "The server is offline.": "A szerver nem működik.",
     "The server has denied your request.": "A szerver elutasította a kérést.",
@@ -2442,7 +2442,7 @@
     "Create community": "Közösség létrehozása",
     "Set up Secure Backup": "Biztonsági mentés beállítása",
     "Explore community rooms": "Fedezd fel a közösségi szobákat",
-    "Create a room in %(communityName)s": "Készíts szobát itt: %(communityName)s",
+    "Create a room in %(communityName)s": "Szoba létrehozása itt: %(communityName)s",
     "Cross-signing and secret storage are ready for use.": "Az eszközök közti hitelesítés és a biztonsági tároló kész a használatra.",
     "Cross-signing is ready for use, but secret storage is currently not being used to backup your keys.": "Az eszközök közti hitelesítés kész a használatra, de a biztonsági tároló nincs használva a kulcsok mentéséhez.",
     "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Privát szobák csak meghívóval találhatók meg és meghívóval lehet belépni. A nyilvános szobákat bárki megtalálhatja és be is léphet.",
@@ -2481,7 +2481,7 @@
     "Group call started by %(senderName)s": "A konferenciahívást elindította: %(senderName)s",
     "Group call ended by %(senderName)s": "A konferenciahívást befejezte: %(senderName)s",
     "Cross-signing is ready for use.": "Eszközök közötti hitelesítés kész a használatra.",
-    "Cross-signing is not set up.": "Eszközök közötti hitelesítés nincs beállítva.",
+    "Cross-signing is not set up.": "Az eszközök közötti hitelesítés nincs beállítva.",
     "Backup version:": "Mentés verzió:",
     "Algorithm:": "Algoritmus:",
     "Back up your encryption keys with your account data in case you lose access to your sessions. Your keys will be secured with a unique Recovery Key.": "Ments el a titkosítási kulcsaidat a fiókadatokkal arra az esetre ha elvesztenéd a hozzáférést a munkameneteidhez. A kulcsok egy egyedi visszaállítási kulccsal lesznek védve.",
@@ -2522,7 +2522,7 @@
     "Video conference ended by %(senderName)s": "A videókonferenciát befejezte: %(senderName)s",
     "Video conference updated by %(senderName)s": "A videókonferenciát frissítette: %(senderName)s",
     "Video conference started by %(senderName)s": "A videókonferenciát elindította: %(senderName)s",
-    "Failed to save your profile": "A profilodat nem sikerült elmenteni",
+    "Failed to save your profile": "A profilját nem sikerült menteni",
     "The operation could not be completed": "A műveletet nem lehetett befejezni",
     "Remove messages sent by others": "Mások által küldött üzenetek törlése",
     "Starting microphone...": "Mikrofon bekapcsolása…",
@@ -2530,7 +2530,7 @@
     "Call connecting...": "Híváshoz csatlakozás…",
     "Calling...": "Hívás…",
     "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Minden szerver ki van tiltva! Ezt a szobát nem lehet többet használni.",
-    "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s megváltoztatta a jogosultságokat a szobában.",
+    "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s megváltoztatta a kiszolgálójogosultságokat a szobában.",
     "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s beállította a jogosultságokat a szobában.",
     "%(senderName)s declined the call.": "%(senderName)s visszautasította a hívást.",
     "(an error occurred)": "(hiba történt)",
@@ -2539,10 +2539,10 @@
     "The call could not be established": "A hívás kapcsolatot nem lehet felépíteni",
     "The other party declined the call.": "A másik fél elutasította a hívást.",
     "Call Declined": "Hívás elutasítva",
-    "Move right": "Jobbra mozgat",
+    "Move right": "Mozgatás jobbra",
     "Move left": "Balra mozgat",
     "Revoke permissions": "Jogosultságok visszavonása",
-    "Data on this screen is shared with %(widgetDomain)s": "Az adatok erről a képernyőről megosztásra kerülnek ezzel: %(widgetDomain)s",
+    "Data on this screen is shared with %(widgetDomain)s": "Az ezen a képernyőn látható adatok megosztásra kerülnek ezzel: %(widgetDomain)s",
     "Modal Widget": "Előugró kisalkalmazás",
     "Unpin a widget to view it in this panel": "Kisalkalmazás megjelenítése ezen a panelen",
     "You can only pin up to %(count)s widgets|other": "Csak %(count)s kisalkalmazást tudsz kitűzni",
@@ -2574,7 +2574,7 @@
     "There are two ways you can provide feedback and help us improve %(brand)s.": "Van két lehetőséged, hogy visszajelezz vagy segíts jobbá tenni ezt: %(brand)s.",
     "Comment": "Megjegyzés",
     "Add comment": "Megjegyzés hozzáadása",
-    "Please go into as much detail as you like, so we can track down the problem.": "Ahhoz, hogy megérthessük a problémát olyan részletesen írd le ahogy csak szeretnéd.",
+    "Please go into as much detail as you like, so we can track down the problem.": "Ahhoz, hogy megérthessük a problémát, írja le olyan részletesen, amennyire csak szeretné.",
     "Bermuda": "Bermuda",
     "Benin": "Benin",
     "Belize": "Belize",

From 0c2fdcd84b1af50cc96ea997d6d3e5c6bd234419 Mon Sep 17 00:00:00 2001
From: LinAGKar <linus.kardell@gmail.com>
Date: Thu, 12 Nov 2020 21:06:54 +0000
Subject: [PATCH 125/146] Translated using Weblate (Swedish)

Currently translated at 90.9% (2402 of 2641 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sv/
---
 src/i18n/strings/sv.json | 44 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index ebd1e0b56b..bf15596277 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -2493,5 +2493,47 @@
     "Please go into as much detail as you like, so we can track down the problem.": "Vänligen gå in i hur mycket detalj du vill, så att vi kan hitta problemet.",
     "Tell us below how you feel about %(brand)s so far.": "Berätta för oss vad du tycker om %(brand)s än så länge.",
     "Rate %(brand)s": "Betygsätt %(brand)s",
-    "Feedback sent": "Återkoppling skickad"
+    "Feedback sent": "Återkoppling skickad",
+    "Canada": "Kanada",
+    "Cameroon": "Kamerun",
+    "Cambodia": "Kambodja",
+    "Burundi": "Burundi",
+    "Burkina Faso": "Burkina Faso",
+    "Bulgaria": "Bulgarien",
+    "Brunei": "Brunei",
+    "British Virgin Islands": "Brittiska Jungfruöarna",
+    "British Indian Ocean Territory": "Brittiska territoriet i Indiska oceanen",
+    "Brazil": "Brasilien",
+    "Bouvet Island": "Bouvetön",
+    "Botswana": "Botswana",
+    "Bosnia": "Bosnien",
+    "Bolivia": "Bolivia",
+    "Bhutan": "Bhutan",
+    "Bermuda": "Bermuda",
+    "Benin": "Benin",
+    "Belize": "Belize",
+    "Belgium": "Belgien",
+    "Belarus": "Belarus",
+    "Barbados": "Barbados",
+    "Bangladesh": "Bangladesh",
+    "Bahrain": "Bahrain",
+    "Bahamas": "Bahamas",
+    "Azerbaijan": "Azerbajdzjan",
+    "Austria": "Österrike",
+    "Australia": "Australien",
+    "Aruba": "Aruba",
+    "Armenia": "Armenien",
+    "Argentina": "Argentina",
+    "Antigua & Barbuda": "Antigua och Barbuda",
+    "United Kingdom": "Förenade kungadömet",
+    "Antarctica": "Antarktis",
+    "Anguilla": "Anguilla",
+    "Angola": "Angola",
+    "Andorra": "Andorra",
+    "American Samoa": "Amerikanska Samoa",
+    "Algeria": "Algeriet",
+    "Albania": "Albanien",
+    "Åland Islands": "Åland",
+    "Afghanistan": "Afghanistan",
+    "United States": "USA"
 }

From 6a3049b90f1ec2b515b154ecfd7a4110d0051751 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 16 Nov 2020 15:40:56 +0000
Subject: [PATCH 126/146] Remove old unused views/paths

---
 src/components/structures/MatrixChat.tsx      | 49 +++---------
 .../structures/auth/PostRegistration.js       | 77 -------------------
 2 files changed, 9 insertions(+), 117 deletions(-)
 delete mode 100644 src/components/structures/auth/PostRegistration.js

diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index 22cd73eff7..dd0b945d86 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -87,36 +87,33 @@ import { CommunityPrototypeStore } from "../../stores/CommunityPrototypeStore";
 export enum Views {
     // a special initial state which is only used at startup, while we are
     // trying to re-animate a matrix client or register as a guest.
-    LOADING = 0,
+    LOADING,
 
     // we are showing the welcome view
-    WELCOME = 1,
+    WELCOME,
 
     // we are showing the login view
-    LOGIN = 2,
+    LOGIN,
 
     // we are showing the registration view
-    REGISTER = 3,
-
-    // completing the registration flow
-    POST_REGISTRATION = 4,
+    REGISTER,
 
     // showing the 'forgot password' view
-    FORGOT_PASSWORD = 5,
+    FORGOT_PASSWORD,
 
     // showing flow to trust this new device with cross-signing
-    COMPLETE_SECURITY = 6,
+    COMPLETE_SECURITY,
 
     // flow to setup SSSS / cross-signing on this account
-    E2E_SETUP = 7,
+    E2E_SETUP,
 
     // we are logged in with an active matrix client. The logged_in state also
     // includes guests users as they too are logged in at the client level.
-    LOGGED_IN = 8,
+    LOGGED_IN,
 
     // We are logged out (invalid token) but have our local state again. The user
     // should log back in to rehydrate the client.
-    SOFT_LOGOUT = 9,
+    SOFT_LOGOUT,
 }
 
 // Actions that are redirected through the onboarding process prior to being
@@ -562,11 +559,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 ThemeController.isLogin = true;
                 this.themeWatcher.recheck();
                 break;
-            case 'start_post_registration':
-                this.setState({
-                    view: Views.POST_REGISTRATION,
-                });
-                break;
             case 'start_password_recovery':
                 this.setStateForNewView({
                     view: Views.FORGOT_PASSWORD,
@@ -1621,14 +1613,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             dis.dispatch({
                 action: 'view_my_groups',
             });
-        } else if (screen === 'complete_security') {
-            dis.dispatch({
-                action: 'start_complete_security',
-            });
-        } else if (screen === 'post_registration') {
-            dis.dispatch({
-                action: 'start_post_registration',
-            });
         } else if (screen.indexOf('room/') === 0) {
             // Rooms can have the following formats:
             // #room_alias:domain or !opaque_id:domain
@@ -1799,14 +1783,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         return Lifecycle.setLoggedIn(credentials);
     }
 
-    onFinishPostRegistration = () => {
-        // Don't confuse this with "PageType" which is the middle window to show
-        this.setState({
-            view: Views.LOGGED_IN,
-        });
-        this.showScreen("settings");
-    };
-
     onSendEvent(roomId: string, event: MatrixEvent) {
         const cli = MatrixClientPeg.get();
         if (!cli) {
@@ -1971,13 +1947,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                     accountPassword={this.accountPassword}
                 />
             );
-        } else if (this.state.view === Views.POST_REGISTRATION) {
-            // needs to be before normal PageTypes as you are logged in technically
-            const PostRegistration = sdk.getComponent('structures.auth.PostRegistration');
-            view = (
-                <PostRegistration
-                    onComplete={this.onFinishPostRegistration} />
-            );
         } else if (this.state.view === Views.LOGGED_IN) {
             // store errors stop the client syncing and require user intervention, so we'll
             // be showing a dialog. Don't show anything else.
diff --git a/src/components/structures/auth/PostRegistration.js b/src/components/structures/auth/PostRegistration.js
deleted file mode 100644
index aa36de6596..0000000000
--- a/src/components/structures/auth/PostRegistration.js
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-
-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 * as sdk from '../../../index';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import { _t } from '../../../languageHandler';
-import AuthPage from "../../views/auth/AuthPage";
-
-export default class PostRegistration extends React.Component {
-    static propTypes = {
-        onComplete: PropTypes.func.isRequired,
-    };
-
-    state = {
-        avatarUrl: null,
-        errorString: null,
-        busy: false,
-    };
-
-    componentDidMount() {
-        // There is some assymetry between ChangeDisplayName and ChangeAvatar,
-        // as ChangeDisplayName will auto-get the name but ChangeAvatar expects
-        // the URL to be passed to you (because it's also used for room avatars).
-        const cli = MatrixClientPeg.get();
-        this.setState({busy: true});
-        const self = this;
-        cli.getProfileInfo(cli.credentials.userId).then(function(result) {
-            self.setState({
-                avatarUrl: MatrixClientPeg.get().mxcUrlToHttp(result.avatar_url),
-                busy: false,
-            });
-        }, function(error) {
-            self.setState({
-                errorString: _t("Failed to fetch avatar URL"),
-                busy: false,
-            });
-        });
-    }
-
-    render() {
-        const ChangeDisplayName = sdk.getComponent('settings.ChangeDisplayName');
-        const ChangeAvatar = sdk.getComponent('settings.ChangeAvatar');
-        const AuthHeader = sdk.getComponent('auth.AuthHeader');
-        const AuthBody = sdk.getComponent("auth.AuthBody");
-        return (
-            <AuthPage>
-                <AuthHeader />
-                <AuthBody>
-                    <div className="mx_Login_profile">
-                        { _t('Set a display name:') }
-                        <ChangeDisplayName />
-                        { _t('Upload an avatar:') }
-                        <ChangeAvatar
-                            initialAvatarUrl={this.state.avatarUrl} />
-                        <button onClick={this.props.onComplete}>{ _t('Continue') }</button>
-                        { this.state.errorString }
-                    </div>
-                </AuthBody>
-            </AuthPage>
-        );
-    }
-}

From 5b32287f3d8a3c22d3801138d608c7f7bdf15d67 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 16 Nov 2020 15:56:54 +0000
Subject: [PATCH 127/146] Redirect user home from auth screens if they are
 already logged in

---
 src/components/structures/MatrixChat.tsx | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index dd0b945d86..69066776a9 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -116,6 +116,8 @@ export enum Views {
     SOFT_LOGOUT,
 }
 
+const AUTH_SCREENS = ["register", "login", "forgot_password", "start_sso", "start_cas"];
+
 // Actions that are redirected through the onboarding process prior to being
 // re-dispatched. NOTE: some actions are non-trivial and would require
 // re-factoring to be included in this list in future.
@@ -1546,6 +1548,14 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
     }
 
     showScreen(screen: string, params?: {[key: string]: any}) {
+        const cli = MatrixClientPeg.get();
+        const isLoggedOutOrGuest = !cli || cli.isGuest();
+        if (!isLoggedOutOrGuest && AUTH_SCREENS.includes(screen)) {
+            // user is logged in and landing on an auth page which will uproot their session, redirect them home instead
+            dis.dispatch({ action: "view_home_page" });
+            return;
+        }
+
         if (screen === 'register') {
             dis.dispatch({
                 action: 'start_registration',
@@ -1562,7 +1572,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 params: params,
             });
         } else if (screen === 'soft_logout') {
-            if (MatrixClientPeg.get() && MatrixClientPeg.get().getUserId() && !Lifecycle.isSoftLogout()) {
+            if (cli.getUserId() && !Lifecycle.isSoftLogout()) {
                 // Logged in - visit a room
                 this.viewLastRoom();
             } else {

From c6ecd591141892288fc2eb46562e996b1fad0281 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 16 Nov 2020 16:30:23 +0000
Subject: [PATCH 128/146] i18n

---
 src/i18n/strings/en_EN.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index e6ba79295e..d3292c3649 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2460,9 +2460,6 @@
     "Signing In...": "Signing In...",
     "If you've joined lots of rooms, this might take a while": "If you've joined lots of rooms, this might take a while",
     "Create account": "Create account",
-    "Failed to fetch avatar URL": "Failed to fetch avatar URL",
-    "Set a display name:": "Set a display name:",
-    "Upload an avatar:": "Upload an avatar:",
     "Unable to query for supported registration methods.": "Unable to query for supported registration methods.",
     "Registration has been disabled on this homeserver.": "Registration has been disabled on this homeserver.",
     "This server does not support authentication with a phone number.": "This server does not support authentication with a phone number.",

From 2543054413e6e6408b740405f6a478f75b76fef7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20Mesk=C3=B3?= <meskobalazs@gmail.com>
Date: Fri, 13 Nov 2020 13:28:49 +0000
Subject: [PATCH 129/146] Translated using Weblate (Hungarian)

Currently translated at 99.8% (2638 of 2641 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
---
 src/i18n/strings/hu.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 8dbac80bc3..9c00c8ff6e 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1590,7 +1590,7 @@
     "%(name)s accepted": "%(name)s elfogadta",
     "You cancelled": "Megszakítottad",
     "%(name)s cancelled": "%(name)s megszakította",
-    "%(name)s wants to verify": "%(name)s ellenőrizni szeretne",
+    "%(name)s wants to verify": "%(name)s ellenőrizni szeretné",
     "You sent a verification request": "Ellenőrzési kérést küldtél",
     "Try out new ways to ignore people (experimental)": "Emberek figyelmen kívül hagyásához próbálj ki új utakat (kísérleti)",
     "My Ban List": "Tiltólistám",

From 47d522f0715475cc7b657fafaf6c660ba52f676f Mon Sep 17 00:00:00 2001
From: Marcelo Filho <marceloaof@protonmail.com>
Date: Fri, 13 Nov 2020 18:06:37 +0000
Subject: [PATCH 130/146] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2641 of 2641 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pt_BR/
---
 src/i18n/strings/pt_BR.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 11853e6ee4..aa4bfc41ca 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -2770,5 +2770,7 @@
     "Vatican City": "Cidade do Vaticano",
     "Vanuatu": "Vanuatu",
     "Uzbekistan": "Uzbequistão",
-    "Role": "Função"
+    "Role": "Função",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|one": "Armazene localmente com segurança as mensagens criptografadas para que apareçam nos resultados da pesquisa, usando %(size)s para armazenar mensagens de %(count)s sala.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|other": "Armazene localmente com segurança as mensagens criptografadas para que apareçam nos resultados da pesquisa, usando %(size)s para armazenar mensagens de %(count)s salas."
 }

From 47510eac862f9092b9afa3484cb8fe43ce43a099 Mon Sep 17 00:00:00 2001
From: LinAGKar <linus.kardell@gmail.com>
Date: Sat, 14 Nov 2020 11:02:14 +0000
Subject: [PATCH 131/146] Translated using Weblate (Swedish)

Currently translated at 100.0% (2641 of 2641 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sv/
---
 src/i18n/strings/sv.json | 241 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 240 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index bf15596277..f1bf9f08cd 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -2535,5 +2535,244 @@
     "Albania": "Albanien",
     "Åland Islands": "Åland",
     "Afghanistan": "Afghanistan",
-    "United States": "USA"
+    "United States": "USA",
+    "%(creator)s created this DM.": "%(creator)s skapade den här DM:en.",
+    "Now, let's help you get started": "Låt oss hjälpa dig komma igång",
+    "Welcome %(name)s": "Välkommen %(name)s",
+    "Add a photo so people know it's you.": "Lägg till en bild för att folk ska veta att det är du.",
+    "Great, that'll help people know it's you": "Fantastiskt, det kommer att hjälpa folk att veta att det är du",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Bjud in någon med deras namn, e-postadress eller användarnamn (som <userId/>) eller <a>dela det här rummet</a>.",
+    "Start a conversation with someone using their name, email address or username (like <userId/>).": "Starta en konversation med någon med deras namn, e-postadress eller användarnamn (som <userId/>).",
+    "Invite by email": "Bjud in via e-post",
+    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Meddelanden i det här rummet är totalsträckskrypterade. När personer går med så kan du verifiera dem i deras profil, bara klicka på deras avatar.",
+    "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Meddelanden här är totalsträckskrypterade. Verifiera %(displayName)s i deras profil - klicka på deras avatar.",
+    "Role": "Roll",
+    "Use the + to make a new room or explore existing ones below": "Använd + för att skapa ett nytt rum eller utforska existerande nedan",
+    "This is the start of <roomName/>.": "Det här är början på <roomName/>.",
+    "Add a photo, so people can easily spot your room.": "Lägg till en bild, så att folk lätt kan se ditt rum.",
+    "%(displayName)s created this room.": "%(displayName)s skapade det här rummet.",
+    "You created this room.": "Du skapade det här rummet.",
+    "<a>Add a topic</a> to help people know what it is about.": "<a>Lägg till ett ämne</a> för att låta folk veta vad det handlar om.",
+    "Topic: %(topic)s ": "Ämne: %(topic)s ",
+    "Topic: %(topic)s (<a>edit</a>)": "Ämne: %(topic)s (<a>redigera</a>)",
+    "This is the beginning of your direct message history with <displayName/>.": "Det här är början på din direktmeddelandehistorik med <displayName/>.",
+    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Bara ni två är i den här konversationen, om inte någon av er bjuder in någon annan.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|one": "Cacha säkert krypterade meddelande lokalt för att de ska visas i sökresultat, och använd %(size)s för att lagra meddelanden från %(count)s rum.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|other": "Cacha säkert krypterade meddelande lokalt för att de ska visas i sökresultat, och använd %(size)s för att lagra meddelanden från %(count)s rum.",
+    "Call Paused": "Samtal pausat",
+    "%(senderName)s ended the call": "%(senderName)s avslutade samtalet",
+    "You ended the call": "Du avslutade samtalet",
+    "New version of %(brand)s is available": "Ny version av %(brand)s är tillgänglig",
+    "Update %(brand)s": "Uppdatera %(brand)s",
+    "Enable desktop notifications": "Aktivera skrivbordsaviseringar",
+    "Don't miss a reply": "Missa inte ett svar",
+    "Takes the call in the current room off hold": "Avslutar parkering av samtalet i det nuvarande samtalet",
+    "Places the call in the current room on hold": "Parkerar samtalet i det aktuella rummet",
+    "Zimbabwe": "Zimbabwe",
+    "Zambia": "Zambia",
+    "Yemen": "Jemen",
+    "Western Sahara": "Västsahara",
+    "Wallis & Futuna": "Wallis- och Futunaöarna",
+    "Vietnam": "Vietnam",
+    "Venezuela": "Venezuela",
+    "Vatican City": "Vatikanstaten",
+    "Vanuatu": "Vanuatu",
+    "Uzbekistan": "Uzbekistan",
+    "Uruguay": "Uruguay",
+    "United Arab Emirates": "Förenade Arabemiraten",
+    "Ukraine": "Ukraina",
+    "Uganda": "Uganda",
+    "U.S. Virgin Islands": "Amerikanska Jungfruöarna",
+    "Tuvalu": "Tuvalu",
+    "Turks & Caicos Islands": "Turks- och Caicosöarna",
+    "Turkmenistan": "Turkmenistan",
+    "Turkey": "Turkiet",
+    "Tunisia": "Tunisien",
+    "Trinidad & Tobago": "Trinidad och Tobago",
+    "Tonga": "Tonga",
+    "Tokelau": "Tokelau",
+    "Togo": "Togo",
+    "Timor-Leste": "Östtimor",
+    "Thailand": "Thailand",
+    "Tanzania": "Tanzania",
+    "Tajikistan": "Tadzjikistan",
+    "Taiwan": "Taiwan",
+    "São Tomé & Príncipe": "São Tomé och Príncipe",
+    "Syria": "Syrien",
+    "Switzerland": "Schweiz",
+    "Sweden": "Sverige",
+    "Swaziland": "Swaziland",
+    "Svalbard & Jan Mayen": "Svalbard och Jan Mayen",
+    "Suriname": "Surinam",
+    "Sudan": "Sudan",
+    "St. Vincent & Grenadines": "Saint Vincent och Grenadinerna",
+    "St. Pierre & Miquelon": "Saint-Pierre och Miquelon",
+    "St. Martin": "Saint Martin",
+    "St. Lucia": "Saint Lucia",
+    "St. Kitts & Nevis": "Saint Kitts och Nevis",
+    "St. Helena": "Sankta Helena",
+    "St. Barthélemy": "Saint-Barthélemy",
+    "Sri Lanka": "Sri Lanka",
+    "Spain": "Spanien",
+    "South Sudan": "Sydsudan",
+    "South Korea": "Sydkorea",
+    "South Georgia & South Sandwich Islands": "Sydgeorgien och Sydsandwichöarna",
+    "South Africa": "Sydafrika",
+    "Somalia": "Somalia",
+    "Solomon Islands": "Salomonöarna",
+    "Slovenia": "Slovenien",
+    "Slovakia": "Slovakien",
+    "Sint Maarten": "Sint Maarten",
+    "Singapore": "Singapore",
+    "Sierra Leone": "Sierra Leone",
+    "Seychelles": "Seychellerna",
+    "Serbia": "Serbien",
+    "Senegal": "Senegal",
+    "Saudi Arabia": "Saudiarabien",
+    "San Marino": "San Marino",
+    "Samoa": "Samoa",
+    "Réunion": "Réunion",
+    "Rwanda": "Rwanda",
+    "Russia": "Ryssland",
+    "Romania": "Rumänien",
+    "Qatar": "Qatar",
+    "Puerto Rico": "Puerto Rico",
+    "Portugal": "Portugal",
+    "Poland": "Polen",
+    "Pitcairn Islands": "Pitcairnöarna",
+    "Philippines": "Filippinerna",
+    "Peru": "Peru",
+    "Paraguay": "Paraguay",
+    "Papua New Guinea": "Papua Nya Guinea",
+    "Panama": "Panama",
+    "Palestine": "Palestina",
+    "Palau": "Palau",
+    "Pakistan": "Pakistan",
+    "Oman": "Oman",
+    "Norway": "Norge",
+    "Northern Mariana Islands": "Nordmarianerna",
+    "North Korea": "Nordkorea",
+    "Norfolk Island": "Norfolkön",
+    "Niue": "Niue",
+    "Nigeria": "Nigeria",
+    "Niger": "Niger",
+    "Nicaragua": "Nicaragua",
+    "New Zealand": "Nya Zeeland",
+    "New Caledonia": "Nya Kaledonien",
+    "Netherlands": "Nederländerna",
+    "Nepal": "Nepal",
+    "Nauru": "Nauru",
+    "Namibia": "Namibia",
+    "Myanmar": "Myanmar",
+    "Mozambique": "Moçambique",
+    "Morocco": "Marocko",
+    "Montserrat": "Montserrat",
+    "Montenegro": "Montenegro",
+    "Mongolia": "Mongoliet",
+    "Monaco": "Monaco",
+    "Moldova": "Moldavien",
+    "Micronesia": "Mikronesien",
+    "Mexico": "Mexiko",
+    "Mayotte": "Mayotte",
+    "Mauritius": "Mauritius",
+    "Mauritania": "Mauretanien",
+    "Martinique": "Martinique",
+    "Marshall Islands": "Marshallöarna",
+    "Malta": "Malta",
+    "Mali": "Mali",
+    "Maldives": "Maldivierna",
+    "Malaysia": "Malaysia",
+    "Malawi": "Malawi",
+    "Madagascar": "Madagaskar",
+    "Macedonia": "Nordmakedonien",
+    "Macau": "Macao",
+    "Luxembourg": "Luxemburg",
+    "Lithuania": "Litauen",
+    "Liechtenstein": "Liechtenstein",
+    "Libya": "Libyen",
+    "Liberia": "Liberia",
+    "Lesotho": "Lesotho",
+    "Lebanon": "Libanon",
+    "Latvia": "Lettland",
+    "Laos": "Laos",
+    "Kyrgyzstan": "Kirgizistan",
+    "Kuwait": "Kuwait",
+    "Kosovo": "Kosovo",
+    "Kiribati": "Kiribati",
+    "Kenya": "Kenya",
+    "Kazakhstan": "Kazakstan",
+    "Jordan": "Jordanien",
+    "Jersey": "Jersey",
+    "Japan": "Japan",
+    "Jamaica": "Jamaica",
+    "Italy": "Italien",
+    "Israel": "Israel",
+    "Isle of Man": "Isle of Man",
+    "Ireland": "Irland",
+    "Iraq": "Irak",
+    "Iran": "Iran",
+    "Indonesia": "Indonesien",
+    "India": "Indien",
+    "Iceland": "Island",
+    "Hungary": "Ungern",
+    "Hong Kong": "Hongkong",
+    "Honduras": "Honduras",
+    "Heard & McDonald Islands": "Heard- och McDonaldöarna",
+    "Haiti": "Haiti",
+    "Guyana": "Guyana",
+    "Guinea-Bissau": "Guinea-Bissau",
+    "Guinea": "Guinea",
+    "Guernsey": "Guernsey",
+    "Guatemala": "Guatemala",
+    "Guam": "Guam",
+    "Guadeloupe": "Guadeloupe",
+    "Grenada": "Grenada",
+    "Greenland": "Grönland",
+    "Greece": "Grekland",
+    "Gibraltar": "Gibraltar",
+    "Ghana": "Ghana",
+    "Germany": "Tyskland",
+    "Georgia": "Georgien",
+    "Gambia": "Gambia",
+    "Gabon": "Gabon",
+    "French Southern Territories": "Franska sydterritorierna",
+    "French Polynesia": "Franska Polynesien",
+    "French Guiana": "Franska Guinea",
+    "France": "Frankrike",
+    "Finland": "Finland",
+    "Fiji": "Fiji",
+    "Faroe Islands": "Färöarna",
+    "Falkland Islands": "Falklandsöarna",
+    "Ethiopia": "Etiopien",
+    "Estonia": "Estland",
+    "Eritrea": "Eritrea",
+    "Equatorial Guinea": "Ekvatorialguinea",
+    "El Salvador": "El Salvador",
+    "Egypt": "Egypten",
+    "Ecuador": "Ecuador",
+    "Dominican Republic": "Dominikanska republiken",
+    "Dominica": "Dominica",
+    "Djibouti": "Djibouti",
+    "Denmark": "Danmark",
+    "Côte d’Ivoire": "Elfenbenskusten",
+    "Czech Republic": "Tjeckien",
+    "Cyprus": "Cypern",
+    "Curaçao": "Curaçao",
+    "Cuba": "Kuba",
+    "Croatia": "Kroatien",
+    "Costa Rica": "Costa Rica",
+    "Cook Islands": "Cooköarna",
+    "Congo - Kinshasa": "Kongo-Kinshasa",
+    "Congo - Brazzaville": "Kongo-Brazzaville",
+    "Comoros": "Komorerna",
+    "Colombia": "Colombia",
+    "Cocos (Keeling) Islands": "Kokosöarna",
+    "Christmas Island": "Julön",
+    "China": "Kina",
+    "Chile": "Chile",
+    "Chad": "Tchad",
+    "Central African Republic": "Centralafrikanska republiken",
+    "Cayman Islands": "Caymanöarna",
+    "Caribbean Netherlands": "Karibiska Nederländerna",
+    "Cape Verde": "Kap Verde"
 }

From 2efc49295cdd4e48a733deb7825818ed114853f4 Mon Sep 17 00:00:00 2001
From: sr093906 <spice2wolf@gmail.com>
Date: Sat, 14 Nov 2020 11:16:31 +0000
Subject: [PATCH 132/146] Translated using Weblate (Chinese (Simplified))

Currently translated at 85.4% (2257 of 2641 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
---
 src/i18n/strings/zh_Hans.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 359dcfc4a0..809be89383 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -584,7 +584,7 @@
     "Please enter the code it contains:": "请输入其包含的代码：",
     "Matrix ID": "Matrix ID",
     "Matrix Room ID": "Matrix 聊天室 ID",
-    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>社区页面的 HTML 代码</h1>\n<p>\n    你可以给社区的新成员们写些长长的社区简介来引导他们，或者放置\n    一些重要的<a href=\"foo\">链接</a>\n</p>\n<p>\n    你甚至可以使用 <img> 标签\n</p>\n",
+    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "",
     "Add rooms to the community summary": "将聊天室添加到社区简介中",
     "Which rooms would you like to add to this summary?": "您想要将哪个聊天室添加到社区简介？",
     "Add to summary": "添加到简介",
@@ -819,7 +819,7 @@
     "Link to selected message": "选中消息的链接",
     "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "至多半个小时内，其他用户可能看不到您社区的 <bold1>名称</bold1> 与 <bold2>头像</bold2> 的变化。",
     "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "这些聊天室对社区成员可见。社区成员可通过点击来加入它们。",
-    "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "您的社区还没有详细介绍，一个展示给社区成员的 HTML 页面。<br>点击这里即可打开设置添加详细介绍！",
+    "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "你的社区没有一个很长的描述，一个HTML页面可以展示给社区成员。<br />点击这里即可打开设置添加详细介绍！",
     "Failed to load %(groupId)s": "%(groupId)s 加载失败",
     "This room is not public. You will not be able to rejoin without an invite.": "此聊天室不是公开聊天室。如果没有成员邀请，您将无法重新加入。",
     "Can't leave Server Notices room": "无法退出服务器公告聊天室",
@@ -1124,7 +1124,7 @@
     "Go back": "返回",
     "Room Settings - %(roomName)s": "聊天室设置 - %(roomName)s",
     "A username can only contain lower case letters, numbers and '=_-./'": "用户名只能包含小写字母、数字和 '=_-./'",
-    "Failed to decrypt %(failedCount)s sessions!": "%(failedCount)s 会话解密失败",
+    "Failed to decrypt %(failedCount)s sessions!": "%(failedCount)s 个会话解密失败！",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>警告</b>：您应该只在受信任的电脑上设置密钥备份。",
     "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "通过输入恢复密码来访问您的安全消息历史记录和设置安全通信。",
     "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "如果忘记了恢复密码，您可以 <button1>使用恢复密钥</button1> 或者 <button2>设置新的恢复选项</button2>",
@@ -1530,9 +1530,9 @@
     "Backup has a <validity>valid</validity> signature from this session": "备份有来自此会话的<validity>有效</validity>签名",
     "Backup has an <validity>invalid</validity> signature from this session": "备份有来自此会话的<validity>无效</validity>签名",
     "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "备份有一个<validity>有效的签名</validity>，它来自<verify>已验证</verify>的会话<device></device>",
-    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "备份有一个<validity>有效的</validity>签名，它来自<verify>未验证的</verify>会话<device>\n</device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "备份有一个<validity>无效的</validity>签名，它来自<verify>已验证的</verify>会话<device>\n</device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "备份有一个<validity>无效的</validity>签名，它来自<verify>未验证的</verify>会话<device>\n</device>",
+    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "备份有一个<validity>有效的</validity>签名，它来自<verify>未验证的</verify>会话<device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "备份有一个<validity>无效的</validity>签名，它来自<verify>已验证的</verify>会话<device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "备份有一个<validity>无效的</validity>签名，它来自<verify>未验证的</verify>会话<device></device>",
     "Backup is not signed by any of your sessions": "备份没有被您的任何一个会话签名",
     "This backup is trusted because it has been restored on this session": "此备份是受信任的因为它被恢复到了此会话上",
     "Backup key stored: ": "存储的备份密钥： ",
@@ -1553,7 +1553,7 @@
     "Disconnect identity server": "断开身份服务器连接",
     "Disconnect from the identity server <idserver />?": "从身份服务器 <idserver /> 断开连接吗？",
     "Disconnect": "断开连接",
-    "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "断开连接前，你应当<b>删除你的个人信息</b>从身份服务器<idserver />。\n不幸的是，身份服务器<idserver />当前处于离线状态或无法访问。",
+    "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "断开连接前，你应当<b>删除你的个人信息</b>从身份服务器<idserver />。不幸的是，身份服务器<idserver />当前处于离线状态或无法访问。",
     "You should:": "您应该：",
     "contact the administrators of identity server <idserver />": "联系身份服务器 <idserver /> 的管理员",
     "wait and try again later": "等待并稍后重试",
@@ -2287,7 +2287,7 @@
     "Alt": "Alt",
     "Alt Gr": "Alt Gr",
     "Shift": "Shift",
-    "Super": "",
+    "Super": "超级",
     "Ctrl": "Ctrl",
     "New line": "换行",
     "Jump to start/end of the composer": "跳转到编辑器的开始/结束",

From 1b1520e896091e3500951fdb1977fcec7555d5f9 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Fri, 13 Nov 2020 02:27:18 +0000
Subject: [PATCH 133/146] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2641 of 2641 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
---
 src/i18n/strings/zh_Hant.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 6929c5e95e..d02ac268bd 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -2842,5 +2842,7 @@
     "Call Paused": "通話已暫停",
     "Takes the call in the current room off hold": "讓目前聊天室中的通話保持等候接聽的狀態",
     "Places the call in the current room on hold": "在目前的聊天室撥打通話並等候接聽",
-    "Role": "角色"
+    "Role": "角色",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|one": "使用 %(size)s 儲存來自 %(count)s 個聊天室的訊息，在本機安全地快取已加密的訊息以讓它們可以在搜尋結果中出現。",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|other": "使用 %(size)s 儲存來自 %(count)s 個聊天室的訊息，在本機安全地快取已加密的訊息以讓它們可以在搜尋結果中出現。"
 }

From 0394a269a5c628d0bf9ee6c23dfd62d65c2b941b Mon Sep 17 00:00:00 2001
From: Hassan Algoz <hassanalgoz@gmail.com>
Date: Mon, 16 Nov 2020 12:18:50 +0000
Subject: [PATCH 134/146] Translated using Weblate (Arabic)

Currently translated at 52.8% (1397 of 2641 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ar/
---
 src/i18n/strings/ar.json | 1067 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 1062 insertions(+), 5 deletions(-)

diff --git a/src/i18n/strings/ar.json b/src/i18n/strings/ar.json
index 718edd4c26..fec025da8d 100644
--- a/src/i18n/strings/ar.json
+++ b/src/i18n/strings/ar.json
@@ -58,7 +58,7 @@
     "Set Password": "تعيين كلمة سرية",
     "Checking for an update...": "البحث عن تحديث …",
     "powered by Matrix": "مشغل بواسطة Matrix",
-    "The platform you're on": "المنصة الحالية",
+    "The platform you're on": "المنصة التي أنت عليها",
     "Your language of choice": "اللغة التي تريد",
     "e.g. %(exampleValue)s": "مثال: %(exampleValue)s",
     "Use Single Sign On to continue": "استعمل الولوج الموحّد للمواصلة",
@@ -70,12 +70,12 @@
     "Add Email Address": "أضِف بريدًا إلكترونيًا",
     "Confirm adding this phone number by using Single Sign On to prove your identity.": "أكّد إضافتك لرقم الهاتف هذا باستعمال الولوج الموحّد لإثبات هويّتك.",
     "Confirm adding phone number": "أكّد إضافة رقم الهاتف",
-    "Click the button below to confirm adding this phone number.": "انقر الزر أسفله لتأكيد إضافة رقم الهاتف هذا",
+    "Click the button below to confirm adding this phone number.": "انقر الزر أسفله لتأكيد إضافة رقم الهاتف هذا.",
     "Add Phone Number": "أضِف رقم الهاتف",
     "Which officially provided instance you are using, if any": "السيرورة المقدّمة رسميًا التي تستعملها، لو وُجدت",
     "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "فيما إذا كنت تستعمل %(brand)s على جهاز اللمس فيه هو طريقة الإدخال الرئيسة",
-    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "",
-    "Whether you're using %(brand)s as an installed Progressive Web App": "فيما إذا كنت تستعمل %(brand)s كتطبيق وِب تدرّجي",
+    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "ما إذا كنت تستعمل ميزة \"breadcrumbs\" (الصور الرمزية أعلى قائمة الغرف)",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "ما إذا كنت تستعمل %(brand)s كتطبيق وِب تدرّجي",
     "Your user agent": "وكيل المستخدم الذي تستعمله",
     "Unable to load! Check your network connectivity and try again.": "تعذر التحميل! افحص اتصالك بالشبكة وأعِد المحاولة.",
     "Call Timeout": "انتهت مهلة الاتصال",
@@ -365,5 +365,1062 @@
     "Cannot reach identity server": "لا يمكن الوصول لهوية السيرفر",
     "You can register, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "يمكنك التسجيل , لكن بعض الميزات ستكون غير متوفرة حتى يتم التعرف على هوية السيرفر بشكل متصل . إن كنت ما تزال ترى هذا التحذير , تأكد من إعداداتك أو تواصل مع مدير السيرفر",
     "You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "يمكنك إعادة ضبط كلمة السر لكن بعض الميزات ستكون غير متوفرة حتى عودة السيرفر للإنترنت . إذا كنت لا تزال ترى هذا التحذير تأكد من إعداداتك أو تواصل مع مدير السيرفر",
-    "I understand the risks and wish to continue": "ادرك المخاطر وارغب في الاستمرار"
+    "I understand the risks and wish to continue": "ادرك المخاطر وارغب في الاستمرار",
+    "Language Dropdown": "قائمة اللغة المنسدلة",
+    "Information": "المعلومات",
+    "Rotate clockwise": "أدر باتجاه عقارب الساعة",
+    "Rotate Right": "أدر لليمين",
+    "Rotate counter-clockwise": "أدر عكس اتجاه عقارب الساعة",
+    "Rotate Left": "أدر لليسار",
+    "Uploaded on %(date)s by %(user)s": "رفعه %(user)s في %(date)s",
+    "You cannot delete this image. (%(code)s)": "لا يمكنك حذف هذه الصورة. (%(code)s)",
+    "expand": "توسيع",
+    "collapse": "تضييق",
+    "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "الرجاء <newIssueLink> إنشاء إشكال جديد</newIssueLink> على GitHub حتى نتمكن من التحقيق في هذا الخطأ.",
+    "No results": "لا نتائج",
+    "Join": "انضم",
+    "This version of %(brand)s does not support searching encrypted messages": "لا يدعم هذا الإصدار من %(brand)s البحث في الرسائل المشفرة",
+    "This version of %(brand)s does not support viewing some encrypted files": "لا يدعم هذا الإصدار من %(brand)s s عرض بعض الملفات المشفرة",
+    "Use the <a>Desktop app</a> to search encrypted messages": "استخدم <a> تطبيق سطح المكتب </a> للبحث في الرسائل المشفرة",
+    "Use the <a>Desktop app</a> to see all encrypted files": "استخدم <a> تطبيق سطح المكتب </a> لمشاهدة جميع الملفات المشفرة",
+    "Popout widget": "عنصر الواجهة المنبثق",
+    "This widget may use cookies.": "قد يستخدم عنصر الواجهة هذا ملفات تعريف الارتباط.",
+    "Widget added by": "عنصر واجهة أضافه",
+    "Widgets do not use message encryption.": "عناصر الواجهة لا تستخدم تشفير الرسائل.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "قد يؤدي استخدام هذه الأداة إلى مشاركة البيانات <helpIcon /> مع%(widgetDomain)s.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "قد يؤدي استخدام عنصر واجهة المستخدم هذا إلى مشاركة البيانات <helpIcon /> مع %(widgetDomain)s ومدير التكامل الخاص بك.",
+    "Widget ID": "معرّف عنصر واجهة",
+    "Room ID": "معرّف الغرفة",
+    "%(brand)s URL": "رابط %(brand)s",
+    "Your theme": "مظهر واجهتك",
+    "Your user ID": "معرّف مستخدمك",
+    "Your avatar URL": "رابط صورتك الشخصية",
+    "Your display name": "اسمك الظاهر",
+    "Any of the following data may be shared:": "يمكن أن تُشارَك أي من البيانات التالية:",
+    "Unknown Address": "عنوان غير معروف",
+    "Cancel search": "إلغاء البحث",
+    "Quick Reactions": "ردود الفعل السريعة",
+    "Categories": "التصنيفات",
+    "Flags": "الأعلام",
+    "Symbols": "الرموز",
+    "Objects": "الأشياء",
+    "Travel & Places": "السفر والأماكن",
+    "Activities": "الأنشطة",
+    "Food & Drink": "الطعام والشراب",
+    "Animals & Nature": "الحيوانات والطبيعة",
+    "Smileys & People": "الوجوه الضاحكة والأشخاص",
+    "Frequently Used": "كثيرة الاستعمال",
+    "You're not currently a member of any communities.": "أنت حاليًا لست عضوًا في أي مجتمعات.",
+    "Display your community flair in rooms configured to show it.": "اعرض flair المجتمع الخاص بك في الغرف المهيأة لإظهار ذلك.",
+    "Something went wrong when trying to get your communities.": "تعذر الحصول على مجتمعاتك.",
+    "Filter community rooms": "تصفية غرف المجتمع",
+    "Add rooms to this community": "أضف غرفاً لهذا المجتمع",
+    "Only visible to community members": "ظاهرة فقط لأعضاء المجتمع",
+    "Visible to everyone": "ظاهرة للجميع",
+    "Visibility in Room List": "الظهور في قائمة الغرف",
+    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "تعذر تحديث رؤية '%(roomName)s' في %(groupId)s.",
+    "Failed to remove '%(roomName)s' from %(groupId)s": "تعذرت إزالة '%(roomName)s' من %(groupId)s",
+    "Failed to remove room from community": "تعذر إزالة الغرفة من المجتمع",
+    "Removing a room from the community will also remove it from the community page.": "ستؤدي إزالة غرفة من المجتمع إلى إزالتها أيضًا من صفحة المجتمع.",
+    "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "هل أنت متأكد من أنك تريد إزالة '%(roomName)s' من %(groupId)s؟",
+    "Filter community members": "تصفية أعضاء المجتمع",
+    "Failed to load group members": "تعذر تحميل أعضاء المجموعة",
+    "Can't load this message": "تعذر تحميل هذه الرسالة",
+    "Submit logs": "إرسال السجلات",
+    "edited": "عُدل",
+    "Edited at %(date)s. Click to view edits.": "عُدل في %(date)s. انقر لترى التعديلات.",
+    "Click to view edits": "انقر لترى التعديلات",
+    "Edited at %(date)s": "عدل في %(date)s",
+    "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "أنت على وشك الانتقال إلى موقع تابع لجهة خارجية حتى تتمكن من مصادقة حسابك لاستخدامه مع %(integrationsUrl)s. هل ترغب في الاستمرار؟",
+    "Add an Integration": "أضف تكاملاً",
+    "Failed to copy": "تعذر النسخ",
+    "Copied!": "نُسخ!",
+    "This room is a continuation of another conversation.": "هذه الغرفة هي استمرار لمحادثة أخرى.",
+    "Click here to see older messages.": "انقر هنا لترى رسائل أقدم.",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s غير صورة الغرفة إلى <img/>",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s حذف صورة الغرفة.",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s غير صورة الغرفة %(roomName)s",
+    "Message deleted on %(date)s": "حذفت الرسالة في %(date)s",
+    "Message deleted by %(name)s": "حذف الرسالة %(name)s",
+    "Message deleted": "حُذفت الرسالة",
+    "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>تفاعلو ب%(shortName)s</reactedWith>",
+    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> تفاعلوا ب%(content)s</reactedWith>",
+    "Reactions": "التفاعلات",
+    "Show all": "أظهر الكل",
+    "Error decrypting video": "تعذر فك تشفير الفيديو",
+    "You sent a verification request": "أنت أرسلت طلب تحقق",
+    "%(name)s wants to verify": "%(name)s يريد التحقق",
+    "Declining …": "جارٍ الرفض …",
+    "Accepting …": "جارٍ القبول …",
+    "%(name)s cancelled": "%(name)s رفض",
+    "%(name)s declined": "%(name)s رفض",
+    "You cancelled": "أنت رفضت",
+    "You declined": "أنت رفضت",
+    "%(name)s accepted": "%(name)s قبل",
+    "You accepted": "أنت قبلت",
+    "%(name)s cancelled verifying": "تم إلغاء التحقق من %(name)s",
+    "You cancelled verifying %(name)s": "لقد ألغيت التحقق من %(name)s",
+    "You verified %(name)s": "لقد تحققت من %(name)s",
+    "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "لقد تجاهلت هذا المستخدم ، لذلك تم إخفاء رسالته. <a> العرض على أي حال. </a>",
+    "Video conference started by %(senderName)s": "بدأ مؤتمر الفيديو %(senderName)s",
+    "Video conference updated by %(senderName)s": "حدث مؤتمر الفيديو %(senderName)s",
+    "Video conference ended by %(senderName)s": "أنهى مؤتمر الفيديو %(senderName)s",
+    "Join the conference from the room information card on the right": "انضم إلى المؤتمر من بطاقة معلومات الغرفة على اليمين",
+    "Join the conference at the top of this room": "انضم إلى المؤتمر في الجزء العلوي من هذه الغرفة",
+    "Show image": "إظهار الصورة",
+    "Error decrypting image": "تعذر فك تشفير صورة",
+    "Invalid file%(extra)s": "ملف غير صحيح %(extra)s",
+    "Download %(text)s": "تحميل %(text)s",
+    "Decrypt %(text)s": "فك تشفير %(text)s",
+    "Error decrypting attachment": "تعذر فك تشفير المرفق",
+    "Attachment": "المرفق",
+    "Message Actions": "إجراءات الرسائل",
+    "Reply": "رد",
+    "React": "تفاعل",
+    "Error decrypting audio": "تعذر فك تشفير الصوت",
+    "The encryption used by this room isn't supported.": "التشفير الذي تستخدمه هذه الغرفة غير مدعوم.",
+    "Encryption not enabled": "التشفير غير مفعل",
+    "Ignored attempt to disable encryption": "تم تجاهل محاولة تعطيل التشفير",
+    "Encryption enabled": "التشفير مفعل",
+    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "يتم تشفير الرسائل الموجودة في هذه الغرفة بين الطرفين. عندما ينضم الأشخاص ، يمكنك التحقق منهم في ملفهم الشخصي ، ما عليك إلا أن تضغط على صورتهم الشخصية.",
+    "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "الرسائل هنا مشفرة من طرف إلى طرف. تحقق من %(displayName)s في ملفهم الشخصي - اضغط على صورتهم الشخصية.",
+    "View Source": "انظر المصدر",
+    "Yesterday": "أمس",
+    "Today": "اليوم",
+    "Saturday": "السبت",
+    "Friday": "الجمعة",
+    "Thursday": "الخميس",
+    "Wednesday": "الأربعاء",
+    "Tuesday": "الثلاثاء",
+    "Monday": "الاثنين",
+    "Sunday": "الأحد",
+    "Compare emoji": "قارن الرمز التعبيري",
+    "Verification cancelled": "أُلغي التحقق",
+    "You cancelled verification.": "لقد ألغيتَ التحقق.",
+    "%(displayName)s cancelled verification.": "%(displayName)s ألغى التحقق.",
+    "You cancelled verification on your other session.": "لقد ألغيت التحقق في اتصالك الآخر.",
+    "Verification timed out.": "انتهت مهلة التحقق.",
+    "Start verification again from their profile.": "ابدأ التحقق مرة أخرى من ملف التعريف الخاص بهم.",
+    "Start verification again from the notification.": "ابدأ التحقق مرة أخرى من الإشعار.",
+    "Got it": "فهمت",
+    "Verified": "تم التحقق",
+    "You've successfully verified %(displayName)s!": "لقد تحققت بنجاح من %(displayName)s!",
+    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "لقد تحققت بنجاح من %(deviceName)s (%(deviceId)s)!",
+    "Error updating flair": "خطأ في تحديث flair",
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "قم بتعيين العناوين لهذه الغرفة حتى يتمكن المستخدمون من العثور على هذه الغرفة من خلال خادمك الوسيط (%(localDomain)s)",
+    "Local Addresses": "عناوين محلية",
+    "New published address (e.g. #alias:server)": "عنوان منشور جديد (على سبيل المثال #alias:server)",
+    "No other published addresses yet, add one below": "لا توجد عناوين أخرى منشورة بعد ، أضف واحدًا أدناه",
+    "Other published addresses:": "عناوين منشورة أخرى:",
+    "Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.": "يمكن لأي شخص استخدام العناوين المنشورة على أي خادم للانضمام إلى غرفتك. لنشر عنوان ، يجب تعيينه كعنوان محلي أولاً.",
+    "Published Addresses": "العناوين المنشورة",
+    "Local address": "العنوان المحلي",
+    "This room has no local addresses": "هذه الغرفة ليس لها عناوين محلية",
+    "not specified": "غير محدد",
+    "Main address": "العنوان الرئيسي",
+    "Error removing address": "تعذرت إزالة العنوان",
+    "There was an error removing that address. It may no longer exist or a temporary error occurred.": "تعذرت إزالة ذاك العنوان. ربما لم يعد موجودًا أو حدث خطأ مؤقت.",
+    "You don't have permission to delete the address.": "ليس لديك الصلاحية لحذف العنوان.",
+    "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "تعذر إنشاء ذاك العنوان. قد لا يسمح به الخادم أو حدث فشل مؤقت.",
+    "Error creating address": "تعذر إنشاء العنوان",
+    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "حدث خطأ أثناء تحديث العناوين البديلة للغرفة. قد لا يسمح به الخادم أو حدث فشل مؤقت.",
+    "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "حدث خطأ أثناء تحديث العنوان الرئيسي للغرفة. قد لا يسمح به الخادم أو حدث فشل مؤقت.",
+    "Error updating main address": "تعذر تحديث العنوان الرئيسي",
+    "Mark all as read": "أشر عليها بأنها قرأت",
+    "Jump to first unread message.": "الانتقال إلى أول رسالة غير مقروءة.",
+    "Invited by %(sender)s": "دُعيت من %(sender)s",
+    "Revoke invite": "إبطال الدعوة",
+    "Admin Tools": "أدوات المدير",
+    "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "تعذر إبطال الدعوة. قد يواجه الخادم مشكلة مؤقتة أو ليس لديك صلاحيات كافية لإلغاء الدعوة.",
+    "Failed to revoke invite": "تعذر إبطال الدعوة",
+    "Show Stickers": "إظهار الملصقات",
+    "Hide Stickers": "إخفاء الملصقات",
+    "Stickerpack": "حزمة الملصقات",
+    "Add some now": "أضف البعض الآن",
+    "You don't currently have any stickerpacks enabled": "ليس لديك حاليًا أي حزم ملصقات ممكّنة",
+    "Failed to connect to integration manager": "تعذر الاتصال بمدير التكامل",
+    "Send as message": "أرسل كرسالة",
+    "Hint: Begin your message with <code>//</code> to start it with a slash.": "تلميح: ابدأ رسالتك ب<code>//</code> لتبدأها بشرطة مائلة.",
+    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "يمكنك استخدام <code>المساعدة</code> لسرد الأوامر المتاحة. هل قصدت إرسال هذا كرسالة؟",
+    "Unrecognised command: %(commandText)s": "أمر غير معروف: %(commandText)s",
+    "Unknown Command": "أمر غير معروف",
+    "Server unavailable, overloaded, or something else went wrong.": "الخادم غير متوفر أو محمّل فوق طاقته أو وقع خطأ غير ذلك.",
+    "Server error": "خطأ في الخادم",
+    "Search…": "بحث …",
+    "This Room": "هذه الغرفة",
+    "Only room administrators will see this warning": "لن يرى هذا التحذير سوى مديرو الغرفة",
+    "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "هذه الغرفة تشغل إصدار الغرفة <roomVersion /> ، والذي عده الخادم الوسيط هذا بأنه<i> غير مستقر </i>.",
+    "This room has already been upgraded.": "سبق وأن تمت ترقية هذه الغرفة.",
+    "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "ستؤدي ترقية هذه الغرفة إلى إغلاق النسخة الحالية للغرفة وإنشاء غرفة تمت ترقيتها بنفس الاسم.",
+    "Unread messages.": "رسائل غير المقروءة.",
+    "%(count)s unread messages.|one": "رسالة واحدة غير مقروءة.",
+    "%(count)s unread messages.|other": "%(count)s من الرسائل غير مقروءة.",
+    "%(count)s unread messages including mentions.|one": "إشارة واحدة غير مقروءة.",
+    "%(count)s unread messages including mentions.|other": "%(count)s من الرسائل والإشارات غير المقروءة.",
+    "Room options": "خيارات الغرفة",
+    "Leave Room": "غادر الغرفة",
+    "Settings": "الإعدادات",
+    "Low Priority": "أولوية منخفضة",
+    "Favourite": "تفضيل",
+    "Favourited": "فُضلت",
+    "Forget Room": "انسَ الغرفة",
+    "Notification options": "خيارات الإشعارات",
+    "Mentions & Keywords": "الإشارات والكلمات المفتاحية",
+    "Use default": "استعمل الاعتيادي",
+    "Show %(count)s more|one": "أظهر %(count)s زيادة",
+    "Show %(count)s more|other": "أظهر %(count)s زيادة",
+    "Jump to first invite.": "الانتقال لأول دعوة.",
+    "Jump to first unread room.": "الانتقال لأول غرفة لم تقرأ.",
+    "List options": "خيارات القائمة",
+    "A-Z": "ألفبائي",
+    "Activity": "النشاط",
+    "Sort by": "ترتيب حسب",
+    "Show previews of messages": "إظهار معاينات للرسائل",
+    "Show rooms with unread messages first": "اعرض الغرف ذات الرسائل غير المقروءة أولاً",
+    "Appearance": "المظهر",
+    "%(errcode)s was returned while trying to access the room. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "رجع %(errcode)s أثناء محاولة الوصول إلى الغرفة. إذا كنت تعتقد أنك ترى هذه الرسالة عن طريق الخطأ ، فيرجى <issueLink> إرسال تقرير خطأ </issueLink>.",
+    "Try again later, or ask a room admin to check if you have access.": "حاول مرة أخرى لاحقًا ، أو اطلب من مدير الغرفة التحقق مما إذا كان لك الوصول.",
+    "%(roomName)s is not accessible at this time.": "لا يمكن الوصول إلى %(roomName)s في الوقت الحالي.",
+    "This room doesn't exist. Are you sure you're at the right place?": "هذه الغرفة غير موجودة. هل أنت متأكد أنك في المكان الصحيح؟",
+    "%(roomName)s does not exist.": "الغرفة %(roomName)s ليست موجودة.",
+    "%(roomName)s can't be previewed. Do you want to join it?": "لا يمكن معاينة %(roomName)s. هل تريد الانضمام إليها؟",
+    "You're previewing %(roomName)s. Want to join it?": "أنت تعاين %(roomName)s. تريد الانضمام إليها؟",
+    "Reject & Ignore user": "رفض الدعوة وتجاهل الداعي",
+    "Reject": "رفض",
+    "<userName/> invited you": "<userName/> دعاك",
+    "Do you want to join %(roomName)s?": "هل تريد أن تنضم إلى %(roomName)s؟",
+    "Start chatting": "ابدأ المحادثة",
+    "<userName/> wants to chat": "<userName/> يريد محادثتك",
+    "Do you want to chat with %(user)s?": "هل تريد محادثة %(user)s؟",
+    "Share this email in Settings to receive invites directly in %(brand)s.": "شارك هذا البريد الإلكتروني في الإعدادات لتلقي الدعوات مباشرةً في %(brand)s.",
+    "Use an identity server in Settings to receive invites directly in %(brand)s.": "استخدم خادم هوية في الإعدادات لتلقي الدعوات مباشرة في %(brand)s.",
+    "This invite to %(roomName)s was sent to %(email)s": "الدعوة إلى %(roomName)s أرسلت إلى %(email)s",
+    "Link this email with your account in Settings to receive invites directly in %(brand)s.": "اربط هذا البريد الإلكتروني بحسابك في الإعدادات لتلقي الدعوات مباشرةً في%(brand)s.",
+    "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "تم إرسال الدعوة إلى %(roomName)s إلى %(email)s الذي لا يرتبط بحسابك",
+    "Join the discussion": "انضم للنقاش",
+    "You can still join it because this is a public room.": "لا يزال بإمكانك الانضمام إليها لأن هذه غرفة عامة.",
+    "Try to join anyway": "حاول الانضمام على أي حال",
+    "You can only join it with a working invite.": "لا يمكن الإنضمام إليها إلا بدعوة صالحة.",
+    "unknown error code": "رمز خطأٍ غير معروف",
+    "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "رجع خطأ (%(errcode)s) أثناء محاولة التحقق من صحة دعوتك. يمكنك محاولة تمرير هذه المعلومات إلى مدير الغرفة.",
+    "Something went wrong with your invite to %(roomName)s": "حدث خطأ في دعوتك إلى %(roomName)s",
+    "You were banned from %(roomName)s by %(memberName)s": "لقد حُظِرت من غرفة %(roomName)s من قِبَل %(memberName)s",
+    "Re-join": "أعِد الانضمام",
+    "Forget this room": "انسَ هذه الغرفة",
+    "Reason: %(reason)s": "السبب: %(reason)s",
+    "You were kicked from %(roomName)s by %(memberName)s": "لقد طُرِدت من غرفة %(roomName)s من قِبَل %(memberName)s",
+    "Loading room preview": "جارٍ تحميل معاينة الغرفة",
+    "Sign Up": "سجل",
+    "Join the conversation with an account": "انضم للمحادثة بحساب",
+    "Rejecting invite …": "جارٍ رفض الدعوة …",
+    "Loading …": "جارٍ الحمل …",
+    "Joining room …": "جارٍ الانضمام للغرفة …",
+    "This room": "هذه الغرفة",
+    "%(count)s results|one": "%(count)s نتيجة",
+    "%(count)s results|other": "%(count)s نتائج",
+    "Use the + to make a new room or explore existing ones below": "استخدم + لإنشاء غرفة جديدة أو استكشف الغرف الموجودة أدناه",
+    "Explore all public rooms": "استكشف جميع الغرف العامة",
+    "Can't see what you’re looking for?": "لا ترى ما تبحث عنه؟",
+    "Custom Tag": "وسم مخصص",
+    "Historical": "تاريخي",
+    "System Alerts": "تنبيهات النظام",
+    "Low priority": "أولوية منخفضة",
+    "Explore public rooms": "استكشف الغرف العامة",
+    "Explore community rooms": "استكشف غرف المجتمع",
+    "Add room": "أضف غرفة",
+    "Rooms": "الغرف",
+    "Start chat": "ابدأ محادثة",
+    "People": "الأشخاص",
+    "Favourites": "مفضلات",
+    "Invites": "دعوات",
+    "Search": "بحث",
+    "Show Widgets": "إظهار عناصر الواجهة",
+    "Hide Widgets": "إخفاء عناصر الواجهة",
+    "Forget room": "انسَ الغرفة",
+    "Join Room": "انضم للغرفة",
+    "(~%(count)s results)|one": "(~%(count)s نتيجة)",
+    "(~%(count)s results)|other": "(~%(count)s نتائج)",
+    "Guests can join": "يمكن للضيوف الانضمام",
+    "World readable": "مقروء للعالم",
+    "Unnamed room": "غرفة بلا اسم",
+    "No rooms to show": "لا غرف للعرض",
+    "No recently visited rooms": "لا توجد غرف تمت زيارتها مؤخرًا",
+    "Room %(name)s": "الغرفة %(name)s",
+    "Replying": "الرد",
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "شاهده %(displayName)s (%(userName)s) في %(dateTime)s",
+    "Seen by %(userName)s at %(dateTime)s": "شاهده %(userName)s في %(dateTime)s",
+    "Unknown": "غير معروف",
+    "Offline": "منفصل",
+    "Idle": "جامد",
+    "Online": "متصل",
+    "Unknown for %(duration)s": "غير معروف منذ %(duration)s",
+    "Offline for %(duration)s": "منفصل منذ %(duration)s",
+    "Idle for %(duration)s": "جامد منذ %(duration)s",
+    "Online for %(duration)s": "متصل منذ %(duration)s",
+    "%(duration)sd": "%(duration)sي",
+    "%(duration)sh": "%(duration)sس",
+    "%(duration)sm": "%(duration)sد",
+    "%(duration)ss": "%(duration)sث",
+    "Jump to message": "انتقل إلى الرسالة",
+    "Unpin Message": "إلغاء تثبيت الرسالة",
+    "Pinned Messages": "الرسائل المثبتة",
+    "Loading...": "جارٍ الحمل...",
+    "No pinned messages.": "لا رسائل مثبَّتة.",
+    "This is the start of <roomName/>.": "هذه بداية <roomName/>.",
+    "Add a photo, so people can easily spot your room.": "أضف صورة ، حتى يسهل على الناس تمييز غرفتك.",
+    "You created this room.": "أنت أنشأت هذه الغرفة.",
+    "%(displayName)s created this room.": "%(displayName)s أنشأ هذه الغرفة.",
+    "<a>Add a topic</a> to help people know what it is about.": "<a>أضف موضوعاً</a> ليُعرف ما يدور حوله الحديث.",
+    "Topic: %(topic)s ": "الموضوع: %(topic)s ",
+    "Topic: %(topic)s (<a>edit</a>)": "الموضوع: %(topic)s (<a>عدل</a>)",
+    "This is the beginning of your direct message history with <displayName/>.": "هذه هي بداية محفوظات رسائلك المباشرة باسم <displayName/>.",
+    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "أنتما فقط في هذه المحادثة ، إلا إذا دعا أي منكما أي شخص للانضمام.",
+    "Quote": "اقتباس",
+    "Code block": "كتلة برمجية",
+    "Strikethrough": "مشطوب",
+    "Italics": "مائل",
+    "Bold": "ثخين",
+    "You do not have permission to post to this room": "ليس لديك إذن للنشر في هذه الغرفة",
+    "This room has been replaced and is no longer active.": "تم استبدال هذه الغرفة ولم تعد نشطة.",
+    "The conversation continues here.": "تستمر المحادثة هنا.",
+    "Send a message…": "أرسل رسالة …",
+    "Send an encrypted message…": "أرسل رسالة مشفرة …",
+    "Send a reply…": "أرسل جواباً …",
+    "Send an encrypted reply…": "أرسل جواباً مشفراً …",
+    "Upload file": "ارفع ملف",
+    "Emoji picker": "منتقي الرموز التعبيرية",
+    "Hangup": "إنهاء المكالمة",
+    "Video call": "مكالمة مرئية",
+    "Voice call": "مكالمة صوتية",
+    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (قوة %(powerLevelNumber)s)",
+    "Filter room members": "تصفية أعضاء الغرفة",
+    "Invited": "مدعو",
+    "Invite to this community": "ادع لهذا المجتمع",
+    "Invite to this room": "ادع لهذه الغرفة",
+    "and %(count)s others...|one": "وواحدة أخرى...",
+    "and %(count)s others...|other": "و %(count)s أخر...",
+    "Close preview": "إغلاق المعاينة",
+    "Scroll to most recent messages": "انتقل إلى أحدث الرسائل",
+    "Please select the destination room for this message": "الرجاء تحديد الغرفة التي توجه لها هذه الرسالة",
+    "The authenticity of this encrypted message can't be guaranteed on this device.": "لا يمكن ضمان موثوقية هذه الرسالة المشفرة على هذا الجهاز.",
+    "Encrypted by a deleted session": "مشفرة باتصال محذوف",
+    "Unencrypted": "غير مشفر",
+    "Encrypted by an unverified session": "مشفرة باتصال لم يتم التحقق منه",
+    "Ignoring people is done through ban lists which contain rules for who to ban. Subscribing to a ban list means the users/servers blocked by that list will be hidden from you.": "يتم تجاهل الأشخاص من خلال قوائم الحظر التي تحتوي على قواعد لمن يتم حظره. الاشتراك في قائمة حظر يعني أن المستخدمين / الخوادم المحظورة بواسطة تلك القائمة سيتم إخفاؤهم عنك.",
+    "Add users and servers you want to ignore here. Use asterisks to have %(brand)s match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "أضف المستخدمين والخوادم التي تريد تجاهلها هنا. استخدم علامة النجمة لجعل %(brand)s s تطابق أي أحرف. على سبيل المثال ، قد يتجاهل <code>bot: * </code> جميع المستخدمين الذين اسمهم \"bot\" على أي خادم.",
+    "⚠ These settings are meant for advanced users.": "⚠ هذه الإعدادات مخصصة للمستخدمين المتقدمين.",
+    "Ignored users": "المستخدمون المتجاهَلون",
+    "You are currently subscribed to:": "أنت مشترك حاليا ب:",
+    "View rules": "عرض القواعد",
+    "Unsubscribe": "إلغاء الاشتراك",
+    "You are not subscribed to any lists": "أنت غير مشترك في أي قوائم",
+    "You are currently ignoring:": "حاليًّا أنت متجاهل:",
+    "You have not ignored anyone.": "أنت لم تتجاهل أحداً.",
+    "User rules": "قواعد المستخدم",
+    "Server rules": "قواعد الخادم",
+    "Ban list rules - %(roomName)s": "قواعد قائمة الحظر - %(roomName)s",
+    "None": "لا شيء",
+    "Please try again or view your console for hints.": "يرجى المحاولة مرة أخرى أو عرض وحدة التحكم (console) للتلميحات.",
+    "Error unsubscribing from list": "تعذر إلغاء الاشتراك من القائمة",
+    "Error removing ignored user/server": "تعذر حذف مستخدم/خادم مُتجاهَل",
+    "Please verify the room ID or address and try again.": "يرجى التحقق من معرف الغرفة أو العنوان والمحاولة مرة أخرى.",
+    "Error subscribing to list": "تعذر الاشتراك في القائمة",
+    "Something went wrong. Please try again or view your console for hints.": "هناك خطأ ما. يرجى المحاولة مرة أخرى أو عرض وحدة التحكم (console) للتلميحات.",
+    "Error adding ignored user/server": "تعذر إضافة مستخدم/خادم مُتجاهَل",
+    "Ignored/Blocked": "المُتجاهل/المحظور",
+    "Labs": "معامل",
+    "Customise your experience with experimental labs features. <a>Learn more</a>.": "خصص تجربتك مع ميزات المعامل التجريبية. <a> اعرف المزيد </a>.",
+    "Clear cache and reload": "محو مخزن الجيب وإعادة التحميل",
+    "click to reveal": "انقر للكشف",
+    "Access Token:": "رمز الوصول:",
+    "Identity Server is": "خادم الهوية هو",
+    "Homeserver is": "الخادم الوسيط هو",
+    "olm version:": "إصدار olm:",
+    "%(brand)s version:": "إصدار %(brand)s:",
+    "Versions": "الإصدارات",
+    "Keyboard Shortcuts": "اختصارات لوحة المفاتيح",
+    "FAQ": "اسئلة شائعة",
+    "Help & About": "المساعدة وعن البرنامج",
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "للإبلاغ عن مشكلة أمنية متعلقة بMatrix ، يرجى قراءة <a>سياسة الإفصاح الأمني</a> في Matrix.org.",
+    "Submit debug logs": "إرسال سجلات تصحيح الأخطاء",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "إذا قمت بإرسال خطأ عبر GitHub ، فيمكن أن تساعدنا سجلات تصحيح الأخطاء في تعقب المشكلة. تحتوي سجلات تصحيح الأخطاء على بيانات استخدام التطبيق بما في ذلك اسم المستخدم والمعرفات أو الأسماء المستعارة للغرف أو المجموعات التي زرتها وأسماء المستخدمين للمستخدمين الآخرين. لا تحتوي على رسائل.",
+    "Bug reporting": "الإبلاغ عن مشاكل في البرنامج",
+    "Chat with %(brand)s Bot": "تخاطب مع الروبوت الخاص ب%(brand)s",
+    "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "للمساعدة في استخدام %(brand)s ، انقر <a> هنا </a> أو ابدأ محادثة مع برنامج الروبوت الخاص بنا باستخدام الزر أدناه.",
+    "For help with using %(brand)s, click <a>here</a>.": "للمساعدة في استخدام %(brand)s انقر <a>هنا</a>.",
+    "Credits": "أمانة",
+    "Legal": "قانوني",
+    "General": "عام",
+    "Discovery": "الاكتشاف",
+    "Deactivate account": "تعطيل الحساب",
+    "Deactivate Account": "تعطيل الحساب",
+    "Deactivating your account is a permanent action - be careful!": "يعد تعطيل حسابك إجراءً دائمًا - كن حذرًا!",
+    "Account management": "إدارة الحساب",
+    "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "وافق على شروط خدمة خادم الهوية %(serverName)s لتكون قابلاً للاكتشاف عن طريق عنوان البريد الإلكتروني أو رقم الهاتف.",
+    "Language and region": "اللغة والمنطقة",
+    "Account": "الحساب",
+    "Set a new account password...": "تعيين كلمة مرور جديدة للحساب ...",
+    "Phone numbers": "أرقام الهواتف",
+    "Email addresses": "عنوان البريد الإلكتروني",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "تم تغيير كلمة السر بنجاح. لن تتلقى إشعارات فورية في الاتصالات الأخرى حتى تقوم بتسجيل الدخول إليها مرة أخرى",
+    "Success": "نجاح",
+    "Appearance Settings only affect this %(brand)s session.": "إنما تؤثر إعدادات المظهر في %(brand)s وعلى هذا الاتصال فقط.",
+    "Customise your appearance": "تخصيص مظهرك",
+    "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "قم بتعيين اسم الخط المثبت على نظامك وسيحاول %(brand)s استخدامه.",
+    "Modern": "حديث",
+    "Compact": "متراصّ",
+    "Message layout": "مظهر الرسائل",
+    "Theme": "المظهر",
+    "Add theme": "إضافة مظهر",
+    "Custom theme URL": "رابط المظهر المخصص",
+    "Theme added!": "أُضيفَ المظهر!",
+    "Error downloading theme information.": "تعذر تحميل معلومات المظهر.",
+    "Invalid theme schema.": "ملف وصف المظهر غير صالح.",
+    "Use between %(min)s pt and %(max)s pt": "استعمل ما بين %(min)spt و %(max)sps",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "الحجم المخصص للخط يجب أن ينحصر بين %(min)spt و %(max)spt",
+    "Size must be a number": "الحجم يجب أن يكون رقمًا",
+    "Hey you. You're the best!": "يا من ترى هذه الرسالة. أنت الأفضل!",
+    "New version available. <a>Update now.</a>": "ثمة إصدارٌ جديد. <a>حدّث الآن.</a>",
+    "Check for update": "ابحث عن تحديث",
+    "Error encountered (%(errorDetail)s).": "صودِفَ خطأ: (%(errorDetail)s).",
+    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "يتلقى مديرو التكامل بيانات الضبط ، ويمكنهم تعديل عناصر واجهة المستخدم ، وإرسال دعوات الغرف ، وتعيين مستويات القوة نيابة عنك.",
+    "Manage integrations": "إدارة التكاملات",
+    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "استخدم مدير التكامل لإدارة الروبوتات وعناصر الواجهة وحزم الملصقات.",
+    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "استخدم مدير التكامل <b>(%(serverName)s)</b> لإدارة الروبوتات وعناصر الواجهة وحزم الملصقات.",
+    "Change": "تغيير",
+    "Enter a new identity server": "أدخل خادم هوية جديدًا",
+    "Do not use an identity server": "لا تستخدم خادم هوية",
+    "Using an identity server is optional. If you choose not to use an identity server, you won't be discoverable by other users and you won't be able to invite others by email or phone.": "استخدام خادم الهوية اختياري. إذا اخترت عدم استخدام خادم هوية ، فلن يتمكن المستخدمون الآخرون من اكتشافك ولن تتمكن من دعوة الآخرين عبر البريد الإلكتروني أو الهاتف.",
+    "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "قطع الاتصال بخادم الهوية الخاص بك يعني أنك لن تكون قابلاً للاكتشاف من قبل المستخدمين الآخرين ولن تتمكن من دعوة الآخرين عبر البريد الإلكتروني أو الهاتف.",
+    "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "أنت لا تستخدم حاليًا خادم هوية. لاكتشاف جهات الاتصال الحالية التي تعرفها وتكون قابلاً للاكتشاف ، أضف واحداً أدناه.",
+    "Identity Server": "خادم الهوية",
+    "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "إذا كنت لا تريد استخدام <server /> لاكتشاف جهات الاتصال الموجودة التي تعرفها وتكون قابلاً للاكتشاف ، فأدخل خادم هوية آخر أدناه.",
+    "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "أنت تستخدم حاليًا <server> </server> لاكتشاف جهات الاتصال الحالية التي تعرفها وتجعل نفسك قابلاً للاكتشاف. يمكنك تغيير خادم الهوية الخاص بك أدناه.",
+    "Identity Server (%(server)s)": "خادمة الهوية (%(server)s)",
+    "Go back": "ارجع",
+    "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "نوصي بإزالة عناوين البريد الإلكتروني وأرقام الهواتف من خادم الهوية قبل قطع الاتصال.",
+    "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "لا زالت <b>بياناتك الشخصية مشاعة</b> على خادم الهوية <idserver />.",
+    "Disconnect anyway": "افصل على أي حال",
+    "wait and try again later": "انتظر وعاوِد لاحقًا",
+    "contact the administrators of identity server <idserver />": "اتصل بمديري خادم الهوية <idserver />",
+    "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "تحقق من المكونات الإضافية للمتصفح الخاص بك بحثًا عن أي شيء قد يحظر خادم الهوية (مثل Privacy Badger)",
+    "You should:": "يجب عليك:",
+    "You should <b>remove your personal data</b> from identity server <idserver /> before disconnecting. Unfortunately, identity server <idserver /> is currently offline or cannot be reached.": "لابد من محو <b>بيانات الشخصية</b> من خادم الهوية <idserver /> قبل الانفصال. لسوء الحظ ، خادم الهوية <idserver /> حاليًّا خارج الشبكة أو لا يمكن الوصول إليه.",
+    "Disconnect": "فصل",
+    "Disconnect from the identity server <idserver />?": "انفصل عن خادم الهوية <idserver />؟",
+    "Disconnect identity server": "افصل خادم الهوية",
+    "The identity server you have chosen does not have any terms of service.": "خادم الهوية الذي اخترت ليس له شروط خدمة.",
+    "Terms of service not accepted or the identity server is invalid.": "شروط الخدمة لم تُقبل أو أن خادم الهوية مردود.",
+    "Disconnect from the identity server <current /> and connect to <new /> instead?": "انفصل عن خادم الهوية <current /> واتصل بآخر <new /> بدلاً منه؟",
+    "Change identity server": "تغيير خادم الهوية",
+    "Checking server": "فحص خادم",
+    "Could not connect to Identity Server": "تعذر الاتصال بخادم هوية",
+    "Not a valid Identity Server (status code %(code)s)": "خادم هوية مردود (رقم الحال %(code)s)",
+    "Identity Server URL must be HTTPS": "يجب أن يكون رابط (URL) خادم الهوية HTTPS",
+    "not ready": "غير جاهز",
+    "ready": "جاهز",
+    "Secret storage:": "التخزين السري:",
+    "in account data": "بيانات في حساب",
+    "Secret storage public key:": "المفتاح العام للتخزين السري:",
+    "Backup key cached:": "المفتاح الاحتياطي المحفوظ (في cache):",
+    "Backup key stored:": "المفتاح الاختياطي المحفوظ:",
+    "not stored": "لم يُحفظ",
+    "Back up your encryption keys with your account data in case you lose access to your sessions. Your keys will be secured with a unique Recovery Key.": "قم بعمل نسخة احتياطية من مفاتيح التشفير ببيانات حسابك في حالة فقد الوصول إلى اتصالاتك. ستأمَّن مفاتيحك باستخدام مفتاح استرداد فريد.",
+    "unexpected type": "نوع غير متوقع",
+    "well formed": "مشكل جيّداً",
+    "Back up your keys before signing out to avoid losing them.": "أضف مفاتيحك للاحتياطي قبل تسجيل الخروج لتتجنب ضياعها.",
+    "Your keys are <b>not being backed up from this session</b>.": "مفاتيحك <b>لا احتياطيَّ لها من هذا الاتصال</b>.",
+    "Algorithm:": "الخوارزمية:",
+    "Backup version:": "نسخة الاحتياطي:",
+    "This backup is trusted because it has been restored on this session": "هذا الاحتياطي موثوق به لأنه تمت استعادته في هذا الاتصال",
+    "Backup is not signed by any of your sessions": "لا توقيع على الاحتياطي من أي اتصالاتك",
+    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "الاحتياطي له توقيع <validity>مردود</validity> من اتصال <verify>لم يتم التحقق منه</verify> <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "الاحتياطي له توقيع <validity>مردود</validity> من اتصال <verify>تم التحقق منه</verify> <device></device>",
+    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "الاحتياطي له توقيع <validity>مقبول</validity> من اتصال <verify>لم يتم التحقق منه</verify> <device></device>",
+    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "الاحتياطي له توقيع <validity>مقبول</validity> من اتصال <verify>تم التحقق منه</verify> <device></device>",
+    "Backup has an <validity>invalid</validity> signature from this session": "الاحتياطي له توقيع <validity>مردود</validity> من هذا الاتصال",
+    "Backup has a <validity>valid</validity> signature from this session": "الاحتياطي له توقيع <validity>مقبول</validity> من هذا الاتصال",
+    "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "الاحتياطي له توقيع من اتصال <verify>مجهول</verify> له المعرّف %(deviceId)s",
+    "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "الاحتياطي له توقيع من مستخدم <verify>مجهول</verify> له المعرّف %(deviceId)s",
+    "Backup has a <validity>invalid</validity> signature from this user": "الاحتياطي له توقيع <validity>مردود</validity> من هذا المستخدم",
+    "Backup has a <validity>valid</validity> signature from this user": "الاحتياطي له توقيع <validity>مقبول</validity> من هذا المستخدم",
+    "All keys backed up": "جميع المفاتيح منسوخة في الاحتياطي",
+    "Backing up %(sessionsRemaining)s keys...": "جارٍ رفع %(sessionsRemaining)s مفاتيح للاحتياط...",
+    "Connect this session to Key Backup": "اربط هذا الاتصال باحتياطي مفتاح",
+    "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "اربط هذا الاتصال باحتياطي قبل تسجيل الخروج لتجنب فقدان أي مفاتيح قد تكون موجودة فقط في هذا الاتصال.",
+    "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.": "هذا الاتصال <b>لم يعتمد الاحتياطي لمفاتيحك</b> لكن لديك احتياطي يمكنك الاتسرجاع منه والإضافة إليه فيما بعد.",
+    "This session is backing up your keys. ": "هذا الاتصال اعتمد الاحتياطي لمفاتيحك. ",
+    "Restore from Backup": "استعادة من الاحتياطي",
+    "Unable to load key backup status": "تعذر حمل حالة النسخ الاحتياطي للمفتاح",
+    "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "هل أنت واثق؟ ستفقد رسائلك المشفرة إذا لم يتم نسخ المفاتيح احتياطيًا بشكل صحيح.",
+    "Delete Backup": "حذف الحتياطي",
+    "Save": "حفظ",
+    "Profile picture": "الصورة الشخصية",
+    "Display Name": "الاسم الظاهر",
+    "Profile": "الملف الشخصي",
+    "<a>Upgrade</a> to your own domain": "<a>رقِّ</a> لنطاقك",
+    "The operation could not be completed": "تعذر إتمام العملية",
+    "Failed to save your profile": "تعذر حفظ ملفك الشخصي",
+    "Noisy": "مزعج",
+    "On": "مشتغل",
+    "Off": "مطفأ",
+    "Enable audible notifications for this session": "تمكين الإشعارات الصوتية لهذا الاتصال",
+    "Show message in desktop notification": "إظهار الرسالة في إشعارات سطح المكتب",
+    "Enable desktop notifications for this session": "تمكين إشعارات سطح المكتب لهذا الاتصال",
+    "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "ربما قد ضبطتها في عميل آخر غير %(brand)s. لا يمكنك ضبطها في %(brand)s لكنها تبقى سارية.",
+    "There are advanced notifications which are not shown here.": "توجد إشعارات متقدمة لا تظهر هنا.",
+    "Notification targets": "أهداف الإشعار",
+    "Unable to fetch notification target list": "تعذر جلب قائمة هدف الإشعار",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "تتبع الإشعارات بالكلمات المفتاحية التالية قواعد لا يمكن عرضها هنا:",
+    "Add an email address to configure email notifications": "أضف عنوان بريد إلكتروني لضبط إشعاراته",
+    "Enable email notifications": "تمكين إشعارات البريد الإلكتروني",
+    "Clear notifications": "محو الإشعارات",
+    "Enable notifications for this account": "تمكين الإشعارات لهذا الحساب",
+    "Notify me for anything else": "أشعرني بأي شيء آخر",
+    "You've successfully verified your device!": "لقد نجحت في التحقق من جهازك!",
+    "In encrypted rooms, verify all users to ensure it’s secure.": "في الغرف المشفرة ، تحقق من جميع المستخدمين للتأكد من أنها آمنة.",
+    "Verify all users in a room to ensure it's secure.": "تحقق من جميع المستخدمين في الغرفة للتأكد من أنها آمنة.",
+    "Yes": "نعم",
+    "Almost there! Is %(displayName)s showing the same shield?": "أوشكت على الوصول! هل يظهر %(displayName)s نفس الدرع؟",
+    "Almost there! Is your other session showing the same shield?": "أوشكت على الوصول! هل يُظهر اتصالك الآخر نفس الدرع؟",
+    "Verify by emoji": "تحقق بالرموز التعبيرية",
+    "Verify by comparing unique emoji.": "تحقق بمقارنة الرموز التعبيرية الفريدة.",
+    "If you can't scan the code above, verify by comparing unique emoji.": "إذا لم تتمكن من مسح الرمز أعلاه ، فتحقق بمقارنة الرموز التعبيرية الفريدة.",
+    "Ask %(displayName)s to scan your code:": "اطلب من %(displayName)s مسح رمزك:",
+    "Verify by scanning": "تحقق بالمسح",
+    "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what %(brand)s supports. Try with a different client.": "الاتصال الذي تحاول التحقق منه لا يدعم مسح رمز الاستجابة السريعة أو التحقق من الرموز التعبيرية ، وهو ما يدعمه %(brand)s. جرب مع عميل مختلف.",
+    "Security": "الأمان",
+    "This client does not support end-to-end encryption.": "لا يدعم هذا العميل التشفير من طرف إلى طرف.",
+    "Role": "الدور",
+    "Failed to deactivate user": "تعذر إلغاء نشاط المستخدم",
+    "Deactivate user": "إلغاء نشاط المستخدم",
+    "Deactivating this user will log them out and prevent them from logging back in. Additionally, they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to deactivate this user?": "سيؤدي إلغاء نشاط هذا المستخدم إلى تسجيل خروجهم ومنعهم من تسجيل الدخول مرة أخرى. بالإضافة إلى ذلك ، سيغادرون جميع الغرف التي يتواجدون فيها. لا يمكن التراجع عن هذا الإجراء. هل أنت متأكد أنك تريد إلغاء نشاط هذا المستخدم؟",
+    "Deactivate user?": "إلغاء نشاط المستخدم؟",
+    "Are you sure?": "هل متأكد أنت؟",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "لن تكون قادرًا على التراجع عن هذا التغيير لأنك ترقي المستخدم ليكون له نفس مستوى الطاقة لديك.",
+    "Failed to change power level": "تعذر تغيير مستوى القوة",
+    "Failed to remove user from community": "تعذر حذف المستخدم من المجتمع",
+    "Failed to withdraw invitation": "تعذر سحب الدعوة",
+    "Remove this user from community?": "إزالة هذا المستخدم من المجتمع؟",
+    "Disinvite this user from community?": "إبطال دعوة  هذا المستخدم إلى المجتمع؟",
+    "Remove from community": "إزالة من المجتمع",
+    "Mute": "كتم",
+    "Unmute": "رفع الكتم",
+    "Failed to mute user": "تعذر كتم المستخدم",
+    "Failed to ban user": "تعذر حذف المستخدم",
+    "Ban this user?": "حظر هذا المستخدم؟",
+    "Unban this user?": "رفع الحظر عن هذا المستخدم؟",
+    "Ban": "حظر",
+    "Remove recent messages": "احذف الرسائل الحديثة",
+    "Remove %(count)s messages|one": "احذف رسالة واحدة",
+    "Remove %(count)s messages|other": "احذف %(count)s رسائل",
+    "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "قد يستغرق هذا وقتًا بحسب عدد الرسائل. من فضلك لا تحدث عمليك أثناء ذلك.",
+    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "أنت على وشك إزالة رسالة واحدة أرسلها %(user)s. هذا لا يمكن التراجع عنه. هل ترغب في الاستمرار؟",
+    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "أنت على وشك إزالة %(count)s رسائل أرسلها %(user)s. هذا لا يمكن التراجع عنها. هل ترغب في الاستمرار؟",
+    "Remove recent messages by %(user)s": "قم بإزالة رسائل %(user)s الأخيرة",
+    "Try scrolling up in the timeline to see if there are any earlier ones.": "حاول الصعود في المخطط الزمني لمعرفة ما إذا كانت هناك سابقات.",
+    "No recent messages by %(user)s found": "لم يتم العثور على رسائل حديثة من %(user)s",
+    "Failed to kick": "تعذر الطرد",
+    "Kick this user?": "طرد هذا المستخدم؟",
+    "Disinvite this user?": "إبطال الدعوة لهذا المستخدم؟",
+    "Kick": "طرد",
+    "Disinvite": "إبطال الدعوة",
+    "Demote": "تخفيض",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "لن تتمكن من التراجع عن هذا التغيير لأنك تقوم بتخفيض رتبتك ، إذا كنت آخر مستخدم ذي امتياز في الغرفة ، فسيكون من المستحيل استعادة الامتيازات.",
+    "Demote yourself?": "خفض مرتبة نفسك؟",
+    "Direct message": "رسالة مباشرة",
+    "Share Link to User": "مشاركة رابط للمستخدم",
+    "Mention": "إشارة",
+    "Invite": "دعوة",
+    "Jump to read receipt": "انتقل لإيصال قراءة",
+    "Hide sessions": "اخف الاتصالات",
+    "%(count)s sessions|one": "%(count)s اتصال",
+    "%(count)s sessions|other": "%(count)s اتصالات",
+    "Hide verified sessions": "اخف الاتصالات المحققة",
+    "%(count)s verified sessions|one": "اتصال واحد محقق",
+    "%(count)s verified sessions|other": "%(count)s اتصالات محققة",
+    "Not trusted": "غير موثوق",
+    "Trusted": "موثوق",
+    "Room settings": "إعدادات الغرفة",
+    "Share room": "شارك الغرفة",
+    "Show files": "أظهر ملفات",
+    "%(count)s people|one": "%(count)s شخص",
+    "%(count)s people|other": "%(count)s أشخاص",
+    "About": "حول",
+    "Not encrypted": "غير مشفر",
+    "Add widgets, bridges & bots": "إضافة عناصر الواجهة والجسور والروبوتات",
+    "Edit widgets, bridges & bots": "تعديل عناصر الواجهة والجسور والروبوتات",
+    "Widgets": "عناصر الواجهة",
+    "Options": "الخيارات",
+    "Unpin a widget to view it in this panel": "قم بفك تثبيت عنصر واجهة مستخدم لعرضه في هذه اللوحة",
+    "Unpin": "فك التثبيت",
+    "You can only pin up to %(count)s widgets|other": "تثبيت عناصر واجهة المستخدم ممكن إلى %(count)s بحدٍ أعلى",
+    "Room Info": "معلومات الغرفة",
+    "Members": "الأعضاء",
+    "Yours, or the other users’ session": "إياك أو اتصال المستخدمين الآخرين",
+    "Yours, or the other users’ internet connection": "إياك أو اتصال المستخدمين الآخرين بالإنترنت",
+    "The homeserver the user you’re verifying is connected to": "الخادم الوسيط الذي يتصل به المستخدم الذي تتحقق منه",
+    "Your homeserver": "خادمك الوسيط",
+    "One of the following may be compromised:": "قد يتم اختراق أي مما يلي:",
+    "Your messages are not secure": "رسائلك ليست آمنة",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "لمزيد من الأمان ، تحقق من هذا المستخدم عن طريق التحقق من رمز لمرة واحدة على كلا الجهازين.",
+    "Verify User": "تحقق من المستخدم",
+    "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "في الغرف المشفرة ، يتم تأمين رسائلك ولا يمتلك أحد سواك أنت والمتلقي المفاتيح الفريدة لفتحها.",
+    "Messages in this room are not end-to-end encrypted.": "الرسائل الموجودة في هذه الغرفة غير مشفرة من طرف إلى طرف.",
+    "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "رسائلك مؤمنة وليس لأحد المفاتيح الفريدة لفكها إلا أنت والمتلقي.",
+    "Messages in this room are end-to-end encrypted.": "يتم تشفير الرسائل الموجودة في هذه الغرفة بين الطرفين.",
+    "Start Verification": "ابدأ التحقق",
+    "Accepting…": "جارٍ القبول …",
+    "Waiting for %(displayName)s to accept…": "بانتظار %(displayName)s ليقبل …",
+    "Waiting for you to accept on your other session…": "في انتظار قبولك من اتصالك الآخر …",
+    "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "عندما يضع شخص ما عنوان URL في رسالته ، يمكن عرض معاينة عنوان URL لإعطاء مزيد من المعلومات حول هذا الرابط مثل العنوان والوصف وصورة من موقع الويب.",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "في الغرف المشفرة ، مثل هذه الغرفة ، يتم تعطيل معاينات URL أصلاً للتأكد من أن خادمك الوسيط (حيث يتم إنشاء المعاينات) لا يمكنه جمع معلومات حول الروابط التي تراها في هذه الغرفة.",
+    "URL previews are disabled by default for participants in this room.": "معاينات URL معطلة بشكل أصلي للمشاركين في هذه الغرفة.",
+    "URL previews are enabled by default for participants in this room.": "يتم تمكين معاينات URL أصلًا للمشاركين في هذه الغرفة.",
+    "You have <a>disabled</a> URL previews by default.": "لقد <a> عطلت </a> معاينات عناوين URL بشكل أصلي.",
+    "You have <a>enabled</a> URL previews by default.": "لقد قمت <a> بتمكين </a> معاينات URL بشكل أصلي.",
+    "Publish this room to the public in %(domain)s's room directory?": "هل تريد نشر هذه الغرفة للملأ في دليل غرف %(domain)s؟",
+    "Room avatar": "صورة الغرفة",
+    "Room Topic": "موضوع الغرفة",
+    "Room Name": "اسم الغرفة",
+    "New community ID (e.g. +foo:%(localDomain)s)": "معرف المجتمع الجديد (على سبيل المثال +foo:%(localDomain)s)",
+    "This room is not showing flair for any communities": "هذه الغرفة لا تظهر flair لأي مجتمعات",
+    "Showing flair for these communities:": "إظهار flair لهذه المجتمعات:",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' ليس معرف مجتمع صالحًا",
+    "Invalid community ID": "معرف المجتمع غير صالح",
+    "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "تعذر تحديث flair لهذه الغرفة. قد لا يسمح الخادم بذلك أو حدث خطأ مؤقت.",
+    "Notify for all other messages/rooms": "أشعر لجميع الرسائل والغرف الأخرى",
+    "Messages containing <span>keywords</span>": "رسائل تتضمن <span>كلمات مفتاحية</span>",
+    "Failed to update keywords": "تعذر تحديث الكلمات المفتاحية",
+    "Failed to change settings": "تعذر تغيير الإعدادات",
+    "Enter keywords separated by a comma:": "أدخل كلماتٍ مفتاحية مع فاصلة بينها:",
+    "Keywords": "الكلمات المفتاحية",
+    "Error saving email notification preferences": "تعذر حفظ تفضيلات إشعار البريد الإلكتروني",
+    "The integration manager is offline or it cannot reach your homeserver.": "مدري التكامل غير متصل بالإنرتنت أو لا يمكنه الوصول إلى خادمك الوسيط.",
+    "Cannot connect to integration manager": "لا يمكن الاتصال بمدير التكامل",
+    "Connecting to integration manager...": "جارٍ الاتصال بمدير التكامل ...",
+    "%(brand)s can't securely cache encrypted messages locally while running in a web browser. Use <desktopLink>%(brand)s Desktop</desktopLink> for encrypted messages to appear in search results.": "%(brand)s لا يستطيع تخزين الرسائل المشفرة محليًّا (في cache) بشكل آمن طالما أنه يعمل على متصفح ويب. استخدم <desktopLink>%(brand)s على سطح المكتب</desktopLink> لتظهر لك الرسائل المشفرة في نتائج البحث.",
+    "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.": "%(brand)s يفقد بعض المكونات المطلوبة لحفظ آمن محليًّا للرسائل المشفرة. إذا أدرت تجربة هذه الخاصية، فأنشئ %(brand)s على سطح المكتب مع <nativeLink>إضافة مكونات البحث</nativeLink>.",
+    "Securely cache encrypted messages locally for them to appear in search results.": "تخزين الرسائل المشفرة بشكل آمن (في cache) محليًا حتى تظهر في نتائج البحث.",
+    "Manage": "إدارة",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|one": "تخزين الرسائل المشفرة مؤقتًا بشكل آمن محليًا حتى تظهر في نتائج البحث ، باستخدام %(size)s لتخزين الرسائل من %(count)s غرفة.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|other": "تخزين الرسائل المشفرة مؤقتًا بشكل آمن محليًا حتى تظهر في نتائج البحث ، باستخدام%(size)s لتخزين الرسائل من %(count)s غرف.",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "تحقق بشكل فردي من كل اتصال يستخدمه المستخدم لتمييزه أنه موثوق ، دون الوثوق بالأجهزة الموقعة بالتبادل.",
+    "Encryption": "تشفير",
+    "Failed to set display name": "تعذر تعيين الاسم الظاهر",
+    "Last seen": "آخر ظهور",
+    "Public Name": "الاسم العام",
+    "ID": "معرف",
+    "Delete %(count)s sessions|one": "حذف %(count)s اتصال",
+    "Delete %(count)s sessions|other": "حذف %(count)s اتصالات",
+    "Authentication": "المصادقة",
+    "Delete sessions|one": "احذف الاتصال",
+    "Delete sessions|other": "‪احذف الاتصالات",
+    "Click the button below to confirm deleting these sessions.|one": "انقر الزر أدناه لتأكيد حذف هذا الاتصال.",
+    "Click the button below to confirm deleting these sessions.|other": "انقر الزر أدناه لتأكيد حذف هذه الاتصالات.",
+    "Confirm deleting these sessions": "أكد حذف هذه الاتصالات",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "أكد حذف هذا الاتصال باستخدام الدخول الموحد لإثبات هويتك.",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "أكد حذف هذه الاتصالات باستخدام الدخول الموحد لإثبات هويتك.",
+    "Unable to load session list": "تعذر حمل قائمة الجلسات",
+    "Your homeserver does not support session management.": "خادمك الوسيط لا يدعم إدارة جلسات اتصال.",
+    "exists": "يوجد",
+    "User signing private key:": "المفتاح الخاص لتوقيع المستخدم:",
+    "Self signing private key:": "المفتاح الخاص للتوقيع الذاتي:",
+    "not found locally": "لم يعثر عليه محليًّا",
+    "cached locally": "حُفظ (في cache) محليًّا",
+    "Master private key:": "المفتاح الخاص الرئيسي:",
+    "not found in storage": "لم يعثر عليها في المخزن",
+    "in secret storage": "في المخزن السري",
+    "Cross-signing private keys:": "المفاتيح الخاصة للتوقيع المتبادل:",
+    "not found": "لم يعثر عليه",
+    "in memory": "في الذاكرة",
+    "Cross-signing public keys:": "المفاتيح العامة للتوقيع المتبادل:",
+    "Reset": "إعادة تعيين",
+    "Set up": "تأسيس",
+    "Cross-signing is not set up.": "لم يتم إعداد التوقيع المتبادل.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "يحتوي حسابك على هوية توقيع متبادل في وحدة تخزين سرية ، لكن هذا الاتصال لم يثق به بعد.",
+    "Cross-signing is ready for use.": "التوقيع المتبادل جاهز للاستخدام.",
+    "Your homeserver does not support cross-signing.": "خادمك الوسيط لا يدعم التوقيع المتبادل (cross-signing).",
+    "Change Password": "تغيير كلمة المرور",
+    "Confirm password": "تأكيد كلمة المرور",
+    "New Password": "كلمة مرور جديدة",
+    "Current password": "كلمة المرور الحالية",
+    "Do you want to set an email address?": "هل تريد تعيين عنوان بريد إلكتروني؟",
+    "Export E2E room keys": "تصدير مفاتيح E2E للغرفة",
+    "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.": "سيؤدي تغيير كلمة المرور حاليًا إلى إعادة تعيين أي مفاتيح تشفير من طرف إلى طرف في جميع الاتصالات، مما يجعل المحادثات المحفوظة المشفرة غير قابلة للقراءة ، إلا إذا قمت بتصدير مفاتيح غرفتك أولاً وإعادة استيرادها بعد ذلك. سيتم تحسين هذا في المستقبل.",
+    "Warning!": "إنذار!",
+    "Passwords can't be empty": "كلمات المرور لا يمكن أن تكون فارغة",
+    "New passwords don't match": "كلمات المرور الجديدة لا تتطابق",
+    "No display name": "لا اسم ظاهر",
+    "Upload new:": "رفع جديد:",
+    "Failed to upload profile picture!": "تعذَّر رفع صورة الملف الشخصي!",
+    "Show more": "أظهر أكثر",
+    "Show less": "أظهر أقل",
+    "Channel: %(channelName)s": "قناة: %(channelName)s",
+    "This bridge is managed by <user />.": "هذا الجسر يديره <user />.",
+    "Upload": "رفع",
+    "Accept <policyLink /> to continue:": "قبول <policyLink /> للمتابعة:",
+    "Decline (%(counter)s)": "رفض (%(counter)s)",
+    "From %(deviceName)s (%(deviceId)s)": "من %(deviceName)s (%(deviceId)s)",
+    "Your server isn't responding to some <a>requests</a>.": "خادمك لا يتجاوب مع بعض <a>الطلبات</a>.",
+    "Dog": "كلب",
+    "To be secure, do this in person or use a trusted way to communicate.": "لتكون آمنًا ، افعل ذلك شخصيًا أو استخدم طريقة موثوقة للتواصل.",
+    "They don't match": "لم يتطابقوا",
+    "They match": "تطابقوا",
+    "Cancelling…": "جارٍ الإلغاء…",
+    "Waiting for %(displayName)s to verify…": "بانتظار %(displayName)s للتحقق…",
+    "Waiting for your other session to verify…": "بانتظار اتصالك الآخر للتحقق…",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "بانتظار اتصالك الآخر %(deviceName)s (%(deviceId)s) ، للتحقق…",
+    "Unable to find a supported verification method.": "تعذر العثور على أحد طرق التحقق الممكنة.",
+    "Verify this user by confirming the following number appears on their screen.": "تحقق من هذا المستخدم من خلال التأكد من ظهور الرقم التالي على شاشته.",
+    "Verify this session by confirming the following number appears on its screen.": "تحقق من هذا الاتصال من خلال التأكد من ظهور الرقم التالي على شاشته.",
+    "Verify this user by confirming the following emoji appear on their screen.": "تحقق من هذا المستخدم من خلال التأكيد من ظهور الرموز التعبيرية التالية على شاشته.",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "تأكد من عرض الرموز التعبيرية أدناه في كلا الاتصالين بنفس الترتيب:",
+    "Start": "بداية",
+    "Compare a unique set of emoji if you don't have a camera on either device": "قارن مجموعة فريدة من الرموز التعبيرية إذا لم يكن لديك كاميرا على أي من الجهازين",
+    "Compare unique emoji": "قارن رمزاً تعبيريًّا فريداً",
+    "or": "أو",
+    "Scan this unique code": "امسح هذا الرمز الفريد",
+    "Verify this session by completing one of the following:": "تحقق من هذا الاتصال بإكمال أحد الإجراءات التالية:",
+    "Got It": "فهمت",
+    "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "الرسائل الآمنة مع هذا المستخدم مشفرة من طرفك إلى طرفه ولا يمكن قراءتها من قبل جهات خارجية.",
+    "You've successfully verified this user.": "لقد نجحت في التحقق من هذا المستخدم.",
+    "Verified!": "تم التحقق!",
+    "The other party cancelled the verification.": "ألغى الطرف الآخر التحقق.",
+    "Accept": "قبول",
+    "Decline": "رفض",
+    "Incoming call": "مكالمة واردة",
+    "Incoming video call": "مكالمة مرئية واردة",
+    "Incoming voice call": "مكالمة صوتية واردة",
+    "Unknown caller": "متصل غير معروف",
+    "Call Paused": "أوقِفَ الاتصال",
+    "Active call": "مكالمة نشطة",
+    "This is your list of users/servers you have blocked - don't leave the room!": "هذه قائمتك للمستخدمين / الخوادم التي حظرت - لا تغادر الغرفة!",
+    "My Ban List": "قائمة الحظر",
+    "When rooms are upgraded": "عند ترقية الغرف",
+    "Messages sent by bot": "رسائل أرسلها آلي (Bot)",
+    "When I'm invited to a room": "عندما أُدعى لغرفة",
+    "Encrypted messages in group chats": "رسائل مشفرة في المحادثات الجماعية",
+    "Messages in group chats": "رسائل المحادثات الجماعية",
+    "Encrypted messages in one-to-one chats": "رسائل مشفرة في المحادثات المباشرة",
+    "Messages in one-to-one chats": "رسائل المحادثات المباشرة",
+    "Messages containing @room": "رسائل تتضمن @غرفة",
+    "Messages containing my username": "رسائل تتضمن اسم المستخدم الخاص بي",
+    "Messages containing my display name": "رسائل تتضمن اسمي الظاهر",
+    "Downloading logs": "تحميل السجلات",
+    "Uploading logs": "رفع السجلات",
+    "Enable experimental, compact IRC style layout": "تفعيل تخطيط نمط IRC التجريبي والمضغوط",
+    "IRC display name width": "عرض الاسم الظاهر لIRC",
+    "Manually verify all remote sessions": "تحقق يدويًا من جميع الاتصالات البعيدة",
+    "How fast should messages be downloaded.": "ما مدى سرعة تنزيل الرسائل.",
+    "Enable message search in encrypted rooms": "تمكين البحث عن الرسائل في الغرف المشفرة",
+    "Show previews/thumbnails for images": "إظهار المعاينات / الصور المصغرة للصور",
+    "Send read receipts for messages (requires compatible homeserver to disable)": "إرسال إيصالات بالقراءة للرسائل (يتطلب التعطيل توافق الخادم الوسيط)",
+    "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "السماح بخادم مساعدة الاتصال الاحتياطي turn.matrix.org عندما لا يقدم خادمك واحدًا (سيتم مشاركة عنوان IP الخاص بك أثناء المكالمة)",
+    "Low bandwidth mode": "وضع النطاق الترددي المنخفض",
+    "Show hidden events in timeline": "إظهار الأحداث المخفية في الجدول الزمني",
+    "Show shortcuts to recently viewed rooms above the room list": "إظهار اختصارات للغرف التي تم عرضها مؤخرًا أعلى قائمة الغرف",
+    "Show rooms with unread notifications first": "اعرض الغرف ذات الإشعارات غير المقروءة أولاً",
+    "Order rooms by name": "ترتيب الغرف بالاسم",
+    "Show developer tools": "عرض أدوات المطور",
+    "Prompt before sending invites to potentially invalid matrix IDs": "أعلمني قبل إرسال دعوات لمعرِّفات قد لا تكون صحيحة",
+    "Room Colour": "لون الغرفة",
+    "Enable URL previews by default for participants in this room": "تمكين معاينة الروابط أصلاً لأي مشارك في هذه الغرفة",
+    "Enable URL previews for this room (only affects you)": "تمكين معاينة الروابط لهذه الغرفة (يؤثر عليك فقط)",
+    "Enable inline URL previews by default": "تمكين معاينة الروابط أصلاً",
+    "Never send encrypted messages to unverified sessions in this room from this session": "لا ترسل أبدًا رسائل مشفرة إلى اتصالات التي لم يتم التحقق منها في هذه الغرفة من هذا الاتصال",
+    "Never send encrypted messages to unverified sessions from this session": "لا ترسل أبدًا رسائل مشفرة إلى اتصالات لم يتم التحقق منها من هذا الاتصال",
+    "Send analytics data": "إرسال بيانات التحليلات",
+    "Allow Peer-to-Peer for 1:1 calls": "تمكين مكالمة القرين للقرين إذا كانت فردية (1:1)",
+    "System font name": "اسم خط النظام",
+    "Use a system font": "استخدام خط النظام",
+    "Match system theme": "مطابقة ألوان النظام",
+    "Mirror local video feed": "محاكاة تغذية الفيديو المحلية",
+    "Automatically replace plain text Emoji": "استبدل الرموز التعبيرية المكتوبة بالأحرف بها",
+    "Show typing notifications": "إظهار إشعار الكتابة",
+    "Send typing notifications": "إرسال إشعار بالكتابة",
+    "Enable big emoji in chat": "تفعيل الرموز التعبيرية الكبيرة في المحادثة",
+    "Show avatars in user and room mentions": "إظهار الصورة الرمزية عند ذكر مستخدم أو غرفة",
+    "Enable automatic language detection for syntax highlighting": "تمكين التعرف التلقائي للغة لتلوين الجمل",
+    "Autoplay GIFs and videos": "التشغيل التلقائي لملفات GIF ومقاطع الفيديو",
+    "Always show message timestamps": "اعرض دائمًا الطوابع الزمنية للرسالة",
+    "Show timestamps in 12 hour format (e.g. 2:30pm)": "عرض الطوابع الزمنية بتنسيق 12 ساعة (على سبيل المثال 2:30pm)",
+    "Show read receipts sent by other users": "إظهار إيصالات القراءة المرسلة من قبل مستخدمين آخرين",
+    "Show display name changes": "إظهار تغييرات الاسم الظاهر",
+    "Show avatar changes": "إظهار التغييرات في الصورة الشخصية",
+    "Show join/leave messages (invites/kicks/bans unaffected)": "إظهار رسائل الانضمام والمغادرة (لا تتأثر الدعوات والركلات والحظر)",
+    "Show a placeholder for removed messages": "إظهار عنصر نائب للرسائل المحذوفة",
+    "Use a more compact ‘Modern’ layout": "استخدم تنسيقًا \"حديثًا\" أكثر إحكاما",
+    "Enable Emoji suggestions while typing": "تفعيل اقتراحات الرموز التعبيرية أثناء الكتابة",
+    "Use custom size": "استخدام حجم مخصص",
+    "Font size": "حجم الخط",
+    "Show info about bridges in room settings": "إظهار المعلومات حول الجسور في إعدادات الغرفة",
+    "Enable advanced debugging for the room list": "تفعيل التصحيح المتقدم لقائمة الغرف",
+    "Offline encrypted messaging using dehydrated devices": "الرسائل المشفرة في وضع عدم الاتصال باستخدام أجهزة مجففة",
+    "Show message previews for reactions in all rooms": "أظهر معاينات الرسائل للتفاعلات في كل الغرف",
+    "Show message previews for reactions in DMs": "أظهر معاينات الرسائل للتفاعلات في المراسلة المباشرة",
+    "Support adding custom themes": "دعم إضافة ألوان مخصصة",
+    "Try out new ways to ignore people (experimental)": "جرب طرق أخرى لتجاهل الناس (تجريبي)",
+    "Multiple integration managers": "تعدد مدراء التكامل",
+    "Render simple counters in room header": "إظهار عدّادات بسيطة في رأس الغرفة",
+    "Group & filter rooms by custom tags (refresh to apply changes)": "جمع وتصفية الغرف حسب أوسمة مخصصة (حدّث لترى التغيرات)",
+    "Custom user status messages": "تخصيص رسالة حالة المستخدم",
+    "Message Pinning": "تثبيت الرسالة",
+    "New spinner design": "التصميم الجديد للدوَّار",
+    "Change notification settings": "تغيير إعدادات الإشعار",
+    "%(senderName)s is calling": "%(senderName)s يتصل",
+    "Waiting for answer": "بانتظار الرد",
+    "%(senderName)s started a call": "%(senderName)s بدأ مكالمة",
+    "You started a call": "لقد بدأت مكالمة",
+    "Call ended": "انتهت المكالمة",
+    "%(senderName)s ended the call": "%(senderName)s أنهى المكالمة",
+    "You ended the call": "لقد أنهيتَ المكالمة",
+    "Call in progress": "مكالمتك تحت الإجراء",
+    "%(senderName)s joined the call": "%(senderName)s انضم للمكالمة",
+    "You joined the call": "لقد انضممت إلى المكالمة",
+    "Failed to join room": "تعذَّر الانضمام للغرفة",
+    "The person who invited you already left the room, or their server is offline.": "الشخص الذي دعاك سبق وغادر الغرفة ، أو أن خادمه غير متصل بالإنترنت.",
+    "The person who invited you already left the room.": "الشخص الذي دعاك قد سبق وغادر الغرفة.",
+    "Please contact your homeserver administrator.": "يُرجى تواصلك مع مدير خادمك.",
+    "Sorry, your homeserver is too old to participate in this room.": "للأسف ، خادمك أقدم من أن يكون قادرًا على المشاركة في هذه الغرفة.",
+    "There was an error joining the room": "تعذَّر الانضمام للغرفة",
+    "Guest": "ضيف",
+    "New version of %(brand)s is available": "يتوفر إصدار جديد من %(brand)s",
+    "Update %(brand)s": "حدّث: %(brand)s",
+    "Verify the new login accessing your account: %(name)s": "تحقق من تسجيل الدخول الجديد لحسابك: %(name)s",
+    "New login. Was this you?": "تسجيل دخول جديد. هل كان ذاك أنت؟",
+    "Other users may not trust it": "قد لا يثق به المستخدمون الآخرون",
+    "This message cannot be decrypted": "لا يمكن فك تشفير هذه الرسالة",
+    "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink> إعادة طلب مفاتيح التشفير </requestLink> من اتصالاتك الأخرى.",
+    "Key request sent.": "تم إرسال طلب المفتاح.",
+    "If your other sessions do not have the key for this message you will not be able to decrypt them.": "إذا كانت اتصالاتك الأخرى لا تحتوي على مفتاح هذه الرسالة ، فلن تتمكن من فك تشفيرها.",
+    "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.": "يتم إرسال طلبات مشاركة المفاتيح إلى اتصالاتك الأخرى تلقائيًا. إذا رفضت أو ألغيت طلب مشاركة المفتاح في اتصالاتك الأخرى ، فانقر هنا لطلب مفاتيح هذا الاتصال مرة أخرى.",
+    "Your key share request has been sent - please check your other sessions for key share requests.": "تم إرسال طلبك لمشاركة المفتاح - يرجى التحقق من اتصالاتك الأخرى في طلبات مشاركة المفتاح.",
+    "%(senderName)s uploaded a file": "%(senderName)s رفع ملفًّا",
+    "%(senderName)s sent a video": "%(senderName)s أرسل مرئيًّا",
+    "%(senderName)s sent an image": "%(senderName)s أرسل صورة",
+    "This event could not be displayed": "تعذر عرض هذا الحدث",
+    "Mod": "مشرف",
+    "Edit message": "تعديل الرسالة",
+    "Everyone in this room is verified": "تم التحقق من جميع من في هذه الغرفة",
+    "This room is end-to-end encrypted": "هذه الغرفة مشفرة من طرف إلى طرف",
+    "Someone is using an unknown session": "شخص ما يستخدم اتصالاً غير معروف",
+    "You have verified this user. This user has verified all of their sessions.": "لقد تحققت من هذا المستخدم. لقد تحقق هذا المستخدم من جميع اتصالاته.",
+    "You have not verified this user.": "أنت لم تتحقق من هذا المستخدم.",
+    "This user has not verified all of their sessions.": "هذا المستخدم لم يتحقق من جميع اتصالاته.",
+    "Drop file here to upload": "قم بإسقاط الملف هنا ليُرفَع",
+    "Drop File Here": "أسقط الملف هنا",
+    "Phone Number": "رقم الهاتف",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "تم إرسال رسالة نصية إلى +%(msisdn)s. الرجاء إدخال رمز التحقق الذي فيها.",
+    "Remove %(phone)s?": "حذف %(phone)s؟",
+    "Email Address": "عنوان بريد الكتروني",
+    "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "لقد أرسلنا إليك بريدًا إلكترونيًا للتحقق من عنوانك. يرجى اتباع التعليمات الموجودة هناك ثم نقر الزر أدناه.",
+    "Add": "أضف",
+    "Unable to add email address": "تعذرت إضافة عنوان البريد الإلكتروني",
+    "This doesn't appear to be a valid email address": "لا يبدو عنوان البريد الإلكتروني هذا صالحاً",
+    "Invalid Email Address": "عنوان البريد الإلكتروني غير صالح",
+    "Remove %(email)s?": "حذف %(email)s؟",
+    "Unable to remove contact information": "غير قادر على إزالة معلومات التواصل",
+    "Discovery options will appear once you have added a phone number above.": "ستظهر خيارات الاكتشاف بمجرد إضافة رقم هاتف أعلاه.",
+    "Verification code": "رمز التحقق",
+    "Please enter verification code sent via text.": "الرجاء إدخال رمز التحقق المرسل عبر النص.",
+    "Incorrect verification code": "رمز التحقق غير صحيح",
+    "Unable to verify phone number.": "تعذر التحقق من رقم الهاتف.",
+    "Unable to share phone number": "تعذرت مشاركة رقم الهاتف",
+    "Revoke": "إبطال",
+    "Unable to revoke sharing for phone number": "تعذر إبطال مشاركة رقم الهاتف",
+    "Discovery options will appear once you have added an email above.": "ستظهر خيارات الاكتشاف بمجرد إضافة بريد إلكتروني أعلاه.",
+    "Share": "مشاركة",
+    "Complete": "تام",
+    "Verify the link in your inbox": "تحقق من الرابط في بريدك الوارد",
+    "Unable to verify email address.": "تعذر التحقق من عنوان البريد الإلكتروني.",
+    "Click the link in the email you received to verify and then click continue again.": "انقر الرابط الواصل لبريدك الإلكتروني للتحقق ثم انقر \"متابعة\" مرة أخرى.",
+    "Your email address hasn't been verified yet": "لم يتم التحقق من عنوان بريدك الإلكتروني حتى الآن",
+    "Unable to share email address": "تعذرت مشاركة البريد الإلتكروني",
+    "Unable to revoke sharing for email address": "تعذر إبطال مشاركة عنوان البريد الإلكتروني",
+    "Who can access this room?": "من يمكنه الوصول إلى هذه الغرفة؟",
+    "Encrypted": "التشفير",
+    "Once enabled, encryption cannot be disabled.": "لا يمكن تعطيل التشفير بعد تمكينه.",
+    "Security & Privacy": "الأمان والخصوصية",
+    "Who can read history?": "من يستطيع قراءة التاريخ؟",
+    "Members only (since they joined)": "الأعضاء فقط (منذ انضمامهم)",
+    "Members only (since they were invited)": "الأعضاء فقط (منذ أن تمت دعوتهم)",
+    "Members only (since the point in time of selecting this option)": "الأعضاء فقط (منذ اللحظة التي حدد فيها هذا الخيار)",
+    "Anyone": "أي أحد",
+    "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "ستنطبق التغييرات على من يمكنه قراءة السجل على الرسائل المستقبلية في هذه الغرفة فقط. رؤية التاريخ الحالي لن تتغير.",
+    "Anyone who knows the room's link, including guests": "أي شخص يعرف رابط الغرفة بما في ذلك الضيوف",
+    "Anyone who knows the room's link, apart from guests": "أي شخص يعرف رابط الغرفة باستثناء الضيوف",
+    "Only people who have been invited": "المدعوون فقط",
+    "To link to this room, please add an address.": "للربط لهذه الغرفة ، يرجى إضافة عنوان.",
+    "Click here to fix": "انقر هنا للإصلاح",
+    "Guests cannot join this room even if explicitly invited.": "لا يمكن للضيوف الانضمام إلى هذه الغرفة حتى إذا تمت دعوتهم بعينهم.",
+    "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "لا يمكن العدول عن التشفير بعد تمكينه للغرفة. التشفير يحجب حتى الخادم من رؤية رسائل الغرفة، فقط أعضاؤها هم من يرونها. قد يمنع تمكين التشفير العديد من الروبوتات والجسور من العمل بشكل صحيح. <a> اعرف المزيد حول التشفير. </a>",
+    "Enable encryption?": "تمكين التشفير؟",
+    "Select the roles required to change various parts of the room": "حدد الأدوار المطلوبة لتغيير أجزاء مختلفة من الغرفة",
+    "Permissions": "الصلاحيات",
+    "Roles & Permissions": "الأدوار والصلاحيات",
+    "Send %(eventType)s events": "إرسال أحداث من نوع %(eventType)s",
+    "Banned users": "المستخدمون المحظورون",
+    "Muted Users": "المستخدمون المكتومون",
+    "Privileged Users": "المستخدمون المميزون",
+    "No users have specific privileges in this room": "لا يوجد مستخدمين لديهم امتيازات خاصة في هذه الغرفة",
+    "Notify everyone": "إشعار الجميع",
+    "Remove messages sent by others": "حذف رسائل الآخرين",
+    "Ban users": "حظر المستخدمين",
+    "Kick users": "طرد المستخدمين",
+    "Change settings": "تغيير الإعدادات",
+    "Send messages": "إرسال الرسائل",
+    "Invite users": "دعوة المستخدمين",
+    "Default role": "الدور الاعتيادي",
+    "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "تعذر تغيير مستوى قوة المستخدم. تأكد من أن لديك صلاحيات كافية وحاول مرة أخرى.",
+    "Error changing power level": "تعذر تغيير مستوى القوة",
+    "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "تعذر تغيير مستوى قوة الغرفة. تأكد من أن لديك صلاحيات كافية وحاول مرة أخرى.",
+    "Error changing power level requirement": "تعذر تغيير متطلبات مستوى القوة",
+    "Banned by %(displayName)s": "حظره %(displayName)s",
+    "Unban": "فك الحظر",
+    "Failed to unban": "تعذر فك الحظر",
+    "Modify widgets": "تعديل عناصر الواجهة",
+    "Enable room encryption": "تفعيل تشفير الغرفة",
+    "Upgrade the room": "ترقية الغرفة",
+    "Change topic": "تغيير الموضوع",
+    "Change permissions": "تغيير الصلاحيات",
+    "Change history visibility": "تغيير ظهور التاريخ",
+    "Change main address for the room": "تغيير العنوان الأساسي للغرفة",
+    "Change room name": "تغيير اسم الغرفة",
+    "Change room avatar": "تغيير صورة الغرفة",
+    "Browse": "تصفح",
+    "Set a new custom sound": "تعيين صوت مخصص جديد",
+    "Notification sound": "صوت الإشعار",
+    "Sounds": "الأصوات",
+    "Uploaded sound": "صوت تمام الرفع",
+    "Room Addresses": "عناوين الغرف",
+    "URL Previews": "معاينة الروابط",
+    "Bridges": "الجسور",
+    "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "هذه الغرفة لا تربط الرسائل بأي منصة. <a> اعرف المزيد. </a>",
+    "This room is bridging messages to the following platforms. <a>Learn more.</a>": "تعمل هذه الغرفة على توصيل الرسائل بالمنصات التالية. <a> اعرف المزيد. </a>",
+    "Open Devtools": "افتح أدوات المطور",
+    "Developer options": "خيارات المطور",
+    "Room version:": "إصدار الغرفة:",
+    "Room version": "إصدار الغرفة",
+    "Internal room ID:": "معرف الغرفة الداخلي:",
+    "Room information": "معلومات الغرفة",
+    "View older messages in %(roomName)s.": "عرض رسائل أقدم في %(roomName)s.",
+    "this room": "هذه الغرفة",
+    "Upgrade this room to the recommended room version": "قم بترقية هذه الغرفة إلى إصدار الغرفة الموصى به",
+    "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b> تحذير </b>: ترقية الغرفة<i> لن يقوم تلقائيًا بترحيل أعضاء الغرفة إلى الإصدار الجديد من الغرفة. </i> سننشر رابطًا للغرفة الجديدة في الإصدار القديم من الغرفة - سيتعين على أعضاء الغرفة نقر هذا الرابط للانضمام إلى الغرفة الجديدة.",
+    "This room is not accessible by remote Matrix servers": "لا يمكن الوصول إلى هذه الغرفة بواسطة خوادم Matrix البعيدة",
+    "Voice & Video": "الصوت والفيديو",
+    "Camera": "كاميرا",
+    "Microphone": "ميكروفون",
+    "Audio Output": "مخرج الصوت",
+    "No Webcams detected": "لم يتم الكشف عن كاميرات الويب",
+    "No Microphones detected": "لم يتم الكشف عن أجهزة ميكروفون",
+    "No Audio Outputs detected": "لم يتم الكشف عن مخرجات الصوت",
+    "Request media permissions": "اطلب الإذن للوسائط",
+    "Missing media permissions, click the button below to request.": "إذن الوسائط مفقود ، انقر الزر أدناه لطلب الإذن.",
+    "You may need to manually permit %(brand)s to access your microphone/webcam": "قد تحتاج إلى السماح يدويًا ل%(brand)s s بالوصول إلى الميكروفون / كاميرا الويب",
+    "No media permissions": "لا إذن للوسائط",
+    "A session's public name is visible to people you communicate with": "يكون الاسم العام للاتصال مرئيًا للأشخاص الذين تتواصل معهم",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "قم بإدارة أسماء اتصالاتك وتسجيل الخروج منها أدناه أو <a> تحقق منها في ملفك التعريفي</a>.",
+    "Where you’re logged in": "أمكنة أنت مسجل دخولك فيها",
+    "Learn more about how we use analytics.": "اعرف أكثر عن كيفية استخدامنا للتحليلات.",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "الخصوصية مهمة بالنسبة لنا ، لذلك نحن لا نجمع أي بيانات شخصية أو ما يمكن التمييز به من البيانات لتحليلاتنا.",
+    "%(brand)s collects anonymous analytics to allow us to improve the application.": "تجمع %(brand)s تحليلات مجهولة للسماح لنا بتحسين التطبيق.",
+    "Privacy": "الخصوصية",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "قام مسؤول الخادم بتعطيل التشفير من طرف إلى طرف أصلاً في الغرف الخاصة والرسائل الخاصّة.",
+    "Cross-signing": "التوقيع المتبادل",
+    "Message search": "بحث الرسائل",
+    "Secure Backup": "تأمين النسخ الاحتياطي",
+    "Reject all %(invitedRooms)s invites": "رفض كل الدعوات (%(invitedRooms)s)",
+    "Accept all %(invitedRooms)s invites": "قبول كل الدعوات (%(invitedRooms)s)",
+    "Bulk options": "خيارات مجمعة",
+    "Session key:": "مفتاح الاتصال:",
+    "Session ID:": "معرّف الاتصال:",
+    "Cryptography": "التشفير",
+    "Import E2E room keys": "تعبئة مفاتيح E2E للغرف",
+    "<not supported>": "<غير معتمد>",
+    "Autocomplete delay (ms)": "تأخير الإكمال التلقائي (مللي ثانية)",
+    "Timeline": "الجدول الزمني",
+    "Composer": "الكاتب",
+    "Room list": "قائمة الغرفة",
+    "Preferences": "تفضلات",
+    "Always show the window menu bar": "",
+    "Start automatically after system login": "ابدأ تلقائيًا بعد تسجيل الدخول إلى النظام",
+    "Subscribe": "اشتراك",
+    "Room ID or address of ban list": "معرف الغرفة أو عنوان قائمة الحظر",
+    "If this isn't what you want, please use a different tool to ignore users.": "إذا لم يكن هذا ما تريده ، فيرجى استخدام أداة مختلفة لتجاهل المستخدمين.",
+    "Subscribing to a ban list will cause you to join it!": "سيؤدي الاشتراك في قائمة الحظر إلى انضمامك إليها!",
+    "Subscribed lists": "قوائم متشرك بها",
+    "Ignore": "تجاهل",
+    "eg: @bot:* or example.org": "مثلاً: @bot:* أو example.org",
+    "Server or user ID to ignore": "الخادم أو معرف المستخدم المطلوب تجاهله",
+    "Your personal ban list holds all the users/servers you personally don't want to see messages from. After ignoring your first user/server, a new room will show up in your room list named 'My Ban List' - stay in this room to keep the ban list in effect.": "تحتوي قائمتك للحظر على المستخدمين / الخوادم الذين لا تريد أن ترى رسائل منهم. بعد أول تجاهل لمستخدم / لخادم ، ستظهر غرفة جديدة في قائمة الغرف باسم \"My Ban List\" - ابق في هذه الغرفة للحفاظ على قائمة الحظر.",
+    "Personal ban list": "قائمة الحظر الشخصية",
+    "Safeguard against losing access to encrypted messages & data": "حماية ضد فقدان الوصول إلى الرسائل والبيانات المشفرة",
+    "Verify": "تحقق",
+    "Upgrade": "ترقية",
+    "Verify this session": "تحقق من هذا الاتصال",
+    "Encryption upgrade available": "ترقية التشفير متاحة",
+    "Set up Secure Backup": "أعد النسخ الاحتياطي الآمن",
+    "Ok": "حسنا",
+    "Contact your <a>server admin</a>.": "تواصل مع <a>مدير الخادم</a> الخاص بك.",
+    "Your homeserver has exceeded one of its resource limits.": "لقد تجاوز خادمك أحد حدود موارده.",
+    "Your homeserver has exceeded its user limit.": "لقد تجاوز خادمك حد عدد المستخدمين.",
+    "Enable": "ممكن",
+    "Enable desktop notifications": "تمكين إشعارات سطح المكتب",
+    "Notifications": "الإشعارات",
+    "Don't miss a reply": "لا تفوت أي رد",
+    "Later": "لاحقاً",
+    "Review": "مراجعة",
+    "Verify all your sessions to ensure your account & messages are safe": "تحقق من جميع اتصالاتك للتأكد من أمان حسابك ورسائلك",
+    "Review where you’re logged in": "راجع أماكن تسجيل دخولك",
+    "No": "لا",
+    "I want to help": "أريد أن أساعد",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "أرسل <UsageDataLink> بيانات استخدام مجهولة </ UseDataLink> والتي تساعدنا في تحسين %(brand)s. سيستخدم هذا <PolicyLink> ملف تعريف الارتباط </ PolicyLink>.",
+    "Help us improve %(brand)s": "ساعدنا في تحسين %(brand)s",
+    "Unknown App": "تطبيق غير معروف",
+    "Short keyboard patterns are easy to guess": "من السهل تخمين أنماط قصيرة من لوحة المفاتيح",
+    "Straight rows of keys are easy to guess": "سهلٌ تخمين صفوف من المفاتيح",
+    "Common names and surnames are easy to guess": "سهلٌ تخمين الأسماء والألقاب الشائعة",
+    "Names and surnames by themselves are easy to guess": "سهلٌ تخمين الأسماء والألقاب",
+    "A word by itself is easy to guess": "الكلمة الواحدة سهلٌ تخمينها",
+    "This is similar to a commonly used password": "كلمة المرور هذه مشابهة لكلمة مرور شائعة",
+    "This is a very common password": "كلمة المرور هذه شائعة جدًّا",
+    "This is a top-100 common password": "كلمة المرور هذه من أكثر الكلمات ال100 شيوعاً",
+    "This is a top-10 common password": "كلمة المرور هذه من أكثر الكلمات ال10 شيوعاً",
+    "Dates are often easy to guess": "غالبًا ما يكون من السهل تخمين التواريخ",
+    "Recent years are easy to guess": "من السهل تخمين السنوات الأخيرة",
+    "Sequences like abc or 6543 are easy to guess": "من السهل تخمين التسلسلات مثل abc أو 6543",
+    "Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"": "يصعب تخمين التكرارات مثل \"abcabcabc\" مقارنةً ب\"abc\"",
+    "Repeats like \"aaa\" are easy to guess": "من السهل تخمين التكرارات مثل \"aaa\"",
+    "Add another word or two. Uncommon words are better.": "أضف كلمة أخرى أو كلمتين. الكلمات غير المألوفة أفضل.",
+    "Predictable substitutions like '@' instead of 'a' don't help very much": "الاستبدالات المتوقعة مثل \"@\" بدلاً من \"a\" لا تساعد كثيرًا",
+    "Reversed words aren't much harder to guess": "الكلمات المعكوسة ليست أصعب تخميناً",
+    "All-uppercase is almost as easy to guess as all-lowercase": "تكاد تتساوى سهولة تخمين الكلمة ذات الأحرف التي كلها صغيرة مع التي كلها كبيرة",
+    "Capitalization doesn't help very much": "لا تساعد الكتابة بالأحرف الكبيرة كثيرًا",
+    "Avoid dates and years that are associated with you": "تجنب التواريخ والسنوات التي ترتبط بك",
+    "Avoid years that are associated with you": "تجنب السنوات التي ترتبط بك",
+    "Avoid recent years": "تجنب السنوات الأخيرة",
+    "Avoid sequences": "تجنب التسلسلات",
+    "Avoid repeated words and characters": "تجنب الكلمات والأحرف المتكررة",
+    "No need for symbols, digits, or uppercase letters": "لا حاجة للرموز أو الأرقام أو الأحرف الكبيرة",
+    "Use a few words, avoid common phrases": "استخدم بضع كلمات ، وتجنب العبارات الشائعة",
+    "Unknown server error": "خطأ غير معروف في الخادم",
+    "The user's homeserver does not support the version of the room.": "لا يدعم خادم المستخدم نموذج هذه الغرفة.",
+    "The user must be unbanned before they can be invited.": "يجب إلغاء حظر المستخدم قبل دعوته.",
+    "User %(user_id)s may or may not exist": "المستخدم %(user_id)s قد يكون أو لا يكون موجودًا",
+    "User %(user_id)s does not exist": "المستخدم %(user_id)s معودم",
+    "User %(userId)s is already in the room": "المستخدم %(userId)s في الغرفة أصلاً",
+    "United States": "الولايات المتحدة",
+    "End conference": "إنهاء المؤتمر",
+    "Answered Elsewhere": "أُجيب في مكان آخر",
+    "The other party declined the call.": "رفض الطرف الآخر المكالمة.",
+    "Default Device": "الجهاز الاعتيادي",
+    "Albania": "ألبانيا",
+    "Afghanistan": "أفغانستان",
+    "United Kingdom": "المملكة المتحدة",
+    "This will end the conference for everyone. Continue?": "هذا سينهي المؤتمر للجميع. استمر؟",
+    "The call was answered on another device.": "تم الرد على المكالمة على جهاز آخر.",
+    "The call could not be established": "تعذر إجراء المكالمة",
+    "Call Declined": "رُفض الاتصال"
 }

From aa6b4578456aa1004d1531bda34f09c37e579e27 Mon Sep 17 00:00:00 2001
From: Hivaa <hivaa@hivaa.im>
Date: Mon, 16 Nov 2020 09:22:17 +0000
Subject: [PATCH 135/146] Translated using Weblate (Persian)

Currently translated at 5.1% (135 of 2641 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fa/
---
 src/i18n/strings/fa.json | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fa.json b/src/i18n/strings/fa.json
index 5be1cdbe4a..eacc029d03 100644
--- a/src/i18n/strings/fa.json
+++ b/src/i18n/strings/fa.json
@@ -151,5 +151,12 @@
     "A new version of %(brand)s is available!": "نگارشی جدید از %(brand)s موجود است!",
     "Guest": "مهمان",
     "Confirm adding this email address by using Single Sign On to prove your identity.": "برای تأیید هویتتان، این نشانی رایانامه را با ورود یکپارچه تأیید کنید.",
-    "Click the button below to confirm adding this email address.": "برای تأیید افزودن این نشانی رایانامه، دکمهٔ زیر را بزنید."
+    "Click the button below to confirm adding this email address.": "برای تأیید افزودن این نشانی رایانامه، دکمهٔ زیر را بزنید.",
+    "Your homeserver's URL": "آدرس سرور شما",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "از حالت Richtext ویرایشگر متنی استفاده می کنید یا نه",
+    "Which officially provided instance you are using, if any": "در صورت وجود ، از کدام سرویس رسمی استفاده می‌کنید",
+    "Whether or not you're logged in (we don't record your username)": "وارد حساب خود می‌شوید یا خیر (ما نام کاربری شما را ثبت نمی‌کنیم)",
+    "Click the button below to confirm adding this phone number.": "برای تائید اضافه‌شدن این شماره تلفن، بر روی دکمه‌ی زیر کلیک کنید.",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "برای اثبات هویت خود، اضافه‌شدن این شماره تلفن را با استفاده از Single Sign On تائید کنید.",
+    "Failed to verify email address: make sure you clicked the link in the email": "خطا در تائید آدرس ایمیل: مطمئن شوید که بر روی لینک موجود در ایمیل کلیک کرده اید"
 }

From 46fb0162c30a670d33cd5c6a9b4b969a607f9a80 Mon Sep 17 00:00:00 2001
From: XoseM <correoxm@disroot.org>
Date: Sat, 14 Nov 2020 06:47:49 +0000
Subject: [PATCH 136/146] Translated using Weblate (Galician)

Currently translated at 100.0% (2641 of 2641 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
---
 src/i18n/strings/gl.json | 62 +++++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 30 deletions(-)

diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index f536de32e9..a674d16407 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -42,7 +42,7 @@
     "Invite new community members": "Convidará comunidade a novos participantes",
     "Invite to Community": "Convidar á comunidade",
     "Which rooms would you like to add to this community?": "Que salas desexaría engadir a esta comunidade?",
-    "Show these rooms to non-members on the community page and room list?": "Quere que estas salas se lle mostren a outros membros de fóra da comunidade na lista de salas?",
+    "Show these rooms to non-members on the community page and room list?": "Queres que estas salas se lle mostren a outras participantes de fóra da comunidade e na lista de salas?",
     "Add rooms to the community": "Engadir salas á comunidade",
     "Add to community": "Engadir á comunidade",
     "Failed to invite the following users to %(groupId)s:": "Fallo ao convidar ás seguintes usuarias a %(groupId)s:",
@@ -74,7 +74,7 @@
     "Missing user_id in request": "Falta o user_id na petición",
     "Usage": "Uso",
     "/ddg is not a command": "/ddg non é unha orde",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Para  utilizala, agarde que carguen os resultados de autocompletado e escolla entre eles.",
+    "To use it, just wait for autocomplete results to load and tab through them.": "Para utilizala, agarda a que carguen os resultados de autocompletado e escolle entre eles.",
     "Ignored user": "Usuaria ignorada",
     "You are now ignoring %(userId)s": "Agora está a ignorar %(userId)s",
     "Unignored user": "Usuarias non ignoradas",
@@ -131,7 +131,7 @@
     "Authentication check failed: incorrect password?": "Fallou a comprobación de autenticación: contrasinal incorrecto?",
     "Failed to join room": "Non puideches entrar na sala",
     "Message Pinning": "Fixando mensaxe",
-    "Show timestamps in 12 hour format (e.g. 2:30pm)": "Mostrar marcas  de tempo con formato 12 horas (ex. 2:30pm)",
+    "Show timestamps in 12 hour format (e.g. 2:30pm)": "Mostrar marcas de tempo con formato 12 horas (ex. 2:30pm)",
     "Always show message timestamps": "Mostrar sempre marcas de tempo",
     "Autoplay GIFs and videos": "Reprodución automática de GIFs e vídeos",
     "Enable automatic language detection for syntax highlighting": "Activar a detección automática de idioma para o resalte da sintaxe",
@@ -281,9 +281,9 @@
     "Publish this room to the public in %(domain)s's room directory?": "Publicar esta sala no directorio público de salas de %(domain)s?",
     "Who can read history?": "Quen pode ler o histórico?",
     "Anyone": "Calquera",
-    "Members only (since the point in time of selecting this option)": "Só membros (desde o momento en que se selecciona esta opción)",
-    "Members only (since they were invited)": "Só membros (desde que foron convidados)",
-    "Members only (since they joined)": "Só membros (desde que se uniron)",
+    "Members only (since the point in time of selecting this option)": "Só participantes (desde o momento en que se selecciona esta opción)",
+    "Members only (since they were invited)": "Só participantes (desde que foron convidadas)",
+    "Members only (since they joined)": "Só participantes (desde que se uniron)",
     "Permissions": "Permisos",
     "Advanced": "Avanzado",
     "Add a topic": "Engadir asunto",
@@ -298,7 +298,7 @@
     "You have <a>enabled</a> URL previews by default.": "<a>Activou</a> a vista previa de URL por defecto.",
     "You have <a>disabled</a> URL previews by default.": "<a>Desactivou</a> a vista previa de URL por defecto.",
     "URL previews are enabled by default for participants in this room.": "As vistas previas de URL están activas por defecto para os participantes desta sala.",
-    "URL previews are disabled by default for participants in this room.": "As vistas previas de URL están desactivadas por defecto para os  participantes desta sala.",
+    "URL previews are disabled by default for participants in this room.": "As vistas previas de URL están desactivadas por defecto para as participantes desta sala.",
     "URL Previews": "Vista previa de URL",
     "Error decrypting audio": "Fallo ao descifrar audio",
     "Error decrypting attachment": "Fallo descifrando o anexo",
@@ -346,7 +346,7 @@
     "Only visible to community members": "Só visible para os participantes da comunidade",
     "Filter community rooms": "Filtrar salas da comunidade",
     "Something went wrong when trying to get your communities.": "Algo fallou ao intentar obter as súas comunidades.",
-    "You're not currently a member of any communities.": "Ate o momento non é membro de ningunha comunidade.",
+    "You're not currently a member of any communities.": "Ate o momento non es participante en ningunha comunidade.",
     "Unknown Address": "Enderezo descoñecido",
     "Allow": "Permitir",
     "Delete Widget": "Eliminar widget",
@@ -390,13 +390,13 @@
     "was invited %(count)s times|one": "foi convidada",
     "were banned %(count)s times|other": "foron prohibidas %(count)s veces",
     "were banned %(count)s times|one": "foron prohibidas",
-    "was banned %(count)s times|other": "foi prohibida  %(count)s veces",
+    "was banned %(count)s times|other": "foi vetada %(count)s veces",
     "was banned %(count)s times|one": "foi prohibida",
     "were unbanned %(count)s times|other": "retiróuselle a prohibición %(count)s veces",
     "were unbanned %(count)s times|one": "retrouseille a prohibición",
-    "was unbanned %(count)s times|other": "retrouseille a prohibición  %(count)s veces",
+    "was unbanned %(count)s times|other": "retirouselle o veto %(count)s veces",
     "was unbanned %(count)s times|one": "retiróuselle a prohibición",
-    "were kicked %(count)s times|other": "foron expulsadas  %(count)s veces",
+    "were kicked %(count)s times|other": "foron expulsadas %(count)s veces",
     "were kicked %(count)s times|one": "foron expulsadas",
     "was kicked %(count)s times|other": "foi expulsada %(count)s veces",
     "was kicked %(count)s times|one": "foi expulsada",
@@ -465,7 +465,7 @@
     "You must <a>register</a> to use this functionality": "Debe <a>rexistrarse</a> para utilizar esta función",
     "You must join the room to see its files": "Debes unirte a sala para ver os seus ficheiros",
     "There are no visible files in this room": "Non hai ficheiros visibles nesta sala",
-    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML para a páxina da súa comunidade</h1>\n<p>\n    Utilice a descrición longa para presentar novos membros a comunidade, ou publicar algunha  <a href=\"foo\">ligazón</a> importante\n   \n</p>\n<p>\n    Tamén pode utilizar etiquetas 'img'\n</p>\n",
+    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML para a páxina da túa comunidade</h1>\n<p>\n    Utiliza a descrición longa para presentalle a comunidade ás novas participantes, ou publicar algunha  <a href=\"foo\">ligazón</a> importante\n   \n</p>\n<p>\n    Tamén podes usar etiquetas 'img'\n</p>\n",
     "Add rooms to the community summary": "Engadir salas ao resumo da comunidade",
     "Which rooms would you like to add to this summary?": "Que salas desexa engadir a este resumo?",
     "Add to summary": "Engadir ao resumo",
@@ -487,13 +487,13 @@
     "Leave %(groupName)s?": "Deixar %(groupName)s?",
     "Leave": "Saír",
     "Community Settings": "Axustes da comunidade",
-    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Estas salas móstranse aos membros da comunidade na páxina da comunidade. Os participantes da comunidade poden unirse ás salas premendo nelas.",
+    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Estas salas móstranse ás participantes da comunidade na páxina da comunidade. As participantes da comunidade poden unirse ás salas premendo nelas.",
     "Add rooms to this community": "Engadir salas a esta comunidade",
     "Featured Rooms:": "Salas destacadas:",
     "Featured Users:": "Usuarias destacadas:",
     "%(inviter)s has invited you to join this community": "%(inviter)s convidoute a entrar nesta comunidade",
     "You are an administrator of this community": "Administras esta comunidade",
-    "You are a member of this community": "É membro desta comunidade",
+    "You are a member of this community": "Participas nesta comunidade",
     "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "A túa comunidade non ten unha descrición longa, ou unha páxina HTML que lle mostrar ás participantes.<br />Preme aquí para abrir os axustes e publicar unha!",
     "Long Description (HTML)": "Descrición longa (HTML)",
     "Description": "Descrición",
@@ -554,7 +554,7 @@
     "Labs": "Labs",
     "Check for update": "Comprobar actualización",
     "Reject all %(invitedRooms)s invites": "Rexeitar todos os %(invitedRooms)s convites",
-    "Start automatically after system login": "Iniciar automaticamente  despois de iniciar sesión",
+    "Start automatically after system login": "Iniciar automaticamente despois de iniciar sesión",
     "No media permissions": "Sen permisos de medios",
     "You may need to manually permit %(brand)s to access your microphone/webcam": "Igual ten que permitir manualmente a %(brand)s acceder ao seus micrófono e cámara",
     "No Microphones detected": "Non se detectaron micrófonos",
@@ -804,8 +804,8 @@
     "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. <b>This action is irreversible.</b>": "Iso fará que a túa deixe de ter uso de xeito permanente. Non poderás acceder e ninguén vai a poder volver a rexistrar esa mesma ID de usuaria. Suporá que sairás de todalas salas de conversas nas que estabas e eliminarás os detalles da túa conta do servidores de identidade. <b>Esta acción non ten volta</b>",
     "Deactivating your account <b>does not by default cause us to forget messages you have sent.</b> If you would like us to forget your messages, please tick the box below.": "Desactivando a súa conta <b>non supón que por defecto esquezamos as súas mensaxes enviadas.</b> Se quere que nos esquezamos das súas mensaxes, prema na caixa de embaixo.",
     "To continue, please enter your password:": "Para continuar introduza o seu contrasinal:",
-    "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "A visibilidade das mensaxes en Matrix é parecida á dos correos electrónicos. Que esquezamos as túas mensaxes significa que as mensaxes non se van a compartir con ningún novo membro ou usuaria que non estea rexistrada. Mais aqueles usuarias que xa tiveron acceso a estas mensaxes si que seguirán tendo acceso as súas propias copias desas mensaxes.",
-    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Esquezan  todas as mensaxes que eu enviara no momento en que elimine a miña conta. (<b>Aviso</b>: iso suporá que os seguintes participantes só verán unha versión incompleta das conversas.)",
+    "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "A visibilidade das mensaxes en Matrix é parecida á dos correos electrónicos. Que esquezamos as túas mensaxes significa que as mensaxes non se van a compartir con ningunha nova participante ou usuaria que non estea rexistrada. Mais aquelas usuarias que xa tiveron acceso a estas mensaxes si que seguirán tendo acceso as súas propias copias desas mensaxes.",
+    "Please forget all messages I have sent when my account is deactivated (<b>Warning:</b> this will cause future users to see an incomplete view of conversations)": "Esquece todas as mensaxes que enviei cando a miña conta está desactivada. (<b>Aviso</b>: isto fará que usuarias futuras vexan unha versión incompleta das conversas)",
     "Share Room": "Compartir sala",
     "Link to most recent message": "Ligazón ás mensaxes máis recentes",
     "Share User": "Compartir usuaria",
@@ -833,7 +833,7 @@
     "The email field must not be blank.": "Este campo de correo non pode quedar en branco.",
     "The phone number field must not be blank.": "O número de teléfono non pode quedar en branco.",
     "The password field must not be blank.": "O campo do contrasinal non pode quedar en branco.",
-    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Non vai poder enviar mensaxes ata que revise e acepte  <consentLink>os nosos termos e condicións</consentLink>.",
+    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Non vas poder enviar mensaxes ata que revises e aceptes <consentLink>os nosos termos e condicións</consentLink>.",
     "A call is currently being placed!": "Xa se estableceu a chamada!",
     "Sorry, your homeserver is too old to participate in this room.": "Lametámolo, o seu servidor de inicio é vello de máis para participar en esta sala.",
     "Please contact your homeserver administrator.": "Por favor, contacte coa administración do seu servidor.",
@@ -920,14 +920,14 @@
     "Messages": "Mensaxes",
     "Actions": "Accións",
     "Other": "Outro",
-    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Anteponse ¯\\_(ツ)_/¯  a mensaxe en texto plano",
+    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Anteponse ¯\\_(ツ)_/¯ a mensaxe en texto plano",
     "Sends a message as plain text, without interpreting it as markdown": "Envía unha mensaxe como texto plano, sen interpretalo como markdown",
     "Sends a message as html, without interpreting it as markdown": "Envía unha mensaxe como html, sen interpretalo como markdown",
     "Upgrades a room to a new version": "Subir a sala de versión",
     "You do not have the required permissions to use this command.": "Non tes os permisos suficientes para usar este comando.",
     "Error upgrading room": "Fallo ao actualizar a sala",
     "Double check that your server supports the room version chosen and try again.": "Comproba ben que o servidor soporta a versión da sala escollida e inténtao outra vez.",
-    "Changes your display nickname in the current room only": "Cambia o teu nome mostrado só para esta esta sala",
+    "Changes your display nickname in the current room only": "Cambia o teu nome mostrado só para esta sala",
     "Changes the avatar of the current room": "Cambia o avatar da sala actual",
     "Changes your avatar in this current room only": "Cambia o teu avatar só nesta sala",
     "Changes your avatar in all rooms": "Cambia o teu avatar en todas as salas",
@@ -997,7 +997,7 @@
     "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "Se hai contexto que cres que axudaría a analizar o problema, como o que estabas a facer, ID da sala, ID da usuaria, etc., por favor inclúeo aquí.",
     "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "Para evitar informes duplicados, mira <existingIssuesLink>os informes existentes</existingIssuesLink> primeiro (e engade un +1) ou <newIssueLink>crea un novo informe</newIssueLink> se non o atopas.",
     "Command Help": "Comando Axuda",
-    "To help us prevent this in future, please <a>send us logs</a>.": "Para axudarnos a previr esto no futuro,  envíanos <a>o rexistro</a>.",
+    "To help us prevent this in future, please <a>send us logs</a>.": "Para axudarnos a evitar esto no futuro, envíanos <a>o rexistro</a>.",
     "Help": "Axuda",
     "Explore Public Rooms": "Explorar Salas Públicas",
     "Explore": "Explorar",
@@ -1085,7 +1085,7 @@
     "Unrecognised address": "Enderezo non recoñecible",
     "You do not have permission to invite people to this room.": "Non tes permiso para convidar a xente a esta sala.",
     "User %(userId)s is already in the room": "A usuaria %(userId)s xa está na sala",
-    "User %(user_id)s does not exist": "A usuaria %(user_id)s  non existe",
+    "User %(user_id)s does not exist": "A usuaria %(user_id)s non existe",
     "User %(user_id)s may or may not exist": "A usuaria %(user_id)s podería non existir",
     "The user must be unbanned before they can be invited.": "A usuria debe ser desbloqueada antes de poder convidala.",
     "Messages in this room are end-to-end encrypted.": "As mensaxes desta sala están cifradas de extremo-a-extremo.",
@@ -1153,7 +1153,7 @@
     "Try out new ways to ignore people (experimental)": "Novos xeitos de ignorar persoas (experimental)",
     "Show join/leave messages (invites/kicks/bans unaffected)": "Mostrar mensaxes de entrada/saída (mais non convites/expulsións/bloqueos)",
     "Subscribing to a ban list will cause you to join it!": "Subscribíndote a unha lista de bloqueo fará que te unas a ela!",
-    "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Aviso</b>: Actualizando a sala non fará que <i>os membros da sala migren automáticamente a nova versión da sala.</i> Publicaremos unha ligazón a nova sala na versión antiga da sala - os membros terán que premer na ligazón para unirse a nova sala.",
+    "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Aviso</b>: Actualizando a sala non farás que <i>as participantes da sala migren automáticamente á nova versión da sala.</i> Publicaremos unha ligazón á nova sala na versión antiga da sala - as participantes terán que premer na ligazón para unirse a nova sala.",
     "Join the conversation with an account": "Únete a conversa cunha conta",
     "Re-join": "Volta a unirte",
     "You can only join it with a working invite.": "Só podes unirte cun convite activo.",
@@ -1555,7 +1555,7 @@
     "Revoke": "Revogar",
     "Share": "Compartir",
     "Discovery options will appear once you have added an email above.": "As opcións de descubrimento aparecerán após ti engadas un email.",
-    "Unable to revoke sharing for phone number": "Non se puido  revogar a compartición do número de teléfono",
+    "Unable to revoke sharing for phone number": "Non se puido revogar a compartición do número de teléfono",
     "Unable to share phone number": "Non se puido compartir o número de teléfono",
     "Unable to verify phone number.": "Non se puido verificar o número de teléfono.",
     "Please enter verification code sent via text.": "Escribe o código de verificación enviado no SMS.",
@@ -1776,7 +1776,7 @@
     "edited": "editada",
     "Can't load this message": "Non se cargou a mensaxe",
     "Submit logs": "Enviar rexistro",
-    "Failed to load group members": "Fallou a carga dos membros do grupo",
+    "Failed to load group members": "Fallou a carga das participantes do grupo",
     "Frequently Used": "Utilizado con frecuencia",
     "Smileys & People": "Sorrisos e Persoas",
     "Animals & Nature": "Animais e Natureza",
@@ -2042,7 +2042,7 @@
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Falta a chave pública do captcha na configuración do servidor. Informa desto á administración do teu servidor.",
     "Please review and accept all of the homeserver's policies": "Revisa e acepta todas as cláusulas do servidor",
     "Please review and accept the policies of this homeserver:": "Revisa e acepta as cláusulas deste servidor:",
-    "Unable to validate homeserver/identity server": "Non se puido validar o servidor/servidor de identidade",
+    "Unable to validate homeserver/identity server": "Non se puido validar o servidor de inicio/servidor de identidade",
     "Your Modular server": "O teu servidor Modular",
     "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Escribe a localización do teu servidor Modular. Podería utilizar o teu propio nome de dominio ou ser un subdominio de <a>modular.im</a>.",
     "Server Name": "Nome do Servidor",
@@ -2206,7 +2206,7 @@
     "If you don't want to set this up now, you can later in Settings.": "Se non queres configurar esto agora, pódelo facer posteriormente nos Axustes.",
     "Don't ask again": "Non preguntar outra vez",
     "New Recovery Method": "Novo Método de Recuperación",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "Detectouse un novo método  de chave e frase de paso de recuperación para Mensaxes Seguras.",
+    "A new recovery passphrase and key for Secure Messages have been detected.": "Detectouse unha nova frase de paso de recuperación e chave para Mensaxes Seguras.",
     "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "Se non configuras o novo método de recuperación, un atacante podería intentar o acceso á túa conta. Cambia inmediatamente o contrasinal da conta e configura un novo método de recuperación nos Axustes.",
     "This session is encrypting history using the new recovery method.": "Esta sesión está cifrando o historial usando o novo método de recuperación.",
     "Go to Settings": "Ir a Axustes",
@@ -2372,7 +2372,7 @@
     "We’re excited to announce Riot is now Element!": "Emociónanos comunicar que Riot agora é Element!",
     "Learn more at <a>element.io/previously-riot</a>": "Coñece máis en <a>element.io/previously-riot</a>",
     "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use %(brand)s with an existing Matrix account on a different homeserver.": "Podes usar as opcións de servidor personalizado para conectar con outros servidores Matrix indicando un URL diferente para o servidor. Poderás usar %(brand)s cunha conta Matrix existente noutro servidor de inicio.",
-    "Enter the location of your Element Matrix Services homeserver. It may use your own domain name or be a subdomain of <a>element.io</a>.": "Escribe a localización do teu servidor Element Matrix Services. Podería ser o teu propio dominio ou un subdominio de  <a>element.io</a>.",
+    "Enter the location of your Element Matrix Services homeserver. It may use your own domain name or be a subdomain of <a>element.io</a>.": "Escribe a localización do teu servidor Element Matrix Services. Podería ser o teu propio dominio ou un subdominio de <a>element.io</a>.",
     "Search rooms": "Buscar salas",
     "User menu": "Menú de usuaria",
     "%(brand)s Web": "Web %(brand)s",
@@ -2453,7 +2453,7 @@
     "Privacy": "Privacidade",
     "There was an error updating your community. The server is unable to process your request.": "Algo fallou ó actualizar a comunidade. O servidor non é quen de procesar a solicitude.",
     "Update community": "Actualizar comunidade",
-    "May include members not in %(communityName)s": "Podería incluir membros que non están en %(communityName)s",
+    "May include members not in %(communityName)s": "Podería incluir participantes que non están en %(communityName)s",
     "Start a conversation with someone using their name, username (like <userId/>) or email address. This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>.": "Iniciar unha conversa con alguén utilizando o seu nome, nome de usuaria (como <userId/>) ou enderezo de email. Esto non as convidará a %(communityName)s. Para convidar a alguén a %(communityName)s, preme <a>aquí</a>.",
     "Failed to find the general chat for this community": "Non se atopou o chat xenérico para esta comunidade",
     "Community settings": "Axustes da comunidade",
@@ -2839,5 +2839,7 @@
     "Eritrea": "Eritrea",
     "Equatorial Guinea": "Guinea Ecuatorial",
     "El Salvador": "O Salvador",
-    "Egypt": "Exipto"
+    "Egypt": "Exipto",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|one": "Conservar na memoria local as mensaxes cifradas de xeito seguro para que aparezan nas buscas, usando %(size)s para gardar mensaxes de %(count)s sala.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|other": "Conservar na memoria local as mensaxes cifradas de xeito seguro para que aparezan nas buscas, usando %(size)s para gardar mensaxes de %(count)s salas."
 }

From c88f50a92916d929ae3f65601125601580909c49 Mon Sep 17 00:00:00 2001
From: blipnik <blaz.lipnik@protonmail.com>
Date: Mon, 16 Nov 2020 12:06:58 +0000
Subject: [PATCH 137/146] Translated using Weblate (Slovenian)

Currently translated at 1.0% (27 of 2641 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sl/
---
 src/i18n/strings/sl.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sl.json b/src/i18n/strings/sl.json
index beff9b5bcb..28d3625a83 100644
--- a/src/i18n/strings/sl.json
+++ b/src/i18n/strings/sl.json
@@ -20,5 +20,9 @@
     "Confirm adding this phone number by using Single Sign On to prove your identity.": "Potrdite dodajanje te telefonske številke z enkratno prijavo, da dokažete svojo identiteto.",
     "Confirm adding phone number": "Potrdi dodajanje telefonske številke",
     "Click the button below to confirm adding this phone number.": "Pritisnite gumb spodaj da potrdite dodajanje te telefonske številke.",
-    "Add Phone Number": "Dodaj telefonsko številko"
+    "Add Phone Number": "Dodaj telefonsko številko",
+    "Analytics": "Analitika",
+    "Call Declined": "Klic zavrnjen",
+    "Call Failed": "Klic ni uspel",
+    "Your homeserver's URL": "URL domačega strežnika"
 }

From a3a14630843e4e0057e5e353f682a022d8b5b1fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matija=20=C5=A0uklje?= <matija@suklje.name>
Date: Mon, 16 Nov 2020 11:20:20 +0000
Subject: [PATCH 138/146] Translated using Weblate (Slovenian)

Currently translated at 1.0% (27 of 2641 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sl/
---
 src/i18n/strings/sl.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sl.json b/src/i18n/strings/sl.json
index 28d3625a83..2024821bb2 100644
--- a/src/i18n/strings/sl.json
+++ b/src/i18n/strings/sl.json
@@ -24,5 +24,6 @@
     "Analytics": "Analitika",
     "Call Declined": "Klic zavrnjen",
     "Call Failed": "Klic ni uspel",
-    "Your homeserver's URL": "URL domačega strežnika"
+    "Your homeserver's URL": "URL domačega strežnika",
+    "End": "Konec"
 }

From 91b1c8b8173b2e83b97602ac6a0eb5fa587cb86a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 13 Nov 2020 15:19:34 -0700
Subject: [PATCH 139/146] Fix DM logic to always pick a more reliable DM room

Fixes https://github.com/vector-im/element-web/issues/15605
---
 src/components/views/dialogs/InviteDialog.js  | 10 ++++++++--
 src/components/views/right_panel/UserInfo.tsx | 14 ++-----------
 src/createRoom.ts                             | 20 +++++++++++++------
 src/utils/membership.ts                       |  5 +++++
 4 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index 99878569d3..e29ef143f2 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -31,7 +31,7 @@ import dis from "../../../dispatcher/dispatcher";
 import IdentityAuthClient from "../../../IdentityAuthClient";
 import Modal from "../../../Modal";
 import {humanizeTime} from "../../../utils/humanize";
-import createRoom, {canEncryptToAllUsers, privateShouldBeEncrypted} from "../../../createRoom";
+import createRoom, {canEncryptToAllUsers, findDMForUser, privateShouldBeEncrypted} from "../../../createRoom";
 import {inviteMultipleToRoom, showCommunityInviteDialog} from "../../../RoomInvite";
 import {Key} from "../../../Keyboard";
 import {Action} from "../../../dispatcher/actions";
@@ -41,6 +41,7 @@ import {CommunityPrototypeStore} from "../../../stores/CommunityPrototypeStore";
 import SettingsStore from "../../../settings/SettingsStore";
 import {UIFeature} from "../../../settings/UIFeature";
 import CountlyAnalytics from "../../../CountlyAnalytics";
+import {Room} from "matrix-js-sdk/src/models/room";
 
 // we have a number of types defined from the Matrix spec which can't reasonably be altered here.
 /* eslint-disable camelcase */
@@ -575,7 +576,12 @@ export default class InviteDialog extends React.PureComponent {
         const targetIds = targets.map(t => t.userId);
 
         // Check if there is already a DM with these people and reuse it if possible.
-        const existingRoom = DMRoomMap.shared().getDMRoomForIdentifiers(targetIds);
+        let existingRoom: Room;
+        if (targetIds.length === 1) {
+            existingRoom = findDMForUser(MatrixClientPeg.get(), targetIds[0]);
+        } else {
+            existingRoom = DMRoomMap.shared().getDMRoomForIdentifiers(targetIds);
+        }
         if (existingRoom) {
             dis.dispatch({
                 action: 'view_room',
diff --git a/src/components/views/right_panel/UserInfo.tsx b/src/components/views/right_panel/UserInfo.tsx
index 66b689ddb9..cdb4c43b09 100644
--- a/src/components/views/right_panel/UserInfo.tsx
+++ b/src/components/views/right_panel/UserInfo.tsx
@@ -28,7 +28,7 @@ import {EventTimeline} from 'matrix-js-sdk/src/models/event-timeline';
 import dis from '../../../dispatcher/dispatcher';
 import Modal from '../../../Modal';
 import {_t} from '../../../languageHandler';
-import createRoom, {privateShouldBeEncrypted} from '../../../createRoom';
+import createRoom, { findDMForUser, privateShouldBeEncrypted } from '../../../createRoom';
 import DMRoomMap from '../../../utils/DMRoomMap';
 import AccessibleButton from '../elements/AccessibleButton';
 import SdkConfig from '../../../SdkConfig';
@@ -105,17 +105,7 @@ export const getE2EStatus = (cli: MatrixClient, userId: string, devices: IDevice
 };
 
 async function openDMForUser(matrixClient: MatrixClient, userId: string) {
-    const dmRooms = DMRoomMap.shared().getDMRoomsForUserId(userId);
-    const lastActiveRoom = dmRooms.reduce((lastActiveRoom, roomId) => {
-        const room = matrixClient.getRoom(roomId);
-        if (!room || room.getMyMembership() === "leave") {
-            return lastActiveRoom;
-        }
-        if (!lastActiveRoom || lastActiveRoom.getLastActiveTimestamp() < room.getLastActiveTimestamp()) {
-            return room;
-        }
-        return lastActiveRoom;
-    }, null);
+    const lastActiveRoom = findDMForUser(matrixClient, userId);
 
     if (lastActiveRoom) {
         dis.dispatch({
diff --git a/src/createRoom.ts b/src/createRoom.ts
index a42fcc5e7b..699df0d799 100644
--- a/src/createRoom.ts
+++ b/src/createRoom.ts
@@ -15,20 +15,21 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {MatrixClient} from "matrix-js-sdk/src/client";
-import {Room} from "matrix-js-sdk/src/models/room";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+import { Room } from "matrix-js-sdk/src/models/room";
 
-import {MatrixClientPeg} from './MatrixClientPeg';
+import { MatrixClientPeg } from './MatrixClientPeg';
 import Modal from './Modal';
 import * as sdk from './index';
 import { _t } from './languageHandler';
 import dis from "./dispatcher/dispatcher";
 import * as Rooms from "./Rooms";
 import DMRoomMap from "./utils/DMRoomMap";
-import {getAddressType} from "./UserAddress";
+import { getAddressType } from "./UserAddress";
 import { getE2EEWellKnown } from "./utils/WellKnownUtils";
 import GroupStore from "./stores/GroupStore";
 import CountlyAnalytics from "./CountlyAnalytics";
+import { isJoinedOrNearlyJoined } from "./utils/membership";
 
 // we define a number of interfaces which take their names from the js-sdk
 /* eslint-disable camelcase */
@@ -236,9 +237,16 @@ export function findDMForUser(client: MatrixClient, userId: string): Room {
     const roomIds = DMRoomMap.shared().getDMRoomsForUserId(userId);
     const rooms = roomIds.map(id => client.getRoom(id));
     const suitableDMRooms = rooms.filter(r => {
+        // Validate that we are joined and the other person is also joined. We'll also make sure
+        // that the room also looks like a DM (until we have canonical DMs to tell us). For now,
+        // a DM is a room of two people that contains those two people exactly. This does mean
+        // that bots, assistants, etc will ruin a room's DM-ness, though this is a problem for
+        // canonical DMs to solve.
         if (r && r.getMyMembership() === "join") {
-            const member = r.getMember(userId);
-            return member && (member.membership === "invite" || member.membership === "join");
+            const members = r.currentState.getMembers();
+            const joinedMembers = members.filter(m => isJoinedOrNearlyJoined(m.membership));
+            const otherMember = joinedMembers.find(m => m.userId === userId);
+            return otherMember && joinedMembers.length === 2;
         }
         return false;
     }).sort((r1, r2) => {
diff --git a/src/utils/membership.ts b/src/utils/membership.ts
index 68ac958490..696bd57880 100644
--- a/src/utils/membership.ts
+++ b/src/utils/membership.ts
@@ -78,6 +78,11 @@ export function getEffectiveMembership(membership: string): EffectiveMembership
     }
 }
 
+export function isJoinedOrNearlyJoined(membership: string): boolean {
+    const effective = getEffectiveMembership(membership);
+    return effective === EffectiveMembership.Join || effective === EffectiveMembership.Invite;
+}
+
 export async function leaveRoomBehaviour(roomId: string) {
     let leavingAllVersions = true;
     const history = await MatrixClientPeg.get().getRoomUpgradeHistory(roomId);

From 3ee25dadd46fb4b38b5fa582a52c1d656e9b1c66 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 18 Nov 2020 13:09:43 +0000
Subject: [PATCH 140/146] Shrink new room intro top margin to half for
 encryption bubble tile

---
 res/css/views/rooms/_NewRoomIntro.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/rooms/_NewRoomIntro.scss b/res/css/views/rooms/_NewRoomIntro.scss
index af72a0dd69..4322ba341c 100644
--- a/res/css/views/rooms/_NewRoomIntro.scss
+++ b/res/css/views/rooms/_NewRoomIntro.scss
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 .mx_NewRoomIntro {
-    margin: 80px 0 48px 64px;
+    margin: 40px 0 48px 64px;
 
     .mx_MiniAvatarUploader_hasAvatar:not(.mx_MiniAvatarUploader_busy):not(:hover) {
         &::before, &::after {

From 37bd251ecfd4ce48b3565a2e8b130ce90a3a2602 Mon Sep 17 00:00:00 2001
From: XoseM <correoxm@disroot.org>
Date: Wed, 18 Nov 2020 11:15:55 +0000
Subject: [PATCH 141/146] Translated using Weblate (Galician)

Currently translated at 100.0% (2642 of 2642 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
---
 src/i18n/strings/gl.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index a674d16407..4f9a6f34b4 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -2841,5 +2841,9 @@
     "El Salvador": "O Salvador",
     "Egypt": "Exipto",
     "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|one": "Conservar na memoria local as mensaxes cifradas de xeito seguro para que aparezan nas buscas, usando %(size)s para gardar mensaxes de %(count)s sala.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|other": "Conservar na memoria local as mensaxes cifradas de xeito seguro para que aparezan nas buscas, usando %(size)s para gardar mensaxes de %(count)s salas."
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|other": "Conservar na memoria local as mensaxes cifradas de xeito seguro para que aparezan nas buscas, usando %(size)s para gardar mensaxes de %(count)s salas.",
+    "Filter rooms and people": "Fitrar salas e persoas",
+    "Open the link in the email to continue registration.": "Abre a ligazón que hai no email para continuar co rexistro.",
+    "A confirmation email has been sent to %(emailAddress)s": "Enviouse un email de confirmación a %(emailAddress)s",
+    "Start a new chat": "Comezar nova conversa"
 }

From 760cb8e00af3a6b47dad9f3a5c2fc7ce679e0843 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Wed, 18 Nov 2020 10:32:52 +0000
Subject: [PATCH 142/146] Translated using Weblate (Estonian)

Currently translated at 100.0% (2642 of 2642 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
---
 src/i18n/strings/et.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 5546fa2b36..ff95a95ffe 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -2842,5 +2842,9 @@
     "Places the call in the current room on hold": "Jätab kõne selles jututoas ootele",
     "Role": "Roll",
     "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|one": "Selleks, et sisu saaks otsingus kasutada, puhverda krüptitud sõnumid kohalikus seadmes turvaliselt. %(count)s jututoa andmete salvestamiseks kulub hetkel %(size)s.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|other": "Selleks, et sisu saaks otsingus kasutada, puhverda krüptitud sõnumid kohalikus seadmes turvaliselt. %(count)s jututoa andmete salvestamiseks kulub hetkel %(size)s."
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|other": "Selleks, et sisu saaks otsingus kasutada, puhverda krüptitud sõnumid kohalikus seadmes turvaliselt. %(count)s jututoa andmete salvestamiseks kulub hetkel %(size)s.",
+    "Filter rooms and people": "Otsi jututubasid ja inimesi",
+    "Open the link in the email to continue registration.": "Registreerimisega jätkamiseks vajuta e-kirjas olevat linki.",
+    "A confirmation email has been sent to %(emailAddress)s": "Saatsime kinnituskirja %(emailAddress)s aadressile",
+    "Start a new chat": "Alusta uut vestlust"
 }

From a2a07b528a2a43187680fa51b648811349b07a0a Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 18 Nov 2020 14:46:46 +0000
Subject: [PATCH 143/146] Fix message search summary text

This repairs the message search summary text, which regressed in
https://github.com/matrix-org/matrix-react-sdk/pull/5416. We can't use the `one`
/ `other` syntax here since there are two numbers and they are both strings.

Fixes https://github.com/vector-im/element-web/issues/15766
---
 src/i18n/strings/en_EN.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 40356b11d5..12baf4c60d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -935,8 +935,7 @@
     "Failed to set display name": "Failed to set display name",
     "Encryption": "Encryption",
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|other": "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|one": "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s room.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.": "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.",
     "Manage": "Manage",
     "Securely cache encrypted messages locally for them to appear in search results.": "Securely cache encrypted messages locally for them to appear in search results.",
     "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.": "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.",

From 95a436cdafb14cb2b50586fcff58409544e4460f Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 18 Nov 2020 14:49:52 +0000
Subject: [PATCH 144/146] Use room(s) style in message

---
 src/components/views/settings/EventIndexPanel.js | 4 ++--
 src/i18n/strings/en_EN.json                      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js
index 1fe18cb207..7391fd479e 100644
--- a/src/components/views/settings/EventIndexPanel.js
+++ b/src/components/views/settings/EventIndexPanel.js
@@ -130,10 +130,10 @@ export default class EventIndexPanel extends React.Component {
                 <div>
                     <div className='mx_SettingsTab_subsectionText'>
                         {_t("Securely cache encrypted messages locally for them " +
-                             "to appear in search results, using %(size)s to store messages from %(count)s rooms.",
+                            "to appear in search results, using %(size)s to store messages from %(rooms)s room(s).",
                             {
                                 size: formatBytes(this.state.eventIndexSize, 0),
-                                count: formatCountLong(this.state.roomCount),
+                                rooms: formatCountLong(this.state.roomCount),
                             },
                         )}
                     </div>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 12baf4c60d..fd61b214ea 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -935,7 +935,7 @@
     "Failed to set display name": "Failed to set display name",
     "Encryption": "Encryption",
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.": "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s room(s).": "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s room(s).",
     "Manage": "Manage",
     "Securely cache encrypted messages locally for them to appear in search results.": "Securely cache encrypted messages locally for them to appear in search results.",
     "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.": "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.",

From 14e64c10a30a0ad1481ac0043e7867efbe640de6 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 18 Nov 2020 15:16:35 +0000
Subject: [PATCH 145/146] Restore numeric count as well for better
 pluralisation

---
 src/components/views/settings/EventIndexPanel.js | 5 ++++-
 src/i18n/strings/en_EN.json                      | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js
index 7391fd479e..ec6ccacc9a 100644
--- a/src/components/views/settings/EventIndexPanel.js
+++ b/src/components/views/settings/EventIndexPanel.js
@@ -130,9 +130,12 @@ export default class EventIndexPanel extends React.Component {
                 <div>
                     <div className='mx_SettingsTab_subsectionText'>
                         {_t("Securely cache encrypted messages locally for them " +
-                            "to appear in search results, using %(size)s to store messages from %(rooms)s room(s).",
+                            "to appear in search results, using %(size)s to store messages from %(rooms)s rooms.",
                             {
                                 size: formatBytes(this.state.eventIndexSize, 0),
+                                // This drives the singular / plural string
+                                // selection for "room" / "rooms" only.
+                                count: this.state.roomCount,
                                 rooms: formatCountLong(this.state.roomCount),
                             },
                         )}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index fd61b214ea..23047cbdb8 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -935,7 +935,8 @@
     "Failed to set display name": "Failed to set display name",
     "Encryption": "Encryption",
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s room(s).": "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s room(s).",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s room.",
     "Manage": "Manage",
     "Securely cache encrypted messages locally for them to appear in search results.": "Securely cache encrypted messages locally for them to appear in search results.",
     "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.": "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.",

From e4e6254c8d475f3357655d027dc6dd9fea88b075 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Wed, 18 Nov 2020 15:00:18 +0000
Subject: [PATCH 146/146] Translated using Weblate (Italian)

Currently translated at 100.0% (2642 of 2642 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
---
 src/i18n/strings/it.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index c0f6fecfea..4b5b85d415 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -2844,5 +2844,9 @@
     "United Kingdom": "Regno Unito",
     "Role": "Ruolo",
     "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|one": "Salva in cache i messaggi cifrati localmente in modo che appaiano nei risultati di ricerca, usando %(size)s per salvarli da %(count)s stanza.",
-    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|other": "Salva in cache i messaggi cifrati localmente in modo che appaiano nei risultati di ricerca, usando %(size)s per salvarli da %(count)s stanze."
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(count)s rooms.|other": "Salva in cache i messaggi cifrati localmente in modo che appaiano nei risultati di ricerca, usando %(size)s per salvarli da %(count)s stanze.",
+    "Filter rooms and people": "Filtra stanze e persone",
+    "Open the link in the email to continue registration.": "Apri il link nell'email per continuare la registrazione.",
+    "A confirmation email has been sent to %(emailAddress)s": "È stata inviata un'email di conferma a %(emailAddress)s",
+    "Start a new chat": "Inizia una nuova chat"
 }