diff --git a/.eslintignore b/.eslintignore
index c4f7298047..e453170087 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,4 +1,4 @@
 src/component-index.js
 test/end-to-end-tests/node_modules/
-test/end-to-end-tests/riot/
+test/end-to-end-tests/element/
 test/end-to-end-tests/synapse/
diff --git a/.eslintignore.errorfiles b/.eslintignore.errorfiles
index aa2a6b7f0b..1c0a3d1254 100644
--- a/.eslintignore.errorfiles
+++ b/.eslintignore.errorfiles
@@ -1,37 +1,16 @@
 # autogenerated file: run scripts/generate-eslint-error-ignore-file to update.
 
-src/ImageUtils.js
 src/Markdown.js
-src/Rooms.js
-src/Unread.js
 src/Velociraptor.js
 src/components/structures/RoomDirectory.js
-src/components/structures/ScrollPanel.js
-src/components/structures/UploadBar.js
-src/components/views/elements/AddressSelector.js
-src/components/views/elements/DirectorySearchBox.js
-src/components/views/messages/MFileBody.js
-src/components/views/messages/TextualBody.js
-src/components/views/rooms/AuxPanel.js
-src/components/views/rooms/LinkPreviewWidget.js
 src/components/views/rooms/MemberList.js
-src/components/views/rooms/RoomPreviewBar.js
-src/components/views/settings/ChangeAvatar.js
-src/components/views/settings/DevicesPanel.js
-src/components/views/settings/Notifications.js
-src/rageshake/rageshake.js
 src/ratelimitedfunc.js
 src/utils/DMRoomMap.js
-src/utils/DecryptFile.js
-src/utils/DirectoryUtils.js
 src/utils/MultiInviter.js
-src/utils/Receipt.js
 test/components/structures/MessagePanel-test.js
 test/components/views/dialogs/InteractiveAuthDialog-test.js
 test/mock-clock.js
-test/notifications/ContentRules-test.js
-test/notifications/PushRuleVectorState-test.js
 src/component-index.js
 test/end-to-end-tests/node_modules/
-test/end-to-end-tests/riot/
+test/end-to-end-tests/element/
 test/end-to-end-tests/synapse/
diff --git a/.eslintrc.js b/.eslintrc.js
index bc2a142c2d..99695b7a03 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -22,6 +22,8 @@ module.exports = {
         "files": ["src/**/*.{ts,tsx}"],
         "extends": ["matrix-org/ts"],
         "rules": {
+            // We're okay being explicit at the moment
+            "@typescript-eslint/no-empty-interface": "off",
             // We disable this while we're transitioning
             "@typescript-eslint/no-explicit-any": "off",
             // We'd rather not do this but we do
diff --git a/.gitignore b/.gitignore
index 33e8bfc7ac..e1dd7726e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ package-lock.json
 /src/component-index.js
 
 .DS_Store
+*.tmp
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a22954c3f..c31eedf93b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,810 @@
+Changes in [3.15.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.15.0) (2021-03-01)
+=====================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.15.0-rc.1...v3.15.0)
+
+## Security notice
+
+matrix-react-sdk 3.15.0 fixes a low severity issue (CVE-2021-21320) where the
+user content sandbox can be abused to trick users into opening unexpected
+documents. The content is opened with a `blob` origin that cannot access Matrix
+user data, so messages and secrets are not at risk. Thanks to @keerok for
+responsibly disclosing this via Matrix's Security Disclosure Policy.
+
+## All changes
+
+ * Upgrade to JS SDK 9.8.0
+
+Changes in [3.15.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.15.0-rc.1) (2021-02-24)
+===============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.14.0...v3.15.0-rc.1)
+
+ * Upgrade to JS SDK 9.8.0-rc.1
+ * Translations update from Weblate
+   [\#5683](https://github.com/matrix-org/matrix-react-sdk/pull/5683)
+ * Fix object diffing when objects have different keys
+   [\#5681](https://github.com/matrix-org/matrix-react-sdk/pull/5681)
+ * Add <code> if it's missing
+   [\#5673](https://github.com/matrix-org/matrix-react-sdk/pull/5673)
+ * Add email only if the verification is complete
+   [\#5629](https://github.com/matrix-org/matrix-react-sdk/pull/5629)
+ * Fix portrait videocalls
+   [\#5676](https://github.com/matrix-org/matrix-react-sdk/pull/5676)
+ * Tweak code block icon positions
+   [\#5643](https://github.com/matrix-org/matrix-react-sdk/pull/5643)
+ * Revert "Improve URL preview formatting and image upload thumbnail size"
+   [\#5677](https://github.com/matrix-org/matrix-react-sdk/pull/5677)
+ * Fix context menu leaving visible area
+   [\#5644](https://github.com/matrix-org/matrix-react-sdk/pull/5644)
+ * Jitsi conferences names, take 3
+   [\#5675](https://github.com/matrix-org/matrix-react-sdk/pull/5675)
+ * Update isUserOnDarkTheme to take use_system_theme in account
+   [\#5670](https://github.com/matrix-org/matrix-react-sdk/pull/5670)
+ * Discard some dead code
+   [\#5665](https://github.com/matrix-org/matrix-react-sdk/pull/5665)
+ * Add developer tool to explore and edit settings
+   [\#5664](https://github.com/matrix-org/matrix-react-sdk/pull/5664)
+ * Use and create new room helpers
+   [\#5663](https://github.com/matrix-org/matrix-react-sdk/pull/5663)
+ * Clear message previews when the maximum limit is reached for history
+   [\#5661](https://github.com/matrix-org/matrix-react-sdk/pull/5661)
+ * VoIP virtual rooms, mk II
+   [\#5639](https://github.com/matrix-org/matrix-react-sdk/pull/5639)
+ * Disable chat effects when reduced motion preferred
+   [\#5660](https://github.com/matrix-org/matrix-react-sdk/pull/5660)
+ * Improve URL preview formatting and image upload thumbnail size
+   [\#5637](https://github.com/matrix-org/matrix-react-sdk/pull/5637)
+ * Fix border radius when the panel is collapsed
+   [\#5641](https://github.com/matrix-org/matrix-react-sdk/pull/5641)
+ * Use a more generic layout setting - useIRCLayout → layout
+   [\#5571](https://github.com/matrix-org/matrix-react-sdk/pull/5571)
+ * Remove redundant lockOrigin parameter from usercontent
+   [\#5657](https://github.com/matrix-org/matrix-react-sdk/pull/5657)
+ * Set ICE candidate pool size option
+   [\#5655](https://github.com/matrix-org/matrix-react-sdk/pull/5655)
+ * Prepare to encrypt when a call arrives
+   [\#5654](https://github.com/matrix-org/matrix-react-sdk/pull/5654)
+ * Use config for host signup branding
+   [\#5650](https://github.com/matrix-org/matrix-react-sdk/pull/5650)
+ * Use randomly generated conference names for Jitsi
+   [\#5649](https://github.com/matrix-org/matrix-react-sdk/pull/5649)
+ * Modified regex to account for an immediate new line after slash commands
+   [\#5647](https://github.com/matrix-org/matrix-react-sdk/pull/5647)
+ * Fix codeblock scrollbar color for non-Firefox
+   [\#5642](https://github.com/matrix-org/matrix-react-sdk/pull/5642)
+ * Fix codeblock scrollbar colors
+   [\#5630](https://github.com/matrix-org/matrix-react-sdk/pull/5630)
+ * Added loading and disabled the button while searching for server
+   [\#5634](https://github.com/matrix-org/matrix-react-sdk/pull/5634)
+
+Changes in [3.14.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.14.0) (2021-02-16)
+=====================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.14.0-rc.1...v3.14.0)
+
+ * Upgrade to JS SDK 9.7.0
+ * [Release] Use config for host signup branding
+   [\#5651](https://github.com/matrix-org/matrix-react-sdk/pull/5651)
+
+Changes in [3.14.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.14.0-rc.1) (2021-02-10)
+===============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.13.1...v3.14.0-rc.1)
+
+ * Upgrade to JS SDK 9.7.0-rc.1
+ * Translations update from Weblate
+   [\#5636](https://github.com/matrix-org/matrix-react-sdk/pull/5636)
+ * Add host signup modal with iframe
+   [\#5450](https://github.com/matrix-org/matrix-react-sdk/pull/5450)
+ * Fix duplication of codeblock elements
+   [\#5633](https://github.com/matrix-org/matrix-react-sdk/pull/5633)
+ * Handle undefined call stats
+   [\#5632](https://github.com/matrix-org/matrix-react-sdk/pull/5632)
+ * Avoid delayed displaying of sources in source picker
+   [\#5631](https://github.com/matrix-org/matrix-react-sdk/pull/5631)
+ * Give breadcrumbs toolbar an accessibility label.
+   [\#5628](https://github.com/matrix-org/matrix-react-sdk/pull/5628)
+ * Fix the %s in logs
+   [\#5627](https://github.com/matrix-org/matrix-react-sdk/pull/5627)
+ * Fix jumpy notifications settings UI
+   [\#5625](https://github.com/matrix-org/matrix-react-sdk/pull/5625)
+ * Improve displaying of code blocks
+   [\#5559](https://github.com/matrix-org/matrix-react-sdk/pull/5559)
+ * Fix desktop Matrix screen sharing and add a screen/window picker
+   [\#5525](https://github.com/matrix-org/matrix-react-sdk/pull/5525)
+ * Call "MatrixClientPeg.get()" only once in method "findOverrideMuteRule"
+   [\#5498](https://github.com/matrix-org/matrix-react-sdk/pull/5498)
+ * Close current modal when session is logged out
+   [\#5616](https://github.com/matrix-org/matrix-react-sdk/pull/5616)
+ * Switch room explorer list to CSS grid
+   [\#5551](https://github.com/matrix-org/matrix-react-sdk/pull/5551)
+ * Improve SSO login start screen and 3pid invite handling somewhat
+   [\#5622](https://github.com/matrix-org/matrix-react-sdk/pull/5622)
+ * Don't jump to bottom on reaction
+   [\#5621](https://github.com/matrix-org/matrix-react-sdk/pull/5621)
+ * Fix several profile settings oddities
+   [\#5620](https://github.com/matrix-org/matrix-react-sdk/pull/5620)
+ * Add option to hide the stickers button in the composer
+   [\#5530](https://github.com/matrix-org/matrix-react-sdk/pull/5530)
+ * Fix confusing right panel button behaviour
+   [\#5598](https://github.com/matrix-org/matrix-react-sdk/pull/5598)
+ * Fix jumping timestamp if hovering a message with e2e indicator bar
+   [\#5601](https://github.com/matrix-org/matrix-react-sdk/pull/5601)
+ * Fix avatar and trash alignment
+   [\#5614](https://github.com/matrix-org/matrix-react-sdk/pull/5614)
+ * Fix z-index of stickerpicker
+   [\#5617](https://github.com/matrix-org/matrix-react-sdk/pull/5617)
+ * Fix permalink via parsing for rooms
+   [\#5615](https://github.com/matrix-org/matrix-react-sdk/pull/5615)
+ * Fix "Terms and Conditions" checkbox alignment
+   [\#5613](https://github.com/matrix-org/matrix-react-sdk/pull/5613)
+ * Fix flair height after accent changes
+   [\#5611](https://github.com/matrix-org/matrix-react-sdk/pull/5611)
+ * Iterate Social Logins work around edge cases and branding
+   [\#5609](https://github.com/matrix-org/matrix-react-sdk/pull/5609)
+ * Lock widget room ID when added
+   [\#5607](https://github.com/matrix-org/matrix-react-sdk/pull/5607)
+ * Better errors for SSO failures
+   [\#5605](https://github.com/matrix-org/matrix-react-sdk/pull/5605)
+ * Increase language search bar width
+   [\#5549](https://github.com/matrix-org/matrix-react-sdk/pull/5549)
+ * Scroll to bottom on message_sent
+   [\#5565](https://github.com/matrix-org/matrix-react-sdk/pull/5565)
+ * Fix new rooms being titled 'Empty Room'
+   [\#5587](https://github.com/matrix-org/matrix-react-sdk/pull/5587)
+ * Fix saving the collapsed state of the left panel
+   [\#5593](https://github.com/matrix-org/matrix-react-sdk/pull/5593)
+ * Fix app-url hint in the e2e-test run script output
+   [\#5600](https://github.com/matrix-org/matrix-react-sdk/pull/5600)
+ * Fix RoomView re-mounting breaking peeking
+   [\#5602](https://github.com/matrix-org/matrix-react-sdk/pull/5602)
+ * Tweak a few room ID checks
+   [\#5592](https://github.com/matrix-org/matrix-react-sdk/pull/5592)
+ * Remove pills from event permalinks with text
+   [\#5575](https://github.com/matrix-org/matrix-react-sdk/pull/5575)
+
+Changes in [3.13.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.13.1) (2021-02-04)
+=====================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.13.0...v3.13.1)
+
+ * [Release] Fix z-index of stickerpicker
+   [\#5618](https://github.com/matrix-org/matrix-react-sdk/pull/5618)
+
+Changes in [3.13.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.13.0) (2021-02-03)
+=====================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.13.0-rc.1...v3.13.0)
+
+ * Upgrade to JS SDK 9.6.0
+ * [Release] Fix flair height after accent changes
+   [\#5612](https://github.com/matrix-org/matrix-react-sdk/pull/5612)
+ * [Release] Iterate Social Logins work around edge cases and branding
+   [\#5610](https://github.com/matrix-org/matrix-react-sdk/pull/5610)
+ * [Release] Lock widget room ID when added
+   [\#5608](https://github.com/matrix-org/matrix-react-sdk/pull/5608)
+ * [Release] Better errors for SSO failures
+   [\#5606](https://github.com/matrix-org/matrix-react-sdk/pull/5606)
+ * [Release] Fix RoomView re-mounting breaking peeking
+   [\#5603](https://github.com/matrix-org/matrix-react-sdk/pull/5603)
+
+Changes in [3.13.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.13.0-rc.1) (2021-01-29)
+===============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.12.1...v3.13.0-rc.1)
+
+ * Upgrade to JS SDK 9.6.0-rc.1
+ * Translations update from Weblate
+   [\#5597](https://github.com/matrix-org/matrix-react-sdk/pull/5597)
+ * Support managed hybrid widgets from config
+   [\#5596](https://github.com/matrix-org/matrix-react-sdk/pull/5596)
+ * Add managed hybrid call widgets when supported
+   [\#5594](https://github.com/matrix-org/matrix-react-sdk/pull/5594)
+ * Tweak mobile guide toast copy
+   [\#5595](https://github.com/matrix-org/matrix-react-sdk/pull/5595)
+ * Improve SSO auth flow
+   [\#5578](https://github.com/matrix-org/matrix-react-sdk/pull/5578)
+ * Add optional mobile guide toast
+   [\#5586](https://github.com/matrix-org/matrix-react-sdk/pull/5586)
+ * Fix invisible text after logging out in the dark theme
+   [\#5588](https://github.com/matrix-org/matrix-react-sdk/pull/5588)
+ * Fix escape for cancelling replies
+   [\#5591](https://github.com/matrix-org/matrix-react-sdk/pull/5591)
+ * Update widget-api to beta.12
+   [\#5589](https://github.com/matrix-org/matrix-react-sdk/pull/5589)
+ * Add commands for DM conversion
+   [\#5540](https://github.com/matrix-org/matrix-react-sdk/pull/5540)
+ * Run a UI refresh over the OIDC Exchange confirmation dialog
+   [\#5580](https://github.com/matrix-org/matrix-react-sdk/pull/5580)
+ * Allow stickerpickers the legacy "visibility" capability
+   [\#5581](https://github.com/matrix-org/matrix-react-sdk/pull/5581)
+ * Hide local video if it is muted
+   [\#5529](https://github.com/matrix-org/matrix-react-sdk/pull/5529)
+ * Don't use name width in reply thread for IRC layout
+   [\#5518](https://github.com/matrix-org/matrix-react-sdk/pull/5518)
+ * Update code_style.md
+   [\#5554](https://github.com/matrix-org/matrix-react-sdk/pull/5554)
+ * Fix Czech capital letters like ŠČŘ...
+   [\#5569](https://github.com/matrix-org/matrix-react-sdk/pull/5569)
+ * Add optional search shortcut
+   [\#5548](https://github.com/matrix-org/matrix-react-sdk/pull/5548)
+ * Fix Sudden 'find a room' UI shows up when the only room moves to favourites
+   [\#5584](https://github.com/matrix-org/matrix-react-sdk/pull/5584)
+ * Increase PersistedElement's z-index
+   [\#5568](https://github.com/matrix-org/matrix-react-sdk/pull/5568)
+ * Remove check that prevents Jitsi widgets from being unpinned
+   [\#5582](https://github.com/matrix-org/matrix-react-sdk/pull/5582)
+ * Fix Jitsi widgets causing localized tile crashes
+   [\#5583](https://github.com/matrix-org/matrix-react-sdk/pull/5583)
+ * Log candidates for calls
+   [\#5573](https://github.com/matrix-org/matrix-react-sdk/pull/5573)
+ * Upgrade deps 2021-01
+   [\#5579](https://github.com/matrix-org/matrix-react-sdk/pull/5579)
+ * Fix "Continuing without email" dialog bug
+   [\#5566](https://github.com/matrix-org/matrix-react-sdk/pull/5566)
+ * Require registration for verification actions
+   [\#5574](https://github.com/matrix-org/matrix-react-sdk/pull/5574)
+ * Don't play the hangup sound when the call is answered from elsewhere
+   [\#5572](https://github.com/matrix-org/matrix-react-sdk/pull/5572)
+ * Move to newer base image for end-to-end tests
+   [\#5570](https://github.com/matrix-org/matrix-react-sdk/pull/5570)
+ * Update widgets in the room upon join
+   [\#5564](https://github.com/matrix-org/matrix-react-sdk/pull/5564)
+ * Update AuxPanel and related buttons when widgets change or on reload
+   [\#5563](https://github.com/matrix-org/matrix-react-sdk/pull/5563)
+ * Add VoIP user mapper
+   [\#5560](https://github.com/matrix-org/matrix-react-sdk/pull/5560)
+ * Improve styling of SSO Buttons for multiple IdPs
+   [\#5558](https://github.com/matrix-org/matrix-react-sdk/pull/5558)
+ * Fixes for the general tab in the room dialog
+   [\#5522](https://github.com/matrix-org/matrix-react-sdk/pull/5522)
+ * fix issue 16226 to allow switching back to default HS.
+   [\#5561](https://github.com/matrix-org/matrix-react-sdk/pull/5561)
+ * Support room-defined widget layouts
+   [\#5553](https://github.com/matrix-org/matrix-react-sdk/pull/5553)
+ * Change a bunch of strings from Recovery Key/Phrase to Security Key/Phrase
+   [\#5533](https://github.com/matrix-org/matrix-react-sdk/pull/5533)
+ * Give a bigger target area to AppsDrawer vertical resizer
+   [\#5557](https://github.com/matrix-org/matrix-react-sdk/pull/5557)
+ * Fix minimized left panel avatar alignment
+   [\#5493](https://github.com/matrix-org/matrix-react-sdk/pull/5493)
+ * Ensure component index has been written before renaming
+   [\#5556](https://github.com/matrix-org/matrix-react-sdk/pull/5556)
+ * Fixed continue button while selecting home-server
+   [\#5552](https://github.com/matrix-org/matrix-react-sdk/pull/5552)
+ * Wire up MSC2931 widget navigation
+   [\#5527](https://github.com/matrix-org/matrix-react-sdk/pull/5527)
+ * Various fixes for Bridge Info page (MSC2346)
+   [\#5454](https://github.com/matrix-org/matrix-react-sdk/pull/5454)
+ * Use room-specific listeners for message preview and community prototype
+   [\#5547](https://github.com/matrix-org/matrix-react-sdk/pull/5547)
+ * Fix some misc. React warnings when viewing timeline
+   [\#5546](https://github.com/matrix-org/matrix-react-sdk/pull/5546)
+ * Use device storage for allowed widgets if account data not supported
+   [\#5544](https://github.com/matrix-org/matrix-react-sdk/pull/5544)
+ * Fix incoming call box on dark theme
+   [\#5542](https://github.com/matrix-org/matrix-react-sdk/pull/5542)
+ * Convert DMRoomMap to typescript
+   [\#5541](https://github.com/matrix-org/matrix-react-sdk/pull/5541)
+ * Add in-call dialpad for DTMF sending
+   [\#5532](https://github.com/matrix-org/matrix-react-sdk/pull/5532)
+
+Changes in [3.12.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.12.1) (2021-01-26)
+=====================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.12.0...v3.12.1)
+
+ * Upgrade to JS SDK 9.5.1
+
+Changes in [3.12.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.12.0) (2021-01-18)
+=====================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.12.0-rc.1...v3.12.0)
+
+ * Upgrade to JS SDK 9.5.0
+ * Fix incoming call box on dark theme
+   [\#5543](https://github.com/matrix-org/matrix-react-sdk/pull/5543)
+
+Changes in [3.12.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.12.0-rc.1) (2021-01-13)
+===============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.11.1...v3.12.0-rc.1)
+
+ * Upgrade to JS SDK 9.5.0-rc.1
+ * Fix soft crash on soft logout page
+   [\#5539](https://github.com/matrix-org/matrix-react-sdk/pull/5539)
+ * Translations update from Weblate
+   [\#5538](https://github.com/matrix-org/matrix-react-sdk/pull/5538)
+ * Run TypeScript tests
+   [\#5537](https://github.com/matrix-org/matrix-react-sdk/pull/5537)
+ * Add a basic widget explorer to devtools (per-room)
+   [\#5528](https://github.com/matrix-org/matrix-react-sdk/pull/5528)
+ * Add <input type="password"> to security key field
+   [\#5534](https://github.com/matrix-org/matrix-react-sdk/pull/5534)
+ * Fix avatar upload prompt/tooltip floating wrong and permissions
+   [\#5526](https://github.com/matrix-org/matrix-react-sdk/pull/5526)
+ * Add a dialpad UI for PSTN lookup
+   [\#5523](https://github.com/matrix-org/matrix-react-sdk/pull/5523)
+ * Basic call transfer initiation support
+   [\#5494](https://github.com/matrix-org/matrix-react-sdk/pull/5494)
+ * Fix #15988
+   [\#5524](https://github.com/matrix-org/matrix-react-sdk/pull/5524)
+ * Bump node-notifier from 8.0.0 to 8.0.1
+   [\#5520](https://github.com/matrix-org/matrix-react-sdk/pull/5520)
+ * Use TypeScript source for development, swap to build during release
+   [\#5503](https://github.com/matrix-org/matrix-react-sdk/pull/5503)
+ * Look for emoji in the body that will be displayed
+   [\#5517](https://github.com/matrix-org/matrix-react-sdk/pull/5517)
+ * Bump ini from 1.3.5 to 1.3.7
+   [\#5486](https://github.com/matrix-org/matrix-react-sdk/pull/5486)
+ * Recognise `*.element.io` links as Element permalinks
+   [\#5514](https://github.com/matrix-org/matrix-react-sdk/pull/5514)
+ * Fixes for call UI
+   [\#5509](https://github.com/matrix-org/matrix-react-sdk/pull/5509)
+ * Add a snowfall chat effect (with /snowfall command)
+   [\#5511](https://github.com/matrix-org/matrix-react-sdk/pull/5511)
+ * fireworks effect
+   [\#5507](https://github.com/matrix-org/matrix-react-sdk/pull/5507)
+ * Don't play call end sound for calls that never started
+   [\#5506](https://github.com/matrix-org/matrix-react-sdk/pull/5506)
+ * Add /tableflip slash command
+   [\#5485](https://github.com/matrix-org/matrix-react-sdk/pull/5485)
+ * Import from src in IncomingCallBox.tsx
+   [\#5504](https://github.com/matrix-org/matrix-react-sdk/pull/5504)
+ * Social Login support both https and mxc icons
+   [\#5499](https://github.com/matrix-org/matrix-react-sdk/pull/5499)
+ * Fix padding in confirmation email registration prompt
+   [\#5501](https://github.com/matrix-org/matrix-react-sdk/pull/5501)
+ * Fix room list help prompt alignment
+   [\#5500](https://github.com/matrix-org/matrix-react-sdk/pull/5500)
+
+Changes in [3.11.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.11.1) (2020-12-21)
+=====================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.11.0...v3.11.1)
+
+ * Upgrade JS SDK to 9.4.1
+
+Changes in [3.11.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.11.0) (2020-12-21)
+=====================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.11.0-rc.2...v3.11.0)
+
+ * Upgrade JS SDK to 9.4.0
+ * [Release] Look for emoji in the body that will be displayed
+   [\#5519](https://github.com/matrix-org/matrix-react-sdk/pull/5519)
+ * [Release] Recognise `*.element.io` links as Element permalinks
+   [\#5516](https://github.com/matrix-org/matrix-react-sdk/pull/5516)
+ * [Release] Fixes for call UI
+   [\#5513](https://github.com/matrix-org/matrix-react-sdk/pull/5513)
+ * [RELEASE] Add a snowfall chat effect (with /snowfall command)
+   [\#5512](https://github.com/matrix-org/matrix-react-sdk/pull/5512)
+ * [Release] Fix padding in confirmation email registration prompt
+   [\#5502](https://github.com/matrix-org/matrix-react-sdk/pull/5502)
+
+Changes in [3.11.0-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.11.0-rc.2) (2020-12-16)
+===============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.11.0-rc.1...v3.11.0-rc.2)
+
+ * Upgrade JS SDK to 9.4.0-rc.2
+
+Changes in [3.11.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.11.0-rc.1) (2020-12-16)
+===============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.10.0...v3.11.0-rc.1)
+
+ * Upgrade JS SDK to 9.4.0-rc.1
+ * Translations update from Weblate
+   [\#5497](https://github.com/matrix-org/matrix-react-sdk/pull/5497)
+ * Unregister from the dispatcher in CallHandler
+   [\#5495](https://github.com/matrix-org/matrix-react-sdk/pull/5495)
+ * Better adhere to MSC process
+   [\#5496](https://github.com/matrix-org/matrix-react-sdk/pull/5496)
+ * Use random pickle key on all platforms
+   [\#5483](https://github.com/matrix-org/matrix-react-sdk/pull/5483)
+ * Fix mx_MemberList icons
+   [\#5492](https://github.com/matrix-org/matrix-react-sdk/pull/5492)
+ * Convert InviteDialog to TypeScript
+   [\#5491](https://github.com/matrix-org/matrix-react-sdk/pull/5491)
+ * Add keyboard shortcut for emoji reactions
+   [\#5425](https://github.com/matrix-org/matrix-react-sdk/pull/5425)
+ * Run chat effects on events sent by widgets too
+   [\#5488](https://github.com/matrix-org/matrix-react-sdk/pull/5488)
+ * Fix being unable to pin widgets
+   [\#5487](https://github.com/matrix-org/matrix-react-sdk/pull/5487)
+ * Line 1 / 2 Support
+   [\#5468](https://github.com/matrix-org/matrix-react-sdk/pull/5468)
+ * Remove impossible labs feature: sending hidden read receipts
+   [\#5484](https://github.com/matrix-org/matrix-react-sdk/pull/5484)
+ * Fix height of Remote Video in call
+   [\#5456](https://github.com/matrix-org/matrix-react-sdk/pull/5456)
+ * Add UI for hold functionality
+   [\#5446](https://github.com/matrix-org/matrix-react-sdk/pull/5446)
+ * Allow SearchBox to expand to fill width
+   [\#5411](https://github.com/matrix-org/matrix-react-sdk/pull/5411)
+ * Use room alias in generated permalink for rooms
+   [\#5451](https://github.com/matrix-org/matrix-react-sdk/pull/5451)
+ * Only show confetti if the current room is receiving an appropriate event
+   [\#5482](https://github.com/matrix-org/matrix-react-sdk/pull/5482)
+ * Throttle RoomState.members handler to improve performance
+   [\#5481](https://github.com/matrix-org/matrix-react-sdk/pull/5481)
+ * Handle manual hs urls better for the server picker
+   [\#5477](https://github.com/matrix-org/matrix-react-sdk/pull/5477)
+ * Add Olm as a dev dependency for types
+   [\#5479](https://github.com/matrix-org/matrix-react-sdk/pull/5479)
+ * Hide Invite to this room CTA if no permission
+   [\#5476](https://github.com/matrix-org/matrix-react-sdk/pull/5476)
+ * Fix width of underline in server picker dialog
+   [\#5478](https://github.com/matrix-org/matrix-react-sdk/pull/5478)
+ * Fix confetti room unread state check
+   [\#5475](https://github.com/matrix-org/matrix-react-sdk/pull/5475)
+ * Show confetti in a chat room on command or emoji
+   [\#5140](https://github.com/matrix-org/matrix-react-sdk/pull/5140)
+ * Fix inverted settings default value
+   [\#5391](https://github.com/matrix-org/matrix-react-sdk/pull/5391)
+ * Improve usability of the Server Picker Dialog
+   [\#5474](https://github.com/matrix-org/matrix-react-sdk/pull/5474)
+ * Fix typos in some strings
+   [\#5473](https://github.com/matrix-org/matrix-react-sdk/pull/5473)
+ * Bump highlight.js from 10.1.2 to 10.4.1
+   [\#5472](https://github.com/matrix-org/matrix-react-sdk/pull/5472)
+ * Remove old app test script path
+   [\#5471](https://github.com/matrix-org/matrix-react-sdk/pull/5471)
+ * add support for giving reason when redacting
+   [\#5260](https://github.com/matrix-org/matrix-react-sdk/pull/5260)
+ * Add support for Netlify to fetchdep script
+   [\#5469](https://github.com/matrix-org/matrix-react-sdk/pull/5469)
+ * Nest other layers inside on automation
+   [\#5467](https://github.com/matrix-org/matrix-react-sdk/pull/5467)
+ * Rebrand various CI scripts and modules
+   [\#5466](https://github.com/matrix-org/matrix-react-sdk/pull/5466)
+ * Add more widget sanity checking
+   [\#5462](https://github.com/matrix-org/matrix-react-sdk/pull/5462)
+ * Fix React complaining about unknown DOM props
+   [\#5465](https://github.com/matrix-org/matrix-react-sdk/pull/5465)
+ * Jump to home page when leaving a room
+   [\#5464](https://github.com/matrix-org/matrix-react-sdk/pull/5464)
+ * Fix SSO buttons for Social Logins
+   [\#5463](https://github.com/matrix-org/matrix-react-sdk/pull/5463)
+ * Social Login and login delight tweaks
+   [\#5426](https://github.com/matrix-org/matrix-react-sdk/pull/5426)
+
+Changes in [3.10.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.10.0) (2020-12-07)
+=====================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.10.0-rc.1...v3.10.0)
+
+ * Upgrade to JS SDK 9.3.0
+
+Changes in [3.10.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.10.0-rc.1) (2020-12-02)
+===============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.9.0...v3.10.0-rc.1)
+
+ * Upgrade to JS SDK 9.3.0-rc.1
+ * Translations update from Weblate
+   [\#5461](https://github.com/matrix-org/matrix-react-sdk/pull/5461)
+ * Fix VoIP call plinth on dark theme
+   [\#5460](https://github.com/matrix-org/matrix-react-sdk/pull/5460)
+ * Add sanity checking around widget pinning
+   [\#5459](https://github.com/matrix-org/matrix-react-sdk/pull/5459)
+ * Update i18n for Appearance User Settings
+   [\#5457](https://github.com/matrix-org/matrix-react-sdk/pull/5457)
+ * Only show 'answered elsewhere' if we tried to answer too
+   [\#5455](https://github.com/matrix-org/matrix-react-sdk/pull/5455)
+ * Fixed Avatar for 3PID invites
+   [\#5442](https://github.com/matrix-org/matrix-react-sdk/pull/5442)
+ * Slightly better error if we can't capture user media
+   [\#5449](https://github.com/matrix-org/matrix-react-sdk/pull/5449)
+ * Make it possible in-code to hide rooms from the room list
+   [\#5445](https://github.com/matrix-org/matrix-react-sdk/pull/5445)
+ * Fix the stickerpicker
+   [\#5447](https://github.com/matrix-org/matrix-react-sdk/pull/5447)
+ * Add live password validation to change password dialog
+   [\#5436](https://github.com/matrix-org/matrix-react-sdk/pull/5436)
+ * LaTeX rendering in element-web using KaTeX
+   [\#5244](https://github.com/matrix-org/matrix-react-sdk/pull/5244)
+ * Add lifecycle customisation point after logout
+   [\#5448](https://github.com/matrix-org/matrix-react-sdk/pull/5448)
+ * Simplify UserMenu for Guests as they can't use most of the options
+   [\#5421](https://github.com/matrix-org/matrix-react-sdk/pull/5421)
+ * Fix known issues with modal widgets
+   [\#5444](https://github.com/matrix-org/matrix-react-sdk/pull/5444)
+ * Fix existing widgets not having approved capabilities for their function
+   [\#5443](https://github.com/matrix-org/matrix-react-sdk/pull/5443)
+ * Use the WidgetDriver to run OIDC requests
+   [\#5440](https://github.com/matrix-org/matrix-react-sdk/pull/5440)
+ * Add a customisation point for widget permissions and fix amnesia issues
+   [\#5439](https://github.com/matrix-org/matrix-react-sdk/pull/5439)
+ * Fix Widget event notification text including spurious space
+   [\#5441](https://github.com/matrix-org/matrix-react-sdk/pull/5441)
+ * Move call listener out of MatrixChat
+   [\#5438](https://github.com/matrix-org/matrix-react-sdk/pull/5438)
+ * New Look in-Call View
+   [\#5432](https://github.com/matrix-org/matrix-react-sdk/pull/5432)
+ * Support arbitrary widgets sticking to the screen + sending stickers
+   [\#5435](https://github.com/matrix-org/matrix-react-sdk/pull/5435)
+ * Auth typescripting and validation tweaks
+   [\#5433](https://github.com/matrix-org/matrix-react-sdk/pull/5433)
+ * Add new widget API actions for changing rooms and sending/receiving events
+   [\#5385](https://github.com/matrix-org/matrix-react-sdk/pull/5385)
+ * Revert room header click behaviour to opening room settings
+   [\#5434](https://github.com/matrix-org/matrix-react-sdk/pull/5434)
+ * Add option to send/edit a message with Ctrl + Enter / Command + Enter
+   [\#5160](https://github.com/matrix-org/matrix-react-sdk/pull/5160)
+ * Add Analytics instrumentation to the Homepage
+   [\#5409](https://github.com/matrix-org/matrix-react-sdk/pull/5409)
+ * Fix encrypted video playback in Chrome-based browsers
+   [\#5430](https://github.com/matrix-org/matrix-react-sdk/pull/5430)
+ * Add border-radius for video
+   [\#5333](https://github.com/matrix-org/matrix-react-sdk/pull/5333)
+ * Push name to the end, near text, in IRC layout
+   [\#5166](https://github.com/matrix-org/matrix-react-sdk/pull/5166)
+ * Disable notifications for the room you have recently been active in
+   [\#5325](https://github.com/matrix-org/matrix-react-sdk/pull/5325)
+ * Search through the list of unfiltered rooms rather than the rooms in the
+   state which are already filtered by the search text
+   [\#5331](https://github.com/matrix-org/matrix-react-sdk/pull/5331)
+ * Lighten blockquote colour in dark mode
+   [\#5353](https://github.com/matrix-org/matrix-react-sdk/pull/5353)
+ * Specify community description img must be mxc urls
+   [\#5364](https://github.com/matrix-org/matrix-react-sdk/pull/5364)
+ * Add keyboard shortcut to close the current conversation
+   [\#5253](https://github.com/matrix-org/matrix-react-sdk/pull/5253)
+ * Redirect user home from auth screens if they are already logged in
+   [\#5423](https://github.com/matrix-org/matrix-react-sdk/pull/5423)
+
+Changes in [3.9.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.9.0) (2020-11-23)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.9.0-rc.1...v3.9.0)
+
+ * Upgrade JS SDK to 9.2.0
+ * [Release] Fix encrypted video playback in Chrome-based browsers
+   [\#5431](https://github.com/matrix-org/matrix-react-sdk/pull/5431)
+
+Changes in [3.9.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.9.0-rc.1) (2020-11-18)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.8.0...v3.9.0-rc.1)
+
+ * Upgrade JS SDK to 9.2.0-rc.1
+ * Translations update from Weblate
+   [\#5429](https://github.com/matrix-org/matrix-react-sdk/pull/5429)
+ * Fix message search summary text
+   [\#5428](https://github.com/matrix-org/matrix-react-sdk/pull/5428)
+ * Shrink new room intro top margin to half for encryption bubble tile
+   [\#5427](https://github.com/matrix-org/matrix-react-sdk/pull/5427)
+ * Small delight tweaks to improve rough corners in the app
+   [\#5418](https://github.com/matrix-org/matrix-react-sdk/pull/5418)
+ * Fix DM logic to always pick a more reliable DM room
+   [\#5424](https://github.com/matrix-org/matrix-react-sdk/pull/5424)
+ * Update styling of the Analytics toast
+   [\#5408](https://github.com/matrix-org/matrix-react-sdk/pull/5408)
+ * Fix vertical centering of the Homepage and button layout
+   [\#5420](https://github.com/matrix-org/matrix-react-sdk/pull/5420)
+ * Fix BaseAvatar sometimes messing up and duplicating the url
+   [\#5422](https://github.com/matrix-org/matrix-react-sdk/pull/5422)
+ * Disable buttons when required by MSC2790
+   [\#5412](https://github.com/matrix-org/matrix-react-sdk/pull/5412)
+ * Fix drag drop file to upload for Safari
+   [\#5414](https://github.com/matrix-org/matrix-react-sdk/pull/5414)
+ * Fix poorly i18n'd string
+   [\#5416](https://github.com/matrix-org/matrix-react-sdk/pull/5416)
+ * Fix the feedback not closing without feedback/countly
+   [\#5417](https://github.com/matrix-org/matrix-react-sdk/pull/5417)
+ * Fix New Room Intro invite to this room button
+   [\#5419](https://github.com/matrix-org/matrix-react-sdk/pull/5419)
+ * Change how we expose Role in User Info and hide in DMs
+   [\#5413](https://github.com/matrix-org/matrix-react-sdk/pull/5413)
+ * Disallow sending of empty messages
+   [\#5390](https://github.com/matrix-org/matrix-react-sdk/pull/5390)
+ * hide some validation tooltips if fields are valid.
+   [\#5403](https://github.com/matrix-org/matrix-react-sdk/pull/5403)
+ * Improvements around new room empty space interactions
+   [\#5398](https://github.com/matrix-org/matrix-react-sdk/pull/5398)
+ * Implement call hold
+   [\#5366](https://github.com/matrix-org/matrix-react-sdk/pull/5366)
+ * Fix Skeleton UI showing up when not intended.
+   [\#5407](https://github.com/matrix-org/matrix-react-sdk/pull/5407)
+ * Close context menu when user clicks the Home button
+   [\#5406](https://github.com/matrix-org/matrix-react-sdk/pull/5406)
+ * Skip e2ee warn logout prompt if user has no megolm sessions to lose
+   [\#5410](https://github.com/matrix-org/matrix-react-sdk/pull/5410)
+ * Allow country names to be translated
+   [\#5405](https://github.com/matrix-org/matrix-react-sdk/pull/5405)
+ * Support thirdparty lookup for phone numbers
+   [\#5396](https://github.com/matrix-org/matrix-react-sdk/pull/5396)
+ * Change "Password" to "New Password"
+   [\#5371](https://github.com/matrix-org/matrix-react-sdk/pull/5371)
+ * Add customisation point for dehydration key
+   [\#5397](https://github.com/matrix-org/matrix-react-sdk/pull/5397)
+ * Rebrand Riot -> Element in the permalink classes
+   [\#5386](https://github.com/matrix-org/matrix-react-sdk/pull/5386)
+ * Invite / Create DM UX tweaks
+   [\#5387](https://github.com/matrix-org/matrix-react-sdk/pull/5387)
+ * Tweaks to toasts and post-registration landing
+   [\#5383](https://github.com/matrix-org/matrix-react-sdk/pull/5383)
+
+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)
+
+ * 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)
+
+ * Upgrade JS SDK to 9.0.1
+ * [Release] Fix theme variable passed to Jitsi
+   [\#5358](https://github.com/matrix-org/matrix-react-sdk/pull/5358)
+ * [Release] Widget fixes
+   [\#5351](https://github.com/matrix-org/matrix-react-sdk/pull/5351)
+
+Changes in [3.7.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.7.0) (2020-10-26)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.7.0-rc.2...v3.7.0)
+
+ * Upgrade JS SDK to 9.0.0
+
+Changes in [3.7.0-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.7.0-rc.2) (2020-10-21)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.7.0-rc.1...v3.7.0-rc.2)
+
+ * Fix JS SDK dependency to use 9.0.0-rc.1 as intended
+
+Changes in [3.7.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.7.0-rc.1) (2020-10-21)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.6.1...v3.7.0-rc.1)
+
+ * Upgrade JS SDK to 9.0.0-rc.1
+ * Update Weblate URL
+   [\#5346](https://github.com/matrix-org/matrix-react-sdk/pull/5346)
+ * Translations update from Weblate
+   [\#5347](https://github.com/matrix-org/matrix-react-sdk/pull/5347)
+ * Left Panel Widget support
+   [\#5247](https://github.com/matrix-org/matrix-react-sdk/pull/5247)
+ * Pinned widgets work
+   [\#5266](https://github.com/matrix-org/matrix-react-sdk/pull/5266)
+ * Convert resizer to Typescript
+   [\#5343](https://github.com/matrix-org/matrix-react-sdk/pull/5343)
+ * Hide filtering microcopy when left panel is minimized
+   [\#5338](https://github.com/matrix-org/matrix-react-sdk/pull/5338)
+ * Skip editor confirmation of upgrades
+   [\#5344](https://github.com/matrix-org/matrix-react-sdk/pull/5344)
+ * Spec compliance, /search doesn't have to return results
+   [\#5337](https://github.com/matrix-org/matrix-react-sdk/pull/5337)
+ * Fix excessive hosting link padding
+   [\#5336](https://github.com/matrix-org/matrix-react-sdk/pull/5336)
+ * Adjust for new widget messaging APIs
+   [\#5341](https://github.com/matrix-org/matrix-react-sdk/pull/5341)
+ * Fix case where sublist context menu missed an update
+   [\#5339](https://github.com/matrix-org/matrix-react-sdk/pull/5339)
+ * Add analytics to VoIP
+   [\#5340](https://github.com/matrix-org/matrix-react-sdk/pull/5340)
+ * Fix Jitsi OpenIDC auth
+   [\#5334](https://github.com/matrix-org/matrix-react-sdk/pull/5334)
+ * Support rejecting calls
+   [\#5324](https://github.com/matrix-org/matrix-react-sdk/pull/5324)
+ * Don't show admin tooling if we're not in the room
+   [\#5330](https://github.com/matrix-org/matrix-react-sdk/pull/5330)
+ * Show Integrations error if iframe failed to load too
+   [\#5328](https://github.com/matrix-org/matrix-react-sdk/pull/5328)
+ * Add security customisation points
+   [\#5327](https://github.com/matrix-org/matrix-react-sdk/pull/5327)
+ * Discard all mx_fadable legacy cruft which is totally useless
+   [\#5326](https://github.com/matrix-org/matrix-react-sdk/pull/5326)
+ * Fix background-image: url(null) for backdrop filter
+   [\#5319](https://github.com/matrix-org/matrix-react-sdk/pull/5319)
+ * Make the ACL update message less noisy
+   [\#5316](https://github.com/matrix-org/matrix-react-sdk/pull/5316)
+ * Fix aspect ratio of avatar before clicking Save
+   [\#5318](https://github.com/matrix-org/matrix-react-sdk/pull/5318)
+ * Don't supply popout widgets with widget parameters
+   [\#5323](https://github.com/matrix-org/matrix-react-sdk/pull/5323)
+ * Changed rainbow algorithm
+   [\#5301](https://github.com/matrix-org/matrix-react-sdk/pull/5301)
+ * Renamed TagPanel and TagOrderStore
+   [\#5309](https://github.com/matrix-org/matrix-react-sdk/pull/5309)
+ * Fix/clarify boolean logic for reaction previews
+   [\#5321](https://github.com/matrix-org/matrix-react-sdk/pull/5321)
+ * Support glare for VoIP calls
+   [\#5311](https://github.com/matrix-org/matrix-react-sdk/pull/5311)
+ * Round of Typescript conversions
+   [\#5314](https://github.com/matrix-org/matrix-react-sdk/pull/5314)
+ * Fix broken rendering of Room Create when showHiddenEvents enabled
+   [\#5317](https://github.com/matrix-org/matrix-react-sdk/pull/5317)
+ * Improve LHS resize performance and tidy stale props&classes
+   [\#5313](https://github.com/matrix-org/matrix-react-sdk/pull/5313)
+ * event-index: Pass the user/device id pair when initializing the event index.
+   [\#5312](https://github.com/matrix-org/matrix-react-sdk/pull/5312)
+ * Fix various aspects of (jitsi) widgets
+   [\#5315](https://github.com/matrix-org/matrix-react-sdk/pull/5315)
+ * Fix rogue (partial) call bar
+   [\#5310](https://github.com/matrix-org/matrix-react-sdk/pull/5310)
+ * Rewrite call state machine
+   [\#5308](https://github.com/matrix-org/matrix-react-sdk/pull/5308)
+ * Convert `src/SecurityManager.js` to TypeScript
+   [\#5307](https://github.com/matrix-org/matrix-react-sdk/pull/5307)
+ * Fix templating for v1 jitsi widgets
+   [\#5305](https://github.com/matrix-org/matrix-react-sdk/pull/5305)
+ * Use new preparing event for widget communications
+   [\#5303](https://github.com/matrix-org/matrix-react-sdk/pull/5303)
+ * Fix parsing issue in event tile preview for appearance tab
+   [\#5302](https://github.com/matrix-org/matrix-react-sdk/pull/5302)
+ * Track replyToEvent along with Cider state & history
+   [\#5284](https://github.com/matrix-org/matrix-react-sdk/pull/5284)
+ * Roving Tab Index should not interfere with inputs
+   [\#5299](https://github.com/matrix-org/matrix-react-sdk/pull/5299)
+ * Visual tweaks from 2020-10-06 polishing
+   [\#5298](https://github.com/matrix-org/matrix-react-sdk/pull/5298)
+ * Convert auth lifecycle to TS, remove dead ILAG code
+   [\#5296](https://github.com/matrix-org/matrix-react-sdk/pull/5296)
+
+Changes in [3.6.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.6.1) (2020-10-20)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.6.0...v3.6.1)
+
+ * [Release] Adjust for new widget messaging APIs
+   [\#5342](https://github.com/matrix-org/matrix-react-sdk/pull/5342)
+ * [Release] Fix Jitsi OpenIDC auth
+   [\#5335](https://github.com/matrix-org/matrix-react-sdk/pull/5335)
+
 Changes in [3.6.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.6.0) (2020-10-12)
 ===================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.6.0-rc.1...v3.6.0)
diff --git a/README.md b/README.md
index 4db02418ba..73afe34df0 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ are currently filed against vector-im/element-web rather than this project).
 
 Translation Status
 ==================
-[![Translation status](https://translate.riot.im/widgets/element-web/-/multi-auto.svg)](https://translate.riot.im/engage/element-web/?utm_source=widget)
+[![Translation status](https://translate.element.io/widgets/element-web/-/multi-auto.svg)](https://translate.element.io/engage/element-web/?utm_source=widget)
 
 Developer Guide
 ===============
diff --git a/code_style.md b/code_style.md
index fe04d2cc3d..5747540a76 100644
--- a/code_style.md
+++ b/code_style.md
@@ -35,12 +35,6 @@ General Style
 - lowerCamelCase for functions and variables.
 - Single line ternary operators are fine.
 - UPPER_SNAKE_CASE for constants
-- Single quotes for strings by default, for consistency with most JavaScript styles:
-
-  ```javascript
-  "bad" // Bad
-  'good' // Good
-  ```
 - Use parentheses or `` ` `` instead of `\` for line continuation where ever possible
 - Open braces on the same line (consistent with Node):
 
@@ -162,7 +156,14 @@ ECMAScript
   - Be careful mixing arrow functions and regular functions, eg. if one function in a promise chain is an
     arrow function, they probably all should be.
 - Apart from that, newer ES features should be used whenever the author deems them to be appropriate.
-- Flow annotations are welcome and encouraged.
+
+TypeScript
+----------
+- TypeScript is preferred over the use of JavaScript
+- It's desirable to convert existing JavaScript files to TypeScript. TypeScript conversions should be done in small
+  chunks without functional changes to ease the review process.
+- Use full type definitions for function parameters and return values.
+- Avoid `any` types and `any` casts
 
 React
 -----
@@ -201,6 +202,8 @@ React
     this.state = { counter: 0 };
   }
   ```
+- Prefer class components over function components and hooks (not a strict rule though)
+
 - Think about whether your component really needs state: are you duplicating
   information in component state that could be derived from the model?
 
diff --git a/docs/widget-layouts.md b/docs/widget-layouts.md
new file mode 100644
index 0000000000..e7f72e2001
--- /dev/null
+++ b/docs/widget-layouts.md
@@ -0,0 +1,60 @@
+# Widget layout support
+
+Rooms can have a default widget layout to auto-pin certain widgets, make the container different
+sizes, etc. These are defined through the `io.element.widgets.layout` state event (empty state key).
+
+Full example content:
+```json5
+{
+  "widgets": {
+    "first-widget-id": {
+      "container": "top",
+      "index": 0,
+      "width": 60,
+      "height": 40
+    },
+    "second-widget-id": {
+      "container": "right"
+    }
+  }
+}
+```
+
+As shown, there are two containers possible for widgets. These containers have different behaviour
+and interpret the other options differently. 
+
+## `top` container
+
+This is the "App Drawer" or any pinned widgets in a room. This is by far the most versatile container
+though does introduce potential usability issues upon members of the room (widgets take up space and
+therefore fewer messages can be shown).
+
+The `index` for a widget determines which order the widgets show up in from left to right. Widgets
+without an `index` will show up as the rightmost widgets. Tiebreaks (same `index` or multiple defined
+without an `index`) are resolved by comparing widget IDs. A maximum of 3 widgets can be in the top
+container - any which exceed this will be ignored (placed into the `right` container). Smaller numbers 
+represent leftmost widgets.
+
+The `width` is relative width within the container in percentage points. This will be clamped to a
+range of 0-100 (inclusive). The widgets will attempt to scale to relative proportions when more than
+100% space is allocated. For example, if 3 widgets are defined at 40% width each then the client will
+attempt to show them at 33% width each.
+
+Note that the client may impose minimum widths on the widgets, such as a 10% minimum to avoid pinning
+hidden widgets. In general, widgets defined in the 30-70% range each will be free of these restrictions.
+
+The `height` is not in fact applied per-widget but is recorded per-widget for potential future 
+capabilities in future containers. The top container will take the tallest `height` and use that for
+the height of the whole container, and thus all widgets in that container. The `height` is relative
+to the container, like with `width`, meaning that 100% will consume as much space as the client is
+willing to sacrifice to the widget container. Like with `width`, the client may impose minimums to avoid
+the container being uselessly small. Heights in the 30-100% range are generally acceptable. The height
+is also clamped to be within 0-100, inclusive.
+
+## `right` container
+
+This is the default container and has no special configuration. Widgets which overflow from the top
+container will be put in this container instead. Putting a widget in the right container does not
+automatically show it - it only mentions that widgets should not be in another container.
+
+The behaviour of this container may change in the future.
diff --git a/package.json b/package.json
index 3f073ce59c..7ed1b272da 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "3.6.0",
+  "version": "3.15.0",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {
@@ -27,11 +27,12 @@
     "matrix-gen-i18n": "scripts/gen-i18n.js",
     "matrix-prune-i18n": "scripts/prune-i18n.js"
   },
-  "main": "./lib/index.js",
-  "typings": "./lib/index.d.ts",
+  "main": "./src/index.js",
   "matrix_src_main": "./src/index.js",
+  "matrix_lib_main": "./lib/index.js",
+  "matrix_lib_typings": "./lib/index.d.ts",
   "scripts": {
-    "prepare": "yarn build",
+    "prepublishOnly": "yarn build",
     "i18n": "matrix-gen-i18n",
     "prunei18n": "matrix-prune-i18n",
     "diff-i18n": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && ./scripts/gen-i18n.js && node scripts/compare-file.js src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json",
@@ -50,49 +51,49 @@
     "lint:types": "tsc --noEmit --jsx react",
     "lint:style": "stylelint 'res/css/**/*.scss'",
     "test": "jest",
-    "test:e2e": "./test/end-to-end-tests/run.sh --riot-url http://localhost:8080"
+    "test:e2e": "./test/end-to-end-tests/run.sh --app-url http://localhost:8080"
   },
   "dependencies": {
-    "@babel/runtime": "^7.10.5",
-    "await-lock": "^2.0.1",
-    "blueimp-canvas-to-blob": "^3.27.0",
+    "@babel/runtime": "^7.12.5",
+    "await-lock": "^2.1.0",
+    "blueimp-canvas-to-blob": "^3.28.0",
     "browser-encrypt-attachment": "^0.3.0",
     "browser-request": "^0.3.3",
+    "cheerio": "^1.0.0-rc.5",
     "classnames": "^2.2.6",
-    "commonmark": "^0.29.1",
+    "commonmark": "^0.29.3",
     "counterpart": "^0.18.6",
-    "diff-dom": "^4.1.6",
+    "diff-dom": "^4.2.2",
     "diff-match-patch": "^1.0.5",
-    "emojibase-data": "^5.0.1",
-    "emojibase-regex": "^4.0.1",
+    "emojibase-data": "^5.1.1",
+    "emojibase-regex": "^4.1.1",
     "escape-html": "^1.0.3",
-    "file-saver": "^1.3.8",
-    "filesize": "3.6.1",
+    "file-saver": "^2.0.5",
+    "filesize": "6.1.0",
     "flux": "2.1.1",
-    "focus-visible": "^5.1.0",
-    "fuse.js": "^2.7.4",
+    "focus-visible": "^5.2.0",
     "gfm.css": "^1.1.2",
     "glob-to-regexp": "^0.4.1",
-    "highlight.js": "^10.1.2",
-    "html-entities": "^1.3.1",
-    "is-ip": "^2.0.0",
+    "highlight.js": "^10.5.0",
+    "html-entities": "^1.4.0",
+    "is-ip": "^3.1.0",
+    "katex": "^0.12.0",
     "linkifyjs": "^2.1.9",
-    "lodash": "^4.17.19",
+    "lodash": "^4.17.20",
     "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
-    "matrix-widget-api": "^0.1.0-beta.3",
+    "matrix-widget-api": "^0.1.0-beta.13",
     "minimist": "^1.2.5",
-    "pako": "^1.0.11",
-    "parse5": "^5.1.1",
+    "pako": "^2.0.3",
+    "parse5": "^6.0.1",
     "png-chunks-extract": "^1.0.0",
-    "project-name-generator": "^2.1.7",
     "prop-types": "^15.7.2",
     "qrcode": "^1.4.4",
-    "qs": "^6.9.4",
-    "re-resizable": "^6.5.4",
-    "react": "^16.13.1",
+    "qs": "^6.9.6",
+    "re-resizable": "^6.9.0",
+    "react": "^16.14.0",
     "react-beautiful-dnd": "^4.0.1",
-    "react-dom": "^16.13.1",
-    "react-focus-lock": "^2.4.1",
+    "react-dom": "^16.14.0",
+    "react-focus-lock": "^2.5.0",
     "react-transition-group": "^4.4.1",
     "resize-observer-polyfill": "^1.5.1",
     "rfc4648": "^1.4.0",
@@ -100,75 +101,80 @@
     "tar-js": "^0.3.0",
     "text-encoding-utf-8": "^1.0.2",
     "url": "^0.11.0",
-    "velocity-animate": "^1.5.2",
+    "velocity-animate": "^2.0.6",
     "what-input": "^5.2.10",
     "zxcvbn": "^4.4.2"
   },
   "devDependencies": {
-    "@babel/cli": "^7.10.5",
-    "@babel/core": "^7.10.5",
-    "@babel/parser": "^7.11.0",
-    "@babel/plugin-proposal-class-properties": "^7.10.4",
-    "@babel/plugin-proposal-decorators": "^7.10.5",
-    "@babel/plugin-proposal-export-default-from": "^7.10.4",
-    "@babel/plugin-proposal-numeric-separator": "^7.10.4",
-    "@babel/plugin-proposal-object-rest-spread": "^7.10.4",
-    "@babel/plugin-transform-flow-comments": "^7.10.4",
-    "@babel/plugin-transform-runtime": "^7.10.5",
-    "@babel/preset-env": "^7.10.4",
-    "@babel/preset-flow": "^7.10.4",
-    "@babel/preset-react": "^7.10.4",
-    "@babel/preset-typescript": "^7.10.4",
-    "@babel/register": "^7.10.5",
-    "@babel/traverse": "^7.11.0",
-    "@peculiar/webcrypto": "^1.1.3",
-    "@types/classnames": "^2.2.10",
+    "@babel/cli": "^7.12.10",
+    "@babel/core": "^7.12.10",
+    "@babel/parser": "^7.12.11",
+    "@babel/plugin-proposal-class-properties": "^7.12.1",
+    "@babel/plugin-proposal-decorators": "^7.12.12",
+    "@babel/plugin-proposal-export-default-from": "^7.12.1",
+    "@babel/plugin-proposal-numeric-separator": "^7.12.7",
+    "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
+    "@babel/plugin-transform-flow-comments": "^7.12.1",
+    "@babel/plugin-transform-runtime": "^7.12.10",
+    "@babel/preset-env": "^7.12.11",
+    "@babel/preset-flow": "^7.12.1",
+    "@babel/preset-react": "^7.12.10",
+    "@babel/preset-typescript": "^7.12.7",
+    "@babel/register": "^7.12.10",
+    "@babel/traverse": "^7.12.12",
+    "@peculiar/webcrypto": "^1.1.4",
+    "@sinonjs/fake-timers": "^7.0.2",
+    "@types/classnames": "^2.2.11",
     "@types/counterpart": "^0.18.1",
     "@types/flux": "^3.1.9",
+    "@types/jest": "^26.0.20",
     "@types/linkifyjs": "^2.1.3",
-    "@types/lodash": "^4.14.158",
+    "@types/lodash": "^4.14.168",
     "@types/modernizr": "^3.5.3",
-    "@types/node": "^12.12.51",
+    "@types/node": "^14.14.22",
     "@types/pako": "^1.0.1",
-    "@types/qrcode": "^1.3.4",
+    "@types/qrcode": "^1.3.5",
     "@types/react": "^16.9",
-    "@types/react-dom": "^16.9.8",
+    "@types/react-dom": "^16.9.10",
     "@types/react-transition-group": "^4.4.0",
-    "@types/sanitize-html": "^1.23.3",
+    "@types/sanitize-html": "^1.27.0",
     "@types/zxcvbn": "^4.4.0",
-    "@typescript-eslint/eslint-plugin": "^3.7.0",
-    "@typescript-eslint/parser": "^3.7.0",
+    "@typescript-eslint/eslint-plugin": "^4.14.0",
+    "@typescript-eslint/parser": "^4.14.0",
     "babel-eslint": "^10.1.0",
-    "babel-jest": "^24.9.0",
-    "chokidar": "^3.4.1",
-    "concurrently": "^4.1.2",
+    "babel-jest": "^26.6.3",
+    "chokidar": "^3.5.1",
+    "concurrently": "^5.3.0",
     "enzyme": "^3.11.0",
-    "enzyme-adapter-react-16": "^1.15.2",
-    "eslint": "7.5.0",
-    "eslint-config-matrix-org": "^0.1.2",
+    "enzyme-adapter-react-16": "^1.15.6",
+    "eslint": "7.18.0",
+    "eslint-config-matrix-org": "^0.2.0",
     "eslint-plugin-babel": "^5.3.1",
-    "eslint-plugin-flowtype": "^2.50.3",
-    "eslint-plugin-react": "^7.20.3",
-    "eslint-plugin-react-hooks": "^2.5.1",
-    "glob": "^5.0.15",
-    "jest": "^26.5.2",
+    "eslint-plugin-flowtype": "^5.2.0",
+    "eslint-plugin-react": "^7.22.0",
+    "eslint-plugin-react-hooks": "^4.2.0",
+    "glob": "^7.1.6",
+    "jest": "^26.6.3",
     "jest-canvas-mock": "^2.3.0",
     "jest-environment-jsdom-sixteen": "^1.0.3",
-    "lolex": "^5.1.2",
     "matrix-mock-request": "^1.2.3",
     "matrix-react-test-utils": "^0.2.2",
-    "react-test-renderer": "^16.13.1",
-    "rimraf": "^2.7.1",
-    "stylelint": "^9.10.1",
-    "stylelint-config-standard": "^18.3.0",
+    "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz",
+    "react-test-renderer": "^16.14.0",
+    "rimraf": "^3.0.2",
+    "stylelint": "^13.9.0",
+    "stylelint-config-standard": "^20.0.0",
     "stylelint-scss": "^3.18.0",
-    "typescript": "^3.9.7",
+    "typescript": "^4.1.3",
     "walk": "^2.3.14"
   },
+  "resolutions": {
+    "**/@types/react": "^16.14"
+  },
   "jest": {
     "testEnvironment": "./__test-utils__/environment.js",
     "testMatch": [
-      "<rootDir>/test/**/*-test.js"
+      "<rootDir>/test/**/*-test.[jt]s"
     ],
     "setupFiles": [
       "jest-canvas-mock"
diff --git a/release.sh b/release.sh
index e2cefcbe74..4742f00dea 100755
--- a/release.sh
+++ b/release.sh
@@ -32,9 +32,7 @@ do
             echo "Upgrading $i to $latestver..."
             yarn add -E $i@$latestver
             git add -u
-            # The `-e` flag opens the editor and gives you a chance to check
-            # the upgrade for correctness.
-            git commit -m "Upgrade $i to $latestver" -e
+            git commit -m "Upgrade $i to $latestver"
         fi
     fi
 done
diff --git a/res/css/_common.scss b/res/css/_common.scss
index 666129af34..6e9d252659 100644
--- a/res/css/_common.scss
+++ b/res/css/_common.scss
@@ -17,9 +17,15 @@ limitations under the License.
 */
 
 @import "./_font-sizes.scss";
+@import "./_font-weights.scss";
 
 $hover-transition: 0.08s cubic-bezier(.46, .03, .52, .96); // quadratic
 
+$EventTile_e2e_state_indicator_width: 4px;
+
+$MessageTimestamp_width: 46px; /* 8 + 30 (avatar) + 8 */
+$MessageTimestamp_width_hover: calc($MessageTimestamp_width - 2 * $EventTile_e2e_state_indicator_width);
+
 :root {
     font-size: 10px;
 }
@@ -59,6 +65,10 @@ pre, code {
     color: $accent-color;
 }
 
+.text-muted {
+    color: $muted-fg-color;
+}
+
 b {
     // On Firefox, the default weight for `<b>` is `bolder` which results in no bold
     // effect since we only have specific weights of our fonts available.
@@ -165,7 +175,6 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
         border: 1px solid rgba($primary-fg-color, .1);
         // these things should probably not be defined globally
         margin: 9px;
-        flex: 0 0 auto;
     }
 
     .mx_textinput {
@@ -323,6 +332,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
 
 .mx_Dialog_title {
     font-size: $font-22px;
+    font-weight: $font-semi-bold;
     line-height: $font-36px;
     color: $dialog-title-fg-color;
 }
@@ -348,8 +358,8 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
     background-color: $dialog-close-fg-color;
     cursor: pointer;
     position: absolute;
-    top: 4px;
-    right: 0px;
+    top: 10px;
+    right: 0;
 }
 
 .mx_Dialog_content {
@@ -362,6 +372,11 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
 .mx_Dialog_buttons {
     margin-top: 20px;
     text-align: right;
+
+    .mx_Dialog_buttons_additive {
+        // The consumer is responsible for positioning their elements.
+        float: left;
+    }
 }
 
 /* XXX: Our button style are a mess: buttons that happen to appear in dialogs get special styles applied
diff --git a/res/css/_components.scss b/res/css/_components.scss
index 18cf0c52d8..d894688cac 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -9,10 +9,12 @@
 @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";
 @import "./structures/_LeftPanel.scss";
+@import "./structures/_LeftPanelWidget.scss";
 @import "./structures/_MainSplit.scss";
 @import "./structures/_MatrixChat.scss";
 @import "./structures/_MyGroups.scss";
@@ -25,8 +27,10 @@
 @import "./structures/_RoomView.scss";
 @import "./structures/_ScrollPanel.scss";
 @import "./structures/_SearchBox.scss";
+@import "./structures/_SpacePanel.scss";
+@import "./structures/_SpaceRoomDirectory.scss";
+@import "./structures/_SpaceRoomView.scss";
 @import "./structures/_TabbedView.scss";
-@import "./structures/_GroupFilterPanel.scss";
 @import "./structures/_ToastContainer.scss";
 @import "./structures/_UploadBar.scss";
 @import "./structures/_UserMenu.scss";
@@ -44,18 +48,18 @@
 @import "./views/auth/_InteractiveAuthEntryComponents.scss";
 @import "./views/auth/_LanguageSelector.scss";
 @import "./views/auth/_PassphraseField.scss";
-@import "./views/auth/_ServerConfig.scss";
-@import "./views/auth/_ServerTypeSelector.scss";
 @import "./views/auth/_Welcome.scss";
 @import "./views/avatars/_BaseAvatar.scss";
 @import "./views/avatars/_DecoratedRoomAvatar.scss";
 @import "./views/avatars/_MemberStatusMessageAvatar.scss";
 @import "./views/avatars/_PulsedAvatar.scss";
+@import "./views/avatars/_WidgetAvatar.scss";
+@import "./views/context_menus/_CallContextMenu.scss";
 @import "./views/context_menus/_IconizedContextMenu.scss";
 @import "./views/context_menus/_MessageContextMenu.scss";
 @import "./views/context_menus/_StatusMessageContextMenu.scss";
 @import "./views/context_menus/_TagTileContextMenu.scss";
-@import "./views/context_menus/_WidgetContextMenu.scss";
+@import "./views/dialogs/_AddExistingToSpaceDialog.scss";
 @import "./views/dialogs/_AddressPickerDialog.scss";
 @import "./views/dialogs/_Analytics.scss";
 @import "./views/dialogs/_BugReportDialog.scss";
@@ -69,25 +73,32 @@
 @import "./views/dialogs/_DeactivateAccountDialog.scss";
 @import "./views/dialogs/_DevtoolsDialog.scss";
 @import "./views/dialogs/_EditCommunityPrototypeDialog.scss";
+@import "./views/dialogs/_FeedbackDialog.scss";
 @import "./views/dialogs/_GroupAddressPicker.scss";
+@import "./views/dialogs/_HostSignupDialog.scss";
 @import "./views/dialogs/_IncomingSasDialog.scss";
 @import "./views/dialogs/_InviteDialog.scss";
 @import "./views/dialogs/_KeyboardShortcutsDialog.scss";
 @import "./views/dialogs/_MessageEditHistoryDialog.scss";
+@import "./views/dialogs/_ModalWidgetDialog.scss";
 @import "./views/dialogs/_NewSessionReviewDialog.scss";
+@import "./views/dialogs/_RegistrationEmailPromptDialog.scss";
 @import "./views/dialogs/_RoomSettingsDialog.scss";
 @import "./views/dialogs/_RoomSettingsDialogBridges.scss";
 @import "./views/dialogs/_RoomUpgradeDialog.scss";
 @import "./views/dialogs/_RoomUpgradeWarningDialog.scss";
 @import "./views/dialogs/_ServerOfflineDialog.scss";
+@import "./views/dialogs/_ServerPickerDialog.scss";
 @import "./views/dialogs/_SetEmailDialog.scss";
 @import "./views/dialogs/_SettingsDialog.scss";
 @import "./views/dialogs/_ShareDialog.scss";
 @import "./views/dialogs/_SlashCommandHelpDialog.scss";
+@import "./views/dialogs/_SpaceSettingsDialog.scss";
 @import "./views/dialogs/_TabbedIntegrationManagerDialog.scss";
 @import "./views/dialogs/_TermsDialog.scss";
 @import "./views/dialogs/_UploadConfirmDialog.scss";
 @import "./views/dialogs/_UserSettingsDialog.scss";
+@import "./views/dialogs/_WidgetCapabilitiesPromptDialog.scss";
 @import "./views/dialogs/_WidgetOpenIDPermissionsDialog.scss";
 @import "./views/dialogs/security/_AccessSecretStorageDialog.scss";
 @import "./views/dialogs/security/_CreateCrossSigningDialog.scss";
@@ -101,17 +112,18 @@
 @import "./views/elements/_AddressTile.scss";
 @import "./views/elements/_DesktopBuildsNotice.scss";
 @import "./views/elements/_DirectorySearchBox.scss";
+@import "./views/elements/_DesktopCapturerSourcePicker.scss";
 @import "./views/elements/_Dropdown.scss";
 @import "./views/elements/_EditableItemList.scss";
 @import "./views/elements/_ErrorBoundary.scss";
 @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";
 @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";
@@ -120,6 +132,8 @@
 @import "./views/elements/_RichText.scss";
 @import "./views/elements/_RoleButton.scss";
 @import "./views/elements/_RoomAliasField.scss";
+@import "./views/elements/_SSOButtons.scss";
+@import "./views/elements/_ServerPicker.scss";
 @import "./views/elements/_Slider.scss";
 @import "./views/elements/_Spinner.scss";
 @import "./views/elements/_StyledCheckbox.scss";
@@ -136,6 +150,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";
@@ -179,6 +194,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";
@@ -201,6 +217,7 @@
 @import "./views/settings/_DevicesPanel.scss";
 @import "./views/settings/_E2eAdvancedPanel.scss";
 @import "./views/settings/_EmailAddresses.scss";
+@import "./views/settings/_SpellCheckLanguages.scss";
 @import "./views/settings/_IntegrationManager.scss";
 @import "./views/settings/_Notifications.scss";
 @import "./views/settings/_PhoneNumbers.scss";
@@ -221,9 +238,16 @@
 @import "./views/settings/tabs/user/_PreferencesUserSettingsTab.scss";
 @import "./views/settings/tabs/user/_SecurityUserSettingsTab.scss";
 @import "./views/settings/tabs/user/_VoiceUserSettingsTab.scss";
+@import "./views/spaces/_SpaceBasicSettings.scss";
+@import "./views/spaces/_SpaceCreateMenu.scss";
+@import "./views/spaces/_SpacePublicShare.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";
 @import "./views/voip/_CallView.scss";
-@import "./views/voip/_VideoView.scss";
+@import "./views/voip/_DialPad.scss";
+@import "./views/voip/_DialPadContextMenu.scss";
+@import "./views/voip/_DialPadModal.scss";
+@import "./views/voip/_VideoFeed.scss";
diff --git a/res/css/structures/_CustomRoomTagPanel.scss b/res/css/structures/_CustomRoomTagPanel.scss
index 96813cccea..be1138cf5b 100644
--- a/res/css/structures/_CustomRoomTagPanel.scss
+++ b/res/css/structures/_CustomRoomTagPanel.scss
@@ -16,11 +16,6 @@ limitations under the License.
 
 // TODO: Update design for custom tags to match new designs
 
-.mx_LeftPanel_tagPanelContainer {
-    display: flex;
-    flex-direction: column;
-}
-
 .mx_CustomRoomTagPanel {
     background-color: $groupFilterPanel-bg-color;
     max-height: 40vh;
diff --git a/res/css/structures/_HomePage.scss b/res/css/structures/_HomePage.scss
index 04527bff48..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 {
@@ -50,56 +51,54 @@ limitations under the License.
         color: $muted-fg-color;
     }
 
+    .mx_MiniAvatarUploader {
+        margin: 0 auto;
+    }
+
     .mx_HomePage_default_buttons {
-        margin: 80px auto 0;
+        margin: 60px auto 0;
         width: fit-content;
 
         .mx_AccessibleButton {
             padding: 73px 8px 15px; // top: 20px top padding + 40px icon + 13px margin
 
-            width: 104px; // 120px - 2* 8px
-            margin: 0 39px; // 55px - 2* 8px
+            width: 160px;
+            height: 132px;
+            margin: 20px;
             position: relative;
             display: inline-block;
             border-radius: 8px;
             vertical-align: top;
             word-break: break-word;
+            box-sizing: border-box;
 
             font-weight: 600;
             font-size: $font-15px;
             line-height: $font-20px;
-            color: $muted-fg-color;
-
-            &:hover {
-                color: $accent-color;
-                background: rgba($accent-color, 0.06);
-
-                &::before {
-                    background-color: $accent-color;
-                }
-            }
+            color: #fff; // on all themes
+            background-color: $accent-color;
 
             &::before {
                 top: 20px;
-                left: 40px; // (120px-40px)/2
+                left: 60px; // (160px-40px)/2
                 width: 40px;
                 height: 40px;
 
                 content: '';
                 position: absolute;
-                background-color: $muted-fg-color;
+                background-color: #fff; // on all themes
                 mask-repeat: no-repeat;
                 mask-size: contain;
             }
 
             &.mx_HomePage_button_sendDm::before {
-                mask-image: url('$(res)/img/feather-customised/message-circle.svg');
+                mask-image: url('$(res)/img/element-icons/feedback.svg');
             }
             &.mx_HomePage_button_explore::before {
-                mask-image: url('$(res)/img/feather-customised/explore.svg');
+                mask-image: url('$(res)/img/element-icons/roomlist/explore.svg');
             }
             &.mx_HomePage_button_createGroup::before {
-                mask-image: url('$(res)/img/feather-customised/group.svg');
+                mask-image: url('$(res)/img/element-icons/community-members.svg');
             }
         }
     }
diff --git a/res/css/structures/_LeftPanel.scss b/res/css/structures/_LeftPanel.scss
index 885dd77a84..f1f27014ee 100644
--- a/res/css/structures/_LeftPanel.scss
+++ b/res/css/structures/_LeftPanel.scss
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 $groupFilterPanelWidth: 56px; // only applies in this file, used for calculations
+$roomListCollapsedWidth: 68px;
 
 .mx_LeftPanel {
     background-color: $roomlist-bg-color;
@@ -32,22 +33,17 @@ $groupFilterPanelWidth: 56px; // only applies in this file, used for calculation
 
         // Create another flexbox so the GroupFilterPanel fills the container
         display: flex;
+        flex-direction: column;
 
         // GroupFilterPanel handles its own CSS
     }
 
-    &:not(.mx_LeftPanel_hasGroupFilterPanel) {
-        .mx_LeftPanel_roomListContainer {
-            width: 100%;
-        }
-    }
-
     // Note: The 'room list' in this context is actually everything that isn't the tag
     // panel, such as the menu options, breadcrumbs, filtering, etc
     .mx_LeftPanel_roomListContainer {
-        width: calc(100% - $groupFilterPanelWidth);
         background-color: $roomlist-bg-color;
-
+        flex: 1 0 0;
+        min-width: 0;
         // Create another flexbox (this time a column) for the room list components
         display: flex;
         flex-direction: column;
@@ -167,17 +163,15 @@ $groupFilterPanelWidth: 56px; // only applies in this file, used for calculation
     // These styles override the defaults for the minimized (66px) layout
     &.mx_LeftPanel_minimized {
         min-width: unset;
-
-        // We have to forcefully set the width to override the resizer's style attribute.
-        &.mx_LeftPanel_hasGroupFilterPanel {
-            width: calc(68px + $groupFilterPanelWidth) !important;
-        }
-        &:not(.mx_LeftPanel_hasGroupFilterPanel) {
-            width: 68px !important;
-        }
+        width: unset !important;
 
         .mx_LeftPanel_roomListContainer {
-            width: 68px;
+            width: $roomListCollapsedWidth;
+
+            .mx_LeftPanel_userHeader {
+                flex-direction: row;
+                justify-content: center;
+            }
 
             .mx_LeftPanel_filterContainer {
                 // Organize the flexbox into a centered column layout
diff --git a/res/css/structures/_LeftPanelWidget.scss b/res/css/structures/_LeftPanelWidget.scss
new file mode 100644
index 0000000000..6e2d99bb37
--- /dev/null
+++ b/res/css/structures/_LeftPanelWidget.scss
@@ -0,0 +1,145 @@
+/*
+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_LeftPanelWidget {
+    // largely based on RoomSublist
+    margin-left: 8px;
+    margin-bottom: 4px;
+
+    .mx_LeftPanelWidget_headerContainer {
+        display: flex;
+        align-items: center;
+
+        height: 24px;
+        color: $roomlist-header-color;
+        margin-top: 4px;
+
+        .mx_LeftPanelWidget_stickable {
+            flex: 1;
+            max-width: 100%;
+
+            display: flex;
+            align-items: center;
+        }
+
+        .mx_LeftPanelWidget_headerText {
+            flex: 1;
+            max-width: calc(100% - 16px);
+            line-height: $font-16px;
+            font-size: $font-13px;
+            font-weight: 600;
+
+            // Ellipsize any text overflow
+            text-overflow: ellipsis;
+            overflow: hidden;
+            white-space: nowrap;
+
+            .mx_LeftPanelWidget_collapseBtn {
+                display: inline-block;
+                position: relative;
+                width: 14px;
+                height: 14px;
+                margin-right: 6px;
+
+                &::before {
+                    content: '';
+                    width: 18px;
+                    height: 18px;
+                    position: absolute;
+                    mask-position: center;
+                    mask-size: contain;
+                    mask-repeat: no-repeat;
+                    background-color: $roomlist-header-color;
+                    mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
+                }
+
+                &.mx_LeftPanelWidget_collapseBtn_collapsed::before {
+                    transform: rotate(-90deg);
+                }
+            }
+        }
+    }
+
+    .mx_LeftPanelWidget_resizeBox {
+        position: relative;
+
+        display: flex;
+        flex-direction: column;
+        overflow: visible; // let the resize handle out
+    }
+
+    .mx_AppTileFullWidth {
+        flex: 1 0 0;
+        overflow: hidden;
+        // need this to be flex otherwise the overflow hidden from above
+        // sometimes vertically centers the clipped list ... no idea why it would do this
+        // as the box model should be top aligned. Happens in both FF and Chromium
+        display: flex;
+        flex-direction: column;
+        box-sizing: border-box;
+
+        mask-image: linear-gradient(0deg, transparent, black 4px);
+    }
+
+    .mx_LeftPanelWidget_resizerHandle {
+        cursor: ns-resize;
+        border-radius: 3px;
+
+        // Override styles from library
+        width: unset !important;
+        height: 4px !important;
+
+        position: absolute;
+        top: -24px !important; // override from library - puts it in the margin-top of the headerContainer
+
+        // Together, these make the bar 64px wide
+        // These are also overridden from the library
+        left: calc(50% - 32px) !important;
+        right: calc(50% - 32px) !important;
+    }
+
+    &:hover .mx_LeftPanelWidget_resizerHandle {
+        opacity: 0.8;
+        background-color: $primary-fg-color;
+    }
+
+    .mx_LeftPanelWidget_maximizeButton {
+        margin-left: 8px;
+        margin-right: 7px;
+        position: relative;
+        width: 24px;
+        height: 24px;
+        border-radius: 32px;
+
+        &::before {
+            content: '';
+            width: 16px;
+            height: 16px;
+            position: absolute;
+            top: 4px;
+            left: 4px;
+            mask-position: center;
+            mask-size: contain;
+            mask-repeat: no-repeat;
+            mask-image: url('$(res)/img/feather-customised/maximise.svg');
+            background: $muted-fg-color;
+        }
+    }
+}
+
+.mx_LeftPanelWidget_maximizeButtonTooltip {
+    margin-top: -3px;
+}
diff --git a/res/css/structures/_MatrixChat.scss b/res/css/structures/_MatrixChat.scss
index f4e46a8e94..812a7f8472 100644
--- a/res/css/structures/_MatrixChat.scss
+++ b/res/css/structures/_MatrixChat.scss
@@ -79,7 +79,6 @@ limitations under the License.
     height: 100%;
 }
 
-.mx_MatrixChat > .mx_LeftPanel2:hover + .mx_ResizeHandle_horizontal,
 .mx_MatrixChat > .mx_ResizeHandle_horizontal:hover {
     position: relative;
 
diff --git a/res/css/structures/_RightPanel.scss b/res/css/structures/_RightPanel.scss
index 5bf0d953f3..5515fe4060 100644
--- a/res/css/structures/_RightPanel.scss
+++ b/res/css/structures/_RightPanel.scss
@@ -160,3 +160,20 @@ limitations under the License.
         mask-position: center;
     }
 }
+
+.mx_RightPanel_scopeHeader {
+    margin: 24px;
+    text-align: center;
+    font-weight: $font-semi-bold;
+    font-size: $font-18px;
+    line-height: $font-22px;
+
+    .mx_BaseAvatar {
+        margin-right: 8px;
+        vertical-align: middle;
+    }
+
+    .mx_BaseAvatar_image {
+        border-radius: 8px;
+    }
+}
diff --git a/res/css/structures/_RoomDirectory.scss b/res/css/structures/_RoomDirectory.scss
index 29e6fecd34..89cb21b7a6 100644
--- a/res/css/structures/_RoomDirectory.scss
+++ b/res/css/structures/_RoomDirectory.scss
@@ -64,28 +64,23 @@ limitations under the License.
 }
 
 .mx_RoomDirectory_table {
-    font-size: $font-12px;
     color: $primary-fg-color;
-    width: 100%;
+    display: grid;
+    font-size: $font-12px;
+    grid-template-columns: max-content auto max-content max-content max-content;
+    row-gap: 24px;
     text-align: left;
-    table-layout: fixed;
+    width: 100%;
 }
 
 .mx_RoomDirectory_roomAvatar {
-    width: 32px;
-    padding-right: 14px;
-    vertical-align: top;
-}
-
-.mx_RoomDirectory_roomDescription {
-    padding-bottom: 16px;
+    padding: 2px 14px 0 0;
 }
 
 .mx_RoomDirectory_roomMemberCount {
+    align-self: center;
     color: $light-fg-color;
-    width: 60px;
-    padding: 0 10px;
-    text-align: center;
+    padding: 3px 10px 0;
 
     &::before {
         background-color: $light-fg-color;
@@ -105,8 +100,7 @@ limitations under the License.
 }
 
 .mx_RoomDirectory_join, .mx_RoomDirectory_preview {
-    width: 80px;
-    text-align: center;
+    align-self: center;
     white-space: nowrap;
 }
 
diff --git a/res/css/structures/_RoomStatusBar.scss b/res/css/structures/_RoomStatusBar.scss
index cd4390ee5c..5bf2aee3ae 100644
--- a/res/css/structures/_RoomStatusBar.scss
+++ b/res/css/structures/_RoomStatusBar.scss
@@ -19,57 +19,6 @@ limitations under the License.
     min-height: 50px;
 }
 
-/* position the indicator in the same place horizontally as .mx_EventTile_avatar. */
-.mx_RoomStatusBar_indicator {
-    padding-left: 17px;
-    padding-right: 12px;
-    margin-left: -73px;
-    margin-top: 15px;
-    float: left;
-    width: 24px;
-    text-align: center;
-}
-
-.mx_RoomStatusBar_callBar {
-    height: 50px;
-    line-height: $font-50px;
-}
-
-.mx_RoomStatusBar_placeholderIndicator span {
-    color: $primary-fg-color;
-    opacity: 0.5;
-    position: relative;
-    top: -4px;
-    /*
-    animation-duration: 1s;
-    animation-name: bounce;
-    animation-direction: alternate;
-    animation-iteration-count: infinite;
-    */
-}
-
-.mx_RoomStatusBar_placeholderIndicator span:nth-child(1) {
-    animation-delay: 0.3s;
-}
-.mx_RoomStatusBar_placeholderIndicator span:nth-child(2) {
-    animation-delay: 0.6s;
-}
-.mx_RoomStatusBar_placeholderIndicator span:nth-child(3) {
-    animation-delay: 0.9s;
-}
-
-@keyframes bounce {
-    from {
-        opacity: 0.5;
-        top: 0;
-    }
-
-    to {
-        opacity: 0.2;
-        top: -3px;
-    }
-}
-
 .mx_RoomStatusBar_typingIndicatorAvatars {
     width: 52px;
     margin-top: -1px;
@@ -153,16 +102,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;
@@ -172,11 +111,6 @@ limitations under the License.
         margin-top: 10px;
     }
 
-    .mx_RoomStatusBar_callBar {
-        height: 40px;
-        line-height: $font-40px;
-    }
-
     .mx_RoomStatusBar_typingBar {
         height: 40px;
         line-height: $font-40px;
diff --git a/res/css/structures/_RoomView.scss b/res/css/structures/_RoomView.scss
index 572c7166d2..36bf96359b 100644
--- a/res/css/structures/_RoomView.scss
+++ b/res/css/structures/_RoomView.scss
@@ -219,7 +219,7 @@ hr.mx_RoomView_myReadMarker {
     position: relative;
     top: -1px;
     z-index: 1;
-    transition: width 400ms easeInSine 1s, opacity 400ms easeInSine 1s;
+    transition: width 400ms easeinsine 1s, opacity 400ms easeinsine 1s;
     width: 99%;
     opacity: 1;
 }
diff --git a/res/css/structures/_SpacePanel.scss b/res/css/structures/_SpacePanel.scss
new file mode 100644
index 0000000000..9937117086
--- /dev/null
+++ b/res/css/structures/_SpacePanel.scss
@@ -0,0 +1,349 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+$topLevelHeight: 32px;
+$nestedHeight: 24px;
+$gutterSize: 17px;
+$activeStripeSize: 4px;
+$activeBorderTransparentGap: 2px;
+
+$activeBackgroundColor: $roomtile-selected-bg-color;
+$activeBorderColor: $secondary-fg-color;
+
+.mx_SpacePanel {
+    flex: 0 0 auto;
+    background-color: $groupFilterPanel-bg-color;
+    padding: 0;
+    margin: 0;
+
+    // Create another flexbox so the Panel fills the container
+    display: flex;
+    flex-direction: column;
+    overflow-y: auto;
+
+    .mx_SpacePanel_spaceTreeWrapper {
+        flex: 1;
+    }
+
+    .mx_SpacePanel_toggleCollapse {
+        flex: 0 0 auto;
+        width: 40px;
+        height: 40px;
+        mask-position: center;
+        mask-size: 32px;
+        mask-repeat: no-repeat;
+        margin-left: $gutterSize;
+        margin-bottom: 12px;
+        background-color: $roomlist-header-color;
+        mask-image: url('$(res)/img/element-icons/expand-space-panel.svg');
+
+        &.expanded {
+            transform: scaleX(-1);
+        }
+    }
+
+    ul {
+        margin: 0;
+        list-style: none;
+        padding: 0;
+        padding-left: 16px;
+    }
+
+    .mx_AutoHideScrollbar {
+        padding: 16px 12px 16px 0;
+    }
+
+    .mx_SpaceButton_toggleCollapse {
+        cursor: pointer;
+    }
+
+    .mx_SpaceItem.collapsed {
+        .mx_SpaceButton {
+            .mx_NotificationBadge {
+                right: -4px;
+                top: -4px;
+            }
+        }
+
+        & > .mx_SpaceButton > .mx_SpaceButton_toggleCollapse {
+            transform: rotate(-90deg);
+        }
+
+        & > .mx_SpaceTreeLevel {
+            display: none;
+        }
+    }
+
+    .mx_SpaceItem:not(.hasSubSpaces) > .mx_SpaceButton {
+        margin-left: $gutterSize;
+    }
+
+    .mx_SpaceButton {
+        border-radius: 8px;
+        position: relative;
+        margin-bottom: 2px;
+        display: flex;
+        align-items: center;
+        padding: 4px;
+
+        &.mx_SpaceButton_active {
+            &:not(.mx_SpaceButton_narrow) .mx_SpaceButton_selectionWrapper {
+                background-color: $activeBackgroundColor;
+                border-radius: 8px;
+            }
+
+            &.mx_SpaceButton_narrow {
+                .mx_BaseAvatar, .mx_SpaceButton_avatarPlaceholder {
+                    border: 2px $activeBorderColor solid;
+                    border-radius: 11px;
+                }
+            }
+        }
+
+        .mx_SpaceButton_selectionWrapper {
+            display: flex;
+            flex: 1;
+            align-items: center;
+        }
+
+        .mx_SpaceButton_name {
+            flex: 1;
+            margin-left: 8px;
+            white-space: nowrap;
+            display: block;
+            max-width: 150px;
+            text-overflow: ellipsis;
+            overflow: hidden;
+            padding-right: 8px;
+            font-size: $font-14px;
+            line-height: $font-18px;
+        }
+
+        .mx_SpaceButton_toggleCollapse {
+            width: calc($gutterSize - $activeStripeSize);
+            margin-left: 1px;
+            height: 20px;
+            mask-position: center;
+            mask-size: 20px;
+            mask-repeat: no-repeat;
+            background-color: $roomlist-header-color;
+            mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
+        }
+
+        .mx_SpaceButton_icon {
+            width: $topLevelHeight;
+            min-width: $topLevelHeight;
+            height: $topLevelHeight;
+            border-radius: 8px;
+            position: relative;
+
+            &::before {
+                position: absolute;
+                content: '';
+                width: $topLevelHeight;
+                height: $topLevelHeight;
+                top: 0;
+                left: 0;
+                mask-position: center;
+                mask-repeat: no-repeat;
+                mask-size: 18px;
+            }
+        }
+
+        &.mx_SpaceButton_home .mx_SpaceButton_icon {
+            background-color: #ffffff;
+
+            &::before {
+                background-color: #3f3d3d;
+                mask-image: url('$(res)/img/element-icons/home.svg');
+            }
+        }
+
+        .mx_SpaceButton_avatarPlaceholder {
+            border: $activeBorderTransparentGap transparent solid;
+            padding: $activeBorderTransparentGap;
+        }
+
+        &.mx_SpaceButton_new .mx_SpaceButton_icon {
+            background-color: $accent-color;
+            transition: all .1s ease-in-out; // TODO transition
+
+            &::before {
+                background-color: #ffffff;
+                mask-image: url('$(res)/img/element-icons/plus.svg');
+                transition: all .2s ease-in-out; // TODO transition
+            }
+        }
+
+        &.mx_SpaceButton_newCancel .mx_SpaceButton_icon {
+            background-color: $icon-button-color;
+
+            &::before {
+                transform: rotate(45deg);
+            }
+        }
+
+        .mx_BaseAvatar {
+            /* moving the border-radius to this element from _image
+            element so we can add a border to it without the initials being displaced */
+            overflow: hidden;
+            border: 2px transparent solid;
+            padding: $activeBorderTransparentGap;
+
+            .mx_BaseAvatar_initial {
+                top: $activeBorderTransparentGap;
+                left: $activeBorderTransparentGap;
+            }
+
+            .mx_BaseAvatar_image {
+                border-radius: 8px;
+            }
+        }
+
+        .mx_SpaceButton_menuButton {
+            width: 20px;
+            min-width: 20px; // yay flex
+            height: 20px;
+            margin-top: auto;
+            margin-bottom: auto;
+            position: relative;
+            display: none;
+
+            &::before {
+                top: 2px;
+                left: 2px;
+                content: '';
+                width: 16px;
+                height: 16px;
+                position: absolute;
+                mask-position: center;
+                mask-size: contain;
+                mask-repeat: no-repeat;
+                mask-image: url('$(res)/img/element-icons/context-menu.svg');
+                background: $primary-fg-color;
+            }
+        }
+    }
+
+    .mx_SpacePanel_badgeContainer {
+        height: 16px;
+        // don't set width so that it takes no space when there is no badge to show
+        margin: auto 0; // vertically align
+
+        // Create a flexbox to make aligning dot badges easier
+        display: flex;
+        align-items: center;
+
+        .mx_NotificationBadge {
+            margin: 0 2px; // centering
+        }
+
+        .mx_NotificationBadge_dot {
+            // make the smaller dot occupy the same width for centering
+            margin-left: 7px;
+            margin-right: 7px;
+        }
+    }
+
+    &.collapsed {
+        .mx_SpaceButton {
+            .mx_SpacePanel_badgeContainer {
+                position: absolute;
+                right: 0px;
+                top: 2px;
+            }
+        }
+    }
+
+    &:not(.collapsed) {
+        .mx_SpaceButton:hover,
+        .mx_SpaceButton:focus-within,
+        .mx_SpaceButton_hasMenuOpen {
+            // Hide the badge container on hover because it'll be a menu button
+            .mx_SpacePanel_badgeContainer {
+                width: 0;
+                height: 0;
+                display: none;
+            }
+
+            .mx_SpaceButton_menuButton {
+                display: block;
+            }
+        }
+    }
+
+    /* root space buttons are bigger and not indented */
+    & > .mx_AutoHideScrollbar {
+        & > .mx_SpaceButton {
+            height: $topLevelHeight;
+
+            &.mx_SpaceButton_active::before {
+                height: $topLevelHeight;
+            }
+        }
+
+        & > ul {
+            padding-left: 0;
+        }
+    }
+}
+
+.mx_SpacePanel_contextMenu {
+    .mx_SpacePanel_contextMenu_header {
+        margin: 12px 16px 12px;
+        font-weight: $font-semi-bold;
+        font-size: $font-15px;
+        line-height: $font-18px;
+    }
+
+    .mx_IconizedContextMenu_optionList .mx_AccessibleButton.mx_SpacePanel_contextMenu_inviteButton {
+        color: $accent-color;
+
+        .mx_SpacePanel_iconInvite::before {
+            background-color: $accent-color;
+            mask-image: url('$(res)/img/element-icons/room/invite.svg');
+        }
+    }
+
+    .mx_SpacePanel_iconSettings::before {
+        mask-image: url('$(res)/img/element-icons/settings.svg');
+    }
+
+    .mx_SpacePanel_iconLeave::before {
+        mask-image: url('$(res)/img/element-icons/leave.svg');
+    }
+
+    .mx_SpacePanel_iconHome::before {
+        mask-image: url('$(res)/img/element-icons/roomlist/home.svg');
+    }
+
+    .mx_SpacePanel_iconMembers::before {
+        mask-image: url('$(res)/img/element-icons/room/members.svg');
+    }
+
+    .mx_SpacePanel_iconPlus::before {
+        mask-image: url('$(res)/img/element-icons/plus.svg');
+    }
+
+    .mx_SpacePanel_iconExplore::before {
+        mask-image: url('$(res)/img/element-icons/roomlist/explore.svg');
+    }
+}
+
+
+.mx_SpacePanel_sharePublicSpace {
+    margin: 0;
+}
diff --git a/res/css/structures/_SpaceRoomDirectory.scss b/res/css/structures/_SpaceRoomDirectory.scss
new file mode 100644
index 0000000000..5cb91820cf
--- /dev/null
+++ b/res/css/structures/_SpaceRoomDirectory.scss
@@ -0,0 +1,231 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_SpaceRoomDirectory_dialogWrapper > .mx_Dialog {
+    max-width: 960px;
+    height: 100%;
+}
+
+.mx_SpaceRoomDirectory {
+    height: 100%;
+    margin-bottom: 12px;
+    color: $primary-fg-color;
+    word-break: break-word;
+    display: flex;
+    flex-direction: column;
+
+    .mx_Dialog_title {
+        display: flex;
+
+        .mx_BaseAvatar {
+            margin-right: 16px;
+        }
+
+        .mx_BaseAvatar_image {
+            border-radius: 8px;
+        }
+
+        > div {
+            > h1 {
+                font-weight: $font-semi-bold;
+                font-size: $font-18px;
+                line-height: $font-22px;
+                margin: 0;
+            }
+
+            > div {
+                color: $secondary-fg-color;
+                font-size: $font-15px;
+                line-height: $font-24px;
+            }
+        }
+    }
+
+    .mx_Dialog_content {
+        // TODO fix scrollbar
+        //display: flex;
+        //flex-direction: column;
+        //height: calc(100% - 80px);
+
+        .mx_AccessibleButton_kind_link {
+            padding: 0;
+        }
+
+        .mx_SearchBox {
+            margin: 24px 0 28px;
+        }
+
+        .mx_SpaceRoomDirectory_listHeader {
+            display: flex;
+            font-size: $font-12px;
+            line-height: $font-15px;
+            color: $secondary-fg-color;
+
+            .mx_FormButton {
+                margin-bottom: 8px;
+            }
+
+            > span {
+                margin: auto 0 0 auto;
+            }
+        }
+    }
+}
+
+.mx_SpaceRoomDirectory_list {
+    margin-top: 8px;
+
+    .mx_SpaceRoomDirectory_roomCount {
+        > h3 {
+            display: inline;
+            font-weight: $font-semi-bold;
+            font-size: $font-18px;
+            line-height: $font-22px;
+            color: $primary-fg-color;
+        }
+
+        > span {
+            margin-left: 8px;
+            font-size: $font-15px;
+            line-height: $font-24px;
+            color: $secondary-fg-color;
+        }
+    }
+
+    .mx_SpaceRoomDirectory_subspace {
+        margin-top: 8px;
+
+        .mx_SpaceRoomDirectory_subspace_info {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            margin-bottom: 8px;
+            color: $secondary-fg-color;
+            font-weight: $font-semi-bold;
+            font-size: $font-12px;
+            line-height: $font-15px;
+
+            .mx_BaseAvatar {
+                margin-right: 12px;
+                vertical-align: middle;
+            }
+
+            .mx_BaseAvatar_image {
+                border-radius: 8px;
+            }
+
+            .mx_SpaceRoomDirectory_actions {
+                text-align: right;
+                height: min-content;
+                margin-left: auto;
+                margin-right: 16px;
+            }
+        }
+
+        .mx_SpaceRoomDirectory_subspace_children {
+            margin-left: 12px;
+            border-left: 2px solid $space-button-outline-color;
+            padding-left: 24px;
+        }
+    }
+
+    .mx_SpaceRoomDirectory_roomTile {
+        padding: 16px;
+        border-radius: 8px;
+        border: 1px solid $space-button-outline-color;
+        margin: 8px 0 16px;
+        display: flex;
+        min-height: 76px;
+        box-sizing: border-box;
+
+        &.mx_AccessibleButton:hover {
+            background-color: rgba(141, 151, 165, 0.1);
+        }
+
+        .mx_BaseAvatar {
+            margin-right: 16px;
+            margin-top: 6px;
+        }
+
+        .mx_SpaceRoomDirectory_roomTile_info {
+            display: inline-block;
+            font-size: $font-15px;
+            flex-grow: 1;
+            height: min-content;
+            margin: auto 0;
+
+            .mx_SpaceRoomDirectory_roomTile_name {
+                font-weight: $font-semi-bold;
+                line-height: $font-18px;
+            }
+            .mx_SpaceRoomDirectory_roomTile_topic {
+                line-height: $font-24px;
+                color: $secondary-fg-color;
+            }
+        }
+
+        .mx_SpaceRoomDirectory_roomTile_memberCount {
+            position: relative;
+            margin: auto 0 auto 24px;
+            padding: 0 0 0 28px;
+            line-height: $font-24px;
+            display: inline-block;
+            width: 32px;
+
+            &::before {
+                position: absolute;
+                content: '';
+                width: 24px;
+                height: 24px;
+                top: 0;
+                left: 0;
+                mask-position: center;
+                mask-repeat: no-repeat;
+                mask-size: contain;
+                background-color: $secondary-fg-color;
+                mask-image: url('$(res)/img/element-icons/community-members.svg');
+            }
+        }
+
+        .mx_SpaceRoomDirectory_actions {
+            width: 180px;
+            text-align: right;
+            height: min-content;
+            margin: auto 0 auto 28px;
+
+            .mx_AccessibleButton {
+                vertical-align: middle;
+
+                & + .mx_AccessibleButton {
+                    margin-left: 24px;
+                }
+            }
+        }
+    }
+
+    .mx_SpaceRoomDirectory_actions {
+        .mx_SpaceRoomDirectory_actionsText {
+            font-weight: normal;
+            font-size: $font-12px;
+            line-height: $font-15px;
+            color: $secondary-fg-color;
+        }
+
+        .mx_Checkbox {
+            display: inline-block;
+        }
+    }
+}
diff --git a/res/css/structures/_SpaceRoomView.scss b/res/css/structures/_SpaceRoomView.scss
new file mode 100644
index 0000000000..38310d39a9
--- /dev/null
+++ b/res/css/structures/_SpaceRoomView.scss
@@ -0,0 +1,336 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+$SpaceRoomViewInnerWidth: 428px;
+
+.mx_SpaceRoomView {
+    .mx_MainSplit > div:first-child {
+        padding: 80px 60px;
+        flex-grow: 1;
+
+        h1 {
+            margin: 0;
+            font-size: $font-24px;
+            font-weight: $font-semi-bold;
+            color: $primary-fg-color;
+            width: max-content;
+        }
+
+        .mx_SpaceRoomView_description {
+            font-size: $font-15px;
+            color: $secondary-fg-color;
+            margin-top: 12px;
+            margin-bottom: 24px;
+        }
+
+        .mx_SpaceRoomView_buttons {
+            display: block;
+            margin-top: 44px;
+            width: $SpaceRoomViewInnerWidth;
+            text-align: right; // button alignment right
+
+            .mx_FormButton {
+                padding: 8px 22px;
+                margin-left: 16px;
+            }
+        }
+
+        .mx_Field {
+            max-width: $SpaceRoomViewInnerWidth;
+
+            & + .mx_Field {
+                margin-top: 28px;
+            }
+        }
+
+        .mx_SpaceRoomView_errorText {
+            font-weight: $font-semi-bold;
+            font-size: $font-12px;
+            line-height: $font-15px;
+            color: $notice-primary-color;
+            margin-bottom: 28px;
+        }
+
+        .mx_AccessibleButton_disabled {
+            cursor: not-allowed;
+        }
+    }
+
+    .mx_SpaceRoomView_landing {
+        overflow-y: auto;
+
+        > .mx_BaseAvatar_image,
+        > .mx_BaseAvatar > .mx_BaseAvatar_image {
+            border-radius: 12px;
+        }
+
+        .mx_SpaceRoomView_landing_name {
+            margin: 24px 0 16px;
+            font-size: $font-15px;
+            color: $secondary-fg-color;
+
+            > span {
+                display: inline-block;
+            }
+
+            .mx_SpaceRoomView_landing_nameRow {
+                margin-top: 12px;
+
+                > h1 {
+                    display: inline-block;
+                }
+            }
+
+            .mx_SpaceRoomView_landing_inviter {
+                .mx_BaseAvatar {
+                    margin-right: 4px;
+                    vertical-align: middle;
+                }
+            }
+
+            .mx_SpaceRoomView_landing_memberCount {
+                position: relative;
+                margin-left: 24px;
+                padding: 0 0 0 28px;
+                line-height: $font-24px;
+                vertical-align: text-bottom;
+
+                &::before {
+                    position: absolute;
+                    content: '';
+                    width: 24px;
+                    height: 24px;
+                    top: 0;
+                    left: 0;
+                    mask-position: center;
+                    mask-repeat: no-repeat;
+                    mask-size: contain;
+                    background-color: $accent-color;
+                    mask-image: url('$(res)/img/element-icons/community-members.svg');
+                }
+            }
+        }
+
+        .mx_SpaceRoomView_landing_topic {
+            font-size: $font-15px;
+        }
+
+        .mx_SpaceRoomView_landing_joinButtons {
+            margin-top: 24px;
+
+            .mx_FormButton {
+                padding: 8px 22px;
+            }
+        }
+
+        .mx_SpaceRoomView_landing_adminButtons {
+            margin-top: 32px;
+
+            .mx_AccessibleButton {
+                position: relative;
+                width: 160px;
+                height: 124px;
+                box-sizing: border-box;
+                padding: 72px 16px 0;
+                border-radius: 12px;
+                border: 1px solid $space-button-outline-color;
+                margin-right: 28px;
+                margin-bottom: 28px;
+                font-size: $font-14px;
+                display: inline-block;
+                vertical-align: bottom;
+
+                &:last-child {
+                    margin-right: 0;
+                }
+
+                &:hover {
+                    background-color: rgba(141, 151, 165, 0.1);
+                }
+
+                &::before, &::after {
+                    position: absolute;
+                    content: "";
+                    left: 16px;
+                    top: 16px;
+                    height: 40px;
+                    width: 40px;
+                    border-radius: 20px;
+                }
+
+                &::after {
+                    mask-position: center;
+                    mask-size: 30px;
+                    mask-repeat: no-repeat;
+                    background: #ffffff; // white icon fill
+                }
+
+                &.mx_SpaceRoomView_landing_inviteButton {
+                    &::before {
+                        background-color: $accent-color;
+                    }
+
+                    &::after {
+                        mask-image: url('$(res)/img/element-icons/room/invite.svg');
+                    }
+                }
+
+                &.mx_SpaceRoomView_landing_addButton {
+                    &::before {
+                        background-color: #ac3ba8;
+                    }
+
+                    &::after {
+                        mask-image: url('$(res)/img/element-icons/roomlist/explore.svg');
+                    }
+                }
+
+                &.mx_SpaceRoomView_landing_createButton {
+                    &::before {
+                        background-color: #368bd6;
+                    }
+
+                    &::after {
+                        mask-image: url('$(res)/img/element-icons/roomlist/explore.svg');
+                    }
+                }
+
+                &.mx_SpaceRoomView_landing_settingsButton {
+                    &::before {
+                        background-color: #5c56f5;
+                    }
+
+                    &::after {
+                        mask-image: url('$(res)/img/element-icons/settings.svg');
+                    }
+                }
+            }
+        }
+
+        .mx_SpaceRoomDirectory_list {
+            max-width: 600px;
+
+            .mx_SpaceRoomDirectory_roomTile_actions {
+                display: none;
+            }
+        }
+    }
+
+    .mx_SpaceRoomView_privateScope {
+        .mx_RadioButton {
+            width: $SpaceRoomViewInnerWidth;
+            border-radius: 8px;
+            border: 1px solid $space-button-outline-color;
+            padding: 16px 16px 16px 72px;
+            margin-top: 36px;
+            cursor: pointer;
+            box-sizing: border-box;
+            position: relative;
+
+            > div:first-of-type {
+                // hide radio dot
+                display: none;
+            }
+
+            .mx_RadioButton_content {
+                margin: 0;
+
+                > h3 {
+                    margin: 0 0 4px;
+                    font-size: $font-15px;
+                    font-weight: $font-semi-bold;
+                    line-height: $font-18px;
+                }
+
+                > div {
+                    color: $secondary-fg-color;
+                    font-size: $font-15px;
+                    line-height: $font-24px;
+                }
+            }
+
+            &::before {
+                content: "";
+                position: absolute;
+                height: 32px;
+                width: 32px;
+                top: 24px;
+                left: 20px;
+                background-color: $secondary-fg-color;
+                mask-repeat: no-repeat;
+                mask-position: center;
+                mask-size: contain;
+            }
+        }
+
+        .mx_RadioButton_checked {
+            border-color: $accent-color;
+
+            .mx_RadioButton_content {
+                > div {
+                    color: $primary-fg-color;
+                }
+            }
+
+            &::before {
+                background-color: $accent-color;
+            }
+        }
+
+        .mx_SpaceRoomView_privateScope_justMeButton::before {
+            mask-image: url('$(res)/img/element-icons/room/members.svg');
+        }
+
+        .mx_SpaceRoomView_privateScope_meAndMyTeammatesButton::before {
+            mask-image: url('$(res)/img/element-icons/community-members.svg');
+        }
+    }
+
+    .mx_SpaceRoomView_inviteTeammates {
+        .mx_SpaceRoomView_inviteTeammates_buttons {
+            color: $secondary-fg-color;
+            margin-top: 28px;
+
+            .mx_AccessibleButton {
+                position: relative;
+                display: inline-block;
+                padding-left: 32px;
+                line-height: 24px; // to center icons
+
+                &::before {
+                    content: "";
+                    position: absolute;
+                    height: 24px;
+                    width: 24px;
+                    top: 0;
+                    left: 0;
+                    background-color: $secondary-fg-color;
+                    mask-repeat: no-repeat;
+                    mask-position: center;
+                    mask-size: contain;
+                }
+
+                & + .mx_AccessibleButton {
+                    margin-left: 32px;
+                }
+            }
+
+            .mx_SpaceRoomView_inviteTeammates_inviteDialogButton::before {
+                mask-image: url('$(res)/img/element-icons/room/invite.svg');
+            }
+        }
+    }
+}
diff --git a/res/css/structures/_UserMenu.scss b/res/css/structures/_UserMenu.scss
index fecac40e4e..3badb0850c 100644
--- a/res/css/structures/_UserMenu.scss
+++ b/res/css/structures/_UserMenu.scss
@@ -72,6 +72,7 @@ limitations under the License.
             position: relative; // to make default avatars work
             margin-right: 8px;
             height: 32px; // to remove the unknown 4px gap the browser puts below it
+            padding: 3px 0; // to align with and without using doubleName
 
             .mx_UserMenu_userAvatar {
                 border-radius: 32px; // should match avatar size
@@ -119,20 +120,16 @@ limitations under the License.
     }
 
     &.mx_UserMenu_minimized {
-        .mx_UserMenu_userHeader {
-            .mx_UserMenu_row {
-                justify-content: center;
-            }
+        padding-right: 0px;
 
-            .mx_UserMenu_userAvatarContainer {
-                margin-right: 0;
-            }
+        .mx_UserMenu_userAvatarContainer {
+            margin-right: 0px;
         }
     }
 }
 
 .mx_UserMenu_contextMenu {
-    width: 247px;
+    width: 258px;
 
     // These override the styles already present on the user menu rather than try to
     // define a new menu. They are specifically for the stacked menu when a community
@@ -230,6 +227,30 @@ limitations under the License.
             align-items: center;
             justify-content: center;
         }
+
+        &.mx_UserMenu_contextMenu_guestPrompts,
+        &.mx_UserMenu_contextMenu_hostingLink {
+            padding-top: 0;
+        }
+
+        &.mx_UserMenu_contextMenu_guestPrompts {
+            display: inline-block;
+
+            > span {
+                font-weight: 600;
+                display: block;
+
+                & + span {
+                    margin-top: 8px;
+                }
+            }
+
+            .mx_AccessibleButton_kind_link {
+                font-weight: normal;
+                font-size: inherit;
+                padding: 0;
+            }
+        }
     }
 
     .mx_IconizedContextMenu_icon {
@@ -252,6 +273,9 @@ limitations under the License.
     .mx_UserMenu_iconHome::before {
         mask-image: url('$(res)/img/element-icons/roomlist/home.svg');
     }
+    .mx_UserMenu_iconHosting::before {
+        mask-image: url('$(res)/img/element-icons/brands/element.svg');
+    }
 
     .mx_UserMenu_iconBell::before {
         mask-image: url('$(res)/img/element-icons/notifications.svg');
diff --git a/res/css/structures/auth/_Login.scss b/res/css/structures/auth/_Login.scss
index 02436833a2..9c98ca3a1c 100644
--- a/res/css/structures/auth/_Login.scss
+++ b/res/css/structures/auth/_Login.scss
@@ -18,7 +18,7 @@ limitations under the License.
 .mx_Login_submit {
     @mixin mx_DialogButton;
     width: 100%;
-    margin-top: 35px;
+    margin-top: 24px;
     margin-bottom: 24px;
     box-sizing: border-box;
     text-align: center;
@@ -33,12 +33,6 @@ limitations under the License.
     cursor: default;
 }
 
-.mx_AuthBody a.mx_Login_sso_link:link,
-.mx_AuthBody a.mx_Login_sso_link:hover,
-.mx_AuthBody a.mx_Login_sso_link:visited {
-    color: $button-primary-fg-color;
-}
-
 .mx_Login_loader {
     display: inline;
     position: relative;
@@ -87,10 +81,13 @@ limitations under the License.
 }
 
 .mx_Login_underlinedServerName {
+    width: max-content;
     border-bottom: 1px dashed $accent-color;
 }
 
 div.mx_AccessibleButton_kind_link.mx_Login_forgot {
+    display: block;
+    margin: 0 auto;
     // style it as a link
     font-size: inherit;
     padding: 0;
diff --git a/res/css/views/auth/_AuthBody.scss b/res/css/views/auth/_AuthBody.scss
index 0ba0d10e06..90dca32e48 100644
--- a/res/css/views/auth/_AuthBody.scss
+++ b/res/css/views/auth/_AuthBody.scss
@@ -34,7 +34,11 @@ limitations under the License.
     h3 {
         font-size: $font-14px;
         font-weight: 600;
-        color: $authpage-primary-color;
+        color: $authpage-secondary-color;
+    }
+
+    h3.mx_AuthBody_centered {
+        text-align: center;
     }
 
     a:link,
@@ -96,12 +100,6 @@ limitations under the License.
     }
 }
 
-.mx_AuthBody_editServerDetails {
-    padding-left: 1em;
-    font-size: $font-12px;
-    font-weight: normal;
-}
-
 .mx_AuthBody_fieldRow {
     display: flex;
     margin-bottom: 10px;
@@ -146,6 +144,14 @@ limitations under the License.
     display: block;
     text-align: center;
     width: 100%;
+
+    > a {
+        font-weight: $font-semi-bold;
+    }
+}
+
+.mx_SSOButtons + .mx_AuthBody_changeFlow {
+    margin-top: 24px;
 }
 
 .mx_AuthBody_spinner {
diff --git a/res/css/views/auth/_AuthHeader.scss b/res/css/views/auth/_AuthHeader.scss
index b1372affee..13d5195160 100644
--- a/res/css/views/auth/_AuthHeader.scss
+++ b/res/css/views/auth/_AuthHeader.scss
@@ -18,7 +18,7 @@ limitations under the License.
     display: flex;
     flex-direction: column;
     width: 206px;
-    padding: 25px 40px;
+    padding: 25px 25px;
     box-sizing: border-box;
 }
 
diff --git a/res/css/views/auth/_AuthHeaderLogo.scss b/res/css/views/auth/_AuthHeaderLogo.scss
index 917dcabf67..86f0313b68 100644
--- a/res/css/views/auth/_AuthHeaderLogo.scss
+++ b/res/css/views/auth/_AuthHeaderLogo.scss
@@ -17,7 +17,7 @@ limitations under the License.
 .mx_AuthHeaderLogo {
     margin-top: 15px;
     flex: 1;
-    padding: 0 10px;
+    padding: 0 25px;
 }
 
 .mx_AuthHeaderLogo img {
diff --git a/res/css/views/auth/_InteractiveAuthEntryComponents.scss b/res/css/views/auth/_InteractiveAuthEntryComponents.scss
index 05cddf2c48..ffaad3cd7a 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: 100px;
+    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;
 }
@@ -54,7 +83,10 @@ limitations under the License.
 }
 
 .mx_InteractiveAuthEntryComponents_termsPolicy {
-    display: block;
+    display: flex;
+    flex-direction: row;
+    justify-content: start;
+    align-items: center;
 }
 
 .mx_InteractiveAuthEntryComponents_passwordSection {
diff --git a/res/css/views/auth/_LanguageSelector.scss b/res/css/views/auth/_LanguageSelector.scss
index 781561f876..885ee7f30d 100644
--- a/res/css/views/auth/_LanguageSelector.scss
+++ b/res/css/views/auth/_LanguageSelector.scss
@@ -23,6 +23,7 @@ limitations under the License.
     font-size: $font-14px;
     font-weight: 600;
     color: $authpage-lang-color;
+    width: auto;
 }
 
 .mx_AuthBody_language .mx_Dropdown_arrow {
diff --git a/res/css/views/auth/_ServerTypeSelector.scss b/res/css/views/auth/_ServerTypeSelector.scss
deleted file mode 100644
index fbd3d2655d..0000000000
--- a/res/css/views/auth/_ServerTypeSelector.scss
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-Copyright 2019 New Vector 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_ServerTypeSelector {
-    display: flex;
-    margin-bottom: 28px;
-}
-
-.mx_ServerTypeSelector_type {
-    margin: 0 5px;
-}
-
-.mx_ServerTypeSelector_type:first-child {
-    margin-left: 0;
-}
-
-.mx_ServerTypeSelector_type:last-child {
-    margin-right: 0;
-}
-
-.mx_ServerTypeSelector_label {
-    text-align: center;
-    font-weight: 600;
-    color: $authpage-primary-color;
-    margin: 8px 0;
-}
-
-.mx_ServerTypeSelector_type .mx_AccessibleButton {
-    padding: 10px;
-    border: 1px solid $input-border-color;
-    border-radius: 4px;
-}
-
-.mx_ServerTypeSelector_type.mx_ServerTypeSelector_type_selected .mx_AccessibleButton {
-    border-color: $input-valid-border-color;
-}
-
-.mx_ServerTypeSelector_logo {
-    display: flex;
-    justify-content: center;
-    height: 18px;
-    margin-bottom: 12px;
-    font-weight: 600;
-    color: $authpage-primary-color;
-}
-
-.mx_ServerTypeSelector_logo > div {
-    display: flex;
-    width: 70%;
-    align-items: center;
-    justify-content: space-evenly;
-}
-
-.mx_ServerTypeSelector_description {
-    font-size: $font-10px;
-}
diff --git a/res/css/views/auth/_Welcome.scss b/res/css/views/auth/_Welcome.scss
index f0e2b3de33..894174d6e2 100644
--- a/res/css/views/auth/_Welcome.scss
+++ b/res/css/views/auth/_Welcome.scss
@@ -18,7 +18,6 @@ limitations under the License.
     display: flex;
     flex-direction: column;
     align-items: center;
-
     &.mx_WelcomePage_registrationDisabled {
         .mx_ButtonCreateAccount {
             display: none;
@@ -27,6 +26,6 @@ limitations under the License.
 }
 
 .mx_Welcome .mx_AuthBody_language {
-    width: 120px;
+    width: 160px;
     margin-bottom: 10px;
 }
diff --git a/res/css/views/avatars/_BaseAvatar.scss b/res/css/views/avatars/_BaseAvatar.scss
index 1a1e14e7ac..cbddd97e18 100644
--- a/res/css/views/avatars/_BaseAvatar.scss
+++ b/res/css/views/avatars/_BaseAvatar.scss
@@ -41,7 +41,7 @@ limitations under the License.
 
 .mx_BaseAvatar_image {
     object-fit: cover;
-    border-radius: 40px;
+    border-radius: 125px;
     vertical-align: top;
     background-color: $avatar-bg-color;
 }
diff --git a/src/dispatcher/payloads/AppTileActionPayload.ts b/res/css/views/avatars/_WidgetAvatar.scss
similarity index 72%
rename from src/dispatcher/payloads/AppTileActionPayload.ts
rename to res/css/views/avatars/_WidgetAvatar.scss
index 3cdb0f8c1f..8e5cfb54d8 100644
--- a/src/dispatcher/payloads/AppTileActionPayload.ts
+++ b/res/css/views/avatars/_WidgetAvatar.scss
@@ -14,10 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { ActionPayload } from "../payloads";
-import { Action } from "../actions";
-
-export interface AppTileActionPayload extends ActionPayload {
-    action: Action.AppTileDelete | Action.AppTileRevoke;
-    widgetId: string;
+.mx_WidgetAvatar {
+    border-radius: 4px;
 }
diff --git a/src/resizer/index.js b/res/css/views/context_menus/_CallContextMenu.scss
similarity index 70%
rename from src/resizer/index.js
rename to res/css/views/context_menus/_CallContextMenu.scss
index 1fd8f4da46..55b73b0344 100644
--- a/src/resizer/index.js
+++ b/res/css/views/context_menus/_CallContextMenu.scss
@@ -1,6 +1,5 @@
 /*
-Copyright 2018 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2020 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,6 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-export FixedDistributor from "./distributors/fixed";
-export CollapseDistributor from "./distributors/collapse";
-export Resizer from "./resizer";
+.mx_CallContextMenu_item {
+    width: 205px;
+    height: 40px;
+    padding-left: 16px;
+    line-height: 40px;
+    vertical-align: center;
+}
diff --git a/res/css/views/context_menus/_IconizedContextMenu.scss b/res/css/views/context_menus/_IconizedContextMenu.scss
index d911ac6dfe..204435995f 100644
--- a/res/css/views/context_menus/_IconizedContextMenu.scss
+++ b/res/css/views/context_menus/_IconizedContextMenu.scss
@@ -75,6 +75,11 @@ limitations under the License.
                 background-color: $menu-selected-color;
             }
 
+            &.mx_AccessibleButton_disabled {
+                opacity: 0.5;
+                cursor: not-allowed;
+            }
+
             img, .mx_IconizedContextMenu_icon { // icons
                 width: 16px;
                 min-width: 16px;
diff --git a/res/css/views/context_menus/_WidgetContextMenu.scss b/res/css/views/context_menus/_WidgetContextMenu.scss
deleted file mode 100644
index 60b7b93f99..0000000000
--- a/res/css/views/context_menus/_WidgetContextMenu.scss
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Copyright 2019 The Matrix.org Foundaction 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_WidgetContextMenu {
-    padding: 6px;
-
-    .mx_WidgetContextMenu_option {
-        padding: 3px 6px 3px 6px;
-        cursor: pointer;
-        white-space: nowrap;
-    }
-
-    .mx_WidgetContextMenu_separator {
-        margin-top: 0;
-        margin-bottom: 0;
-        border-bottom-style: none;
-        border-left-style: none;
-        border-right-style: none;
-        border-top-style: solid;
-        border-top-width: 1px;
-        border-color: $menu-border-color;
-    }
-}
diff --git a/res/css/views/dialogs/_AddExistingToSpaceDialog.scss b/res/css/views/dialogs/_AddExistingToSpaceDialog.scss
new file mode 100644
index 0000000000..0c9d8e3840
--- /dev/null
+++ b/res/css/views/dialogs/_AddExistingToSpaceDialog.scss
@@ -0,0 +1,185 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_AddExistingToSpaceDialog_wrapper {
+    .mx_Dialog {
+        display: flex;
+        flex-direction: column;
+    }
+}
+
+.mx_AddExistingToSpaceDialog {
+    width: 480px;
+    color: $primary-fg-color;
+    display: flex;
+    flex-direction: column;
+    flex-wrap: nowrap;
+    min-height: 0;
+
+    .mx_Dialog_title {
+        display: flex;
+
+        .mx_BaseAvatar {
+            display: inline-flex;
+            margin: 5px 16px 5px 5px;
+            vertical-align: middle;
+        }
+
+        .mx_BaseAvatar_image {
+            border-radius: 8px;
+            margin: 0;
+            vertical-align: unset;
+        }
+
+        > div {
+            > h1 {
+                font-weight: $font-semi-bold;
+                font-size: $font-18px;
+                line-height: $font-22px;
+                margin: 0;
+            }
+
+            .mx_AddExistingToSpaceDialog_onlySpace {
+                color: $secondary-fg-color;
+                font-size: $font-15px;
+                line-height: $font-24px;
+            }
+        }
+
+        .mx_Dropdown_input {
+            border: none;
+
+            > .mx_Dropdown_option {
+                padding-left: 0;
+                flex: unset;
+                height: unset;
+                color: $secondary-fg-color;
+                font-size: $font-15px;
+                line-height: $font-24px;
+
+                .mx_BaseAvatar {
+                    display: none;
+                }
+            }
+
+            .mx_Dropdown_menu {
+                .mx_AddExistingToSpaceDialog_dropdownOptionActive {
+                    color: $accent-color;
+                    padding-right: 32px;
+                    position: relative;
+
+                    &::before {
+                        content: '';
+                        width: 20px;
+                        height: 20px;
+                        top: 8px;
+                        right: 0;
+                        position: absolute;
+                        mask-position: center;
+                        mask-size: contain;
+                        mask-repeat: no-repeat;
+                        background-color: $accent-color;
+                        mask-image: url('$(res)/img/element-icons/roomlist/checkmark.svg');
+                    }
+                }
+            }
+        }
+    }
+
+    .mx_SearchBox {
+        margin: 0;
+    }
+
+    .mx_AddExistingToSpaceDialog_errorText {
+        font-weight: $font-semi-bold;
+        font-size: $font-12px;
+        line-height: $font-15px;
+        color: $notice-primary-color;
+        margin-bottom: 28px;
+    }
+
+    .mx_AddExistingToSpaceDialog_content {
+        .mx_AddExistingToSpaceDialog_noResults {
+            margin-top: 24px;
+        }
+    }
+
+    .mx_AddExistingToSpaceDialog_section {
+        margin-top: 24px;
+
+        > h3 {
+            margin: 0;
+            color: $secondary-fg-color;
+            font-size: $font-12px;
+            font-weight: $font-semi-bold;
+            line-height: $font-15px;
+        }
+
+        .mx_AddExistingToSpaceDialog_entry {
+            display: flex;
+            margin-top: 12px;
+
+            .mx_BaseAvatar {
+                margin-right: 12px;
+            }
+
+            .mx_AddExistingToSpaceDialog_entry_name {
+                font-size: $font-15px;
+                line-height: 30px;
+                flex-grow: 1;
+            }
+
+            .mx_FormButton {
+                min-width: 92px;
+                font-weight: normal;
+                box-sizing: border-box;
+            }
+        }
+    }
+
+    .mx_AddExistingToSpaceDialog_section_spaces {
+        .mx_BaseAvatar_image {
+            border-radius: 8px;
+        }
+    }
+
+    .mx_AddExistingToSpaceDialog_footer {
+        display: flex;
+        margin-top: 32px;
+
+        > span {
+            flex-grow: 1;
+            font-size: $font-12px;
+            line-height: $font-15px;
+
+            > * {
+                vertical-align: middle;
+            }
+        }
+
+        .mx_AccessibleButton {
+            display: inline-block;
+        }
+
+        .mx_AccessibleButton_kind_link {
+            padding: 0;
+        }
+    }
+
+    .mx_FormButton {
+        padding: 8px 22px;
+    }
+}
diff --git a/res/css/views/dialogs/_DevtoolsDialog.scss b/res/css/views/dialogs/_DevtoolsDialog.scss
index 35cb6bc7ab..8fee740016 100644
--- a/res/css/views/dialogs/_DevtoolsDialog.scss
+++ b/res/css/views/dialogs/_DevtoolsDialog.scss
@@ -223,3 +223,54 @@ limitations under the License.
         content: ":";
     }
 }
+
+.mx_DevTools_SettingsExplorer {
+    table {
+        width: 100%;
+        table-layout: fixed;
+        border-collapse: collapse;
+
+        th {
+            // Colour choice: first one autocomplete gave me.
+            border-bottom: 1px solid $accent-color;
+            text-align: left;
+        }
+
+        td, th {
+            width: 360px; // "feels right" number
+
+            text-overflow: ellipsis;
+            overflow: hidden;
+            white-space: nowrap;
+        }
+
+        td + td, th + th {
+            width: auto;
+        }
+
+        tr:hover {
+            // Colour choice: first one autocomplete gave me.
+            background-color: $accent-color-50pct;
+        }
+    }
+
+    .mx_DevTools_SettingsExplorer_mutable {
+        background-color: $accent-color;
+    }
+
+    .mx_DevTools_SettingsExplorer_immutable {
+        background-color: $warning-color;
+    }
+
+    .mx_DevTools_SettingsExplorer_edit {
+        float: right;
+        margin-right: 16px;
+    }
+
+    .mx_DevTools_SettingsExplorer_warning {
+        border: 2px solid $warning-color;
+        border-radius: 4px;
+        padding: 4px;
+        margin-bottom: 8px;
+    }
+}
diff --git a/res/css/views/dialogs/_FeedbackDialog.scss b/res/css/views/dialogs/_FeedbackDialog.scss
new file mode 100644
index 0000000000..fd225dd882
--- /dev/null
+++ b/res/css/views/dialogs/_FeedbackDialog.scss
@@ -0,0 +1,121 @@
+/*
+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_FeedbackDialog {
+    hr {
+        margin: 24px 0;
+        border-color: $input-border-color;
+    }
+
+    .mx_Dialog_content {
+        margin-bottom: 24px;
+
+        > h2 {
+            margin-bottom: 32px;
+        }
+    }
+
+    .mx_FeedbackDialog_section {
+        position: relative;
+        padding-left: 52px;
+
+        > p {
+            color: $tertiary-fg-color;
+        }
+
+        .mx_AccessibleButton_kind_link {
+            padding: 0;
+            font-size: inherit;
+        }
+
+        a, .mx_AccessibleButton_kind_link {
+            color: $accent-color;
+            text-decoration: underline;
+        }
+
+        &::before, &::after {
+            content: "";
+            position: absolute;
+            width: 40px;
+            height: 40px;
+            left: 0;
+            top: 0;
+        }
+
+        &::before {
+            background-color: $icon-button-color;
+            border-radius: 20px;
+        }
+
+        &::after {
+            background: $avatar-initial-color; // TODO
+            mask-position: center;
+            mask-size: 24px;
+            mask-repeat: no-repeat;
+        }
+    }
+
+    .mx_FeedbackDialog_reportBug {
+        &::after {
+            mask-image: url('$(res)/img/feather-customised/bug.svg');
+        }
+    }
+
+    .mx_FeedbackDialog_rateApp {
+        .mx_RadioButton {
+            display: inline-flex;
+            font-size: 20px;
+            transition: font-size 1s, border .5s;
+            border-radius: 50%;
+            border: 2px solid transparent;
+            margin-top: 12px;
+            margin-bottom: 24px;
+            vertical-align: top;
+            cursor: pointer;
+
+            input[type="radio"] + div {
+                display: none;
+            }
+
+            .mx_RadioButton_content {
+                background: $icon-button-color;
+                width: 40px;
+                height: 40px;
+                text-align: center;
+                line-height: 40px;
+                border-radius: 20px;
+                margin: 5px;
+            }
+
+            .mx_RadioButton_spacer {
+                display: none;
+            }
+
+            & + .mx_RadioButton {
+                margin-left: 16px;
+            }
+        }
+
+        .mx_RadioButton_checked {
+            font-size: 24px;
+            border-color: $accent-color;
+        }
+
+        &::after {
+            mask-image: url('$(res)/img/element-icons/feedback.svg');
+        }
+    }
+}
diff --git a/res/css/views/dialogs/_HostSignupDialog.scss b/res/css/views/dialogs/_HostSignupDialog.scss
new file mode 100644
index 0000000000..ac4bc41951
--- /dev/null
+++ b/res/css/views/dialogs/_HostSignupDialog.scss
@@ -0,0 +1,143 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_HostSignupDialog {
+    width: 90vw;
+    max-width: 580px;
+    height: 80vh;
+    max-height: 600px;
+    // Ensure dialog borders are always white as the HostSignupDialog
+    // does not yet support dark mode or theming in general.
+    // In the future we might want to pass the theme to the called
+    // iframe, should some hosting provider have that need.
+    background-color: #ffffff;
+
+    .mx_HostSignupDialog_info {
+        text-align: center;
+
+        .mx_HostSignupDialog_content_top {
+            margin-bottom: 24px;
+        }
+
+        .mx_HostSignupDialog_paragraphs {
+            text-align: left;
+            padding-left: 25%;
+            padding-right: 25%;
+        }
+
+        .mx_HostSignupDialog_buttons {
+            margin-bottom: 24px;
+            display: flex;
+            justify-content: center;
+
+            button {
+                padding: 12px;
+                margin: 0 16px;
+            }
+        }
+
+        .mx_HostSignupDialog_footer {
+            display: flex;
+            justify-content: center;
+            align-items: baseline;
+
+            img {
+                padding-right: 5px;
+            }
+        }
+    }
+
+    iframe {
+        width: 100%;
+        height: 100%;
+        border: none;
+        background-color: #fff;
+        min-height: 540px;
+    }
+}
+
+.mx_HostSignupDialog_text_dark {
+    color: $primary-fg-color;
+}
+
+.mx_HostSignupDialog_text_light {
+    color: $secondary-fg-color;
+}
+
+.mx_HostSignup_maximize_button {
+    mask: url('$(res)/img/feather-customised/maximise.svg');
+    mask-repeat: no-repeat;
+    mask-position: center;
+    mask-size: cover;
+    width: 14px;
+    height: 14px;
+    background-color: $dialog-close-fg-color;
+    cursor: pointer;
+    position: absolute;
+    top: 10px;
+    right: 10px;
+}
+
+.mx_HostSignup_minimize_button {
+    mask: url('$(res)/img/feather-customised/minimise.svg');
+    mask-repeat: no-repeat;
+    mask-position: center;
+    mask-size: cover;
+    width: 14px;
+    height: 14px;
+    background-color: $dialog-close-fg-color;
+    cursor: pointer;
+    position: absolute;
+    top: 10px;
+    right: 25px;
+}
+
+.mx_HostSignup_persisted {
+    width: 90vw;
+    max-width: 580px;
+    height: 80vh;
+    max-height: 600px;
+    top: 0;
+    left: 0;
+    position: fixed;
+    display: none;
+}
+
+.mx_HostSignupDialog_minimized {
+    position: fixed;
+    bottom: 80px;
+    right: 26px;
+    width: 314px;
+    height: 217px;
+    overflow: hidden;
+
+    &.mx_Dialog {
+        padding: 12px;
+    }
+
+    .mx_Dialog_title {
+        text-align: left !important;
+        padding-left: 20px;
+        font-size: $font-15px;
+    }
+
+    iframe {
+        width: 100%;
+        height: 100%;
+        border: none;
+        background-color: #fff;
+    }
+}
diff --git a/res/css/views/dialogs/_InviteDialog.scss b/res/css/views/dialogs/_InviteDialog.scss
index b9063f46b9..d8ff56663a 100644
--- a/res/css/views/dialogs/_InviteDialog.scss
+++ b/res/css/views/dialogs/_InviteDialog.scss
@@ -27,37 +27,29 @@ limitations under the License.
         padding-left: 8px;
         overflow-x: hidden;
         overflow-y: auto;
+        display: flex;
+        flex-wrap: wrap;
 
         .mx_InviteDialog_userTile {
+            margin: 6px 6px 0 0;
             display: inline-block;
-            float: left;
-            position: relative;
-            top: 7px;
+            min-width: max-content; // prevent manipulation by flexbox
         }
 
-        // Using a textarea for this element, to circumvent autofill
-        // Mostly copied from AddressPickerDialog
-        textarea,
-        textarea:focus {
-            height: 34px;
-            line-height: $font-34px;
+        // Mostly copied from AddressPickerDialog; overrides bunch of our default text input styles
+        > input[type="text"] {
+            margin: 6px 0 !important;
+            height: 24px;
+            line-height: $font-24px;
             font-size: $font-14px;
             padding-left: 12px;
-            margin: 0 !important;
             border: 0 !important;
             outline: 0 !important;
             resize: none;
-            overflow: hidden;
             box-sizing: border-box;
-            word-wrap: nowrap;
-
-            // Roughly fill about 2/5ths of the available space. This is to try and 'fill' the
-            // remaining space after a bunch of pills, but is a bit hacky. Ideally we'd have
-            // support for "fill remaining width", but traditional tricks don't work with what
-            // we're pushing into this "field". Flexbox just makes things worse. The theory is
-            // that users won't need more than about 2/5ths of the input to find the person
-            // they're looking for.
-            width: 40%;
+            min-width: 40%;
+            flex: 1 !important;
+            color: $primary-fg-color !important;
         }
     }
 
@@ -148,6 +140,10 @@ limitations under the License.
         }
     }
 
+    .mx_InviteDialog_roomTile_nameStack {
+        display: inline-block;
+    }
+
     .mx_InviteDialog_roomTile_name {
         font-weight: 600;
         font-size: $font-14px;
diff --git a/src/utils/NamingUtils.ts b/res/css/views/dialogs/_ModalWidgetDialog.scss
similarity index 53%
rename from src/utils/NamingUtils.ts
rename to res/css/views/dialogs/_ModalWidgetDialog.scss
index 44ccb9b030..aa2dd0d395 100644
--- a/src/utils/NamingUtils.ts
+++ b/res/css/views/dialogs/_ModalWidgetDialog.scss
@@ -14,16 +14,29 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import * as projectNameGenerator from "project-name-generator";
+.mx_ModalWidgetDialog {
+    .mx_ModalWidgetDialog_warning {
+        margin-bottom: 24px;
 
-/**
- * Generates a human readable identifier. This should not be used for anything
- * which needs secure/cryptographic random: just a level uniquness that is offered
- * by something like Date.now().
- * @returns {string} The randomly generated ID
- */
-export function generateHumanReadableId(): string {
-    return projectNameGenerator({words: 3}).raw.map(w => {
-        return w[0].toUpperCase() + w.substring(1).toLowerCase();
-    }).join('');
+        > img {
+            vertical-align: middle;
+            margin-right: 8px;
+        }
+    }
+
+    .mx_ModalWidgetDialog_buttons {
+        float: right;
+        margin-top: 24px;
+
+        .mx_AccessibleButton + .mx_AccessibleButton {
+            margin-left: 8px;
+        }
+    }
+
+    iframe {
+        width: 100%;
+        height: 450px;
+        border: 0;
+        border-radius: 8px;
+    }
 }
diff --git a/src/components/views/avatars/PulsedAvatar.tsx b/res/css/views/dialogs/_RegistrationEmailPromptDialog.scss
similarity index 73%
rename from src/components/views/avatars/PulsedAvatar.tsx
rename to res/css/views/dialogs/_RegistrationEmailPromptDialog.scss
index b4e876b9f6..31fc6d7a04 100644
--- a/src/components/views/avatars/PulsedAvatar.tsx
+++ b/res/css/views/dialogs/_RegistrationEmailPromptDialog.scss
@@ -14,15 +14,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
+.mx_RegistrationEmailPromptDialog {
+    width: 417px;
 
-interface IProps {
+    .mx_Dialog_content {
+        margin-bottom: 24px;
+        color: $tertiary-fg-color;
+    }
+
+    .mx_Dialog_primary {
+        width: 100%;
+    }
 }
-
-const PulsedAvatar: React.FC<IProps> = (props) => {
-    return <div className="mx_PulsedAvatar">
-        {props.children}
-    </div>;
-};
-
-export default PulsedAvatar;
diff --git a/res/css/views/dialogs/_RoomSettingsDialogBridges.scss b/res/css/views/dialogs/_RoomSettingsDialogBridges.scss
index a1793cc75e..c97a3b69b7 100644
--- a/res/css/views/dialogs/_RoomSettingsDialogBridges.scss
+++ b/res/css/views/dialogs/_RoomSettingsDialogBridges.scss
@@ -89,24 +89,18 @@ limitations under the License.
             }
         }
 
-        .mx_showMore {
-            display: block;
-            text-align: left;
-            margin-top: 10px;
-        }
-
         .metadata {
             color: $muted-fg-color;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
             margin-bottom: 0;
-        }
-
-        .metadata.visible {
             overflow-y: visible;
             text-overflow: ellipsis;
             white-space: normal;
+            padding: 0;
+
+            > li {
+                padding: 0;
+                border: 0;
+            }
         }
     }
 }
diff --git a/res/css/views/dialogs/_ServerPickerDialog.scss b/res/css/views/dialogs/_ServerPickerDialog.scss
new file mode 100644
index 0000000000..b01b49d7af
--- /dev/null
+++ b/res/css/views/dialogs/_ServerPickerDialog.scss
@@ -0,0 +1,78 @@
+/*
+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_ServerPickerDialog {
+    width: 468px;
+    box-sizing: border-box;
+
+    .mx_Dialog_content {
+        margin-bottom: 0;
+
+        > p {
+            color: $secondary-fg-color;
+            font-size: $font-14px;
+            margin: 16px 0;
+
+            &:first-of-type {
+                margin-bottom: 40px;
+            }
+
+            &:last-of-type {
+                margin: 0 24px 24px;
+            }
+        }
+
+        > h4 {
+            font-size: $font-15px;
+            font-weight: $font-semi-bold;
+            color: $secondary-fg-color;
+            margin-left: 8px;
+        }
+
+        > a {
+            color: $accent-color;
+            margin-left: 8px;
+        }
+    }
+
+    .mx_ServerPickerDialog_otherHomeserverRadio {
+        input[type="radio"] + div {
+            margin-top: auto;
+            margin-bottom: auto;
+        }
+    }
+
+    .mx_ServerPickerDialog_otherHomeserver {
+        border-top: none;
+        border-left: none;
+        border-right: none;
+        border-radius: unset;
+
+        > input {
+            padding-left: 0;
+        }
+
+        > label {
+            margin-left: 0;
+        }
+    }
+
+    .mx_AccessibleButton_kind_primary {
+        width: calc(100% - 64px);
+        margin: 0 8px;
+        padding: 15px 18px;
+    }
+}
diff --git a/res/css/views/dialogs/_SpaceSettingsDialog.scss b/res/css/views/dialogs/_SpaceSettingsDialog.scss
new file mode 100644
index 0000000000..c1fa539e9b
--- /dev/null
+++ b/res/css/views/dialogs/_SpaceSettingsDialog.scss
@@ -0,0 +1,55 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_SpaceSettingsDialog {
+    width: 480px;
+    color: $primary-fg-color;
+
+    .mx_SpaceSettings_errorText {
+        font-weight: $font-semi-bold;
+        font-size: $font-12px;
+        line-height: $font-15px;
+        color: $notice-primary-color;
+        margin-bottom: 28px;
+    }
+
+    .mx_ToggleSwitch {
+        display: inline-block;
+        vertical-align: middle;
+        margin-left: 16px;
+    }
+
+    .mx_AccessibleButton_kind_danger {
+        margin-top: 28px;
+    }
+
+    .mx_SpaceSettingsDialog_buttons {
+        display: flex;
+        margin-top: 64px;
+
+        .mx_AccessibleButton {
+            display: inline-block;
+        }
+
+        .mx_AccessibleButton_kind_link {
+            margin-left: auto;
+        }
+    }
+
+    .mx_FormButton {
+        padding: 8px 22px;
+    }
+}
diff --git a/res/css/views/dialogs/_WidgetCapabilitiesPromptDialog.scss b/res/css/views/dialogs/_WidgetCapabilitiesPromptDialog.scss
new file mode 100644
index 0000000000..176919b84c
--- /dev/null
+++ b/res/css/views/dialogs/_WidgetCapabilitiesPromptDialog.scss
@@ -0,0 +1,75 @@
+/*
+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_WidgetCapabilitiesPromptDialog {
+    .text-muted {
+        font-size: $font-12px;
+    }
+
+    .mx_Dialog_content {
+        margin-bottom: 16px;
+    }
+
+    .mx_WidgetCapabilitiesPromptDialog_cap {
+        margin-top: 20px;
+        font-size: $font-15px;
+        line-height: $font-15px;
+
+        .mx_WidgetCapabilitiesPromptDialog_byline {
+            color: $muted-fg-color;
+            margin-left: 26px;
+            font-size: $font-12px;
+            line-height: $font-12px;
+        }
+    }
+
+    .mx_Dialog_buttons {
+        margin-top: 40px; // double normal
+    }
+
+    .mx_SettingsFlag {
+        line-height: calc($font-14px + 7px + 7px); // 7px top & bottom padding
+        color: $muted-fg-color;
+        font-size: $font-12px;
+
+        .mx_ToggleSwitch {
+            display: inline-block;
+            vertical-align: middle;
+            margin-right: 8px;
+
+            // downsize the switch + ball
+            width: $font-32px;
+            height: $font-15px;
+
+
+            &.mx_ToggleSwitch_on > .mx_ToggleSwitch_ball {
+                left: calc(100% - $font-15px);
+            }
+
+            .mx_ToggleSwitch_ball {
+                width: $font-15px;
+                height: $font-15px;
+                border-radius: $font-15px;
+            }
+        }
+
+        .mx_SettingsFlag_label {
+            display: inline-block;
+            vertical-align: middle;
+        }
+    }
+}
diff --git a/res/css/views/elements/_AccessibleButton.scss b/res/css/views/elements/_AccessibleButton.scss
index 96269cea43..9c26f8f120 100644
--- a/res/css/views/elements/_AccessibleButton.scss
+++ b/res/css/views/elements/_AccessibleButton.scss
@@ -25,7 +25,7 @@ limitations under the License.
 .mx_AccessibleButton_hasKind {
     padding: 7px 18px;
     text-align: center;
-    border-radius: 4px;
+    border-radius: 8px;
     display: inline-block;
     font-size: $font-14px;
 }
diff --git a/res/css/views/elements/_DesktopCapturerSourcePicker.scss b/res/css/views/elements/_DesktopCapturerSourcePicker.scss
new file mode 100644
index 0000000000..69dde5925e
--- /dev/null
+++ b/res/css/views/elements/_DesktopCapturerSourcePicker.scss
@@ -0,0 +1,72 @@
+/*
+Copyright 2021 Šimon Brandner <simon.bra.ag@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_desktopCapturerSourcePicker {
+    overflow: hidden;
+}
+
+.mx_desktopCapturerSourcePicker_tabLabels {
+    display: flex;
+    padding: 0 0 8px 0;
+}
+
+.mx_desktopCapturerSourcePicker_tabLabel,
+.mx_desktopCapturerSourcePicker_tabLabel_selected {
+    width: 100%;
+    text-align: center;
+    border-radius: 8px;
+    padding: 8px 0;
+    font-size: $font-13px;
+}
+
+.mx_desktopCapturerSourcePicker_tabLabel_selected {
+    background-color: $tab-label-active-bg-color;
+    color: $tab-label-active-fg-color;
+}
+
+.mx_desktopCapturerSourcePicker_panel {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: center;
+    align-items: flex-start;
+    height: 500px;
+    overflow: overlay;
+}
+
+.mx_desktopCapturerSourcePicker_stream_button {
+    display: flex;
+    flex-direction: column;
+    margin: 8px;
+    border-radius: 4px;
+}
+
+.mx_desktopCapturerSourcePicker_stream_button:hover,
+.mx_desktopCapturerSourcePicker_stream_button:focus {
+    background: $roomtile-selected-bg-color;
+}
+
+.mx_desktopCapturerSourcePicker_stream_thumbnail {
+    margin: 4px;
+    width: 312px;
+}
+
+.mx_desktopCapturerSourcePicker_stream_name {
+    margin: 0 4px;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    width: 312px;
+}
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/elements/_MiniAvatarUploader.scss b/res/css/views/elements/_MiniAvatarUploader.scss
new file mode 100644
index 0000000000..698184a095
--- /dev/null
+++ b/res/css/views/elements/_MiniAvatarUploader.scss
@@ -0,0 +1,66 @@
+/*
+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;
+
+    // this isn't a floating tooltip so override some things to not need to bother with z-index and floating
+    .mx_Tooltip {
+        display: inline-block;
+        position: absolute;
+        z-index: unset;
+        width: max-content;
+        left: 72px;
+        top: 0;
+    }
+
+    &::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/res/css/views/elements/_SSOButtons.scss b/res/css/views/elements/_SSOButtons.scss
new file mode 100644
index 0000000000..e02816780f
--- /dev/null
+++ b/res/css/views/elements/_SSOButtons.scss
@@ -0,0 +1,74 @@
+/*
+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_SSOButtons {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: center;
+
+    .mx_SSOButtons_row {
+        & + .mx_SSOButtons_row {
+            margin-top: 16px;
+        }
+    }
+
+    .mx_SSOButton {
+        position: relative;
+        width: 100%;
+        padding: 7px 32px;
+        text-align: center;
+        border-radius: 8px;
+        display: inline-block;
+        font-size: $font-14px;
+        font-weight: $font-semi-bold;
+        border: 1px solid $input-border-color;
+        color: $primary-fg-color;
+
+        > img {
+            object-fit: contain;
+            position: absolute;
+            left: 8px;
+            top: 4px;
+        }
+    }
+
+    .mx_SSOButton_default {
+        color: $button-primary-bg-color;
+        background-color: $button-secondary-bg-color;
+        border-color: $button-primary-bg-color;
+    }
+    .mx_SSOButton_default.mx_SSOButton_primary {
+        color: $button-primary-fg-color;
+        background-color: $button-primary-bg-color;
+    }
+
+    .mx_SSOButton_mini {
+        box-sizing: border-box;
+        width: 50px; // 48px + 1px border on all sides
+        height: 50px; // 48px + 1px border on all sides
+        min-width: 50px; // prevent crushing by the flexbox
+        padding: 12px;
+
+        > img {
+            left: 12px;
+            top: 12px;
+        }
+
+        & + .mx_SSOButton_mini {
+            margin-left: 16px;
+        }
+    }
+}
diff --git a/res/css/views/elements/_ServerPicker.scss b/res/css/views/elements/_ServerPicker.scss
new file mode 100644
index 0000000000..188eb5d655
--- /dev/null
+++ b/res/css/views/elements/_ServerPicker.scss
@@ -0,0 +1,88 @@
+/*
+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_ServerPicker {
+    margin-bottom: 14px;
+    border-bottom: 1px solid rgba(141, 151, 165, 0.2);
+    display: grid;
+    grid-template-columns: auto min-content;
+    grid-template-rows: auto auto auto;
+    font-size: $font-14px;
+    line-height: $font-20px;
+
+    > h3 {
+        font-weight: $font-semi-bold;
+        margin: 0 0 20px;
+        grid-column: 1;
+        grid-row: 1;
+    }
+
+    .mx_ServerPicker_help {
+        width: 20px;
+        height: 20px;
+        background-color: $icon-button-color;
+        border-radius: 10px;
+        grid-column: 2;
+        grid-row: 1;
+        margin-left: auto;
+        text-align: center;
+        color: #ffffff;
+        font-size: 16px;
+        position: relative;
+
+        &::before {
+            content: '';
+            width: 24px;
+            height: 24px;
+            position: absolute;
+            top: -2px;
+            left: -2px;
+            mask-position: center;
+            mask-size: contain;
+            mask-repeat: no-repeat;
+            mask-image: url('$(res)/img/element-icons/i.svg');
+            background: #ffffff;
+        }
+    }
+
+    .mx_ServerPicker_server {
+        color: $authpage-primary-color;
+        grid-column: 1;
+        grid-row: 2;
+        margin-bottom: 16px;
+    }
+
+    .mx_ServerPicker_change {
+        padding: 0;
+        font-size: inherit;
+        grid-column: 2;
+        grid-row: 2;
+    }
+
+    .mx_ServerPicker_desc {
+        margin-top: -12px;
+        color: $tertiary-fg-color;
+        grid-column: 1 / 2;
+        grid-row: 3;
+        margin-bottom: 16px;
+    }
+}
+
+.mx_ServerPicker_helpDialog {
+    .mx_Dialog_content {
+        width: 456px;
+    }
+}
diff --git a/res/css/views/messages/_CreateEvent.scss b/res/css/views/messages/_CreateEvent.scss
index d45645863f..cb2bf841dd 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 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.
@@ -15,25 +15,8 @@ limitations under the License.
 */
 
 .mx_CreateEvent {
-    background-color: $info-plinth-bg-color;
-    padding-left: 20px;
-    padding-right: 20px;
-    padding-top: 10px;
-    padding-bottom: 10px;
-}
-
-.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: $composer-e2e-icon-color;
+        mask-image: url('$(res)/img/element-icons/chat-bubbles.svg');
+    }
 }
diff --git a/res/css/views/messages/_EventTileBubble.scss b/res/css/views/messages/_EventTileBubble.scss
new file mode 100644
index 0000000000..e0f5d521cb
--- /dev/null
+++ b/res/css/views/messages/_EventTileBubble.scss
@@ -0,0 +1,60 @@
+/*
+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 {
+        font-size: $font-12px;
+        grid-column: 2;
+        grid-row: 2;
+    }
+}
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/_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;
     }
 }
diff --git a/res/css/views/messages/_RedactedBody.scss b/res/css/views/messages/_RedactedBody.scss
index e4ab0c0835..600ac0c6b7 100644
--- a/res/css/views/messages/_RedactedBody.scss
+++ b/res/css/views/messages/_RedactedBody.scss
@@ -30,7 +30,7 @@ limitations under the License.
         mask-size: contain;
         content: '';
         position: absolute;
-        top: 2px;
+        top: 1px;
         left: 0;
     }
 }
diff --git a/res/css/views/messages/_ViewSourceEvent.scss b/res/css/views/messages/_ViewSourceEvent.scss
index 076932ee97..66825030e0 100644
--- a/res/css/views/messages/_ViewSourceEvent.scss
+++ b/res/css/views/messages/_ViewSourceEvent.scss
@@ -35,13 +35,13 @@ limitations under the License.
         mask-size: auto 12px;
         visibility: hidden;
         background-color: $accent-color;
-        mask-image: url('$(res)/img/feather-customised/widget/maximise.svg');
+        mask-image: url('$(res)/img/feather-customised/maximise.svg');
     }
 
     &.mx_ViewSourceEvent_expanded .mx_ViewSourceEvent_toggle {
         mask-position: 0 bottom;
         margin-bottom: 7px;
-        mask-image: url('$(res)/img/feather-customised/widget/minimise.svg');
+        mask-image: url('$(res)/img/feather-customised/minimise.svg');
     }
 
     &:hover .mx_ViewSourceEvent_toggle {
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/right_panel/_BaseCard.scss b/res/css/views/right_panel/_BaseCard.scss
index 3ff3b52531..9a5a59bda8 100644
--- a/res/css/views/right_panel/_BaseCard.scss
+++ b/res/css/views/right_panel/_BaseCard.scss
@@ -128,6 +128,13 @@ limitations under the License.
                 mask-size: 20px;
                 mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
             }
+
+            &.mx_AccessibleButton_disabled {
+                padding-right: 12px;
+                &::after {
+                    content: unset;
+                }
+            }
         }
     }
 
diff --git a/res/css/views/right_panel/_RoomSummaryCard.scss b/res/css/views/right_panel/_RoomSummaryCard.scss
index 0031d3a64c..36882f4e8b 100644
--- a/res/css/views/right_panel/_RoomSummaryCard.scss
+++ b/res/css/views/right_panel/_RoomSummaryCard.scss
@@ -110,28 +110,107 @@ limitations under the License.
 
     .mx_RoomSummaryCard_appsGroup {
         .mx_RoomSummaryCard_Button {
-            padding-left: 12px;
+            // this button is special so we have to override some of the original styling
+            // as we will be applying it in its children
+            padding: 0;
+            height: auto;
             color: $tertiary-fg-color;
 
-            span {
-                color: $primary-fg-color;
+            .mx_RoomSummaryCard_icon_app {
+                padding: 10px 48px 10px 12px; // based on typical mx_RoomSummaryCard_Button padding
+                text-overflow: ellipsis;
+                overflow: hidden;
+
+                .mx_BaseAvatar_image {
+                    vertical-align: top;
+                    margin-right: 12px;
+                }
+
+                span {
+                    color: $primary-fg-color;
+                }
             }
 
-            img {
-                vertical-align: top;
-                margin-right: 12px;
-                border-radius: 4px;
+            .mx_RoomSummaryCard_app_pinToggle,
+            .mx_RoomSummaryCard_app_options {
+                position: absolute;
+                top: 0;
+                height: 100%; // to give bigger interactive zone
+                width: 24px;
+                padding: 12px 4px;
+                box-sizing: border-box;
+                min-width: 24px; // prevent flexbox crushing
+
+                &:hover {
+                    &::after {
+                        content: '';
+                        position: absolute;
+                        height: 24px;
+                        width: 24px;
+                        top: 8px; // equal to padding-top of parent
+                        left: 0;
+                        border-radius: 12px;
+                        background-color: rgba(141, 151, 165, 0.1);
+                    }
+                }
+
+                &::before {
+                    content: '';
+                    position: absolute;
+                    height: 16px;
+                    width: 16px;
+                    mask-repeat: no-repeat;
+                    mask-position: center;
+                    mask-size: 16px;
+                    background-color: $icon-button-color;
+                }
+            }
+
+            .mx_RoomSummaryCard_app_pinToggle {
+                right: 24px;
+
+                &::before {
+                    mask-image: url('$(res)/img/element-icons/room/pin-upright.svg');
+                }
+            }
+
+            .mx_RoomSummaryCard_app_options {
+                right: 48px;
+                display: none;
+
+                &::before {
+                    mask-image: url('$(res)/img/element-icons/room/ellipsis.svg');
+                }
+            }
+
+            &.mx_RoomSummaryCard_Button_pinned {
+                &::after {
+                    opacity: 0.2;
+                }
+
+                .mx_RoomSummaryCard_app_pinToggle::before {
+                    background-color: $accent-color;
+                }
+            }
+
+            &:hover {
+                .mx_RoomSummaryCard_icon_app {
+                    padding-right: 72px;
+                }
+
+                .mx_RoomSummaryCard_app_options {
+                    display: unset;
+                }
             }
 
             &::before {
                 content: unset;
             }
-        }
 
-        .mx_RoomSummaryCard_icon_app_pinned::after {
-            mask-image: url('$(res)/img/element-icons/room/pin-upright.svg');
-            background-color: $accent-color;
-            transform: unset;
+            &::after {
+                top: 8px; // re-align based on the height change
+                pointer-events: none; // pass through to the real button
+            }
         }
     }
 
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/res/css/views/right_panel/_WidgetCard.scss b/res/css/views/right_panel/_WidgetCard.scss
index 315fd5213c..a90e744a5a 100644
--- a/res/css/views/right_panel/_WidgetCard.scss
+++ b/res/css/views/right_panel/_WidgetCard.scss
@@ -24,34 +24,35 @@ limitations under the License.
         border: 0;
     }
 
-    &.mx_WidgetCard_noEdit {
-        .mx_AccessibleButton_kind_secondary {
-            margin: 0 12px;
+    .mx_BaseCard_header {
+        display: inline-flex;
 
-            &:first-child {
-                // expand the Pin to room primary action
-                flex-grow: 1;
-            }
+        & > h2 {
+            margin-right: 0;
+            flex-grow: 1;
         }
-    }
 
-    .mx_WidgetCard_optionsButton {
-        position: relative;
-        height: 18px;
-        width: 26px;
-
-        &::before {
-            content: "";
-            position: absolute;
-            width: 20px;
+        .mx_WidgetCard_optionsButton {
+            position: relative;
+            margin-right: 44px;
             height: 20px;
-            top: 6px;
-            left: 20px;
-            mask-repeat: no-repeat;
-            mask-position: center;
-            mask-size: contain;
-            mask-image: url('$(res)/img/element-icons/room/ellipsis.svg');
-            background-color: $secondary-fg-color;
+            width: 20px;
+            min-width: 20px; // prevent crushing by the flexbox
+            padding: 0;
+
+            &::before {
+                content: "";
+                position: absolute;
+                width: 20px;
+                height: 20px;
+                top: 0;
+                left: 4px;
+                mask-repeat: no-repeat;
+                mask-position: center;
+                mask-size: contain;
+                mask-image: url('$(res)/img/element-icons/room/ellipsis.svg');
+                background-color: $secondary-fg-color;
+            }
         }
     }
 }
diff --git a/res/css/views/rooms/_AppsDrawer.scss b/res/css/views/rooms/_AppsDrawer.scss
index 6e3ffbe5f0..492ed95973 100644
--- a/res/css/views/rooms/_AppsDrawer.scss
+++ b/res/css/views/rooms/_AppsDrawer.scss
@@ -24,76 +24,142 @@ $MiniAppTileHeight: 200px;
     flex-direction: column;
     overflow: hidden;
 
+    .mx_AppsContainer_resizerHandleContainer {
+        width: 100%;
+        height: 10px;
+        margin-top: -3px; // move it up so the interactions are slightly more comfortable
+        display: block;
+        position: relative;
+    }
+
     .mx_AppsContainer_resizerHandle {
         cursor: ns-resize;
-        border-radius: 3px;
 
-        // Override styles from library
-        width: unset !important;
-        height: 4px !important;
+        // Override styles from library, making the whole area the target area
+        width: 100% !important;
+        height: 100% !important;
 
         // This is positioned directly below frame
         position: absolute;
-        bottom: -8px !important; // override from library
+        bottom: 0 !important; // override from library
 
-        // Together, these make the bar 64px wide
-        // These are also overridden from the library
-        left: calc(50% - 32px) !important;
-        right: calc(50% - 32px) !important;
+        // We then render the pill handle in an ::after to keep it in the handle's
+        // area without being a massive line across the screen
+        &::after {
+            content: '';
+            position: absolute;
+            border-radius: 3px;
+
+            // The combination of these two should make the pill 4px high
+            top: 6px;
+            bottom: 0;
+
+            // Together, these make the bar 64px wide
+            // These are also overridden from the library
+            left: calc(50% - 32px);
+            right: calc(50% - 32px);
+        }
     }
 
     &:hover {
-        .mx_AppsContainer_resizerHandle {
+        .mx_AppsContainer_resizerHandle::after {
             opacity: 0.8;
             background: $primary-fg-color;
         }
+
+        .mx_ResizeHandle_horizontal::before {
+            position: absolute;
+            left: 3px;
+            top: 50%;
+            transform: translate(0, -50%);
+
+            height: 64px; // to match width of the ones on roomlist
+            width: 4px;
+            border-radius: 4px;
+
+            content: '';
+
+            background-color: $primary-fg-color;
+            opacity: 0.8;
+        }
     }
 }
 
+.mx_AppsContainer_resizer {
+    margin-bottom: 8px;
+}
+
 .mx_AppsContainer {
     display: flex;
     flex-direction: row;
     align-items: stretch;
     justify-content: center;
     height: 100%;
-    margin-bottom: 8px;
+    width: 100%;
+    flex: 1;
+    min-height: 0;
+
+    .mx_AppTile:first-of-type {
+        border-left-width: 8px;
+        border-radius: 10px 0 0 10px;
+    }
+    .mx_AppTile:last-of-type {
+        border-right-width: 8px;
+        border-radius: 0 10px 10px 0;
+    }
+
+    .mx_ResizeHandle_horizontal {
+        position: relative;
+
+        > div {
+            width: 0;
+        }
+    }
 }
 
-.mx_AppsDrawer_minimised .mx_AppsContainer {
-    // override the re-resizable inline styles
-    height: inherit !important;
-    min-height: inherit !important;
-}
+// TODO this should be 300px but that's too large
+$MinWidth: 240px;
 
-.mx_AddWidget_button {
-    order: 2;
-    cursor: pointer;
-    padding: 0;
-    margin: -3px auto 5px 0;
-    color: $accent-color;
-    font-size: $font-12px;
+.mx_AppsDrawer_2apps .mx_AppTile {
+    width: 50%;
+
+    &:nth-child(3) {
+        flex-grow: 1;
+        width: 0 !important;
+        min-width: $MinWidth !important;
+    }
+}
+.mx_AppsDrawer_3apps .mx_AppTile {
+    width: 33%;
+
+    &:nth-child(3) {
+        flex-grow: 1;
+        width: 0 !important;
+        min-width: $MinWidth !important;
+    }
 }
 
 .mx_AppTile {
     width: 50%;
-    border: 5px solid $widget-menu-bar-bg-color;
-    border-radius: 4px;
+    min-width: $MinWidth;
+    border: 8px solid $widget-menu-bar-bg-color;
+    border-left-width: 5px;
+    border-right-width: 5px;
     display: flex;
     flex-direction: column;
-
-    & + .mx_AppTile {
-        margin-left: 5px;
-    }
+    box-sizing: border-box;
+    background-color: $widget-menu-bar-bg-color;
 }
 
 .mx_AppTileFullWidth {
-    width: 100%;
+    width: 100% !important; // to override the inline style set by the resizer
     margin: 0;
     padding: 0;
     border: 5px solid $widget-menu-bar-bg-color;
     border-radius: 8px;
     display: flex;
     flex-direction: column;
+    background-color: $widget-menu-bar-bg-color;
 }
 
 .mx_AppTile_mini {
@@ -105,12 +171,6 @@ $MiniAppTileHeight: 200px;
     height: $MiniAppTileHeight;
 }
 
-.mx_AppTile.mx_AppTile_minimised,
-.mx_AppTileFullWidth.mx_AppTile_minimised,
-.mx_AppTile_mini.mx_AppTile_minimised {
-    height: 14px;
-}
-
 .mx_AppTile .mx_AppTile_persistedWrapper,
 .mx_AppTileFullWidth .mx_AppTile_persistedWrapper,
 .mx_AppTile_mini .mx_AppTile_persistedWrapper {
@@ -130,19 +190,20 @@ $MiniAppTileHeight: 200px;
     flex-direction: row;
     align-items: center;
     justify-content: space-between;
-    cursor: pointer;
     width: 100%;
-}
-
-.mx_AppTileMenuBar_expanded {
-    padding-bottom: 5px;
+    padding-top: 2px;
+    padding-bottom: 8px;
 }
 
 .mx_AppTileMenuBarTitle {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    pointer-events: none;
+    line-height: 20px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+
+    .mx_WidgetAvatar {
+        margin-right: 12px;
+    }
 }
 
 .mx_AppTileMenuBarTitle > :last-child {
@@ -166,37 +227,20 @@ $MiniAppTileHeight: 200px;
     margin: 0 3px;
 }
 
-.mx_AppTileMenuBar_iconButton.mx_AppTileMenuBar_iconButton_minimise {
-    mask-image: url('$(res)/img/feather-customised/widget/minimise.svg');
-    background-color: $accent-color;
-}
-
-.mx_AppTileMenuBar_iconButton.mx_AppTileMenuBar_iconButton_maximise {
-    mask-image: url('$(res)/img/feather-customised/widget/maximise.svg');
-    background-color: $accent-color;
-}
-
 .mx_AppTileMenuBar_iconButton.mx_AppTileMenuBar_iconButton_popout {
     mask-image: url('$(res)/img/feather-customised/widget/external-link.svg');
 }
 
 .mx_AppTileMenuBar_iconButton.mx_AppTileMenuBar_iconButton_menu {
-    mask-image: url('$(res)/img/icon_context.svg');
-}
-
-.mx_AppTileMenuBarWidgetDelete {
-    filter: none;
-}
-
-.mx_AppTileMenuBarWidget:hover {
-    border: 1px solid $primary-fg-color;
-    border-radius: 2px;
+    mask-image: url('$(res)/img/element-icons/room/ellipsis.svg');
 }
 
 .mx_AppTileBody {
     height: 100%;
     width: 100%;
     overflow: hidden;
+    border-radius: 8px;
+    background-color: $widget-body-bg-color;
 }
 
 .mx_AppTileBody_mini {
@@ -231,7 +275,6 @@ $MiniAppTileHeight: 200px;
 
 .mx_AppPermissionWarning {
     text-align: center;
-    background-color: $widget-menu-bar-bg-color;
     display: flex;
     height: 100%;
     flex-direction: column;
@@ -296,6 +339,10 @@ $MiniAppTileHeight: 200px;
     font-weight: bold;
     position: relative;
     height: 100%;
+
+    // match bg of border so that the cut corners have the right fill
+    background-color: $widget-body-bg-color !important;
+    border-radius: 8px;
 }
 
 .mx_AppLoading .mx_Spinner {
@@ -323,10 +370,6 @@ $MiniAppTileHeight: 200px;
     display: none;
 }
 
-.mx_AppsDrawer_minimised .mx_AppsContainer_resizerHandle {
-    display: none;
-}
-
 /* Avoid apptile iframes capturing mouse event focus when resizing */
 .mx_AppsDrawer_resizing iframe {
     pointer-events: none;
diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 3b9a491db5..5841cf2853 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -25,17 +25,8 @@ $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;
+    padding-top: 1px;
 }
 
 .mx_EventTile_avatar {
@@ -46,7 +37,7 @@ $left-gutter: 64px;
 }
 
 .mx_EventTile.mx_EventTile_info .mx_EventTile_avatar {
-    top: $font-8px;
+    top: $font-6px;
     left: $left-gutter;
 }
 
@@ -83,7 +74,6 @@ $left-gutter: 64px;
     margin-left: 5px;
     display: inline-block;
     vertical-align: top;
-    height: 16px;
     overflow: hidden;
     user-select: none;
 
@@ -131,9 +121,10 @@ $left-gutter: 64px;
     grid-template-columns: 1fr 100px;
 
     .mx_EventTile_line {
-        margin-right: 0px;
+        margin-right: 0;
         grid-column: 1 / 3;
-        padding: 0;
+        // override default padding of mx_EventTile_line so that we can be centered
+        padding: 0 !important;
     }
 
     .mx_EventTile_msgOption {
@@ -266,17 +257,13 @@ $left-gutter: 64px;
     display: inline-block;
     width: 14px;
     height: 14px;
-    top: 29px;
+    // This aligns the avatar with the last line of the
+    // message. We want to move it one line up - 2.2rem
+    top: -2.2rem;
     user-select: none;
     z-index: 1;
 }
 
-.mx_EventTile_continuation .mx_EventTile_readAvatars,
-.mx_EventTile_info .mx_EventTile_readAvatars,
-.mx_EventTile_emote .mx_EventTile_readAvatars {
-    top: 7px;
-}
-
 .mx_EventTile_readAvatars .mx_BaseAvatar {
     position: absolute;
     display: inline-block;
@@ -429,15 +416,15 @@ $left-gutter: 64px;
 }
 
 .mx_EventTile:hover.mx_EventTile_verified .mx_EventTile_line {
-    border-left: $e2e-verified-color 4px solid;
+    border-left: $e2e-verified-color $EventTile_e2e_state_indicator_width solid;
 }
 
 .mx_EventTile:hover.mx_EventTile_unverified .mx_EventTile_line {
-    border-left: $e2e-unverified-color 4px solid;
+    border-left: $e2e-unverified-color $EventTile_e2e_state_indicator_width solid;
 }
 
 .mx_EventTile:hover.mx_EventTile_unknown .mx_EventTile_line {
-    border-left: $e2e-unknown-color 4px solid;
+    border-left: $e2e-unknown-color $EventTile_e2e_state_indicator_width solid;
 }
 
 .mx_EventTile:hover.mx_EventTile_verified.mx_EventTile_info .mx_EventTile_line,
@@ -455,8 +442,7 @@ $left-gutter: 64px;
 .mx_EventTile:hover.mx_EventTile_verified .mx_EventTile_line > a > .mx_MessageTimestamp,
 .mx_EventTile:hover.mx_EventTile_unverified .mx_EventTile_line > a > .mx_MessageTimestamp,
 .mx_EventTile:hover.mx_EventTile_unknown .mx_EventTile_line > a > .mx_MessageTimestamp {
-    left: 3px;
-    width: auto;
+    width: $MessageTimestamp_width_hover;
 }
 
 // Explicit relationships so that it doesn't apply to nested EventTile components (e.g in Replies)
@@ -501,7 +487,6 @@ $left-gutter: 64px;
         // https://github.com/vector-im/vector-web/issues/754
         overflow-x: overlay;
         overflow-y: visible;
-        max-height: 30vh;
     }
 
     code {
@@ -510,6 +495,22 @@ $left-gutter: 64px;
     }
 }
 
+.mx_EventTile_lineNumbers {
+    float: left;
+    margin: 0 0.5em 0 -1.5em;
+    color: gray;
+}
+
+.mx_EventTile_lineNumber {
+    text-align: right;
+    display: block;
+    padding-left: 1em;
+}
+
+.mx_EventTile_collapsedCodeBlock {
+    max-height: 30vh;
+}
+
 .mx_EventTile:hover .mx_EventTile_body pre,
 .mx_EventTile.focus-visible:focus-within .mx_EventTile_body pre {
     border: 1px solid #e5e5e5; // deliberate constant as we're behind an invert filter
@@ -521,21 +522,42 @@ $left-gutter: 64px;
 }
 
 // Inserted adjacent to <pre> blocks, (See TextualBody)
-.mx_EventTile_copyButton {
+.mx_EventTile_button {
     position: absolute;
     display: inline-block;
     visibility: hidden;
     cursor: pointer;
-    top: 6px;
-    right: 6px;
+    top: 8px;
+    right: 8px;
     width: 19px;
     height: 19px;
-    mask-image: url($copy-button-url);
     background-color: $message-action-bar-fg-color;
 }
+.mx_EventTile_buttonBottom {
+    top: 33px;
+}
+.mx_EventTile_copyButton {
+    mask-image: url($copy-button-url);
+}
+.mx_EventTile_collapseButton {
+    mask-size: 75%;
+    mask-position: center;
+    mask-repeat: no-repeat;
+    mask-image: url($collapse-button-url);
+}
+.mx_EventTile_expandButton {
+    mask-size: 75%;
+    mask-position: center;
+    mask-repeat: no-repeat;
+    mask-image: url($expand-button-url);
+}
 
 .mx_EventTile_body .mx_EventTile_pre_container:focus-within .mx_EventTile_copyButton,
-.mx_EventTile_body .mx_EventTile_pre_container:hover .mx_EventTile_copyButton {
+.mx_EventTile_body .mx_EventTile_pre_container:hover .mx_EventTile_copyButton,
+.mx_EventTile_body .mx_EventTile_pre_container:focus-within .mx_EventTile_collapseButton,
+.mx_EventTile_body .mx_EventTile_pre_container:hover .mx_EventTile_collapseButton,
+.mx_EventTile_body .mx_EventTile_pre_container:focus-within .mx_EventTile_expandButton,
+.mx_EventTile_body .mx_EventTile_pre_container:hover .mx_EventTile_expandButton {
     visibility: visible;
 }
 
diff --git a/res/css/views/rooms/_GroupLayout.scss b/res/css/views/rooms/_GroupLayout.scss
index 2b447be44a..903fabc8fd 100644
--- a/res/css/views/rooms/_GroupLayout.scss
+++ b/res/css/views/rooms/_GroupLayout.scss
@@ -20,7 +20,7 @@ $left-gutter: 64px;
 .mx_GroupLayout {
     .mx_EventTile {
         > .mx_SenderProfile {
-            line-height: $font-17px;
+            line-height: $font-20px;
             padding-left: $left-gutter;
         }
 
@@ -34,11 +34,11 @@ $left-gutter: 64px;
 
         .mx_MessageTimestamp {
             position: absolute;
-            width: 46px; /* 8 + 30 (avatar) + 8 */
+            width: $MessageTimestamp_width;
         }
 
         .mx_EventTile_line, .mx_EventTile_reply {
-            padding-top: 3px;
+            padding-top: 1px;
             padding-bottom: 3px;
             line-height: $font-22px;
         }
@@ -105,16 +105,9 @@ $left-gutter: 64px;
         }
 
         .mx_EventTile_readAvatars {
-            top: 27px;
-        }
-
-        &.mx_EventTile_continuation .mx_EventTile_readAvatars,
-        &.mx_EventTile_emote .mx_EventTile_readAvatars {
-            top: 5px;
-        }
-
-        &.mx_EventTile_info .mx_EventTile_readAvatars {
-            top: 4px;
+            // This aligns the avatar with the last line of the
+            // message. We want to move it one line up - 2rem
+            top: -2rem;
         }
 
         .mx_EventTile_content .markdown-body {
diff --git a/res/css/views/rooms/_IRCLayout.scss b/res/css/views/rooms/_IRCLayout.scss
index 958d718b11..792c2f1f58 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;
             }
         }
     }
@@ -206,6 +207,17 @@ $irc-line-height: $font-18px;
             width: unset;
             max-width: var(--name-width);
         }
+
+        .mx_SenderProfile_hover {
+            background: transparent;
+
+            > span {
+                > .mx_SenderProfile_name,
+                > .mx_SenderProfile_aux {
+                    min-width: inherit;
+                }
+            }
+        }
     }
 
     .mx_ProfileResizer {
diff --git a/res/css/views/rooms/_MemberInfo.scss b/res/css/views/rooms/_MemberInfo.scss
index 182c280217..3f7f83d334 100644
--- a/res/css/views/rooms/_MemberInfo.scss
+++ b/res/css/views/rooms/_MemberInfo.scss
@@ -19,6 +19,7 @@ limitations under the License.
     flex-direction: column;
     flex: 1;
     overflow-y: auto;
+    margin-top: 8px;
 }
 
 .mx_MemberInfo_name {
diff --git a/res/css/views/rooms/_MemberList.scss b/res/css/views/rooms/_MemberList.scss
index f00907aeef..075e9ff585 100644
--- a/res/css/views/rooms/_MemberList.scss
+++ b/res/css/views/rooms/_MemberList.scss
@@ -44,6 +44,17 @@ limitations under the License.
     .mx_AutoHideScrollbar {
         flex: 1 1 0;
     }
+
+    .mx_RightPanel_scopeHeader {
+        // vertically align with position on other right panel cards
+        // to prevent it bouncing as user navigates right panel
+        margin-top: -8px;
+    }
+}
+
+.mx_GroupMemberList_query,
+.mx_GroupRoomList_query {
+    flex: 0 0 auto;
 }
 
 .mx_MemberList_chevron {
@@ -59,10 +70,8 @@ limitations under the License.
     flex: 1 1 0px;
 }
 
-.mx_MemberList_query,
-.mx_GroupMemberList_query,
-.mx_GroupRoomList_query {
-    flex: 1 1 0;
+.mx_MemberList_query {
+    height: 16px;
 
     // stricter rule to override the one in _common.scss
     &[type="text"] {
@@ -70,10 +79,6 @@ limitations under the License.
     }
 }
 
-.mx_MemberList_query {
-    height: 16px;
-}
-
 .mx_MemberList_wrapper {
     padding: 10px;
 }
@@ -113,10 +118,10 @@ limitations under the License.
     }
 }
 
-.mx_MemberList_inviteCommunity span {
-    background-image: url('$(res)/img/icon-invite-people.svg');
+.mx_MemberList_inviteCommunity span::before {
+    mask-image: url('$(res)/img/icon-invite-people.svg');
 }
 
-.mx_MemberList_addRoomToCommunity span {
-    background-image: url('$(res)/img/icons-room-add.svg');
+.mx_MemberList_addRoomToCommunity span::before {
+    mask-image: url('$(res)/img/icons-room-add.svg');
 }
diff --git a/res/css/views/rooms/_MessageComposer.scss b/res/css/views/rooms/_MessageComposer.scss
index 71c0db947e..dea1b58741 100644
--- a/res/css/views/rooms/_MessageComposer.scss
+++ b/res/css/views/rooms/_MessageComposer.scss
@@ -227,18 +227,6 @@ limitations under the License.
     mask-image: url('$(res)/img/element-icons/room/composer/attach.svg');
 }
 
-.mx_MessageComposer_hangup::before {
-    mask-image: url('$(res)/img/element-icons/call/hangup.svg');
-}
-
-.mx_MessageComposer_voicecall::before {
-    mask-image: url('$(res)/img/element-icons/call/voice-call.svg');
-}
-
-.mx_MessageComposer_videocall::before {
-    mask-image: url('$(res)/img/element-icons/call/video-call.svg');
-}
-
 .mx_MessageComposer_emoji::before {
     mask-image: url('$(res)/img/element-icons/room/composer/emoji.svg');
 }
@@ -247,6 +235,32 @@ limitations under the License.
     mask-image: url('$(res)/img/element-icons/room/composer/sticker.svg');
 }
 
+.mx_MessageComposer_sendMessage {
+    cursor: pointer;
+    position: relative;
+    margin-right: 6px;
+    width: 32px;
+    height: 32px;
+    border-radius: 100%;
+    background-color: $button-bg-color;
+
+    &::before {
+        position: absolute;
+        height: 16px;
+        width: 16px;
+        top: 8px;
+        left: 9px;
+
+        mask-image: url('$(res)/img/element-icons/send-message.svg');
+        mask-repeat: no-repeat;
+        mask-size: contain;
+        mask-position: center;
+
+        background-color: $button-fg-color;
+        content: '';
+    }
+}
+
 .mx_MessageComposer_formatting {
     cursor: pointer;
     margin: 0 11px;
diff --git a/res/css/views/rooms/_NewRoomIntro.scss b/res/css/views/rooms/_NewRoomIntro.scss
new file mode 100644
index 0000000000..4322ba341c
--- /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: 40px 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/res/css/views/rooms/_RoomHeader.scss b/res/css/views/rooms/_RoomHeader.scss
index d240877507..387d1588a3 100644
--- a/res/css/views/rooms/_RoomHeader.scss
+++ b/res/css/views/rooms/_RoomHeader.scss
@@ -241,10 +241,30 @@ limitations under the License.
     width: 26px;
 }
 
+.mx_RoomHeader_appsButton::before {
+    mask-image: url('$(res)/img/element-icons/room/apps.svg');
+}
+.mx_RoomHeader_appsButton_highlight::before {
+    background-color: $accent-color;
+}
+
 .mx_RoomHeader_searchButton::before {
     mask-image: url('$(res)/img/element-icons/room/search-inset.svg');
 }
 
+.mx_RoomHeader_voiceCallButton::before {
+    mask-image: url('$(res)/img/element-icons/call/voice-call.svg');
+
+    // The call button SVG is padded slightly differently, so match it up to the size
+    // of the other icons
+    mask-size: 20px;
+    mask-position: center;
+}
+
+.mx_RoomHeader_videoCallButton::before {
+    mask-image: url('$(res)/img/element-icons/call/video-call.svg');
+}
+
 .mx_RoomHeader_showPanel {
     height: 16px;
 }
diff --git a/res/css/views/rooms/_RoomList.scss b/res/css/views/rooms/_RoomList.scss
index 78e7307bc0..d49ed4b736 100644
--- a/res/css/views/rooms/_RoomList.scss
+++ b/res/css/views/rooms/_RoomList.scss
@@ -19,11 +19,17 @@ limitations under the License.
 }
 
 .mx_RoomList_iconPlus::before {
-    mask-image: url('$(res)/img/element-icons/roomlist/plus.svg');
+    mask-image: url('$(res)/img/element-icons/roomlist/plus-circle.svg');
+}
+.mx_RoomList_iconHash::before {
+    mask-image: url('$(res)/img/element-icons/roomlist/hash-circle.svg');
 }
 .mx_RoomList_iconExplore::before {
     mask-image: url('$(res)/img/element-icons/roomlist/explore.svg');
 }
+.mx_RoomList_iconDialpad::before {
+    mask-image: url('$(res)/img/element-icons/roomlist/dialpad.svg');
+}
 
 .mx_RoomList_explorePrompt {
     margin: 4px 12px 4px;
@@ -33,7 +39,6 @@ limitations under the License.
 
     div:first-child {
         font-weight: $font-semi-bold;
-        margin-bottom: 8px;
     }
 
     .mx_AccessibleButton {
@@ -41,6 +46,9 @@ limitations under the License.
         position: relative;
         padding: 0 0 0 24px;
         font-size: inherit;
+        margin-top: 8px;
+        display: block;
+        text-align: start;
 
         &::before {
             content: '';
@@ -53,6 +61,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/res/css/views/rooms/_RoomSublist.scss b/res/css/views/rooms/_RoomSublist.scss
index 543940fb78..92a475694e 100644
--- a/res/css/views/rooms/_RoomSublist.scss
+++ b/res/css/views/rooms/_RoomSublist.scss
@@ -59,10 +59,6 @@ limitations under the License.
                 width: calc(100% - 22px);
             }
 
-            &.mx_RoomSublist_headerContainer_stickyBottom {
-                bottom: 0;
-            }
-
             // We don't have a top style because the top is dependent on the room list header's
             // height, and is therefore calculated in JS.
             // The class, mx_RoomSublist_headerContainer_stickyTop, is applied though.
@@ -201,6 +197,9 @@ limitations under the License.
 
         .mx_RoomSublist_resizerHandles {
             flex: 0 0 4px;
+            display: flex;
+            justify-content: center;
+            width: 100%;
         }
 
         // Class name comes from the ResizableBox component
@@ -211,17 +210,12 @@ limitations under the License.
             border-radius: 3px;
 
             // Override styles from library
-            width: unset !important;
+            max-width: 64px;
             height: 4px !important; // Update RESIZE_HANDLE_HEIGHT if this changes
 
             // This is positioned directly below the 'show more' button.
-            position: absolute;
+            position: relative !important;
             bottom: 0 !important; // override from library
-
-            // Together, these make the bar 64px wide
-            // These are also overridden from the library
-            left: calc(50% - 32px) !important;
-            right: calc(50% - 32px) !important;
         }
 
         &:hover, &.mx_RoomSublist_hasMenuOpen {
@@ -387,3 +381,22 @@ limitations under the License.
 .mx_RoomSublist_addRoomTooltip {
     margin-top: -3px;
 }
+
+.mx_RoomSublist_skeletonUI {
+    position: relative;
+    margin-left: 4px;
+    height: 288px;
+
+    &::before {
+        background: $roomsublist-skeleton-ui-bg;
+
+        width: 100%;
+        height: 100%;
+
+        content: '';
+        position: absolute;
+        mask-repeat: repeat-y;
+        mask-size: auto 48px;
+        mask-image: url('$(res)/img/element-icons/roomlist/skeleton-ui.svg');
+    }
+}
diff --git a/res/css/views/rooms/_Stickers.scss b/res/css/views/rooms/_Stickers.scss
index d99276b70a..da86797f42 100644
--- a/res/css/views/rooms/_Stickers.scss
+++ b/res/css/views/rooms/_Stickers.scss
@@ -16,9 +16,13 @@
         border-bottom: none;
     }
 
+    .mx_AppTileMenuBar {
+        padding: 0;
+    }
+
     iframe {
         // Sticker picker depends on the fixed height previously used for all tiles
-        height: 273px;
+        height: 283px; // height of the popout minus the AppTile menu bar
     }
 }
 
diff --git a/res/css/views/settings/_Notifications.scss b/res/css/views/settings/_Notifications.scss
index e6d09b9a2a..77a7bc5b68 100644
--- a/res/css/views/settings/_Notifications.scss
+++ b/res/css/views/settings/_Notifications.scss
@@ -64,6 +64,7 @@ limitations under the License.
 
 .mx_UserNotifSettings_notifTable {
     display: table;
+    position: relative;
 }
 
 .mx_UserNotifSettings_notifTable .mx_Spinner {
diff --git a/res/css/views/settings/_ProfileSettings.scss b/res/css/views/settings/_ProfileSettings.scss
index 732cbedf02..4cbcb8e708 100644
--- a/res/css/views/settings/_ProfileSettings.scss
+++ b/res/css/views/settings/_ProfileSettings.scss
@@ -14,6 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+.mx_ProfileSettings_controls_topic {
+    & > textarea {
+        resize: vertical;
+    }
+}
+
 .mx_ProfileSettings_profile {
     display: flex;
 }
diff --git a/res/css/views/auth/_ServerConfig.scss b/res/css/views/settings/_SpellCheckLanguages.scss
similarity index 57%
rename from res/css/views/auth/_ServerConfig.scss
rename to res/css/views/settings/_SpellCheckLanguages.scss
index a7e0057ab3..bb322c983f 100644
--- a/res/css/views/auth/_ServerConfig.scss
+++ b/res/css/views/settings/_SpellCheckLanguages.scss
@@ -1,6 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2021 Šimon Brandner <simon.bra.ag@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,21 +14,22 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_ServerConfig_help:link {
-    opacity: 0.8;
+.mx_ExistingSpellCheckLanguage {
+    display: flex;
+    align-items: center;
+    margin-bottom: 5px;
 }
 
-.mx_ServerConfig_error {
-    display: block;
-    color: $warning-color;
+.mx_ExistingSpellCheckLanguage_language {
+    flex: 1;
+    margin-right: 10px;
 }
 
-.mx_ServerConfig_identityServer {
-    transform: scaleY(0);
-    transform-origin: top;
-    transition: transform 0.25s;
-
-    &.mx_ServerConfig_identityServer_shown {
-        transform: scaleY(1);
-    }
+.mx_GeneralUserSettingsTab_spellCheckLanguageInput {
+    margin-top: 1em;
+    margin-bottom: 1em;
+}
+
+.mx_SpellCheckLanguages {
+    @mixin mx_Settings_fullWidthField;
 }
diff --git a/res/css/views/spaces/_SpaceBasicSettings.scss b/res/css/views/spaces/_SpaceBasicSettings.scss
new file mode 100644
index 0000000000..204ccab2b7
--- /dev/null
+++ b/res/css/views/spaces/_SpaceBasicSettings.scss
@@ -0,0 +1,86 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_SpaceBasicSettings {
+    .mx_Field {
+        margin: 32px 0;
+    }
+
+    .mx_SpaceBasicSettings_avatarContainer {
+        display: flex;
+        margin-top: 24px;
+
+        .mx_SpaceBasicSettings_avatar {
+            position: relative;
+            height: 80px;
+            width: 80px;
+            background-color: $tertiary-fg-color;
+            border-radius: 16px;
+        }
+
+        img.mx_SpaceBasicSettings_avatar {
+            width: 80px;
+            height: 80px;
+            object-fit: cover;
+            border-radius: 16px;
+        }
+
+        // only show it when the button is a div and not an img (has avatar)
+        div.mx_SpaceBasicSettings_avatar {
+            cursor: pointer;
+
+            &::before {
+                content: "";
+                position: absolute;
+                height: 80px;
+                width: 80px;
+                top: 0;
+                left: 0;
+                background-color: #ffffff; // white icon fill
+                mask-repeat: no-repeat;
+                mask-position: center;
+                mask-size: 20px;
+                mask-image: url('$(res)/img/element-icons/camera.svg');
+            }
+        }
+
+        > input[type="file"] {
+            display: none;
+        }
+
+        > .mx_AccessibleButton_kind_link {
+            display: inline-block;
+            padding: 0;
+            margin: auto 16px;
+            color: #368bd6;
+        }
+
+        > .mx_SpaceBasicSettings_avatar_remove {
+            color: $notice-primary-color;
+        }
+    }
+
+    .mx_FormButton {
+        padding: 8px 22px;
+        margin-left: auto;
+        display: block;
+        width: min-content;
+    }
+
+    .mx_AccessibleButton_disabled {
+        cursor: not-allowed;
+    }
+}
diff --git a/res/css/views/spaces/_SpaceCreateMenu.scss b/res/css/views/spaces/_SpaceCreateMenu.scss
new file mode 100644
index 0000000000..2a11ec9f23
--- /dev/null
+++ b/res/css/views/spaces/_SpaceCreateMenu.scss
@@ -0,0 +1,138 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// TODO: the space panel currently does not have a fixed width,
+// just the headers at each level have a max-width of 150px
+// so this will look slightly off for now. We should probably use css grid for the whole main layout...
+$spacePanelWidth: 200px;
+
+.mx_SpaceCreateMenu_wrapper {
+    // background blur everything except SpacePanel
+    .mx_ContextualMenu_background {
+        background-color: $dialog-backdrop-color;
+        opacity: 0.6;
+        left: $spacePanelWidth;
+    }
+
+    .mx_ContextualMenu {
+        padding: 24px;
+        width: 480px;
+        box-sizing: border-box;
+        background-color: $primary-bg-color;
+
+        > div {
+            > h2 {
+                font-weight: $font-semi-bold;
+                font-size: $font-18px;
+                margin-top: 4px;
+            }
+
+            > p {
+                font-size: $font-15px;
+                color: $secondary-fg-color;
+                margin: 0;
+            }
+        }
+
+        .mx_SpaceCreateMenuType {
+            position: relative;
+            padding: 16px 32px 16px 72px;
+            width: 432px;
+            box-sizing: border-box;
+            border-radius: 8px;
+            border: 1px solid $input-darker-bg-color;
+            font-size: $font-15px;
+            margin: 20px 0;
+
+            > h3 {
+                font-weight: $font-semi-bold;
+                margin: 0 0 4px;
+            }
+
+            > span {
+                color: $secondary-fg-color;
+            }
+
+            &::before {
+                position: absolute;
+                content: '';
+                width: 32px;
+                height: 32px;
+                top: 24px;
+                left: 20px;
+                mask-position: center;
+                mask-repeat: no-repeat;
+                mask-size: 32px;
+                background-color: $tertiary-fg-color;
+            }
+
+            &:hover {
+                border-color: $accent-color;
+
+                &::before {
+                    background-color: $accent-color;
+                }
+
+                > span {
+                    color: $primary-fg-color;
+                }
+            }
+        }
+
+        .mx_SpaceCreateMenuType_public::before {
+            mask-image: url('$(res)/img/globe.svg');
+            mask-size: 26px;
+        }
+        .mx_SpaceCreateMenuType_private::before {
+            mask-image: url('$(res)/img/element-icons/lock.svg');
+        }
+
+        .mx_SpaceCreateMenu_back {
+            width: 28px;
+            height: 28px;
+            position: relative;
+            background-color: $theme-button-bg-color;
+            border-radius: 14px;
+            margin-bottom: 12px;
+
+            &::before {
+                content: "";
+                position: absolute;
+                height: 28px;
+                width: 28px;
+                top: 0;
+                left: 0;
+                background-color: $muted-fg-color;
+                transform: rotate(90deg);
+                mask-repeat: no-repeat;
+                mask-position: 2px 3px;
+                mask-size: 24px;
+                mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
+            }
+        }
+
+        .mx_FormButton {
+            padding: 8px 22px;
+            margin-left: auto;
+            display: block;
+            width: min-content;
+        }
+
+        .mx_AccessibleButton_disabled {
+            cursor: not-allowed;
+        }
+    }
+}
diff --git a/res/css/views/spaces/_SpacePublicShare.scss b/res/css/views/spaces/_SpacePublicShare.scss
new file mode 100644
index 0000000000..9ba0549ae3
--- /dev/null
+++ b/res/css/views/spaces/_SpacePublicShare.scss
@@ -0,0 +1,60 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_SpacePublicShare {
+    .mx_AccessibleButton {
+        border: 1px solid $space-button-outline-color;
+        box-sizing: border-box;
+        border-radius: 8px;
+        padding: 12px 24px 12px 52px;
+        margin-top: 16px;
+        width: $SpaceRoomViewInnerWidth;
+        font-size: $font-15px;
+        line-height: $font-24px;
+        position: relative;
+        display: flex;
+
+        > span {
+            color: #368bd6;
+            margin-left: auto;
+        }
+
+        &:hover {
+            background-color: rgba(141, 151, 165, 0.1);
+        }
+
+        &::before {
+            content: "";
+            position: absolute;
+            width: 30px;
+            height: 30px;
+            mask-repeat: no-repeat;
+            mask-size: contain;
+            mask-position: center;
+            background: $muted-fg-color;
+            left: 12px;
+            top: 9px;
+        }
+
+        &.mx_SpacePublicShare_shareButton::before {
+            mask-image: url('$(res)/img/element-icons/link.svg');
+        }
+
+        &.mx_SpacePublicShare_inviteButton::before {
+            mask-image: url('$(res)/img/element-icons/room/invite.svg');
+        }
+    }
+}
diff --git a/src/RoomListSorter.js b/res/css/views/toasts/_AnalyticsToast.scss
similarity index 57%
rename from src/RoomListSorter.js
rename to res/css/views/toasts/_AnalyticsToast.scss
index 0ff37a6af2..fdbe7f1c76 100644
--- a/src/RoomListSorter.js
+++ b/res/css/views/toasts/_AnalyticsToast.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket 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.
@@ -14,18 +14,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
+.mx_AnalyticsToast {
+    .mx_AccessibleButton_kind_danger {
+        background: none;
+        color: $accent-color;
+    }
 
-function tsOfNewestEvent(room) {
-    if (room.timeline.length) {
-        return room.timeline[room.timeline.length - 1].getTs();
-    } else {
-        return Number.MAX_SAFE_INTEGER;
+    .mx_AccessibleButton_kind_primary {
+        background: $accent-color;
+        color: #ffffff;
     }
 }
-
-export function mostRecentActivityFirst(roomList) {
-    return roomList.sort(function(a, b) {
-        return tsOfNewestEvent(b) - tsOfNewestEvent(a);
-    });
-}
diff --git a/res/css/views/voip/_CallContainer.scss b/res/css/views/voip/_CallContainer.scss
index 759797ae7b..8262075559 100644
--- a/res/css/views/voip/_CallContainer.scss
+++ b/res/css/views/voip/_CallContainer.scss
@@ -18,10 +18,7 @@ limitations under the License.
     position: absolute;
     right: 20px;
     bottom: 72px;
-    border-radius: 8px;
-    overflow: hidden;
     z-index: 100;
-    box-shadow: 0px 14px 24px rgba(0, 0, 0, 0.08);
 
     // Disable pointer events for Jitsi widgets to function. Direct
     // calls have their own cursor and behaviour, but we need to make
@@ -33,11 +30,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;
         }
@@ -49,8 +46,10 @@ limitations under the License.
 
     .mx_IncomingCallBox {
         min-width: 250px;
-        background-color: $primary-bg-color;
+        background-color: $voipcall-plinth-color;
         padding: 8px;
+        box-shadow: 0px 14px 24px rgba(0, 0, 0, 0.08);
+        border-radius: 8px;
 
         pointer-events: initial; // restore pointer events so the user can accept/decline
         cursor: pointer;
diff --git a/res/css/views/voip/_CallView.scss b/res/css/views/voip/_CallView.scss
index f6f3d40308..7eb329594a 100644
--- a/res/css/views/voip/_CallView.scss
+++ b/res/css/views/voip/_CallView.scss
@@ -15,80 +15,357 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_CallView_voice {
-    background-color: $accent-color;
-    color: $accent-fg-color;
-    cursor: pointer;
-    padding: 6px;
-    font-weight: bold;
-
+.mx_CallView {
     border-radius: 8px;
-    min-width: 200px;
+    background-color: $voipcall-plinth-color;
+    padding-left: 8px;
+    padding-right: 8px;
+    // XXX: CallContainer sets pointer-events: none - should probably be set back in a better place
+    pointer-events: initial;
+}
 
-    display: flex;
-    align-items: center;
+.mx_CallView_large {
+    padding-bottom: 10px;
+    margin: 5px 5px 5px 18px;
 
-    img {
-        margin: 4px;
-        margin-right: 10px;
-    }
-
-    > div {
-        display: flex;
-        flex-direction: column;
-        // Hacky vertical align
-        padding-top: 3px;
-    }
-
-    > div > p,
-    > div > h1 {
-        padding: 0;
-        margin: 0;
-        font-size: $font-13px;
-        line-height: $font-15px;
-    }
-
-    > div > p {
-        font-weight: bold;
-    }
-
-    > * {
-        flex-grow: 0;
-        flex-shrink: 0;
+    .mx_CallView_voice {
+        height: 360px;
     }
 }
 
-.mx_CallView_hangup {
+.mx_CallView_pip {
+    width: 320px;
+    padding-bottom: 8px;
+    margin-top: 10px;
+    box-shadow: 0px 14px 24px rgba(0, 0, 0, 0.08);
+    border-radius: 8px;
+
+    .mx_CallView_voice {
+        height: 180px;
+    }
+
+    .mx_CallView_callControls {
+        bottom: 0px;
+    }
+
+    .mx_CallView_callControls_button {
+        &::before {
+            width: 36px;
+            height: 36px;
+        }
+    }
+
+    .mx_CallView_voice_holdText {
+        padding-top: 10px;
+        padding-bottom: 25px;
+    }
+}
+
+.mx_CallView_voice {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    background-color: $inverted-bg-color;
+    border-radius: 8px;
+}
+
+.mx_CallView_voice_avatarsContainer {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+    div {
+        margin-left: 12px;
+        margin-right: 12px;
+    }
+}
+
+.mx_CallView_voice_hold {
+    // This masks the avatar image so when it's blurred, the edge is still crisp
+    .mx_CallView_voice_avatarContainer {
+        border-radius: 2000px;
+        overflow: hidden;
+        position: relative;
+    }
+}
+
+.mx_CallView_voice_holdText {
+    height: 20px;
+    padding-top: 20px;
+    padding-bottom: 15px;
+    color: $accent-fg-color;
+    .mx_AccessibleButton_hasKind {
+        padding: 0px;
+        font-weight: bold;
+    }
+}
+
+.mx_CallView_video {
+    width: 100%;
+    position: relative;
+    z-index: 30;
+    border-radius: 8px;
+    overflow: hidden;
+}
+
+.mx_CallView_video_hold {
+    overflow: hidden;
+
+    // we keep these around in the DOM: it saved wiring them up again when the call
+    // is resumed and keeps the container the right size
+    .mx_VideoFeed {
+        visibility: hidden;
+    }
+}
+
+.mx_CallView_video_holdBackground {
     position: absolute;
+    width: 100%;
+    height: 100%;
+    left: 0;
+    right: 0;
+    background-repeat: no-repeat;
+    background-size: cover;
+    background-position: center;
+    filter: blur(20px);
+    &::after {
+        content: '';
+        display: block;
+        position: absolute;
+        width: 100%;
+        height: 100%;
+        left: 0;
+        right: 0;
+        background-color: rgba(0, 0, 0, 0.6);
+    }
+}
 
-    right: 8px;
-    bottom: 10px;
+.mx_CallView_video_holdContent {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    font-weight: bold;
+    color: $accent-fg-color;
+    text-align: center;
 
-    height: 35px;
-    width: 35px;
+    &::before {
+        display: block;
+        margin-left: auto;
+        margin-right: auto;
+        content: '';
+        width: 40px;
+        height: 40px;
+        background-image: url('$(res)/img/voip/paused.svg');
+        background-position: center;
+        background-size: cover;
+    }
+    .mx_CallView_pip &::before {
+        width: 30px;
+        height: 30px;
+    }
+    .mx_AccessibleButton_hasKind {
+        padding: 0px;
+    }
+}
 
-    border-radius: 35px;
+.mx_CallView_header {
+    height: 44px;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: left;
+}
 
-    background-color: $notice-primary-color;
+.mx_CallView_header_callType {
+    font-size: 1.2rem;
+    font-weight: bold;
+    vertical-align: middle;
+}
 
-    z-index: 101;
+.mx_CallView_header_secondaryCallInfo {
+    &::before {
+        content: '·';
+        margin-left: 6px;
+        margin-right: 6px;
+    }
+}
 
+.mx_CallView_header_controls {
+    margin-left: auto;
+}
+
+.mx_CallView_header_button {
+    display: inline-block;
+    vertical-align: middle;
     cursor: pointer;
 
     &::before {
         content: '';
-        position: absolute;
-
+        display: inline-block;
         height: 20px;
         width: 20px;
-
-        top: 6.5px;
-        left: 7.5px;
-
-        mask: url('$(res)/img/hangup.svg');
+        vertical-align: middle;
+        background-color: $secondary-fg-color;
+        mask-repeat: no-repeat;
         mask-size: contain;
-        background-size: contain;
-
-        background-color: $primary-fg-color;
+        mask-position: center;
     }
 }
+
+.mx_CallView_header_button_fullscreen {
+    &::before {
+        mask-image: url('$(res)/img/element-icons/call/fullscreen.svg');
+    }
+}
+
+.mx_CallView_header_button_expand {
+    &::before {
+        mask-image: url('$(res)/img/element-icons/call/expand.svg');
+    }
+}
+
+.mx_CallView_header_callInfo {
+    margin-left: 12px;
+    margin-right: 16px;
+}
+
+.mx_CallView_header_roomName {
+    font-weight: bold;
+    font-size: 12px;
+    line-height: initial;
+    height: 15px;
+}
+
+.mx_CallView_secondaryCall_roomName {
+    margin-left: 4px;
+}
+
+.mx_CallView_header_callTypeSmall {
+    font-size: 12px;
+    color: $secondary-fg-color;
+    line-height: initial;
+    height: 15px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    max-width: 240px;
+}
+
+.mx_CallView_header_phoneIcon {
+    display: inline-block;
+    margin-right: 6px;
+    height: 16px;
+    width: 16px;
+    vertical-align: middle;
+
+    &::before {
+        content: '';
+        display: inline-block;
+        vertical-align: top;
+
+        height: 16px;
+        width: 16px;
+        background-color: $warning-color;
+        mask-repeat: no-repeat;
+        mask-size: contain;
+        mask-position: center;
+        mask-image: url('$(res)/img/element-icons/call/voice-call.svg');
+    }
+}
+
+.mx_CallView_callControls {
+    position: absolute;
+    display: flex;
+    justify-content: center;
+    bottom: 5px;
+    width: 100%;
+    opacity: 1;
+    transition: opacity 0.5s;
+}
+
+.mx_CallView_callControls_hidden {
+    opacity: 0.001; // opacity 0 can cause a re-layout
+    pointer-events: none;
+}
+
+.mx_CallView_callControls_button {
+    cursor: pointer;
+    margin-left: 8px;
+    margin-right: 8px;
+
+
+    &::before {
+        content: '';
+        display: inline-block;
+
+        height: 48px;
+        width: 48px;
+
+        background-repeat: no-repeat;
+        background-size: contain;
+        background-position: center;
+    }
+}
+
+.mx_CallView_callControls_dialpad {
+    margin-right: auto;
+    &::before {
+        background-image: url('$(res)/img/voip/dialpad.svg');
+    }
+}
+
+.mx_CallView_callControls_button_dialpad_hidden {
+    margin-right: auto;
+    cursor: initial;
+}
+
+.mx_CallView_callControls_button_micOn {
+    &::before {
+        background-image: url('$(res)/img/voip/mic-on.svg');
+    }
+}
+
+.mx_CallView_callControls_button_micOff {
+    &::before {
+        background-image: url('$(res)/img/voip/mic-off.svg');
+    }
+}
+
+.mx_CallView_callControls_button_vidOn {
+    &::before {
+        background-image: url('$(res)/img/voip/vid-on.svg');
+    }
+}
+
+.mx_CallView_callControls_button_vidOff {
+    &::before {
+        background-image: url('$(res)/img/voip/vid-off.svg');
+    }
+}
+
+.mx_CallView_callControls_button_hangup {
+    &::before {
+        background-image: url('$(res)/img/voip/hangup.svg');
+    }
+}
+
+.mx_CallView_callControls_button_more {
+    margin-left: auto;
+    &::before {
+        background-image: url('$(res)/img/voip/more.svg');
+    }
+}
+
+.mx_CallView_callControls_button_more_hidden {
+    margin-left: auto;
+    cursor: initial;
+}
+
+.mx_CallView_callControls_button_invisible {
+    visibility: hidden;
+    pointer-events: none;
+    position: absolute;
+}
diff --git a/res/css/views/voip/_DialPad.scss b/res/css/views/voip/_DialPad.scss
new file mode 100644
index 0000000000..0c7bff0ce8
--- /dev/null
+++ b/res/css/views/voip/_DialPad.scss
@@ -0,0 +1,62 @@
+/*
+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_DialPad {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    gap: 16px;
+}
+
+.mx_DialPad_button {
+    width: 40px;
+    height: 40px;
+    background-color: $theme-button-bg-color;
+    border-radius: 40px;
+    font-size: 18px;
+    font-weight: 600;
+    text-align: center;
+    vertical-align: middle;
+    line-height: 40px;
+}
+
+.mx_DialPad_deleteButton, .mx_DialPad_dialButton {
+    &::before {
+        content: '';
+        display: inline-block;
+        height: 40px;
+        width: 40px;
+        vertical-align: middle;
+        mask-repeat: no-repeat;
+        mask-size: 20px;
+        mask-position: center;
+        background-color: $primary-bg-color;
+    }
+}
+
+.mx_DialPad_deleteButton {
+    background-color: $notice-primary-color;
+    &::before {
+        mask-image: url('$(res)/img/element-icons/call/delete.svg');
+        mask-position: 9px; // delete icon is right-heavy so have to be slightly to the left to look centered
+    }
+}
+
+.mx_DialPad_dialButton {
+    background-color: $accent-color;
+    &::before {
+        mask-image: url('$(res)/img/element-icons/call/voice-call.svg');
+    }
+}
diff --git a/res/css/views/voip/_DialPadContextMenu.scss b/res/css/views/voip/_DialPadContextMenu.scss
new file mode 100644
index 0000000000..520f51cf93
--- /dev/null
+++ b/res/css/views/voip/_DialPadContextMenu.scss
@@ -0,0 +1,47 @@
+/*
+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_DialPadContextMenu_header {
+    margin-top: 12px;
+    margin-left: 12px;
+    margin-right: 12px;
+}
+
+.mx_DialPadContextMenu_title {
+    color: $muted-fg-color;
+    font-size: 12px;
+    font-weight: 600;
+}
+
+.mx_DialPadContextMenu_dialled {
+    height: 1em;
+    font-size: 18px;
+    font-weight: 600;
+}
+
+.mx_DialPadContextMenu_dialPad {
+    margin: 16px;
+}
+
+.mx_DialPadContextMenu_horizSep {
+    position: relative;
+    &::before {
+        content: '';
+        position: absolute;
+        width: 100%;
+        border-bottom: 1px solid $input-darker-bg-color;
+    }
+}
diff --git a/res/css/views/voip/_DialPadModal.scss b/res/css/views/voip/_DialPadModal.scss
new file mode 100644
index 0000000000..f9d7673a38
--- /dev/null
+++ b/res/css/views/voip/_DialPadModal.scss
@@ -0,0 +1,74 @@
+/*
+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_Dialog_dialPadWrapper .mx_Dialog {
+    padding: 0px;
+}
+
+.mx_DialPadModal {
+    width: 192px;
+    height: 368px;
+}
+
+.mx_DialPadModal_header {
+    margin-top: 12px;
+    margin-left: 12px;
+    margin-right: 12px;
+}
+
+.mx_DialPadModal_title {
+    color: $muted-fg-color;
+    font-size: 12px;
+    font-weight: 600;
+}
+
+.mx_DialPadModal_cancel {
+    float: right;
+    mask: url('$(res)/img/feather-customised/cancel.svg');
+    mask-repeat: no-repeat;
+    mask-position: center;
+    mask-size: cover;
+    width: 14px;
+    height: 14px;
+    background-color: $dialog-close-fg-color;
+    cursor: pointer;
+}
+
+.mx_DialPadModal_field {
+    border: none;
+    margin: 0px;
+}
+
+.mx_DialPadModal_field input {
+    font-size: 18px;
+    font-weight: 600;
+}
+
+.mx_DialPadModal_dialPad {
+    margin-left: 16px;
+    margin-right: 16px;
+    margin-top: 16px;
+}
+
+.mx_DialPadModal_horizSep {
+    position: relative;
+    &::before {
+        content: '';
+        position: absolute;
+        width: 100%;
+        border-bottom: 1px solid $input-darker-bg-color;
+    }
+}
diff --git a/res/css/views/voip/_VideoView.scss b/res/css/views/voip/_VideoFeed.scss
similarity index 63%
rename from res/css/views/voip/_VideoView.scss
rename to res/css/views/voip/_VideoFeed.scss
index feb60f4763..3e473a80b2 100644
--- a/res/css/views/voip/_VideoView.scss
+++ b/res/css/views/voip/_VideoFeed.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
+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.
@@ -14,36 +14,23 @@ 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 {
+.mx_VideoFeed_remote {
     width: 100%;
+    max-height: 100%;
     background-color: #000;
     z-index: 50;
 }
 
-.mx_VideoView_localVideoFeed {
+.mx_VideoFeed_local {
     width: 25%;
     height: 25%;
     position: absolute;
-    left: 10px;
-    bottom: 10px;
+    right: 10px;
+    top: 10px;
     z-index: 100;
+    border-radius: 4px;
 }
 
-.mx_VideoView_localVideoFeed video {
-    width: auto;
-    height: 100%;
-}
-
-.mx_VideoView_localVideoFeed.mx_VideoView_localVideoFeed_flipped video {
+.mx_VideoFeed_mirror {
     transform: scale(-1, 1);
 }
diff --git a/res/img/element-icons/brands/apple.svg b/res/img/element-icons/brands/apple.svg
new file mode 100644
index 0000000000..308c3c5d5a
--- /dev/null
+++ b/res/img/element-icons/brands/apple.svg
@@ -0,0 +1,3 @@
+<svg width="25" height="24" viewBox="0 0 25 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.9803 1.2796C17.0771 2.54383 16.6773 3.79601 15.8657 4.77022C15.0784 5.74949 13.8854 6.31354 12.629 6.3006C12.5491 5.07276 12.9605 3.86352 13.7727 2.93921C14.5952 2.00238 15.7404 1.40982 16.9803 1.2796ZM20.9539 8.70795C19.5086 9.59652 18.6192 11.1635 18.5974 12.86C18.5994 14.7794 19.7489 16.5115 21.5166 17.2592C21.1766 18.3636 20.6642 19.4073 19.9982 20.3517C19.1038 21.6896 18.1661 22.9967 16.6777 23.0208C15.9698 23.0372 15.492 22.8336 14.9941 22.6215C14.4747 22.4003 13.9335 22.1697 13.0867 22.1697C12.1885 22.1697 11.6231 22.4077 11.0778 22.6372C10.6065 22.8355 10.1503 23.0275 9.50727 23.0542C8.08982 23.1067 7.00654 21.6263 6.07964 20.3009C4.22703 17.5943 2.78444 12.6733 4.71844 9.32483C5.62662 7.69286 7.32468 6.65727 9.19136 6.59696C9.99528 6.58042 10.7667 6.89028 11.443 7.16193C11.9602 7.36969 12.4219 7.5551 12.7999 7.5551C13.1321 7.5551 13.5809 7.37701 14.1038 7.16946C14.9276 6.84251 15.9356 6.44246 16.9628 6.55027C18.5589 6.60021 20.038 7.39984 20.9539 8.70795Z" fill="#17191C"/>
+</svg>
diff --git a/res/img/element-icons/brands/element.svg b/res/img/element-icons/brands/element.svg
new file mode 100644
index 0000000000..6861de0955
--- /dev/null
+++ b/res/img/element-icons/brands/element.svg
@@ -0,0 +1,6 @@
+<svg width="17" height="17" viewBox="0 0 17 17" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.12012 1.02C6.12012 0.45667 6.57679 0 7.14012 0C10.8957 0 13.9401 3.04446 13.9401 6.8C13.9401 7.36333 13.4834 7.82 12.9201 7.82C12.3568 7.82 11.9001 7.36333 11.9001 6.8C11.9001 4.17112 9.76899 2.04 7.14012 2.04C6.57679 2.04 6.12012 1.58333 6.12012 1.02Z" fill="#1E1E1E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.8799 15.98C10.8799 16.5433 10.4232 17 9.85988 17C6.10435 17 3.05989 13.9555 3.05989 10.2C3.05989 9.63667 3.51656 9.18 4.07989 9.18C4.64322 9.18 5.09989 9.63667 5.09989 10.2C5.09989 12.8289 7.23101 14.96 9.85988 14.96C10.4232 14.96 10.8799 15.4167 10.8799 15.98Z" fill="#1E1E1E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1.02 10.88C0.45667 10.88 -1.99617e-08 10.4233 -4.45856e-08 9.86C-2.08745e-07 6.10447 3.04446 3.06 6.8 3.06C7.36333 3.06 7.82 3.51667 7.82 4.08C7.82 4.64334 7.36333 5.1 6.8 5.1C4.17113 5.1 2.04 7.23113 2.04 9.86C2.04 10.4233 1.58333 10.88 1.02 10.88Z" fill="#1E1E1E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.98 6.12C16.5433 6.12 17 6.57666 17 7.14C17 10.8955 13.9555 13.94 10.2 13.94C9.63667 13.94 9.18 13.4833 9.18 12.92C9.18 12.3567 9.63667 11.9 10.2 11.9C12.8289 11.9 14.96 9.76887 14.96 7.14C14.96 6.57666 15.4167 6.12 15.98 6.12Z" fill="#1E1E1E"/>
+</svg>
diff --git a/res/img/element-icons/brands/facebook.svg b/res/img/element-icons/brands/facebook.svg
new file mode 100644
index 0000000000..2742785424
--- /dev/null
+++ b/res/img/element-icons/brands/facebook.svg
@@ -0,0 +1,9 @@
+<svg width="25" height="24" viewBox="0 0 25 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="mask0" mask-type="alpha" maskUnits="userSpaceOnUse" x="2" y="1" width="22" height="22">
+<path d="M2.10154 1.5H23.1003V22.3716H2.10154V1.5Z" fill="white"/>
+</mask>
+<g mask="url(#mask0)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.1 11.999C23.1 6.20003 18.399 1.49902 12.6 1.49902C6.801 1.49902 2.1 6.20003 2.1 11.999C2.1 17.2399 5.9397 21.5838 10.9594 22.3715V15.0342H8.29336V11.999H10.9594V9.68574C10.9594 7.05418 12.5269 5.60059 14.9254 5.60059C16.0742 5.60059 17.2758 5.80566 17.2758 5.80566V8.38965H15.9518C14.6474 8.38965 14.2406 9.19903 14.2406 10.0294V11.999H17.1527L16.6872 15.0342H14.2406V22.3715C19.2603 21.5838 23.1 17.2399 23.1 11.999Z" fill="#1877F2"/>
+</g>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.6872 15.0342L17.1527 11.999H14.2406V10.0294C14.2406 9.19903 14.6474 8.38965 15.9518 8.38965H17.2758V5.80566C17.2758 5.80566 16.0742 5.60059 14.9254 5.60059C12.5269 5.60059 10.9594 7.05418 10.9594 9.68574V11.999H8.29336V15.0342H10.9594V22.3715C11.494 22.4553 12.0419 22.499 12.6 22.499C13.1581 22.499 13.706 22.4553 14.2406 22.3715V15.0342H16.6872Z" fill="white"/>
+</svg>
diff --git a/res/img/element-icons/brands/github.svg b/res/img/element-icons/brands/github.svg
new file mode 100644
index 0000000000..503719520b
--- /dev/null
+++ b/res/img/element-icons/brands/github.svg
@@ -0,0 +1,3 @@
+<svg width="25" height="24" viewBox="0 0 25 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20.8421 7.10595C19.9703 5.6121 18.7876 4.42942 17.2939 3.55764C15.8 2.68581 14.169 2.25001 12.3999 2.25001C10.6311 2.25001 8.9996 2.68594 7.50597 3.55764C6.01212 4.42938 4.82953 5.6121 3.95765 7.10595C3.08592 8.59976 2.65002 10.231 2.65002 11.9997C2.65002 14.1242 3.26987 16.0346 4.50987 17.7315C5.74973 19.4284 7.35145 20.6027 9.3149 21.2543C9.54345 21.2967 9.71264 21.2669 9.82265 21.1656C9.9327 21.0641 9.98766 20.937 9.98766 20.7848C9.98766 20.7595 9.98548 20.531 9.98126 20.0993C9.9769 19.6676 9.97485 19.291 9.97485 18.9696L9.68285 19.0202C9.49667 19.0543 9.26181 19.0687 8.97826 19.0646C8.69484 19.0607 8.40061 19.031 8.09598 18.9757C7.79121 18.921 7.50775 18.7941 7.24536 18.5952C6.98311 18.3963 6.79693 18.1359 6.68688 17.8145L6.55993 17.5224C6.47531 17.3279 6.3421 17.1119 6.1601 16.875C5.97811 16.638 5.79406 16.4773 5.60789 16.3927L5.519 16.329C5.45978 16.2868 5.40482 16.2358 5.35399 16.1766C5.30321 16.1174 5.2652 16.0582 5.23981 15.9988C5.21437 15.9395 5.23545 15.8908 5.30326 15.8526C5.37107 15.8144 5.49361 15.7959 5.67143 15.7959L5.92524 15.8338C6.09451 15.8677 6.3039 15.9691 6.55366 16.1384C6.80329 16.3077 7.0085 16.5277 7.16933 16.7984C7.36408 17.1455 7.59873 17.4099 7.87392 17.5919C8.14889 17.7739 8.42613 17.8648 8.70537 17.8648C8.98461 17.8648 9.22579 17.8436 9.429 17.8015C9.63198 17.7592 9.82243 17.6955 10.0002 17.611C10.0764 17.0437 10.2838 16.6079 10.6222 16.3033C10.1399 16.2526 9.70619 16.1762 9.32099 16.0747C8.93601 15.9731 8.53818 15.8081 8.12777 15.5794C7.71714 15.3509 7.37649 15.0673 7.10574 14.7289C6.83495 14.3904 6.61271 13.9459 6.43934 13.3959C6.26588 12.8457 6.17913 12.211 6.17913 11.4916C6.17913 10.4674 6.51351 9.59578 7.18213 8.87633C6.86892 8.10629 6.89849 7.24304 7.27093 6.28668C7.51638 6.21043 7.88037 6.26765 8.36273 6.45801C8.84517 6.64845 9.1984 6.8116 9.42277 6.94686C9.64714 7.08208 9.82692 7.19666 9.96236 7.2896C10.7496 7.06963 11.562 6.95962 12.3998 6.95962C13.2377 6.95962 14.0503 7.06963 14.8376 7.2896L15.32 6.98505C15.6498 6.78185 16.0394 6.59563 16.4877 6.42635C16.9363 6.25716 17.2793 6.21056 17.5164 6.28682C17.8971 7.24322 17.931 8.10642 17.6177 8.87647C18.2863 9.59591 18.6208 10.4677 18.6208 11.4918C18.6208 12.2111 18.5337 12.8478 18.3605 13.4023C18.1871 13.9568 17.963 14.4008 17.688 14.7353C17.4127 15.0697 17.0699 15.3511 16.6595 15.5795C16.249 15.808 15.851 15.973 15.466 16.0747C15.0809 16.1763 14.6472 16.2527 14.1648 16.3035C14.6048 16.6842 14.8248 17.2851 14.8248 18.106V20.7845C14.8248 20.9367 14.8777 21.0637 14.9836 21.1652C15.0894 21.2665 15.2565 21.2964 15.485 21.2539C17.4487 20.6024 19.0505 19.4281 20.2903 17.7311C21.53 16.0343 22.15 14.1238 22.15 11.9993C22.1496 10.2309 21.7135 8.59976 20.8421 7.10595Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/brands/gitlab.svg b/res/img/element-icons/brands/gitlab.svg
new file mode 100644
index 0000000000..df84c41e21
--- /dev/null
+++ b/res/img/element-icons/brands/gitlab.svg
@@ -0,0 +1,9 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.0005 20.3296L15.3166 10.1293H8.68921L12.0005 20.3296Z" fill="#E24329"/>
+<path d="M4.04348 10.1293L3.03364 13.2283C2.94226 13.5097 3.04095 13.8203 3.28214 13.9957L11.9996 20.3296L4.04348 10.1293Z" fill="#FCA326"/>
+<path d="M4.04248 10.1289H8.68727L6.68828 3.98572C6.58597 3.67143 6.1401 3.67143 6.03411 3.98572L4.04248 10.1289Z" fill="#E24329"/>
+<path d="M19.9602 10.1293L20.9664 13.2283C21.0577 13.5097 20.9591 13.8203 20.7179 13.9957L11.9991 20.3296L19.9602 10.1293Z" fill="#FCA326"/>
+<path d="M19.9616 10.1289H15.3168L17.3121 3.98572C17.4144 3.67143 17.8603 3.67143 17.9663 3.98572L19.9616 10.1289Z" fill="#E24329"/>
+<path d="M11.9991 20.3296L15.3153 10.1293H19.9601L11.9991 20.3296Z" fill="#FC6D26"/>
+<path d="M11.9985 20.3296L4.04248 10.1293H8.68727L11.9985 20.3296Z" fill="#FC6D26"/>
+</svg>
diff --git a/res/img/element-icons/brands/google.svg b/res/img/element-icons/brands/google.svg
new file mode 100644
index 0000000000..1b0b19ae5b
--- /dev/null
+++ b/res/img/element-icons/brands/google.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M22.501 12.2333C22.501 11.37 22.4296 10.74 22.2748 10.0867H12.2153V13.9833H18.12C18.001 14.9517 17.3582 16.41 15.9296 17.3899L15.9096 17.5204L19.0902 19.9351L19.3106 19.9567C21.3343 18.125 22.501 15.43 22.501 12.2333Z" fill="#4285F4"/>
+<path d="M12.2147 22.5001C15.1075 22.5001 17.5361 21.5667 19.3099 19.9567L15.929 17.39C15.0242 18.0083 13.8099 18.44 12.2147 18.44C9.38142 18.44 6.97669 16.6083 6.11947 14.0767L5.99382 14.0871L2.68656 16.5955L2.64331 16.7133C4.40519 20.1433 8.02423 22.5001 12.2147 22.5001Z" fill="#34A853"/>
+<path d="M6.12022 14.0767C5.89403 13.4234 5.76313 12.7233 5.76313 12C5.76313 11.2767 5.89403 10.5767 6.10832 9.92337L6.10233 9.78423L2.75361 7.2356L2.64405 7.28667C1.91789 8.71002 1.50122 10.3084 1.50122 12C1.50122 13.6917 1.91789 15.29 2.64405 16.7133L6.12022 14.0767Z" fill="#FBBC05"/>
+<path d="M12.2148 5.55997C14.2267 5.55997 15.5838 6.41163 16.3576 7.12335L19.3814 4.23C17.5243 2.53834 15.1076 1.5 12.2148 1.5C8.02426 1.5 4.4052 3.85665 2.64331 7.28662L6.10759 9.92332C6.97671 7.39166 9.38146 5.55997 12.2148 5.55997Z" fill="#EB4335"/>
+</svg>
diff --git a/res/img/element-icons/brands/twitter.svg b/res/img/element-icons/brands/twitter.svg
new file mode 100644
index 0000000000..43eb825a59
--- /dev/null
+++ b/res/img/element-icons/brands/twitter.svg
@@ -0,0 +1,3 @@
+<svg width="25" height="24" viewBox="0 0 25 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.04155 21C6.6153 21 4.35363 20.2943 2.45 19.0767C4.06624 19.1813 6.91855 18.9308 8.69268 17.2386C6.0238 17.1161 4.82019 15.0692 4.6632 14.1945C4.88997 14.2819 5.97147 14.3869 6.582 14.142C3.51192 13.3722 3.04094 10.678 3.1456 9.85573C3.72124 10.2581 4.69809 10.3981 5.08185 10.3631C2.22109 8.31618 3.25027 5.23707 3.75613 4.57226C5.80911 7.4165 8.8859 9.01393 12.6923 9.10278C12.6205 8.78802 12.5826 8.46032 12.5826 8.12373C12.5826 5.70819 14.5351 3.75 16.9435 3.75C18.2019 3.75 19.3358 4.28457 20.1318 5.13963C20.9727 4.94258 22.2382 4.4813 22.8569 4.0824C22.5451 5.20208 21.5742 6.13612 20.9869 6.48231C20.9918 6.49408 20.9821 6.47048 20.9869 6.48231C21.5028 6.40428 22.8986 6.13603 23.45 5.76192C23.1773 6.39094 22.148 7.4368 21.3033 8.02232C21.4604 14.9535 16.1574 21 9.04155 21Z" fill="#1D9BF0"/>
+</svg>
diff --git a/res/img/element-icons/call/delete.svg b/res/img/element-icons/call/delete.svg
new file mode 100644
index 0000000000..133bdad4ca
--- /dev/null
+++ b/res/img/element-icons/call/delete.svg
@@ -0,0 +1,10 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path d="M18.3333 2.49951H5.83333C5.25833 2.49951 4.80833 2.79118 4.50833 3.23285L0 9.99951L4.50833 16.7578C4.80833 17.1995 5.25833 17.4995 5.83333 17.4995H18.3333C19.25 17.4995 20 16.7495 20 15.8328V4.16618C20 3.24951 19.25 2.49951 18.3333 2.49951ZM15.8333 12.9912L14.6583 14.1662L11.6667 11.1745L8.675 14.1662L7.5 12.9912L10.4917 9.99951L7.5 7.00784L8.675 5.83284L11.6667 8.82451L14.6583 5.83284L15.8333 7.00784L12.8417 9.99951L15.8333 12.9912Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0">
+<rect width="20" height="20" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/res/img/element-icons/call/expand.svg b/res/img/element-icons/call/expand.svg
new file mode 100644
index 0000000000..91ef4d8a76
--- /dev/null
+++ b/res/img/element-icons/call/expand.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6 19H18C18.55 19 19 18.55 19 18V6C19 5.45 18.55 5 18 5H13C12.45 5 12 4.55 12 4C12 3.45 12.45 3 13 3H19C20.11 3 21 3.9 21 5V19C21 20.1 20.1 21 19 21H5C3.9 21 3 20.1 3 19V13C3 12.45 3.45 12 4 12C4.55 12 5 12.45 5 13V18C5 18.55 5.45 19 6 19ZM10 4C10 4.55 9.55 5 9 5H6.41L15.54 14.13C15.93 14.52 15.93 15.15 15.54 15.54C15.15 15.93 14.52 15.93 14.13 15.54L5 6.41V9C5 9.55 4.55 10 4 10C3.45 10 3 9.55 3 9V4C3 3.44772 3.44772 3 4 3H9C9.55 3 10 3.45 10 4Z" fill="#737D8C"/>
+</svg>
diff --git a/res/img/element-icons/call/video-muted.svg b/res/img/element-icons/call/video-muted.svg
deleted file mode 100644
index d2aea71d11..0000000000
--- a/res/img/element-icons/call/video-muted.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M1 2L19 20" stroke="white" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M3 4H4.41122L17 16.615V19.415C16.9914 19.4057 16.9825 19.3965 16.9735 19.3874L1.98909 4.37176C1.93823 4.32079 1.88324 4.27646 1.82519 4.23876C2.18599 4.08505 2.58306 4 3 4ZM0.386676 5.52565C0.140502 5.96107 0 6.46413 0 7V17C0 18.6569 1.34315 20 3 20H14.7593L0.573407 5.78449C0.495634 5.70656 0.433392 5.619 0.386676 5.52565ZM17 7V13.7837L7.2367 4H14C15.6569 4 17 5.34315 17 7Z" fill="white"/>
-<path d="M19 9L22.3753 6.29976C23.0301 5.77595 24 6.24212 24 7.08062V16.9194C24 17.7579 23.0301 18.2241 22.3753 17.7002L19 15V9Z" fill="white"/>
-</svg>
diff --git a/res/img/element-icons/call/voice-muted.svg b/res/img/element-icons/call/voice-muted.svg
deleted file mode 100644
index 32abafb04a..0000000000
--- a/res/img/element-icons/call/voice-muted.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3 3L21 21" stroke="white" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8 6.59209V12C8 14.2091 9.79086 16 12 16C13.4616 16 14.7402 15.216 15.4381 14.0457L8 6.59209ZM16.8804 15.491C15.7918 17.0102 14.0115 18 12 18C8.68629 18 6 15.3137 6 12C6 11.4477 5.55228 11 5 11C4.44772 11 4 11.4477 4 12C4 16.0796 7.05369 19.446 11 19.9381V21C11 21.5523 11.4477 22 12 22C12.5523 22 13 21.5523 13 21V19.9381C15.1511 19.6699 17.037 18.5476 18.3077 16.9213L16.8804 15.491ZM19.3589 15.1433L17.7917 13.5729C17.9275 13.0716 18 12.5443 18 12C18 11.4477 18.4477 11 19 11C19.5523 11 20 11.4477 20 12C20 13.1159 19.7715 14.1783 19.3589 15.1433ZM16 11.7774L8.43077 4.19238C9.09091 2.89149 10.4413 2 12 2C14.2091 2 16 3.79086 16 6V11.7774Z" fill="white"/>
-</svg>
diff --git a/res/img/element-icons/call/voice-unmuted.svg b/res/img/element-icons/call/voice-unmuted.svg
deleted file mode 100644
index e664080217..0000000000
--- a/res/img/element-icons/call/voice-unmuted.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8 6C8 3.79086 9.79086 2 12 2C14.2091 2 16 3.79086 16 6V12C16 14.2091 14.2091 16 12 16C9.79086 16 8 14.2091 8 12V6ZM5 11C5.55228 11 6 11.4477 6 12C6 15.3137 8.68629 18 12 18C15.3137 18 18 15.3137 18 12C18 11.4477 18.4477 11 19 11C19.5523 11 20 11.4477 20 12C20 16.0796 16.9463 19.446 13 19.9381V21C13 21.5523 12.5523 22 12 22C11.4477 22 11 21.5523 11 21V19.9381C7.05369 19.446 4 16.0796 4 12C4 11.4477 4.44772 11 5 11Z" fill="white"/>
-</svg>
diff --git a/res/img/element-icons/camera.svg b/res/img/element-icons/camera.svg
new file mode 100644
index 0000000000..92d1f91dec
--- /dev/null
+++ b/res/img/element-icons/camera.svg
@@ -0,0 +1,10 @@
+<svg width="25" height="24" viewBox="0 0 25 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.4896 2.5C9.04778 2.5 7.827 3.52171 7.54879 4.90624C7.50711 5.11367 7.42679 5.31408 7.28726 5.47312L6.6851 6.15949C6.49523 6.37591 6.22129 6.5 5.93338 6.5H2.75C1.64543 6.5 0.75 7.39543 0.75 8.5V19.5C0.75 20.6046 1.64543 21.5 2.75 21.5H22.75C23.8546 21.5 24.75 20.6046 24.75 19.5V8.5C24.75 7.39543 23.8546 6.5 22.75 6.5H19.5666C19.2787 6.5 19.0048 6.37591 18.8149 6.15949L18.2127 5.47312C18.0732 5.31408 17.9929 5.11366 17.9512 4.90623C17.673 3.5217 16.4522 2.5 15.0104 2.5H10.4896ZM16.75 13.5C16.75 15.7091 14.9591 17.5 12.75 17.5C10.5409 17.5 8.75 15.7091 8.75 13.5C8.75 11.2909 10.5409 9.5 12.75 9.5C14.9591 9.5 16.75 11.2909 16.75 13.5ZM3.25 5C2.97386 5 2.75 5.22386 2.75 5.5C2.75 5.77614 2.97386 6 3.25 6H5.25C5.52614 6 5.75 5.77614 5.75 5.5C5.75 5.22386 5.52614 5 5.25 5H3.25Z" fill="black"/>
+</g>
+<defs>
+<clipPath id="clip0">
+<rect width="24" height="24" fill="white" transform="translate(0.75)"/>
+</clipPath>
+</defs>
+</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/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/res/img/element-icons/expand-space-panel.svg b/res/img/element-icons/expand-space-panel.svg
new file mode 100644
index 0000000000..11232acd58
--- /dev/null
+++ b/res/img/element-icons/expand-space-panel.svg
@@ -0,0 +1,4 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.7701 16.617H22.3721L18.614 20.3751C18.3137 20.6754 18.3137 21.1683 18.614 21.4686C18.9143 21.769 19.3995 21.769 19.6998 21.4686L24.7747 16.3937C25.0751 16.0934 25.0751 15.6082 24.7747 15.3079L19.7075 10.2253C19.4072 9.92492 18.922 9.92492 18.6217 10.2253C18.3214 10.5256 18.3214 11.0107 18.6217 11.3111L22.3721 15.0768H13.7701C13.3465 15.0768 13 15.4234 13 15.8469C13 16.2705 13.3465 16.617 13.7701 16.617Z" fill="#86888A"/>
+<rect x="7" y="10" width="1.5" height="12" rx="0.75" fill="#86888A"/>
+</svg>
diff --git a/res/img/element-icons/feedback.svg b/res/img/element-icons/feedback.svg
new file mode 100644
index 0000000000..3ee20d18d9
--- /dev/null
+++ b/res/img/element-icons/feedback.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.283 21.4392C17.649 21.4392 21.9991 17.0875 21.9991 11.7196C21.9991 6.3516 17.649 2 12.283 2C6.91698 2 2.56696 6.3516 2.56696 11.7196C2.56696 13.2233 2.90831 14.6472 3.51772 15.9181L2.04565 20.7041C1.80906 21.4733 2.53172 22.1926 3.29983 21.9525L8.04605 20.4688C9.32655 21.0905 10.7641 21.4392 12.283 21.4392Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/i.svg b/res/img/element-icons/i.svg
new file mode 100644
index 0000000000..6674f1ed8d
--- /dev/null
+++ b/res/img/element-icons/i.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 10C12.8284 10 13.5 9.32843 13.5 8.5C13.5 7.67157 12.8284 7 12 7C11.1716 7 10.5 7.67157 10.5 8.5C10.5 9.32843 11.1716 10 12 10ZM11 13C10.4477 13 10 12.5523 10 12C10 11.4477 10.4477 11 11 11H12C12.5523 11 13 11.4477 13 12V15.5H13.5C14.0523 15.5 14.5 15.9477 14.5 16.5C14.5 17.0523 14.0523 17.5 13.5 17.5H12C11.4477 17.5 11 17.0523 11 16.5L11 13Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/link.svg b/res/img/element-icons/link.svg
new file mode 100644
index 0000000000..ab3d54b838
--- /dev/null
+++ b/res/img/element-icons/link.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.5285 6.54089L13.0273 6.04207C14.4052 4.66426 16.6259 4.65104 17.9874 6.01253C19.349 7.37402 19.3357 9.59466 17.9579 10.9725L15.5878 13.3425C14.21 14.7203 11.9893 14.7335 10.6277 13.372M11.4717 17.4589L10.9727 17.9579C9.59481 19.3357 7.37409 19.349 6.01256 17.9875C4.65102 16.626 4.66426 14.4053 6.04211 13.0275L8.41203 10.6577C9.78988 9.27988 12.0106 9.26665 13.3721 10.6281" stroke="black" stroke-width="2" stroke-linecap="round"/>
+</svg>
diff --git a/res/img/element-icons/lock.svg b/res/img/element-icons/lock.svg
new file mode 100644
index 0000000000..06fe52a391
--- /dev/null
+++ b/res/img/element-icons/lock.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.1113 2.6665C11.1839 2.6665 8.00016 5.85026 8.00016 9.77762V13.3332L7.3335 13.3332C6.22893 13.3332 5.3335 14.2286 5.3335 15.3332V27.3332C5.3335 28.4377 6.22893 29.3332 7.3335 29.3332H24.6668C25.7714 29.3332 26.6668 28.4377 26.6668 27.3332V15.3332C26.6668 14.2286 25.7714 13.3332 24.6668 13.3332L24.0002 13.3332V9.77762C24.0002 5.85026 20.8164 2.6665 16.8891 2.6665H15.1113ZM20.4446 13.3332V9.77762C20.4446 7.81394 18.8527 6.22206 16.8891 6.22206H15.1113C13.1476 6.22206 11.5557 7.81394 11.5557 9.77762V13.3332H20.4446Z" fill="#8E99A4"/>
+</svg>
diff --git a/res/img/element-icons/plus.svg b/res/img/element-icons/plus.svg
new file mode 100644
index 0000000000..ea1972237d
--- /dev/null
+++ b/res/img/element-icons/plus.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M8.74986 3.55554C8.74986 3.14133 8.41408 2.80554 7.99986 2.80554C7.58565 2.80554 7.24986 3.14133 7.24986 3.55554V7.24999L3.55542 7.24999C3.14121 7.24999 2.80542 7.58577 2.80542 7.99999C2.80542 8.4142 3.14121 8.74999 3.55542 8.74999L7.24987 8.74999V12.4444C7.24987 12.8586 7.58565 13.1944 7.99987 13.1944C8.41408 13.1944 8.74987 12.8586 8.74987 12.4444V8.74999L12.4443 8.74999C12.8585 8.74999 13.1943 8.4142 13.1943 7.99999C13.1943 7.58577 12.8585 7.24999 12.4443 7.24999L8.74986 7.24999V3.55554Z" fill="#8E99A4"/>
+</svg>
diff --git a/res/img/element-icons/room/apps.svg b/res/img/element-icons/room/apps.svg
new file mode 100644
index 0000000000..c90704752c
--- /dev/null
+++ b/res/img/element-icons/room/apps.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="14" y="2" width="8" height="8" rx="2" fill="#0DBD8B"/>
+<rect x="14" y="14" width="8" height="8" rx="2" fill="#0DBD8B"/>
+<rect x="2" y="14" width="8" height="8" rx="2" fill="#0DBD8B"/>
+<rect x="2" y="2" width="8" height="8" rx="2" fill="#0DBD8B"/>
+</svg>
diff --git a/res/img/element-icons/room/default_app.svg b/res/img/element-icons/room/default_app.svg
index 08734170df..baf9bc37fa 100644
--- a/res/img/element-icons/room/default_app.svg
+++ b/res/img/element-icons/room/default_app.svg
@@ -1,11 +1,21 @@
-<svg width="21" height="20" viewBox="0 0 21 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="20" height="20" fill="url(#paint0_linear)"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M2 3V9.5H0.00390625L0.00390625 10.5H2V17H0.00390625L0.00390625 18H2V20H3V18H9.5039V20.0005H10.5039V18H17V20H18V18H20.0039V17H18V10.5H20.0039V9.5H18V3H20.0039V2H18V0L17 0V2H10.5039V0.000488281L9.5039 0.000488281V2H3V0L2 0V2H0.00390625L0.00390625 3H2ZM17 3H10.5039V9.5H17V3ZM17 10.5H10.5039V17H17V10.5ZM9.5039 10.5V17H3V10.5H9.5039ZM9.5039 3V9.5H3V3H9.5039Z" fill="white" fill-opacity="0.3" style="mix-blend-mode:lighten"/>
-<circle opacity="0.8" cx="10.0039" cy="10" r="7.5" stroke="white"/>
-<defs>
-<linearGradient id="paint0_linear" x1="10" y1="0" x2="10" y2="20" gradientUnits="userSpaceOnUse">
-<stop stop-color="#60A6FF"/>
-<stop offset="1" stop-color="#418DED"/>
-</linearGradient>
-</defs>
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <g clip-path="url(#clip0)">
+        <rect width="20" height="20" rx="4" fill="url(#paint0_linear)"/>
+        <path d="M2.49609 0V20" stroke="white" stroke-opacity="0.5" style="mix-blend-mode:lighten"/>
+        <path d="M20 2.5L1.60531e-06 2.5" stroke="white" stroke-opacity="0.5" style="mix-blend-mode:lighten"/>
+        <path d="M20 10L1.60531e-06 10" stroke="white" stroke-opacity="0.5" style="mix-blend-mode:lighten"/>
+        <path d="M20 17.5H1.60531e-06" stroke="white" stroke-opacity="0.5" style="mix-blend-mode:lighten"/>
+        <path d="M10 0.000488281V20.0005" stroke="white" stroke-opacity="0.5" style="mix-blend-mode:lighten"/>
+        <path d="M17.4961 0V20" stroke="white" stroke-opacity="0.5" style="mix-blend-mode:lighten"/>
+        <circle opacity="0.8" cx="10" cy="10" r="7.5" stroke="white"/>
+    </g>
+    <defs>
+        <linearGradient id="paint0_linear" x1="10" y1="0" x2="10" y2="20" gradientUnits="userSpaceOnUse">
+            <stop stop-color="#60A6FF"/>
+            <stop offset="1" stop-color="#418DED"/>
+        </linearGradient>
+        <clipPath id="clip0">
+            <rect width="20" height="20.0005" rx="4" fill="white"/>
+        </clipPath>
+    </defs>
 </svg>
diff --git a/res/img/element-icons/room/default_cal.svg b/res/img/element-icons/room/default_cal.svg
index 5bced115cf..fc440b4553 100644
--- a/res/img/element-icons/room/default_cal.svg
+++ b/res/img/element-icons/room/default_cal.svg
@@ -1,6 +1,6 @@
-<svg width="21" height="20" viewBox="0 0 21 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="1.99461" y="1.00002" width="18" height="18" rx="2" fill="white" stroke="#FF4B55" stroke-width="2"/>
-<rect x="2.96777" y="2" width="16.9843" height="5" fill="#FF4B55"/>
-<rect x="4.96533" y="9" width="2.99723" height="3" rx="0.25" fill="#FF4B55"/>
-<rect x="11.9585" y="13.0005" width="2.99723" height="3" rx="0.25" fill="#FF4B55"/>
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <rect width="20" height="20" rx="4" fill="#FF4B55"/>
+    <path d="M2 7H18V16C18 17.1046 17.1046 18 16 18H4C2.89543 18 2 17.1046 2 16V7Z" fill="white"/>
+    <rect x="3.96826" y="8.99951" width="2.99723" height="3" rx="0.25" fill="#FF4B55"/>
+    <rect x="10.9614" y="13" width="2.99723" height="3" rx="0.25" fill="#FF4B55"/>
 </svg>
diff --git a/res/img/element-icons/room/default_clock.svg b/res/img/element-icons/room/default_clock.svg
index cc21716d15..c7f453aadd 100644
--- a/res/img/element-icons/room/default_clock.svg
+++ b/res/img/element-icons/room/default_clock.svg
@@ -1,5 +1,5 @@
-<svg width="21" height="20" viewBox="0 0 21 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="1.49609" y="0.500488" width="19" height="19" rx="3.5" fill="#17191C" stroke="#17191C"/>
-<path d="M18.9961 10.0005C18.9961 14.4188 15.4144 18.0005 10.9961 18.0005C6.57782 18.0005 2.99609 14.4188 2.99609 10.0005C2.99609 5.58221 6.57782 2.00049 10.9961 2.00049C15.4144 2.00049 18.9961 5.58221 18.9961 10.0005Z" fill="white"/>
-<path d="M10.9961 6.00049V9.81299L13.4961 11.5005" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <rect x="1" y="1" width="18" height="18" rx="3" fill="#17191C" stroke="#17191C" stroke-width="2"/>
+    <path d="M18 10C18 14.4183 14.4183 18 10 18C5.58172 18 2 14.4183 2 10C2 5.58172 5.58172 2 10 2C14.4183 2 18 5.58172 18 10Z" fill="white"/>
+    <path d="M10 6V9.8125L12.5 11.5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/res/img/element-icons/room/default_doc.svg b/res/img/element-icons/room/default_doc.svg
index 93e7507be3..aff393ffd5 100644
--- a/res/img/element-icons/room/default_doc.svg
+++ b/res/img/element-icons/room/default_doc.svg
@@ -1,4 +1,4 @@
 <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <rect x="-0.000976562" y="0.000488281" width="20" height="20" rx="4" fill="#FCC639"/>
-    <path d="M1.99902 7.00049H17.999V16.5005C17.999 17.3289 17.3274 18.0005 16.499 18.0005H3.49902C2.6706 18.0005 1.99902 17.3289 1.99902 16.5005V7.00049Z" fill="white"/>
+    <rect width="20" height="20" rx="4" fill="#FCC639"/>
+    <path d="M2 7H18V16C18 17.1046 17.1046 18 16 18H4C2.89543 18 2 17.1046 2 16V7Z" fill="white"/>
 </svg>
diff --git a/res/img/element-icons/room/default_video.svg b/res/img/element-icons/room/default_video.svg
new file mode 100644
index 0000000000..022f1f43b1
--- /dev/null
+++ b/res/img/element-icons/room/default_video.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <rect width="20" height="20" rx="4" fill="#5ABFF2"/>
+    <path d="M3 7.875C3 6.83947 3.83947 6 4.875 6H11.1875C12.223 6 13.0625 6.83947 13.0625 7.875V12.875C13.0625 13.9105 12.223 14.75 11.1875 14.75H4.875C3.83947 14.75 3 13.9105 3 12.875V7.875Z" fill="white"/>
+    <path d="M14.375 8.44644L16.1208 7.11039C16.4806 6.83502 17 7.09158 17 7.54468V13.0396C17 13.5199 16.4251 13.7669 16.0767 13.4363L14.375 11.8214V8.44644Z" fill="white"/>
+</svg>
diff --git a/res/img/element-icons/room/in-call.svg b/res/img/element-icons/room/in-call.svg
deleted file mode 100644
index 0e574faa84..0000000000
--- a/res/img/element-icons/room/in-call.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M16 9C16 9 17 10.2857 17 12C17 13.7143 16 15 16 15" stroke="white" stroke-width="2" stroke-linecap="round"/>
-<path d="M19 6C19 6 21 8.57143 21 12C21 15.4286 19 18 19 18" stroke="white" stroke-width="2" stroke-linecap="round"/>
-<rect x="2" y="8" width="11" height="8" rx="2" fill="white"/>
-<path d="M7 8L11.3598 4.36682C12.0111 3.82405 13 4.2872 13 5.13504V18.865C13 19.7128 12.0111 20.176 11.3598 19.6332L7 16V8Z" fill="white"/>
-</svg>
diff --git a/res/img/element-icons/room/integrations.svg b/res/img/element-icons/room/integrations.svg
deleted file mode 100644
index 3a39506411..0000000000
--- a/res/img/element-icons/room/integrations.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M2 6C2 3.79086 3.79086 2 6 2H18C20.2091 2 22 3.79086 22 6V18C22 20.2091 20.2091 22 18 22H6C3.79086 22 2 20.2091 2 18V6ZM11 8C11 9.65685 9.65685 11 8 11C6.34315 11 5 9.65685 5 8C5 6.34315 6.34315 5 8 5C9.65685 5 11 6.34315 11 8ZM8 19C9.65685 19 11 17.6569 11 16C11 14.3431 9.65685 13 8 13C6.34315 13 5 14.3431 5 16C5 17.6569 6.34315 19 8 19ZM19 16C19 17.6569 17.6569 19 16 19C14.3431 19 13 17.6569 13 16C13 14.3431 14.3431 13 16 13C17.6569 13 19 14.3431 19 16ZM16 11C17.6569 11 19 9.65685 19 8C19 6.34315 17.6569 5 16 5C14.3431 5 13 6.34315 13 8C13 9.65685 14.3431 11 16 11Z" fill="black"/>
-</svg>
diff --git a/res/img/element-icons/room/invite.svg b/res/img/element-icons/room/invite.svg
index 655f9f118a..d2ecb837b2 100644
--- a/res/img/element-icons/room/invite.svg
+++ b/res/img/element-icons/room/invite.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="24" height="24" viewBox="-0.4 1 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path fill-rule="evenodd" clip-rule="evenodd" d="M19.1001 9C18.7779 9 18.5168 8.73883 18.5168 8.41667V6.08333H16.1834C15.8613 6.08333 15.6001 5.82217 15.6001 5.5C15.6001 5.17783 15.8613 4.91667 16.1834 4.91667H18.5168V2.58333C18.5168 2.26117 18.7779 2 19.1001 2C19.4223 2 19.6834 2.26117 19.6834 2.58333V4.91667H22.0168C22.3389 4.91667 22.6001 5.17783 22.6001 5.5C22.6001 5.82217 22.3389 6.08333 22.0168 6.08333H19.6834V8.41667C19.6834 8.73883 19.4223 9 19.1001 9ZM19.6001 11C20.0669 11 20.5212 10.9467 20.9574 10.8458C21.1161 11.5383 21.2 12.2594 21.2 13C21.2 16.1409 19.6917 18.9294 17.3598 20.6808V20.6807C16.0014 21.7011 14.3635 22.3695 12.5815 22.5505C12.2588 22.5832 11.9314 22.6 11.6 22.6C6.29807 22.6 2 18.302 2 13C2 7.69809 6.29807 3.40002 11.6 3.40002C12.3407 3.40002 13.0618 3.48391 13.7543 3.64268C13.6534 4.07884 13.6001 4.53319 13.6001 5C13.6001 8.31371 16.2864 11 19.6001 11ZM11.5999 20.68C13.6754 20.68 15.5585 19.8567 16.9407 18.5189C16.0859 16.4086 14.0167 14.92 11.5998 14.92C9.18298 14.92 7.11378 16.4086 6.25901 18.5189C7.64115 19.8567 9.52436 20.68 11.5999 20.68ZM11.7426 7.41172C10.3168 7.54168 9.2 8.74043 9.2 10.2C9.2 11.7464 10.4536 13 12 13C13.0308 13 13.9315 12.443 14.4176 11.6135C13.0673 10.6058 12.0929 9.12248 11.7426 7.41172Z" fill="black"/>
 </svg>
diff --git a/res/img/element-icons/roomlist/dialpad.svg b/res/img/element-icons/roomlist/dialpad.svg
new file mode 100644
index 0000000000..b51d4a4dc9
--- /dev/null
+++ b/res/img/element-icons/roomlist/dialpad.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.99999 15.8335C9.08333 15.8335 8.33333 16.5835 8.33333 17.5002C8.33333 18.4168 9.08333 19.1668 9.99999 19.1668C10.9167 19.1668 11.6667 18.4168 11.6667 17.5002C11.6667 16.5835 10.9167 15.8335 9.99999 15.8335ZM4.99999 0.833496C4.08333 0.833496 3.33333 1.5835 3.33333 2.50016C3.33333 3.41683 4.08333 4.16683 4.99999 4.16683C5.91666 4.16683 6.66666 3.41683 6.66666 2.50016C6.66666 1.5835 5.91666 0.833496 4.99999 0.833496ZM4.99999 5.8335C4.08333 5.8335 3.33333 6.5835 3.33333 7.50016C3.33333 8.41683 4.08333 9.16683 4.99999 9.16683C5.91666 9.16683 6.66666 8.41683 6.66666 7.50016C6.66666 6.5835 5.91666 5.8335 4.99999 5.8335ZM4.99999 10.8335C4.08333 10.8335 3.33333 11.5835 3.33333 12.5002C3.33333 13.4168 4.08333 14.1668 4.99999 14.1668C5.91666 14.1668 6.66666 13.4168 6.66666 12.5002C6.66666 11.5835 5.91666 10.8335 4.99999 10.8335ZM15 4.16683C15.9167 4.16683 16.6667 3.41683 16.6667 2.50016C16.6667 1.5835 15.9167 0.833496 15 0.833496C14.0833 0.833496 13.3333 1.5835 13.3333 2.50016C13.3333 3.41683 14.0833 4.16683 15 4.16683ZM9.99999 10.8335C9.08333 10.8335 8.33333 11.5835 8.33333 12.5002C8.33333 13.4168 9.08333 14.1668 9.99999 14.1668C10.9167 14.1668 11.6667 13.4168 11.6667 12.5002C11.6667 11.5835 10.9167 10.8335 9.99999 10.8335ZM15 10.8335C14.0833 10.8335 13.3333 11.5835 13.3333 12.5002C13.3333 13.4168 14.0833 14.1668 15 14.1668C15.9167 14.1668 16.6667 13.4168 16.6667 12.5002C16.6667 11.5835 15.9167 10.8335 15 10.8335ZM15 5.8335C14.0833 5.8335 13.3333 6.5835 13.3333 7.50016C13.3333 8.41683 14.0833 9.16683 15 9.16683C15.9167 9.16683 16.6667 8.41683 16.6667 7.50016C16.6667 6.5835 15.9167 5.8335 15 5.8335ZM9.99999 5.8335C9.08333 5.8335 8.33333 6.5835 8.33333 7.50016C8.33333 8.41683 9.08333 9.16683 9.99999 9.16683C10.9167 9.16683 11.6667 8.41683 11.6667 7.50016C11.6667 6.5835 10.9167 5.8335 9.99999 5.8335ZM9.99999 0.833496C9.08333 0.833496 8.33333 1.5835 8.33333 2.50016C8.33333 3.41683 9.08333 4.16683 9.99999 4.16683C10.9167 4.16683 11.6667 3.41683 11.6667 2.50016C11.6667 1.5835 10.9167 0.833496 9.99999 0.833496Z" fill="#8D99A5"/>
+</svg>
diff --git a/res/img/element-icons/roomlist/hash-circle.svg b/res/img/element-icons/roomlist/hash-circle.svg
new file mode 100644
index 0000000000..924b22cf32
--- /dev/null
+++ b/res/img/element-icons/roomlist/hash-circle.svg
@@ -0,0 +1,7 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <mask id="path-1-inside-1" fill="white">
+        <path fill-rule="evenodd" clip-rule="evenodd" d="M9 17C13.4183 17 17 13.4183 17 9C17 4.58172 13.4183 1 9 1C4.58172 1 1 4.58172 1 9C1 13.4183 4.58172 17 9 17ZM8.33969 5.15616C8.38275 4.74419 8.0837 4.37532 7.67173 4.33225C7.25976 4.28918 6.89088 4.58824 6.84781 5.00021L6.68776 6.53131H5.65625C5.24204 6.53131 4.90625 6.8671 4.90625 7.28131C4.90625 7.69552 5.24204 8.03131 5.65625 8.03131H6.53095L6.32841 9.96881H5.39062C4.97641 9.96881 4.64062 10.3046 4.64062 10.7188C4.64062 11.133 4.97641 11.4688 5.39062 11.4688H6.17161L6.01969 12.9221C5.97662 13.3341 6.27568 13.7029 6.68765 13.746C7.09962 13.7891 7.46849 13.49 7.51156 13.078L7.67978 11.4688H9.49973L9.34781 12.9221C9.30475 13.3341 9.6038 13.7029 10.0158 13.746C10.4277 13.7891 10.7966 13.49 10.8397 13.078L11.0079 11.4688H12.2969C12.7111 11.4688 13.0469 11.133 13.0469 10.7188C13.0469 10.3046 12.7111 9.96881 12.2969 9.96881H11.1647L11.3673 8.03131H12.2969C12.7111 8.03131 13.0469 7.69552 13.0469 7.28131C13.0469 6.8671 12.7111 6.53131 12.2969 6.53131H11.5241L11.6678 5.15616C11.7109 4.74419 11.4118 4.37532 10.9999 4.33225C10.5879 4.28918 10.219 4.58824 10.1759 5.00021L10.0159 6.53131H8.19593L8.33969 5.15616ZM9.65654 9.96881H7.83659L8.03913 8.03131H9.85908L9.65654 9.96881Z"/>
+    </mask>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M9 17C13.4183 17 17 13.4183 17 9C17 4.58172 13.4183 1 9 1C4.58172 1 1 4.58172 1 9C1 13.4183 4.58172 17 9 17ZM8.33969 5.15616C8.38275 4.74419 8.0837 4.37532 7.67173 4.33225C7.25976 4.28918 6.89088 4.58824 6.84781 5.00021L6.68776 6.53131H5.65625C5.24204 6.53131 4.90625 6.8671 4.90625 7.28131C4.90625 7.69552 5.24204 8.03131 5.65625 8.03131H6.53095L6.32841 9.96881H5.39062C4.97641 9.96881 4.64062 10.3046 4.64062 10.7188C4.64062 11.133 4.97641 11.4688 5.39062 11.4688H6.17161L6.01969 12.9221C5.97662 13.3341 6.27568 13.7029 6.68765 13.746C7.09962 13.7891 7.46849 13.49 7.51156 13.078L7.67978 11.4688H9.49973L9.34781 12.9221C9.30475 13.3341 9.6038 13.7029 10.0158 13.746C10.4277 13.7891 10.7966 13.49 10.8397 13.078L11.0079 11.4688H12.2969C12.7111 11.4688 13.0469 11.133 13.0469 10.7188C13.0469 10.3046 12.7111 9.96881 12.2969 9.96881H11.1647L11.3673 8.03131H12.2969C12.7111 8.03131 13.0469 7.69552 13.0469 7.28131C13.0469 6.8671 12.7111 6.53131 12.2969 6.53131H11.5241L11.6678 5.15616C11.7109 4.74419 11.4118 4.37532 10.9999 4.33225C10.5879 4.28918 10.219 4.58824 10.1759 5.00021L10.0159 6.53131H8.19593L8.33969 5.15616ZM9.65654 9.96881H7.83659L8.03913 8.03131H9.85908L9.65654 9.96881Z" fill="black"/>
+    <path d="M7.67173 4.33225L7.5331 5.65836H7.5331L7.67173 4.33225ZM8.33969 5.15616L9.66579 5.29479V5.29479L8.33969 5.15616ZM6.84781 5.00021L5.52171 4.86158L5.52171 4.86158L6.84781 5.00021ZM6.68776 6.53131V7.86464H7.88898L8.01387 6.66994L6.68776 6.53131ZM6.53095 8.03131L7.85706 8.16994L8.01093 6.69798H6.53095V8.03131ZM6.32841 9.96881V11.3021H7.52963L7.65452 10.1074L6.32841 9.96881ZM6.17161 11.4688L7.49772 11.6074L7.65159 10.1355H6.17161V11.4688ZM6.01969 12.9221L4.69358 12.7835V12.7835L6.01969 12.9221ZM6.68765 13.746L6.82628 12.4199H6.82627L6.68765 13.746ZM7.51156 13.078L8.83767 13.2167L8.83767 13.2167L7.51156 13.078ZM7.67978 11.4688V10.1355H6.47857L6.35368 11.3302L7.67978 11.4688ZM9.49973 11.4688L10.8258 11.6074L10.9797 10.1355H9.49973V11.4688ZM9.34781 12.9221L10.6739 13.0607V13.0607L9.34781 12.9221ZM10.0158 13.746L10.1544 12.4199H10.1544L10.0158 13.746ZM10.8397 13.078L12.1658 13.2167V13.2167L10.8397 13.078ZM11.0079 11.4688V10.1355H9.80669L9.6818 11.3302L11.0079 11.4688ZM11.1647 9.96881L9.83861 9.83018L9.68473 11.3021H11.1647V9.96881ZM11.3673 8.03131V6.69798H10.166L10.0411 7.89268L11.3673 8.03131ZM11.5241 6.53131L10.198 6.39268L10.0441 7.86464H11.5241V6.53131ZM11.6678 5.15616L10.3417 5.01754V5.01754L11.6678 5.15616ZM10.9999 4.33225L11.1385 3.00614H11.1385L10.9999 4.33225ZM10.1759 5.00021L8.84983 4.86158L8.84983 4.86158L10.1759 5.00021ZM10.0159 6.53131V7.86464H11.2171L11.342 6.66994L10.0159 6.53131ZM8.19593 6.53131L6.86982 6.39268L6.71595 7.86464H8.19593V6.53131ZM7.83659 9.96881L6.51048 9.83018L6.35661 11.3021H7.83659V9.96881ZM9.65654 9.96881V11.3021H10.8578L10.9826 10.1074L9.65654 9.96881ZM8.03913 8.03131V6.69798H6.83791L6.71302 7.89268L8.03913 8.03131ZM9.85908 8.03131L11.1852 8.16994L11.3391 6.69798H9.85908V8.03131ZM15.6667 9C15.6667 12.6819 12.6819 15.6667 9 15.6667V18.3333C14.1547 18.3333 18.3333 14.1547 18.3333 9H15.6667ZM9 2.33333C12.6819 2.33333 15.6667 5.3181 15.6667 9H18.3333C18.3333 3.84534 14.1547 -0.333333 9 -0.333333V2.33333ZM2.33333 9C2.33333 5.3181 5.3181 2.33333 9 2.33333V-0.333333C3.84534 -0.333333 -0.333333 3.84534 -0.333333 9H2.33333ZM9 15.6667C5.3181 15.6667 2.33333 12.6819 2.33333 9H-0.333333C-0.333333 14.1547 3.84534 18.3333 9 18.3333V15.6667ZM7.5331 5.65836C7.21268 5.62486 6.98008 5.33796 7.01358 5.01754L9.66579 5.29479C9.78542 4.15043 8.95471 3.12577 7.81035 3.00614L7.5331 5.65836ZM8.17392 5.13884C8.14043 5.45925 7.85352 5.69185 7.5331 5.65836L7.81035 3.00614C6.666 2.88652 5.64134 3.71722 5.52171 4.86158L8.17392 5.13884ZM8.01387 6.66994L8.17392 5.13883L5.52171 4.86158L5.36165 6.39268L8.01387 6.66994ZM5.65625 7.86464H6.68776V5.19798H5.65625V7.86464ZM6.23958 7.28131C6.23958 7.60348 5.97842 7.86464 5.65625 7.86464V5.19798C4.50566 5.19798 3.57292 6.13072 3.57292 7.28131H6.23958ZM5.65625 6.69798C5.97842 6.69798 6.23958 6.95914 6.23958 7.28131H3.57292C3.57292 8.4319 4.50566 9.36464 5.65625 9.36464V6.69798ZM6.53095 6.69798H5.65625V9.36464H6.53095V6.69798ZM7.65452 10.1074L7.85706 8.16994L5.20485 7.89268L5.00231 9.83018L7.65452 10.1074ZM5.39062 11.3021H6.32841V8.63548H5.39062V11.3021ZM5.97396 10.7188C5.97396 11.041 5.71279 11.3021 5.39062 11.3021V8.63548C4.24003 8.63548 3.30729 9.56822 3.30729 10.7188H5.97396ZM5.39062 10.1355C5.71279 10.1355 5.97396 10.3966 5.97396 10.7188H3.30729C3.30729 11.8694 4.24003 12.8021 5.39062 12.8021V10.1355ZM6.17161 10.1355H5.39062V12.8021H6.17161V10.1355ZM7.3458 13.0607L7.49772 11.6074L4.8455 11.3302L4.69358 12.7835L7.3458 13.0607ZM6.82627 12.4199C7.14669 12.4534 7.37929 12.7403 7.3458 13.0607L4.69358 12.7835C4.57396 13.9278 5.40466 14.9525 6.54902 15.0721L6.82627 12.4199ZM6.18545 12.9394C6.21895 12.619 6.50585 12.3864 6.82628 12.4199L6.54902 15.0721C7.69338 15.1917 8.71804 14.361 8.83767 13.2167L6.18545 12.9394ZM6.35368 11.3302L6.18545 12.9394L8.83767 13.2167L9.00589 11.6074L6.35368 11.3302ZM9.49973 10.1355H7.67978V12.8021H9.49973V10.1355ZM10.6739 13.0607L10.8258 11.6074L8.17363 11.3302L8.02171 12.7835L10.6739 13.0607ZM10.1544 12.4199C10.4748 12.4534 10.7074 12.7403 10.6739 13.0607L8.02171 12.7835C7.90208 13.9278 8.73279 14.9525 9.87715 15.0721L10.1544 12.4199ZM9.51358 12.9394C9.54707 12.619 9.83398 12.3864 10.1544 12.4199L9.87714 15.0721C11.0215 15.1917 12.0462 14.361 12.1658 13.2167L9.51358 12.9394ZM9.6818 11.3302L9.51358 12.9394L12.1658 13.2167L12.334 11.6074L9.6818 11.3302ZM12.2969 10.1355H11.0079V12.8021H12.2969V10.1355ZM11.7135 10.7188C11.7135 10.3966 11.9747 10.1355 12.2969 10.1355V12.8021C13.4475 12.8021 14.3802 11.8694 14.3802 10.7188H11.7135ZM12.2969 11.3021C11.9747 11.3021 11.7135 11.041 11.7135 10.7188H14.3802C14.3802 9.56822 13.4475 8.63548 12.2969 8.63548V11.3021ZM11.1647 11.3021H12.2969V8.63548H11.1647V11.3021ZM10.0411 7.89268L9.83861 9.83018L12.4908 10.1074L12.6934 8.16994L10.0411 7.89268ZM12.2969 6.69798H11.3673V9.36464H12.2969V6.69798ZM11.7135 7.28131C11.7135 6.95914 11.9747 6.69798 12.2969 6.69798V9.36464C13.4475 9.36464 14.3802 8.4319 14.3802 7.28131H11.7135ZM12.2969 7.86464C11.9747 7.86464 11.7135 7.60348 11.7135 7.28131H14.3802C14.3802 6.13072 13.4475 5.19798 12.2969 5.19798V7.86464ZM11.5241 7.86464H12.2969V5.19798H11.5241V7.86464ZM10.3417 5.01754L10.198 6.39268L12.8502 6.66994L12.9939 5.29479L10.3417 5.01754ZM10.8612 5.65836C10.5408 5.62486 10.3082 5.33796 10.3417 5.01754L12.9939 5.29479C13.1135 4.15043 12.2828 3.12577 11.1385 3.00614L10.8612 5.65836ZM11.502 5.13884C11.4686 5.45925 11.1816 5.69185 10.8612 5.65836L11.1385 3.00614C9.99412 2.88652 8.96946 3.71722 8.84983 4.86158L11.502 5.13884ZM11.342 6.66994L11.502 5.13883L8.84983 4.86158L8.68978 6.39268L11.342 6.66994ZM8.19593 7.86464H10.0159V5.19798H8.19593V7.86464ZM7.01358 5.01754L6.86982 6.39268L9.52204 6.66994L9.66579 5.29479L7.01358 5.01754ZM7.83659 11.3021H9.65654V8.63548H7.83659V11.3021ZM6.71302 7.89268L6.51048 9.83018L9.16269 10.1074L9.36523 8.16994L6.71302 7.89268ZM9.85908 6.69798H8.03913V9.36464H9.85908V6.69798ZM10.9826 10.1074L11.1852 8.16994L8.53297 7.89268L8.33043 9.83018L10.9826 10.1074Z" fill="black" mask="url(#path-1-inside-1)"/>
+</svg>
diff --git a/res/img/element-icons/roomlist/plus-circle.svg b/res/img/element-icons/roomlist/plus-circle.svg
new file mode 100644
index 0000000000..251ded225c
--- /dev/null
+++ b/res/img/element-icons/roomlist/plus-circle.svg
@@ -0,0 +1,3 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17 9C17 13.4183 13.4183 17 9 17C4.58172 17 1 13.4183 1 9C1 4.58172 4.58172 1 9 1C13.4183 1 17 4.58172 17 9ZM5.25 9C5.25 8.58579 5.58579 8.25 6 8.25H8.25V6C8.25 5.58579 8.58579 5.25 9 5.25C9.41421 5.25 9.75 5.58579 9.75 6V8.25H12C12.4142 8.25 12.75 8.58579 12.75 9C12.75 9.41421 12.4142 9.75 12 9.75H9.75V12C9.75 12.4142 9.41421 12.75 9 12.75C8.58579 12.75 8.25 12.4142 8.25 12V9.75H6C5.58579 9.75 5.25 9.41421 5.25 9Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/roomlist/skeleton-ui.svg b/res/img/element-icons/roomlist/skeleton-ui.svg
new file mode 100644
index 0000000000..e95692536c
--- /dev/null
+++ b/res/img/element-icons/roomlist/skeleton-ui.svg
@@ -0,0 +1,5 @@
+<svg width="228" height="48" viewBox="0 0 228 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="16" cy="16" r="16" fill="#D4D4D4"/>
+<rect x="39" width="189" height="12" rx="6" fill="#D4D4D4"/>
+<rect x="39" y="20" width="143" height="12" rx="6" fill="#D4D4D4"/>
+</svg>
diff --git a/res/img/element-icons/send-message.svg b/res/img/element-icons/send-message.svg
new file mode 100644
index 0000000000..ce35bf8bc8
--- /dev/null
+++ b/res/img/element-icons/send-message.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M 18.792 11.145 L 2.356 19.359 C 1.249 19.913 0.097 18.725 0.638 17.642 C 0.638 17.642 2.675 13.528 3.235 12.451 C 3.796 11.373 4.437 11.187 10.393 10.417 C 10.614 10.388 10.794 10.222 10.794 10 C 10.794 9.778 10.614 9.612 10.393 9.583 C 4.437 8.813 3.796 8.627 3.235 7.549 C 2.675 6.472 0.638 2.358 0.638 2.358 C 0.097 1.275 1.249 0.087 2.356 0.64 L 18.792 8.855 C 19.736 9.326 19.736 10.674 18.792 11.145 Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/warning-badge.svg b/res/img/element-icons/warning-badge.svg
new file mode 100644
index 0000000000..ac5991f221
--- /dev/null
+++ b/res/img/element-icons/warning-badge.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="8" cy="8" r="8" fill="#737D8C" style="mix-blend-mode:multiply"/>
+<rect x="7" y="3" width="2" height="6" rx="1" fill="white"/>
+<rect x="7" y="11" width="2" height="2" rx="1" fill="white"/>
+</svg>
diff --git a/res/img/feather-customised/bug.svg b/res/img/feather-customised/bug.svg
new file mode 100644
index 0000000000..babc4fed0e
--- /dev/null
+++ b/res/img/feather-customised/bug.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 2C9.23858 2 7 4.23858 7 7L17 7C17 4.23858 14.7614 2 12 2ZM2.29289 7.70711C1.90237 7.31658 1.90237 6.68342 2.29289 6.29289C2.68342 5.90237 3.31658 5.90237 3.70711 6.29289L6.41421 9H17.5858L20.2929 6.29289C20.6834 5.90237 21.3166 5.90237 21.7071 6.29289C22.0976 6.68342 22.0976 7.31658 21.7071 7.70711L19 10.4142V13H22C22.5523 13 23 13.4477 23 14C23 14.5523 22.5523 15 22 15H19C19 15.7795 18.8726 16.5292 18.6375 17.2295C18.6614 17.2493 18.6847 17.2705 18.7071 17.2929L21.7071 20.2929C22.0976 20.6834 22.0976 21.3166 21.7071 21.7071C21.3166 22.0976 20.6834 22.0976 20.2929 21.7071L17.6791 19.0933C16.5924 20.5983 14.9222 21.6542 13 21.9291L13 12C13 11.4477 12.5523 11 12 11C11.4477 11 11 11.4477 11 12V21.9291C9.07785 21.6542 7.40759 20.5983 6.32091 19.0933L3.70711 21.7071C3.31658 22.0976 2.68342 22.0976 2.29289 21.7071C1.90237 21.3166 1.90237 20.6834 2.29289 20.2929L5.29289 17.2929C5.31533 17.2705 5.33857 17.2493 5.36252 17.2295C5.1274 16.5292 5 15.7795 5 15H2C1.44772 15 1 14.5523 1 14C1 13.4477 1.44772 13 2 13H5V10.4142L2.29289 7.70711Z" fill="#FF4B55"/>
+</svg>
diff --git a/res/img/feather-customised/widget/maximise.svg b/res/img/feather-customised/maximise.svg
similarity index 100%
rename from res/img/feather-customised/widget/maximise.svg
rename to res/img/feather-customised/maximise.svg
diff --git a/res/img/feather-customised/widget/minimise.svg b/res/img/feather-customised/minimise.svg
similarity index 100%
rename from res/img/feather-customised/widget/minimise.svg
rename to res/img/feather-customised/minimise.svg
diff --git a/res/img/hangup.svg b/res/img/hangup.svg
deleted file mode 100644
index be038d2b30..0000000000
--- a/res/img/hangup.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="25px" height="26px" viewBox="-1 -1 25 26" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.4.3 (16618) - http://www.bohemiancoding.com/sketch -->
-    <title>Fill 72 + Path 98</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="05-Voice-and-video" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="05_2-Video-call" sketch:type="MSArtboardGroup" transform="translate(-910.000000, -719.000000)" stroke="#FF0064">
-            <g id="Fill-72-+-Path-98" sketch:type="MSLayerGroup" transform="translate(910.000000, 719.000000)">
-                <path d="M17.8404444,24 C15.8137778,24 10.8875556,21.408 6.75022222,15.8448889 C2.88088889,10.6413333 1,6.88222222 1,4.35244444 C1,2.36088889 2.37511111,1.41022222 3.11422222,0.9 L3.29644444,0.772888889 C4.11288889,0.188888889 5.38222222,0 5.86888889,0 C6.72222222,0 7.08177778,0.499555556 7.29955556,0.935111111 C7.48488889,1.30311111 9.01777778,4.59511111 9.17288889,5.00444444 C9.41111111,5.63377778 9.33288889,6.55111111 8.596,7.07822222 L8.46622222,7.16844444 C8.10044444,7.42222222 7.42,7.89333333 7.32577778,8.46622222 C7.28,8.74488889 7.37333333,9.03644444 7.61111111,9.35688889 C8.79777778,10.956 12.5862222,15.6506667 13.2693333,16.2884444 C13.8044444,16.7884444 14.4826667,16.8595556 14.9444444,16.4702222 C15.4222222,16.0675556 15.6342222,15.8297778 15.6364444,15.8271111 L15.6857778,15.7795556 C15.7257778,15.7457778 16.0991111,15.4497778 16.7093333,15.4497778 C17.1497778,15.4497778 17.5973333,15.6017778 18.04,15.9008889 C19.1884444,16.6768889 21.7808889,18.4106667 21.7808889,18.4106667 L21.8226667,18.4426667 C22.1542222,18.7266667 22.6333333,19.5453333 22.0751111,20.6106667 C21.496,21.7168889 19.6986667,24 17.8404444,24 L17.8404444,24 Z" id="Fill-72" sketch:type="MSShapeGroup"></path>
-                <path d="M19.8035085,4 L0,22.8035085" id="Path-98" sketch:type="MSShapeGroup"></path>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/res/img/icon_context.svg b/res/img/icon_context.svg
deleted file mode 100644
index 600c5bbd1d..0000000000
--- a/res/img/icon_context.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="3" height="15" viewBox="0 0 3 15" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M1.5 3C2.32843 3 3 2.32843 3 1.5C3 0.671573 2.32843 0 1.5 0C0.671573 0 0 0.671573 0 1.5C0 2.32843 0.671573 3 1.5 3Z" fill="#9FA9BA"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M1.5 9C2.32843 9 3 8.32843 3 7.5C3 6.67157 2.32843 6 1.5 6C0.671573 6 0 6.67157 0 7.5C0 8.32843 0.671573 9 1.5 9Z" fill="#9FA9BA"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M1.5 15C2.32843 15 3 14.3284 3 13.5C3 12.6716 2.32843 12 1.5 12C0.671573 12 0 12.6716 0 13.5C0 14.3284 0.671573 15 1.5 15Z" fill="#9FA9BA"/>
-</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>
-
diff --git a/res/img/voip/dialpad.svg b/res/img/voip/dialpad.svg
new file mode 100644
index 0000000000..79c9ba1612
--- /dev/null
+++ b/res/img/voip/dialpad.svg
@@ -0,0 +1,17 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d)">
+<circle cx="24" cy="20" r="20" fill="white"/>
+</g>
+<path d="M24 25.8335C23.0833 25.8335 22.3333 26.5835 22.3333 27.5002C22.3333 28.4168 23.0833 29.1668 24 29.1668C24.9167 29.1668 25.6667 28.4168 25.6667 27.5002C25.6667 26.5835 24.9167 25.8335 24 25.8335ZM19 10.8335C18.0833 10.8335 17.3333 11.5835 17.3333 12.5002C17.3333 13.4168 18.0833 14.1668 19 14.1668C19.9167 14.1668 20.6667 13.4168 20.6667 12.5002C20.6667 11.5835 19.9167 10.8335 19 10.8335ZM19 15.8335C18.0833 15.8335 17.3333 16.5835 17.3333 17.5002C17.3333 18.4168 18.0833 19.1668 19 19.1668C19.9167 19.1668 20.6667 18.4168 20.6667 17.5002C20.6667 16.5835 19.9167 15.8335 19 15.8335ZM19 20.8335C18.0833 20.8335 17.3333 21.5835 17.3333 22.5002C17.3333 23.4168 18.0833 24.1668 19 24.1668C19.9167 24.1668 20.6667 23.4168 20.6667 22.5002C20.6667 21.5835 19.9167 20.8335 19 20.8335ZM29 14.1668C29.9167 14.1668 30.6667 13.4168 30.6667 12.5002C30.6667 11.5835 29.9167 10.8335 29 10.8335C28.0833 10.8335 27.3333 11.5835 27.3333 12.5002C27.3333 13.4168 28.0833 14.1668 29 14.1668ZM24 20.8335C23.0833 20.8335 22.3333 21.5835 22.3333 22.5002C22.3333 23.4168 23.0833 24.1668 24 24.1668C24.9167 24.1668 25.6667 23.4168 25.6667 22.5002C25.6667 21.5835 24.9167 20.8335 24 20.8335ZM29 20.8335C28.0833 20.8335 27.3333 21.5835 27.3333 22.5002C27.3333 23.4168 28.0833 24.1668 29 24.1668C29.9167 24.1668 30.6667 23.4168 30.6667 22.5002C30.6667 21.5835 29.9167 20.8335 29 20.8335ZM29 15.8335C28.0833 15.8335 27.3333 16.5835 27.3333 17.5002C27.3333 18.4168 28.0833 19.1668 29 19.1668C29.9167 19.1668 30.6667 18.4168 30.6667 17.5002C30.6667 16.5835 29.9167 15.8335 29 15.8335ZM24 15.8335C23.0833 15.8335 22.3333 16.5835 22.3333 17.5002C22.3333 18.4168 23.0833 19.1668 24 19.1668C24.9167 19.1668 25.6667 18.4168 25.6667 17.5002C25.6667 16.5835 24.9167 15.8335 24 15.8335ZM24 10.8335C23.0833 10.8335 22.3333 11.5835 22.3333 12.5002C22.3333 13.4168 23.0833 14.1668 24 14.1668C24.9167 14.1668 25.6667 13.4168 25.6667 12.5002C25.6667 11.5835 24.9167 10.8335 24 10.8335Z" fill="#737D8C"/>
+<defs>
+<filter id="filter0_d" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+<feOffset dy="4"/>
+<feGaussianBlur stdDeviation="2"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/res/img/voip/hangup.svg b/res/img/voip/hangup.svg
new file mode 100644
index 0000000000..dfb20bd519
--- /dev/null
+++ b/res/img/voip/hangup.svg
@@ -0,0 +1,17 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d)">
+<circle cx="24" cy="20" r="20" fill="#FE2928"/>
+</g>
+<path d="m 24.008382,14.7565 c -1.6873,-0.0649 -5.157,0.373 -6.0006,0.5948 -0.0499,0.0131 -0.1074,0.0278 -0.1716,0.0442 -1.2952,0.3306 -5.35348,1.3663 -5.79196,4.6481 -0.33971,2.5426 1.36151,3.3122 2.21196,3.195 0.5886,-0.0738 2.2739,-0.3403 3.831,-0.6197 1.5291,-0.2743 1.5283,-1.283 1.5278,-1.9651 0,-0.0125 0,-0.025 0,-0.0373 v -1.3712 c 0,-0.3492 0.3281,-0.5511 0.7808,-0.6057 1.6024,-0.2176 2.9401,-0.2183 3.6097,-0.2183 h 0.0057 c 0.6695,0 1.9906,7e-4 3.593,0.2183 0.4527,0.0546 0.7808,0.2565 0.7808,0.6057 v 1.3712 c 0,0.0124 0,0.0248 0,0.0373 -5e-4,0.6821 -0.0013,1.6908 1.5278,1.9652 1.5571,0.2793 3.2424,0.5458 3.831,0.6196 0.8504,0.1172 2.5517,-0.6524 2.212,-3.195 -0.4385,-3.2818 -4.4968,-4.3175 -5.792,-4.6481 -0.0642,-0.0164 -0.1217,-0.031 -0.1716,-0.0442 -0.8435,-0.2218 -4.2966,-0.6597 -5.9838,-0.5948 z" fill="#ffffff" />
+<defs>
+<filter id="filter0_d" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+<feOffset dy="4"/>
+<feGaussianBlur stdDeviation="2"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/res/img/voip/mic-off.svg b/res/img/voip/mic-off.svg
new file mode 100644
index 0000000000..6409f1fd07
--- /dev/null
+++ b/res/img/voip/mic-off.svg
@@ -0,0 +1,18 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d)">
+<circle cx="24" cy="20" r="20" fill="#61708B"/>
+</g>
+<path d="M15 11L33 29" stroke="white" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20 14.5921V20C20 22.2091 21.7909 24 24 24C25.4616 24 26.7402 23.216 27.4381 22.0457L20 14.5921ZM28.8804 23.491C27.7918 25.0102 26.0115 26 24 26C20.6863 26 18 23.3137 18 20C18 19.4477 17.5523 19 17 19C16.4477 19 16 19.4477 16 20C16 24.0796 19.0537 27.446 23 27.9381V29C23 29.5523 23.4477 30 24 30C24.5523 30 25 29.5523 25 29V27.9381C27.1511 27.6699 29.037 26.5476 30.3077 24.9213L28.8804 23.491ZM31.3589 23.1433L29.7917 21.5729C29.9275 21.0716 30 20.5443 30 20C30 19.4477 30.4477 19 31 19C31.5523 19 32 19.4477 32 20C32 21.1159 31.7715 22.1783 31.3589 23.1433ZM28 19.7774L20.4308 12.1924C21.0909 10.8915 22.4413 10 24 10C26.2091 10 28 11.7909 28 14V19.7774Z" fill="white"/>
+<defs>
+<filter id="filter0_d" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+<feOffset dy="4"/>
+<feGaussianBlur stdDeviation="2"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/res/img/voip/mic-on.svg b/res/img/voip/mic-on.svg
new file mode 100644
index 0000000000..3493b3c581
--- /dev/null
+++ b/res/img/voip/mic-on.svg
@@ -0,0 +1,17 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d)">
+<circle cx="24" cy="20" r="20" fill="white"/>
+</g>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20 14C20 11.7909 21.7909 10 24 10C26.2091 10 28 11.7909 28 14V20C28 22.2091 26.2091 24 24 24C21.7909 24 20 22.2091 20 20V14ZM17 19C17.5523 19 18 19.4477 18 20C18 23.3137 20.6863 26 24 26C27.3137 26 30 23.3137 30 20C30 19.4477 30.4477 19 31 19C31.5523 19 32 19.4477 32 20C32 24.0796 28.9463 27.446 25 27.9381V29C25 29.5523 24.5523 30 24 30C23.4477 30 23 29.5523 23 29V27.9381C19.0537 27.446 16 24.0796 16 20C16 19.4477 16.4477 19 17 19Z" fill="#61708B"/>
+<defs>
+<filter id="filter0_d" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+<feOffset dy="4"/>
+<feGaussianBlur stdDeviation="2"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/res/img/voip/more.svg b/res/img/voip/more.svg
new file mode 100644
index 0000000000..7990f6bcff
--- /dev/null
+++ b/res/img/voip/more.svg
@@ -0,0 +1,17 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d)">
+<circle cx="24" cy="20" r="20" fill="white"/>
+</g>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.667 20C18.667 21.1046 17.7716 22 16.667 22C15.5624 22 14.667 21.1046 14.667 20C14.667 18.8954 15.5624 18 16.667 18C17.7716 18 18.667 18.8954 18.667 20ZM26 20C26 21.1046 25.1046 22 24 22C22.8954 22 22 21.1046 22 20C22 18.8954 22.8954 18 24 18C25.1046 18 26 18.8954 26 20ZM31.333 22C32.4376 22 33.333 21.1046 33.333 20C33.333 18.8954 32.4376 18 31.333 18C30.2284 18 29.333 18.8954 29.333 20C29.333 21.1046 30.2284 22 31.333 22Z" fill="#737D8C"/>
+<defs>
+<filter id="filter0_d" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+<feOffset dy="4"/>
+<feGaussianBlur stdDeviation="2"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/res/img/voip/paused.svg b/res/img/voip/paused.svg
new file mode 100644
index 0000000000..a967bf8ddf
--- /dev/null
+++ b/res/img/voip/paused.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 2C6.48 2 2 6.48 2 12C2 17.52 6.48 22 12 22C17.52 22 22 17.52 22 12C22 6.48 17.52 2 12 2ZM11 16H9V8H11V16ZM15 16H13V8H15V16Z" fill="white"/>
+</svg>
diff --git a/res/img/voip/vid-off.svg b/res/img/voip/vid-off.svg
new file mode 100644
index 0000000000..199d97ab97
--- /dev/null
+++ b/res/img/voip/vid-off.svg
@@ -0,0 +1,19 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d)">
+<circle cx="24" cy="20" r="20" fill="#61708B"/>
+</g>
+<path d="M14.8334 11.6666L29.8334 26.6666" stroke="white" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17 13.3333H17.676L28.1667 23.8458V26.1791C28.1595 26.1713 28.1521 26.1636 28.1446 26.1561L15.662 13.6474C16.0648 13.4464 16.5192 13.3333 17 13.3333ZM14.4359 14.7751C14.1593 15.2292 14 15.7626 14 16.3332V23.6666C14 25.3234 15.3431 26.6666 17 26.6666H26.2994L14.4778 14.8203C14.4632 14.8056 14.4492 14.7906 14.4359 14.7751ZM28.1667 16.3333V21.4863L20.0306 13.3333H25.1667C26.8235 13.3333 28.1667 14.6764 28.1667 16.3333Z" fill="white"/>
+<path d="M29.8334 17.5L32.3753 15.4664C33.0301 14.9426 34 15.4087 34 16.2473V23.7527C34 24.5912 33.0301 25.0573 32.3753 24.5335L29.8334 22.5V17.5Z" fill="white"/>
+<defs>
+<filter id="filter0_d" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+<feOffset dy="4"/>
+<feGaussianBlur stdDeviation="2"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/res/img/voip/vid-on.svg b/res/img/voip/vid-on.svg
new file mode 100644
index 0000000000..d8146d01d3
--- /dev/null
+++ b/res/img/voip/vid-on.svg
@@ -0,0 +1,18 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d)">
+<circle cx="24" cy="20" r="20" fill="white"/>
+</g>
+<path d="M14 16.3334C14 14.6765 15.3431 13.3334 17 13.3334H25.1667C26.8235 13.3334 28.1667 14.6765 28.1667 16.3334V23.6667C28.1667 25.3236 26.8235 26.6667 25.1667 26.6667H17C15.3431 26.6667 14 25.3236 14 23.6667V16.3334Z" fill="#61708B"/>
+<path d="M29.8334 17.5001L32.3753 15.4665C33.0301 14.9427 34 15.4089 34 16.2474V23.7528C34 24.5913 33.0301 25.0575 32.3753 24.5337L29.8334 22.5001V17.5001Z" fill="#61708B"/>
+<defs>
+<filter id="filter0_d" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+<feOffset dy="4"/>
+<feGaussianBlur stdDeviation="2"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index 6e0c9acdfe..0de5e69782 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -108,6 +108,9 @@ $eventtile-meta-color: $roomtopic-color;
 $header-divider-color: $header-panel-text-primary-color;
 $composer-e2e-icon-color: $header-panel-text-primary-color;
 
+// this probably shouldn't have it's own colour
+$voipcall-plinth-color: #21262c;
+
 // ********************
 
 $theme-button-bg-color: #e3e8f0;
@@ -117,8 +120,10 @@ $roomlist-filter-active-bg-color: $bg-color;
 $roomlist-bg-color: rgba(33, 38, 44, 0.90);
 $roomlist-header-color: $tertiary-fg-color;
 $roomsublist-divider-color: $primary-fg-color;
+$roomsublist-skeleton-ui-bg: linear-gradient(180deg, #3e444c 0%, #3e444c00 100%);
 
 $groupFilterPanel-divider-color: $roomlist-header-color;
+$space-button-outline-color: rgba(141, 151, 165, 0.2);
 
 $roomtile-preview-color: $secondary-fg-color;
 $roomtile-default-badge-bg-color: #61708b;
@@ -131,6 +136,7 @@ $notice-secondary-color: $roomlist-header-color;
 $panel-divider-color: transparent;
 
 $widget-menu-bar-bg-color: $header-panel-bg-color;
+$widget-body-bg-color: rgba(141, 151, 165, 0.2);
 
 // event tile lifecycle
 $event-sending-color: $text-secondary-color;
@@ -212,7 +218,7 @@ $composer-shadow-color: rgba(0, 0, 0, 0.28);
     /* align images in buttons (eg spinners) */
     vertical-align: middle;
     border: 0px;
-    border-radius: 4px;
+    border-radius: 8px;
     font-family: $font-family;
     font-size: $font-14px;
     color: $button-fg-color;
@@ -253,6 +259,12 @@ $composer-shadow-color: rgba(0, 0, 0, 0.28);
 // markdown overrides:
 .mx_EventTile_content .markdown-body pre:hover {
     border-color: #808080 !important; // inverted due to rules below
+    scrollbar-color: rgba(0, 0, 0, 0.2) transparent; // copied from light theme due to inversion below
+    // the code above works only in Firefox, this is for other browsers
+    // see https://developer.mozilla.org/en-US/docs/Web/CSS/scrollbar-color
+    &::-webkit-scrollbar-thumb {
+        background-color: rgba(0, 0, 0, 0.2); // copied from light theme due to inversion below
+    }
 }
 .mx_EventTile_content .markdown-body {
     pre, code {
@@ -272,6 +284,10 @@ $composer-shadow-color: rgba(0, 0, 0, 0.28);
             background-color: #080808;
         }
     }
+
+    blockquote {
+        color: #919191;
+    }
 }
 
 // diff highlight colors
diff --git a/res/themes/legacy-dark/css/_legacy-dark.scss b/res/themes/legacy-dark/css/_legacy-dark.scss
index efde7b3747..8c5f20178b 100644
--- a/res/themes/legacy-dark/css/_legacy-dark.scss
+++ b/res/themes/legacy-dark/css/_legacy-dark.scss
@@ -105,6 +105,9 @@ $eventtile-meta-color: $roomtopic-color;
 $header-divider-color: $header-panel-text-primary-color;
 $composer-e2e-icon-color: $header-panel-text-primary-color;
 
+// this probably shouldn't have it's own colour
+$voipcall-plinth-color: #f2f5f8;
+
 // ********************
 
 $theme-button-bg-color: #e3e8f0;
@@ -114,8 +117,10 @@ $roomlist-filter-active-bg-color: $roomlist-button-bg-color;
 $roomlist-bg-color: $header-panel-bg-color;
 
 $roomsublist-divider-color: $primary-fg-color;
+$roomsublist-skeleton-ui-bg: linear-gradient(180deg, #3e444c 0%, #3e444c00 100%);
 
 $groupFilterPanel-divider-color: $roomlist-header-color;
+$space-button-outline-color: rgba(141, 151, 165, 0.2);
 
 $roomtile-preview-color: #9e9e9e;
 $roomtile-default-badge-bg-color: #61708b;
@@ -126,6 +131,7 @@ $roomtile-selected-bg-color: #1A1D23;
 $panel-divider-color: $header-panel-border-color;
 
 $widget-menu-bar-bg-color: $header-panel-bg-color;
+$widget-body-bg-color: #1A1D23;
 
 // event tile lifecycle
 $event-sending-color: $text-secondary-color;
@@ -203,7 +209,7 @@ $composer-shadow-color: tranparent;
     /* align images in buttons (eg spinners) */
     vertical-align: middle;
     border: 0px;
-    border-radius: 4px;
+    border-radius: 8px;
     font-family: $font-family;
     font-size: $font-14px;
     color: $button-fg-color;
diff --git a/res/themes/legacy-light/css/_legacy-light.scss b/res/themes/legacy-light/css/_legacy-light.scss
index f77226cbca..3ba10a68ea 100644
--- a/res/themes/legacy-light/css/_legacy-light.scss
+++ b/res/themes/legacy-light/css/_legacy-light.scss
@@ -172,6 +172,9 @@ $eventtile-meta-color: $roomtopic-color;
 $composer-e2e-icon-color: #91a1c0;
 $header-divider-color: #91a1c0;
 
+// this probably shouldn't have it's own colour
+$voipcall-plinth-color: #f2f5f8;
+
 // ********************
 
 $theme-button-bg-color: #e3e8f0;
@@ -181,8 +184,10 @@ $roomlist-filter-active-bg-color: $roomlist-button-bg-color;
 $roomlist-bg-color: $header-panel-bg-color;
 $roomlist-header-color: $primary-fg-color;
 $roomsublist-divider-color: $primary-fg-color;
+$roomsublist-skeleton-ui-bg: linear-gradient(180deg, #ffffff 0%, #ffffff00 100%);
 
 $groupFilterPanel-divider-color: $roomlist-header-color;
+$space-button-outline-color: #E3E8F0;
 
 $roomtile-preview-color: #9e9e9e;
 $roomtile-default-badge-bg-color: #61708b;
@@ -208,6 +213,7 @@ $panel-divider-color: #dee1f3;
 // ********************
 
 $widget-menu-bar-bg-color: $secondary-accent-color;
+$widget-body-bg-color: #fff;
 
 // ********************
 
@@ -232,7 +238,8 @@ $event-redacted-border-color: #cccccc;
 $event-timestamp-color: #acacac;
 
 $copy-button-url: "$(res)/img/feather-customised/clipboard.svg";
-
+$collapse-button-url: "$(res)/img/feather-customised/minimise.svg";
+$expand-button-url: "$(res)/img/feather-customised/maximise.svg";
 
 // e2e
 $e2e-verified-color: #76cfa5; // N.B. *NOT* the same as $accent-color
@@ -326,7 +333,7 @@ $composer-shadow-color: tranparent;
     /* align images in buttons (eg spinners) */
     vertical-align: middle;
     border: 0px;
-    border-radius: 4px;
+    border-radius: 8px;
     font-family: $font-family;
     font-size: $font-14px;
     color: $button-fg-color;
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index d137373bd5..76bf2ddc21 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -166,6 +166,9 @@ $eventtile-meta-color: $roomtopic-color;
 $composer-e2e-icon-color: #91A1C0;
 $header-divider-color: #91A1C0;
 
+// this probably shouldn't have it's own colour
+$voipcall-plinth-color: #f2f5f8;
+
 // ********************
 
 $theme-button-bg-color: #e3e8f0;
@@ -175,8 +178,10 @@ $roomlist-filter-active-bg-color: #ffffff;
 $roomlist-bg-color: rgba(245, 245, 245, 0.90);
 $roomlist-header-color: $tertiary-fg-color;
 $roomsublist-divider-color: $primary-fg-color;
+$roomsublist-skeleton-ui-bg: linear-gradient(180deg, #ffffff 0%, #ffffff00 100%);
 
 $groupFilterPanel-divider-color: $roomlist-header-color;
+$space-button-outline-color: #E3E8F0;
 
 $roomtile-preview-color: $secondary-fg-color;
 $roomtile-default-badge-bg-color: #61708b;
@@ -208,6 +213,7 @@ $pinned-color: $notice-secondary-color;
 // ********************
 
 $widget-menu-bar-bg-color: $secondary-accent-color;
+$widget-body-bg-color: #FFF;
 
 // ********************
 
@@ -232,6 +238,8 @@ $event-redacted-border-color: #cccccc;
 $event-timestamp-color: #acacac;
 
 $copy-button-url: "$(res)/img/feather-customised/clipboard.svg";
+$collapse-button-url: "$(res)/img/feather-customised/minimise.svg";
+$expand-button-url: "$(res)/img/feather-customised/maximise.svg";
 
 // e2e
 $e2e-verified-color: #76cfa5; // N.B. *NOT* the same as $accent-color
@@ -330,7 +338,7 @@ $composer-shadow-color: rgba(0, 0, 0, 0.04);
     /* align images in buttons (eg spinners) */
     vertical-align: middle;
     border: 0px;
-    border-radius: 4px;
+    border-radius: 8px;
     font-family: $font-family;
     font-size: $font-14px;
     color: $button-fg-color;
diff --git a/res/themes/light/css/_mods.scss b/res/themes/light/css/_mods.scss
index 30aaeedf8f..fbca58dfb1 100644
--- a/res/themes/light/css/_mods.scss
+++ b/res/themes/light/css/_mods.scss
@@ -16,6 +16,10 @@
         backdrop-filter: blur($groupFilterPanel-background-blur-amount);
     }
 
+    .mx_SpacePanel {
+        backdrop-filter: blur($groupFilterPanel-background-blur-amount);
+    }
+
     .mx_LeftPanel .mx_LeftPanel_roomListContainer {
         backdrop-filter: blur($roomlist-background-blur-amount);
     }
diff --git a/scripts/ci/Dockerfile b/scripts/ci/Dockerfile
index c153d11cc7..3fdd0d7bf6 100644
--- a/scripts/ci/Dockerfile
+++ b/scripts/ci/Dockerfile
@@ -1,8 +1,7 @@
 # Update on docker hub with the following commands in the directory of this file:
-# docker build -t matrixdotorg/riotweb-ci-e2etests-env:latest .
-# docker log
-# docker push matrixdotorg/riotweb-ci-e2etests-env:latest
-FROM node:10
+# docker build -t vectorim/element-web-ci-e2etests-env:latest .
+# docker push vectorim/element-web-ci-e2etests-env:latest
+FROM node:14-buster
 RUN apt-get update
 RUN apt-get -y install build-essential python3-dev libffi-dev python-pip python-setuptools sqlite3 libssl-dev python-virtualenv libjpeg-dev libxslt1-dev uuid-runtime
 # dependencies for chrome (installed by puppeteer)
diff --git a/scripts/ci/riot-unit-tests.sh b/scripts/ci/app-tests.sh
similarity index 56%
rename from scripts/ci/riot-unit-tests.sh
rename to scripts/ci/app-tests.sh
index 337c0fe6c3..97e54dce66 100755
--- a/scripts/ci/riot-unit-tests.sh
+++ b/scripts/ci/app-tests.sh
@@ -2,11 +2,11 @@
 #
 # script which is run by the CI build (after `yarn test`).
 #
-# clones riot-web develop and runs the tests against our version of react-sdk.
+# clones element-web develop and runs the tests against our version of react-sdk.
 
 set -ev
 
-scripts/ci/layered-riot-web.sh
-cd ../riot-web
+scripts/ci/layered.sh
+cd element-web
 yarn build:genfiles # so the tests can run. Faster version of `build`
 yarn test
diff --git a/scripts/ci/end-to-end-tests.sh b/scripts/ci/end-to-end-tests.sh
index 7a62c03b12..edb8870d8e 100755
--- a/scripts/ci/end-to-end-tests.sh
+++ b/scripts/ci/end-to-end-tests.sh
@@ -2,7 +2,7 @@
 #
 # script which is run by the CI build (after `yarn test`).
 #
-# clones riot-web develop and runs the tests against our version of react-sdk.
+# clones element-web develop and runs the tests against our version of react-sdk.
 
 set -ev
 
@@ -14,20 +14,20 @@ handle_error() {
 trap 'handle_error' ERR
 
 echo "--- Building Element"
-scripts/ci/layered-riot-web.sh
-cd ../riot-web
-riot_web_dir=`pwd`
+scripts/ci/layered.sh
+cd element-web
+element_web_dir=`pwd`
 CI_PACKAGE=true yarn build
-cd ../matrix-react-sdk
+cd ..
 # run end to end tests
 pushd test/end-to-end-tests
-ln -s $riot_web_dir riot/riot-web
+ln -s $element_web_dir element/element-web
 # PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true ./install.sh
 # CHROME_PATH=$(which google-chrome-stable) ./run.sh
 echo "--- Install synapse & other dependencies"
 ./install.sh
-# install static webserver to server symlinked local copy of riot
-./riot/install-webserver.sh
+# install static webserver to server symlinked local copy of element
+./element/install-webserver.sh
 rm -r logs || true
 mkdir logs
 echo "+++ Running end-to-end tests"
diff --git a/scripts/ci/install-deps.sh b/scripts/ci/install-deps.sh
index 14b5fc5393..bbda74ef9d 100755
--- a/scripts/ci/install-deps.sh
+++ b/scripts/ci/install-deps.sh
@@ -7,7 +7,6 @@ scripts/fetchdep.sh matrix-org matrix-js-sdk
 pushd matrix-js-sdk
 yarn link
 yarn install $@
-yarn build
 popd
 
 yarn link matrix-js-sdk
diff --git a/scripts/ci/layered-riot-web.sh b/scripts/ci/layered-riot-web.sh
deleted file mode 100755
index f58794b451..0000000000
--- a/scripts/ci/layered-riot-web.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-# Creates an environment similar to one that riot-web would expect for
-# development. This means going one directory up (and assuming we're in
-# a directory like /workdir/matrix-react-sdk) and putting riot-web and
-# the js-sdk there.
-
-cd ../  # Assume we're at something like /workdir/matrix-react-sdk
-
-# Set up the js-sdk first
-matrix-react-sdk/scripts/fetchdep.sh matrix-org matrix-js-sdk
-pushd matrix-js-sdk
-yarn link
-yarn install
-popd
-
-# Now set up the react-sdk
-pushd matrix-react-sdk
-yarn link matrix-js-sdk
-yarn link
-yarn install
-popd
-
-# Finally, set up riot-web
-matrix-react-sdk/scripts/fetchdep.sh vector-im riot-web
-pushd riot-web
-yarn link matrix-js-sdk
-yarn link matrix-react-sdk
-yarn install
-yarn build:res
-popd
diff --git a/scripts/ci/layered.sh b/scripts/ci/layered.sh
new file mode 100755
index 0000000000..039f90c7df
--- /dev/null
+++ b/scripts/ci/layered.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# Creates a layered environment with the full repo for the app and SDKs cloned
+# and linked.
+
+# Note that this style is different from the recommended developer setup: this
+# file nests js-sdk and element-web inside react-sdk, while the local
+# development setup places them all at the same level. We are nesting them here
+# because some CI systems do not allow moving to a directory above the checkout
+# for the primary repo (react-sdk in this case).
+
+# Set up the js-sdk first
+scripts/fetchdep.sh matrix-org matrix-js-sdk
+pushd matrix-js-sdk
+yarn link
+yarn install
+popd
+
+# Now set up the react-sdk
+yarn link matrix-js-sdk
+yarn link
+yarn install
+yarn reskindex
+
+# Finally, set up element-web
+scripts/fetchdep.sh vector-im element-web
+pushd element-web
+yarn link matrix-js-sdk
+yarn link matrix-react-sdk
+yarn install
+yarn build:res
+popd
diff --git a/scripts/fetchdep.sh b/scripts/fetchdep.sh
index 0142305797..850eef25ec 100755
--- a/scripts/fetchdep.sh
+++ b/scripts/fetchdep.sh
@@ -34,7 +34,7 @@ elif [[ "${#BUILDKITE_BRANCH_ARRAY[@]}" == "2" ]]; then
 fi
 # Try the target branch of the push or PR.
 clone $deforg $defrepo $BUILDKITE_PULL_REQUEST_BASE_BRANCH
-# Try the current branch from Jenkins.
-clone $deforg $defrepo `"echo $GIT_BRANCH" | sed -e 's/^origin\///'`
+# Try HEAD which is the branch name in Netlify (not BRANCH which is pull/xxxx/head for PR builds)
+clone $deforg $defrepo $HEAD
 # Use the default branch as the last resort.
 clone $deforg $defrepo $defbranch
diff --git a/scripts/reskindex.js b/scripts/reskindex.js
index 9fb0e1a7c0..12310b77c1 100755
--- a/scripts/reskindex.js
+++ b/scripts/reskindex.js
@@ -1,29 +1,30 @@
 #!/usr/bin/env node
-var fs = require('fs');
-var path = require('path');
-var glob = require('glob');
-var args = require('minimist')(process.argv);
-var chokidar = require('chokidar');
+const fs = require('fs');
+const path = require('path');
+const glob = require('glob');
+const util = require('util');
+const args = require('minimist')(process.argv);
+const chokidar = require('chokidar');
 
-var componentIndex = path.join('src', 'component-index.js');
-var componentIndexTmp = componentIndex+".tmp";
-var componentsDir = path.join('src', 'components');
-var componentJsGlob = '**/*.js';
-var componentTsGlob = '**/*.tsx';
-var prevFiles = [];
+const componentIndex = path.join('src', 'component-index.js');
+const componentIndexTmp = componentIndex+".tmp";
+const componentsDir = path.join('src', 'components');
+const componentJsGlob = '**/*.js';
+const componentTsGlob = '**/*.tsx';
+let prevFiles = [];
 
-function reskindex() {
-    var jsFiles = glob.sync(componentJsGlob, {cwd: componentsDir}).sort();
-    var tsFiles = glob.sync(componentTsGlob, {cwd: componentsDir}).sort();
-    var files = [...tsFiles, ...jsFiles];
+async function reskindex() {
+    const jsFiles = glob.sync(componentJsGlob, {cwd: componentsDir}).sort();
+    const tsFiles = glob.sync(componentTsGlob, {cwd: componentsDir}).sort();
+    const files = [...tsFiles, ...jsFiles];
     if (!filesHaveChanged(files, prevFiles)) {
         return;
     }
     prevFiles = files;
 
-    var header = args.h || args.header;
+    const header = args.h || args.header;
 
-    var strm = fs.createWriteStream(componentIndexTmp);
+    const strm = fs.createWriteStream(componentIndexTmp);
 
     if (header) {
        strm.write(fs.readFileSync(header));
@@ -38,11 +39,11 @@ function reskindex() {
     strm.write(" */\n\n");
     strm.write("let components = {};\n");
 
-    for (var i = 0; i < files.length; ++i) {
-        var file = files[i].replace('.js', '').replace('.tsx', '');
+    for (let i = 0; i < files.length; ++i) {
+        const file = files[i].replace('.js', '').replace('.tsx', '');
 
-        var moduleName = (file.replace(/\//g, '.'));
-        var importName = moduleName.replace(/\./g, "$");
+        const moduleName = (file.replace(/\//g, '.'));
+        const importName = moduleName.replace(/\./g, "$");
 
         strm.write("import " + importName + " from './components/" + file + "';\n");
         strm.write(importName + " && (components['"+moduleName+"'] = " + importName + ");");
@@ -51,9 +52,10 @@ function reskindex() {
     }
 
     strm.write("export {components};\n");
-    strm.end();
+    // Ensure the file has been fully written to disk before proceeding
+    await util.promisify(strm.end);
     fs.rename(componentIndexTmp, componentIndex, function(err) {
-        if(err) {
+        if (err) {
             console.error("Error moving new index into place: " + err);
         } else {
             console.log('Reskindex: completed');
@@ -67,7 +69,7 @@ function filesHaveChanged(files, prevFiles) {
         return true;
     }
     // Check for name changes
-    for (var i = 0; i < files.length; i++) {
+    for (let i = 0; i < files.length; i++) {
         if (prevFiles[i] !== files[i]) {
             return true;
         }
@@ -81,7 +83,7 @@ if (!args.w) {
     return;
 }
 
-var watchDebouncer = null;
+let watchDebouncer = null;
 chokidar.watch(path.join(componentsDir, componentJsGlob)).on('all', (event, path) => {
     if (path === componentIndex) return;
     if (watchDebouncer) clearTimeout(watchDebouncer);
diff --git a/src/@types/global.d.ts b/src/@types/global.d.ts
index ed28a5c479..4aa6df5488 100644
--- a/src/@types/global.d.ts
+++ b/src/@types/global.d.ts
@@ -33,7 +33,12 @@ import RightPanelStore from "../stores/RightPanelStore";
 import WidgetStore from "../stores/WidgetStore";
 import CallHandler from "../CallHandler";
 import {Analytics} from "../Analytics";
+import CountlyAnalytics from "../CountlyAnalytics";
 import UserActivity from "../UserActivity";
+import {ModalWidgetStore} from "../stores/ModalWidgetStore";
+import { WidgetLayoutStore } from "../stores/widgets/WidgetLayoutStore";
+import VoipUserMapper from "../VoipUserMapper";
+import {SpaceStoreClass} from "../stores/SpaceStore";
 
 declare global {
     interface Window {
@@ -57,14 +62,26 @@ declare global {
         mxNotifier: typeof Notifier;
         mxRightPanelStore: RightPanelStore;
         mxWidgetStore: WidgetStore;
+        mxWidgetLayoutStore: WidgetLayoutStore;
         mxCallHandler: CallHandler;
         mxAnalytics: Analytics;
+        mxCountlyAnalytics: typeof CountlyAnalytics;
         mxUserActivity: UserActivity;
+        mxModalWidgetStore: ModalWidgetStore;
+        mxVoipUserMapper: VoipUserMapper;
+        mxSpaceStore: SpaceStoreClass;
     }
 
     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 +111,20 @@ 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>;
+    }
+
+    interface Error {
+        // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error/fileName
+        fileName?: string;
+        // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error/lineNumber
+        lineNumber?: number;
+        // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error/columnNumber
+        columnNumber?: number;
+    }
 }
diff --git a/src/Avatar.ts b/src/Avatar.ts
index 60bdfdcf75..e2557e21a8 100644
--- a/src/Avatar.ts
+++ b/src/Avatar.ts
@@ -165,6 +165,9 @@ export function avatarUrlForRoom(room: Room, width: number, height: number, resi
         return explicitRoomAvatar;
     }
 
+    // space rooms cannot be DMs so skip the rest
+    if (room.isSpaceRoom()) return null;
+
     let otherMember = null;
     const otherUserId = DMRoomMap.shared().getUserIdForRoomId(room.roomId);
     if (otherUserId) {
diff --git a/src/BasePlatform.ts b/src/BasePlatform.ts
index 4d06c5df73..9d7077097b 100644
--- a/src/BasePlatform.ts
+++ b/src/BasePlatform.ts
@@ -18,15 +18,19 @@ limitations under the License.
 */
 
 import {MatrixClient} from "matrix-js-sdk/src/client";
+import {encodeUnpaddedBase64} from "matrix-js-sdk/src/crypto/olmlib";
 import dis from './dispatcher/dispatcher';
 import BaseEventIndexManager from './indexing/BaseEventIndexManager';
 import {ActionPayload} from "./dispatcher/payloads";
 import {CheckUpdatesPayload} from "./dispatcher/payloads/CheckUpdatesPayload";
 import {Action} from "./dispatcher/actions";
 import {hideToast as hideUpdateToast} from "./toasts/UpdateToast";
+import {MatrixClientPeg} from "./MatrixClientPeg";
+import {idbLoad, idbSave, idbDelete} from "./utils/StorageManager";
 
 export const SSO_HOMESERVER_URL_KEY = "mx_sso_hs_url";
 export const SSO_ID_SERVER_URL_KEY = "mx_sso_is_url";
+export const SSO_IDP_ID_KEY = "mx_sso_idp_id";
 
 export enum UpdateCheckStatus {
     Checking = "CHECKING",
@@ -53,7 +57,7 @@ export default abstract class BasePlatform {
         this.startUpdateCheck = this.startUpdateCheck.bind(this);
     }
 
-    abstract async getConfig(): Promise<{}>;
+    abstract getConfig(): Promise<{}>;
 
     abstract getDefaultDeviceDisplayName(): string;
 
@@ -105,6 +109,9 @@ export default abstract class BasePlatform {
      * @param newVersion the version string to check
      */
     protected shouldShowUpdate(newVersion: string): boolean {
+        // If the user registered on this client in the last 24 hours then do not show them the update toast
+        if (MatrixClientPeg.userRegisteredWithinLastHours(24)) return false;
+
         try {
             const [version, deferUntil] = JSON.parse(localStorage.getItem(UPDATE_DEFER_KEY));
             return newVersion !== version || Date.now() > deferUntil;
@@ -124,6 +131,14 @@ export default abstract class BasePlatform {
         hideUpdateToast();
     }
 
+    /**
+     * Return true if platform supports multi-language
+     * spell-checking, otherwise false.
+     */
+    supportsMultiLanguageSpellCheck(): boolean {
+        return false;
+    }
+
     /**
      * Returns true if the platform supports displaying
      * notifications, otherwise false.
@@ -233,6 +248,16 @@ export default abstract class BasePlatform {
 
     setLanguage(preferredLangs: string[]) {}
 
+    setSpellCheckLanguages(preferredLangs: string[]) {}
+
+    getSpellCheckLanguages(): Promise<string[]> | null {
+        return null;
+    }
+
+    getAvailableSpellCheckLanguages(): Promise<string[]> | null {
+        return null;
+    }
+
     protected getSSOCallbackUrl(fragmentAfterLogin: string): URL {
         const url = new URL(window.location.href);
         url.hash = fragmentAfterLogin || "";
@@ -244,15 +269,19 @@ export default abstract class BasePlatform {
      * @param {MatrixClient} mxClient the matrix client using which we should start the flow
      * @param {"sso"|"cas"} loginType the type of SSO it is, CAS/SSO.
      * @param {string} fragmentAfterLogin the hash to pass to the app during sso callback.
+     * @param {string} idpId The ID of the Identity Provider being targeted, optional.
      */
-    startSingleSignOn(mxClient: MatrixClient, loginType: "sso" | "cas", fragmentAfterLogin: string) {
+    startSingleSignOn(mxClient: MatrixClient, loginType: "sso" | "cas", fragmentAfterLogin: string, idpId?: string) {
         // persist hs url and is url for when the user is returned to the app with the login token
         localStorage.setItem(SSO_HOMESERVER_URL_KEY, mxClient.getHomeserverUrl());
         if (mxClient.getIdentityServerUrl()) {
             localStorage.setItem(SSO_ID_SERVER_URL_KEY, mxClient.getIdentityServerUrl());
         }
+        if (idpId) {
+            localStorage.setItem(SSO_IDP_ID_KEY, idpId);
+        }
         const callbackUrl = this.getSSOCallbackUrl(fragmentAfterLogin);
-        window.location.href = mxClient.getSsoLoginUrl(callbackUrl.toString(), loginType); // redirect to SSO
+        window.location.href = mxClient.getSsoLoginUrl(callbackUrl.toString(), loginType, idpId); // redirect to SSO
     }
 
     onKeyDown(ev: KeyboardEvent): boolean {
@@ -268,7 +297,40 @@ export default abstract class BasePlatform {
      *     pickle key has been stored.
      */
     async getPickleKey(userId: string, deviceId: string): Promise<string | null> {
-        return null;
+        if (!window.crypto || !window.crypto.subtle) {
+            return null;
+        }
+        let data;
+        try {
+            data = await idbLoad("pickleKey", [userId, deviceId]);
+        } catch (e) {}
+        if (!data) {
+            return null;
+        }
+        if (!data.encrypted || !data.iv || !data.cryptoKey) {
+            console.error("Badly formatted pickle key");
+            return null;
+        }
+
+        const additionalData = new Uint8Array(userId.length + deviceId.length + 1);
+        for (let i = 0; i < userId.length; i++) {
+            additionalData[i] = userId.charCodeAt(i);
+        }
+        additionalData[userId.length] = 124; // "|"
+        for (let i = 0; i < deviceId.length; i++) {
+            additionalData[userId.length + 1 + i] = deviceId.charCodeAt(i);
+        }
+
+        try {
+            const key = await crypto.subtle.decrypt(
+                {name: "AES-GCM", iv: data.iv, additionalData}, data.cryptoKey,
+                data.encrypted,
+            );
+            return encodeUnpaddedBase64(key);
+        } catch (e) {
+            console.error("Error decrypting pickle key");
+            return null;
+        }
     }
 
     /**
@@ -279,7 +341,37 @@ export default abstract class BasePlatform {
      *     support storing pickle keys.
      */
     async createPickleKey(userId: string, deviceId: string): Promise<string | null> {
-        return null;
+        if (!window.crypto || !window.crypto.subtle) {
+            return null;
+        }
+        const crypto = window.crypto;
+        const randomArray = new Uint8Array(32);
+        crypto.getRandomValues(randomArray);
+        const cryptoKey = await crypto.subtle.generateKey(
+            {name: "AES-GCM", length: 256}, false, ["encrypt", "decrypt"],
+        );
+        const iv = new Uint8Array(32);
+        crypto.getRandomValues(iv);
+
+        const additionalData = new Uint8Array(userId.length + deviceId.length + 1);
+        for (let i = 0; i < userId.length; i++) {
+            additionalData[i] = userId.charCodeAt(i);
+        }
+        additionalData[userId.length] = 124; // "|"
+        for (let i = 0; i < deviceId.length; i++) {
+            additionalData[userId.length + 1 + i] = deviceId.charCodeAt(i);
+        }
+
+        const encrypted = await crypto.subtle.encrypt(
+            {name: "AES-GCM", iv, additionalData}, cryptoKey, randomArray,
+        );
+
+        try {
+            await idbSave("pickleKey", [userId, deviceId], {encrypted, iv, cryptoKey});
+        } catch (e) {
+            return null;
+        }
+        return encodeUnpaddedBase64(randomArray);
     }
 
     /**
@@ -288,5 +380,8 @@ export default abstract class BasePlatform {
      * @param {string} userId the device ID that the pickle key is for.
      */
     async destroyPickleKey(userId: string, deviceId: string): Promise<void> {
+        try {
+            await idbDelete("pickleKey", [userId, deviceId]);
+        } catch (e) {}
     }
 }
diff --git a/src/CallHandler.tsx b/src/CallHandler.tsx
index fc24feb90f..8621f441de 100644
--- a/src/CallHandler.tsx
+++ b/src/CallHandler.tsx
@@ -59,13 +59,11 @@ 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 { createNewMatrixCall } from 'matrix-js-sdk/src/webrtc/call';
 import dis from './dispatcher/dispatcher';
 import WidgetUtils from './utils/WidgetUtils';
 import WidgetEchoStore from './stores/WidgetEchoStore';
 import SettingsStore from './settings/SettingsStore';
-import {generateHumanReadableId} from "./utils/NamingUtils";
 import {Jitsi} from "./widgets/Jitsi";
 import {WidgetType} from "./widgets/WidgetType";
 import {SettingLevel} from "./settings/SettingLevel";
@@ -77,7 +75,27 @@ 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, CallType } from "matrix-js-sdk/src/webrtc/call";
+import Analytics from './Analytics';
+import CountlyAnalytics from "./CountlyAnalytics";
+import {UIFeature} from "./settings/UIFeature";
+import { CallError } from "matrix-js-sdk/src/webrtc/call";
+import { logger } from 'matrix-js-sdk/src/logger';
+import DesktopCapturerSourcePicker from "./components/views/elements/DesktopCapturerSourcePicker"
+import { Action } from './dispatcher/actions';
+import VoipUserMapper from './VoipUserMapper';
+import { addManagedHybridWidget, isManagedHybridWidgetEnabled } from './widgets/ManagedHybrid';
+import { randomUppercaseString, randomLowercaseString } from "matrix-js-sdk/src/randomstring";
+
+export const PROTOCOL_PSTN = 'm.protocol.pstn';
+export const PROTOCOL_PSTN_PREFIXED = 'im.vector.protocol.pstn';
+export const PROTOCOL_SIP_NATIVE = 'im.vector.protocol.sip_native';
+export const PROTOCOL_SIP_VIRTUAL = 'im.vector.protocol.sip_virtual';
+
+const CHECK_PROTOCOLS_ATTEMPTS = 3;
+// Event type for room account data and room creation content used to mark rooms as virtual rooms
+// (and store the ID of their native room)
+export const VIRTUAL_ROOM_EVENT_TYPE = 'im.vector.is_virtual_room';
 
 enum AudioID {
     Ring = 'ringAudio',
@@ -86,6 +104,29 @@ enum AudioID {
     Busy = 'busyAudio',
 }
 
+interface ThirdpartyLookupResponseFields {
+    /* eslint-disable camelcase */
+
+    // im.vector.sip_native
+    virtual_mxid?: string;
+    is_virtual?: boolean;
+
+    // im.vector.sip_virtual
+    native_mxid?: string;
+    is_native?: boolean;
+
+    // common
+    lookup_success?: boolean;
+
+    /* eslint-enable camelcase */
+}
+
+interface ThirdpartyLookupResponse {
+    userid: string,
+    protocol: string,
+    fields: ThirdpartyLookupResponseFields,
+}
+
 // Unlike 'CallType' in js-sdk, this one includes screen sharing
 // (because a screen sharing call is only a screen sharing call to the caller,
 // to the callee it's just a video call, at least as far as the current impl
@@ -96,9 +137,32 @@ 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 null;
+    }
+    return remoteAudioElement;
+}
+
 export default class CallHandler {
-    private calls = new Map<string, MatrixCall>();
+    private calls = new Map<string, MatrixCall>(); // roomId -> call
     private audioPromises = new Map<AudioID, Promise<void>>();
+    private dispatcherRef: string = null;
+    private supportsPstnProtocol = null;
+    private pstnSupportPrefixed = null; // True if the server only support the prefixed pstn protocol
+    private supportsSipNativeVirtual = null; // im.vector.protocol.sip_virtual and im.vector.protocol.sip_native
+    private pstnSupportCheckTimer: NodeJS.Timeout; // number actually because we're in the browser
+    // For rooms we've been invited to, true if they're from virtual user, false if we've checked and they aren't.
+    private invitedRoomsAreVirtual = new Map<string, boolean>();
+    private invitedRoomCheckInProgress = false;
 
     static sharedInstance() {
         if (!window.mxCallHandler) {
@@ -108,8 +172,17 @@ export default class CallHandler {
         return window.mxCallHandler;
     }
 
-    constructor() {
-        dis.register(this.onAction);
+    /*
+     * Gets the user-facing room associated with a call (call.roomId may be the call "virtual room"
+     * if a voip_mxid_translate_pattern is set in the config)
+     */
+    public static roomIdForCall(call: MatrixCall): string {
+        if (!call) return null;
+        return VoipUserMapper.sharedInstance().nativeRoomForVirtualRoom(call.roomId) || call.roomId;
+    }
+
+    start() {
+        this.dispatcherRef = dis.register(this.onAction);
         // add empty handlers for media actions, otherwise the media keys
         // end up causing the audio elements with our ring/ringback etc
         // audio clips in to play.
@@ -121,6 +194,100 @@ export default class CallHandler {
             navigator.mediaSession.setActionHandler('previoustrack', function() {});
             navigator.mediaSession.setActionHandler('nexttrack', function() {});
         }
+
+        if (SettingsStore.getValue(UIFeature.Voip)) {
+            MatrixClientPeg.get().on('Call.incoming', this.onCallIncoming);
+        }
+
+        this.checkProtocols(CHECK_PROTOCOLS_ATTEMPTS);
+    }
+
+    stop() {
+        const cli = MatrixClientPeg.get();
+        if (cli) {
+            cli.removeListener('Call.incoming', this.onCallIncoming);
+        }
+        if (this.dispatcherRef !== null) {
+            dis.unregister(this.dispatcherRef);
+            this.dispatcherRef = null;
+        }
+    }
+
+    private async checkProtocols(maxTries) {
+        try {
+            const protocols = await MatrixClientPeg.get().getThirdpartyProtocols();
+
+            if (protocols[PROTOCOL_PSTN] !== undefined) {
+                this.supportsPstnProtocol = Boolean(protocols[PROTOCOL_PSTN]);
+                if (this.supportsPstnProtocol) this.pstnSupportPrefixed = false;
+            } else if (protocols[PROTOCOL_PSTN_PREFIXED] !== undefined) {
+                this.supportsPstnProtocol = Boolean(protocols[PROTOCOL_PSTN_PREFIXED]);
+                if (this.supportsPstnProtocol) this.pstnSupportPrefixed = true;
+            } else {
+                this.supportsPstnProtocol = null;
+            }
+
+            dis.dispatch({action: Action.PstnSupportUpdated});
+
+            if (protocols[PROTOCOL_SIP_NATIVE] !== undefined && protocols[PROTOCOL_SIP_VIRTUAL] !== undefined) {
+                this.supportsSipNativeVirtual = Boolean(
+                    protocols[PROTOCOL_SIP_NATIVE] && protocols[PROTOCOL_SIP_VIRTUAL],
+                );
+            }
+
+            dis.dispatch({action: Action.VirtualRoomSupportUpdated});
+        } catch (e) {
+            if (maxTries === 1) {
+                console.log("Failed to check for protocol support and no retries remain: assuming no support", e);
+            } else {
+                console.log("Failed to check for protocol support: will retry", e);
+                this.pstnSupportCheckTimer = setTimeout(() => {
+                    this.checkProtocols(maxTries - 1);
+                }, 10000);
+            }
+        }
+    }
+
+    public getSupportsPstnProtocol() {
+        return this.supportsPstnProtocol;
+    }
+
+    public getSupportsVirtualRooms() {
+        return this.supportsPstnProtocol;
+    }
+
+    public pstnLookup(phoneNumber: string): Promise<ThirdpartyLookupResponse[]> {
+        return MatrixClientPeg.get().getThirdpartyUser(
+            this.pstnSupportPrefixed ? PROTOCOL_PSTN_PREFIXED : PROTOCOL_PSTN, {
+                'm.id.phone': phoneNumber,
+            },
+        );
+    }
+
+    public sipVirtualLookup(nativeMxid: string): Promise<ThirdpartyLookupResponse[]> {
+        return MatrixClientPeg.get().getThirdpartyUser(
+            PROTOCOL_SIP_VIRTUAL, {
+                'native_mxid': nativeMxid,
+            },
+        );
+    }
+
+    public sipNativeLookup(virtualMxid: string): Promise<ThirdpartyLookupResponse[]> {
+        return MatrixClientPeg.get().getThirdpartyUser(
+            PROTOCOL_SIP_NATIVE, {
+                'virtual_mxid': virtualMxid,
+            },
+        );
+    }
+
+    private onCallIncoming = (call) => {
+        // we dispatch this synchronously to make sure that the event
+        // handlers on the call are set up immediately (so that if
+        // we get an immediate hangup, we don't get a stuck call)
+        dis.dispatch({
+            action: 'incoming_call',
+            call: call,
+        }, true);
     }
 
     getCallForRoom(roomId: string): MatrixCall {
@@ -136,6 +303,28 @@ export default class CallHandler {
         return null;
     }
 
+    getAllActiveCalls() {
+        const activeCalls = [];
+
+        for (const call of this.calls.values()) {
+            if (call.state !== CallState.Ended && call.state !== CallState.Ringing) {
+                activeCalls.push(call);
+            }
+        }
+        return activeCalls;
+    }
+
+    getAllActiveCallsNotInRoom(notInThisRoomId) {
+        const callsNotInThatRoom = [];
+
+        for (const [roomId, call] of this.calls.entries()) {
+            if (roomId !== notInThisRoomId && call.state !== CallState.Ended) {
+                callsNotInThatRoom.push(call);
+            }
+        }
+        return callsNotInThatRoom;
+    }
+
     play(audioId: AudioID) {
         // TODO: Attach an invisible element for this instead
         // which listens?
@@ -183,15 +372,26 @@ export default class CallHandler {
         // We don't allow placing more than one call per room, but that doesn't mean there
         // can't be more than one, eg. in a glare situation. This checks that the given call
         // is the call we consider 'the' call for its room.
-        const callForThisRoom = this.getCallForRoom(call.roomId);
+        const mappedRoomId = CallHandler.roomIdForCall(call);
+
+        const callForThisRoom = this.getCallForRoom(mappedRoomId);
         return callForThisRoom && call.callId === callForThisRoom.callId;
     }
 
     private setCallListeners(call: MatrixCall) {
-        call.on(CallEvent.Error, (err) => {
+        const mappedRoomId = CallHandler.roomIdForCall(call);
+
+        call.on(CallEvent.Error, (err: CallError) => {
             if (!this.matchesCallForThisRoom(call)) return;
 
+            Analytics.trackEvent('voip', 'callError', 'error', err.toString());
             console.error("Call error:", err);
+
+            if (err.code === CallErrorCode.NoUserMedia) {
+                this.showMediaCaptureError(call);
+                return;
+            }
+
             if (
                 MatrixClientPeg.get().getTurnServers().length === 0 &&
                 SettingsStore.getValue("fallbackICEServerAllowed") === null
@@ -208,7 +408,9 @@ export default class CallHandler {
         call.on(CallEvent.Hangup, () => {
             if (!this.matchesCallForThisRoom(call)) return;
 
-            this.removeCallForRoom(call.roomId);
+            Analytics.trackEvent('voip', 'callHangup');
+
+            this.removeCallForRoom(mappedRoomId);
         });
         call.on(CallEvent.State, (newState: CallState, oldState: CallState) => {
             if (!this.matchesCallForThisRoom(call)) return;
@@ -232,19 +434,48 @@ export default class CallHandler {
                     this.play(AudioID.Ringback);
                     break;
                 case CallState.Ended:
-                    this.removeCallForRoom(call.roomId);
+                {
+                    Analytics.trackEvent('voip', 'callEnded', 'hangupReason', call.hangupReason);
+                    this.removeCallForRoom(mappedRoomId);
                     if (oldState === CallState.InviteSent && (
                         call.hangupParty === CallParty.Remote ||
                         (call.hangupParty === CallParty.Local && call.hangupReason === CallErrorCode.InviteTimeout)
                     )) {
                         this.play(AudioID.Busy);
-                        Modal.createTrackedDialog('Call Handler', 'Call Timeout', ErrorDialog, {
-                            title: _t('Call Timeout'),
-                            description: _t('The remote side failed to pick up') + '.',
+                        let title;
+                        let description;
+                        if (call.hangupReason === CallErrorCode.UserHangup) {
+                            title = _t("Call Declined");
+                            description = _t("The other party declined the call.");
+                        } else if (call.hangupReason === CallErrorCode.InviteTimeout) {
+                            title = _t("Call Failed");
+                            // XXX: full stop appended as some relic here, but these
+                            // strings need proper input from design anyway, so let's
+                            // not change this string until we have a proper one.
+                            description = _t('The remote side failed to pick up') + '.';
+                        } else {
+                            title = _t("Call Failed");
+                            description = _t("The call could not be established");
+                        }
+
+                        Modal.createTrackedDialog('Call Handler', 'Call Failed', ErrorDialog, {
+                            title, description,
                         });
-                    } else {
+                    } else if (
+                        call.hangupReason === CallErrorCode.AnsweredElsewhere && oldState === CallState.Connecting
+                    ) {
+                        Modal.createTrackedDialog('Call Handler', 'Call Failed', ErrorDialog, {
+                            title: _t("Answered Elsewhere"),
+                            description: _t("The call was answered on another device."),
+                        });
+                    } else if (oldState !== CallState.Fledgling && oldState !== CallState.Ringing) {
+                        // don't play the end-call sound for calls that never got off the ground
                         this.play(AudioID.CallEnd);
                     }
+
+                    this.logCallStats(call, mappedRoomId);
+                    break;
+                }
             }
         });
         call.on(CallEvent.Replaced, (newCall: MatrixCall) => {
@@ -258,20 +489,70 @@ export default class CallHandler {
                 this.pause(AudioID.Ringback);
             }
 
-            this.calls.set(newCall.roomId, newCall);
+            this.calls.set(mappedRoomId, newCall);
             this.setCallListeners(newCall);
             this.setCallState(newCall, newCall.state);
         });
     }
 
+    private async logCallStats(call: MatrixCall, mappedRoomId: string) {
+        const stats = await call.getCurrentCallStats();
+        logger.debug(
+            `Call completed. Call ID: ${call.callId}, virtual room ID: ${call.roomId}, ` +
+            `user-facing room ID: ${mappedRoomId}, direction: ${call.direction}, ` +
+            `our Party ID: ${call.ourPartyId}, hangup party: ${call.hangupParty}, ` +
+            `hangup reason: ${call.hangupReason}`,
+        );
+        if (!stats) {
+            logger.debug(
+                "Call statistics are undefined. The call has " +
+                "probably failed before a peerConn was established",
+            );
+            return;
+        }
+        logger.debug("Local candidates:");
+        for (const cand of stats.filter(item => item.type === 'local-candidate')) {
+            const address = cand.address || cand.ip; // firefox uses 'address', chrome uses 'ip'
+            logger.debug(
+                `${cand.id} - type: ${cand.candidateType}, address: ${address}, port: ${cand.port}, ` +
+                `protocol: ${cand.protocol}, relay protocol: ${cand.relayProtocol}, network type: ${cand.networkType}`,
+            );
+        }
+        logger.debug("Remote candidates:");
+        for (const cand of stats.filter(item => item.type === 'remote-candidate')) {
+            const address = cand.address || cand.ip; // firefox uses 'address', chrome uses 'ip'
+            logger.debug(
+                `${cand.id} - type: ${cand.candidateType}, address: ${address}, port: ${cand.port}, ` +
+                `protocol: ${cand.protocol}`,
+            );
+        }
+        logger.debug("Candidate pairs:");
+        for (const pair of stats.filter(item => item.type === 'candidate-pair')) {
+            logger.debug(
+                `${pair.localCandidateId} / ${pair.remoteCandidateId} - state: ${pair.state}, ` +
+                `nominated: ${pair.nominated}, ` +
+                `requests sent ${pair.requestsSent}, requests received  ${pair.requestsReceived},  ` +
+                `responses received: ${pair.responsesReceived}, responses sent: ${pair.responsesSent}, ` +
+                `bytes received: ${pair.bytesReceived}, bytes sent: ${pair.bytesSent}, `,
+            );
+        }
+    }
+
+    private setCallAudioElement(call: MatrixCall) {
+        const audioElement = getRemoteAudioElement();
+        if (audioElement) call.setRemoteAudioElement(audioElement);
+    }
+
     private setCallState(call: MatrixCall, status: CallState) {
+        const mappedRoomId = CallHandler.roomIdForCall(call);
+
         console.log(
-            `Call state in ${call.roomId} changed to ${status}`,
+            `Call state in ${mappedRoomId} changed to ${status}`,
         );
 
         dis.dispatch({
             action: 'call_state',
-            room_id: call.roomId,
+            room_id: mappedRoomId,
             state: status,
         });
     }
@@ -309,14 +590,56 @@ export default class CallHandler {
         }, null, true);
     }
 
+    private showMediaCaptureError(call: MatrixCall) {
+        let title;
+        let description;
 
-    private placeCall(
+        if (call.type === CallType.Voice) {
+            title = _t("Unable to access microphone");
+            description = <div>
+                {_t(
+                    "Call failed because microphone could not be accessed. " +
+                    "Check that a microphone is plugged in and set up correctly.",
+                )}
+            </div>;
+        } else if (call.type === CallType.Video) {
+            title = _t("Unable to access webcam / microphone");
+            description = <div>
+                {_t("Call failed because webcam or microphone could not be accessed. Check that:")}
+                <ul>
+                    <li>{_t("A microphone and webcam are plugged in and set up correctly")}</li>
+                    <li>{_t("Permission is granted to use the webcam")}</li>
+                    <li>{_t("No other application is using the webcam")}</li>
+                </ul>
+            </div>;
+        }
+
+        Modal.createTrackedDialog('Media capture failed', '', ErrorDialog, {
+            title, description,
+        }, null, true);
+    }
+
+    private async placeCall(
         roomId: string, type: PlaceCallType,
         localElement: HTMLVideoElement, remoteElement: HTMLVideoElement,
     ) {
-        const call = Matrix.createNewMatrixCall(MatrixClientPeg.get(), roomId);
+        Analytics.trackEvent('voip', 'placeCall', 'type', type);
+        CountlyAnalytics.instance.trackStartCall(roomId, type === PlaceCallType.Video, false);
+
+        const mappedRoomId = (await VoipUserMapper.sharedInstance().getOrCreateVirtualRoomForRoom(roomId)) || roomId;
+        logger.debug("Mapped real room " + roomId + " to room ID " + mappedRoomId);
+
+        const timeUntilTurnCresExpire = MatrixClientPeg.get().getTurnServersExpiry() - Date.now();
+        console.log("Current turn creds expire in " + timeUntilTurnCresExpire + " seconds");
+        const call = createNewMatrixCall(MatrixClientPeg.get(), mappedRoomId);
+
         this.calls.set(roomId, call);
+
         this.setCallListeners(call);
+        this.setCallAudioElement(call);
+
+        this.setActiveCallRoomId(roomId);
+
         if (type === PlaceCallType.Voice) {
             call.placeVoiceCall();
         } else if (type === 'video') {
@@ -335,9 +658,17 @@ export default class CallHandler {
                 });
                 return;
             }
-            call.placeScreenSharingCall(remoteElement, localElement);
+
+            call.placeScreenSharingCall(
+                remoteElement,
+                localElement,
+                async () : Promise<DesktopCapturerSource> => {
+                    const {finished} = Modal.createDialog(DesktopCapturerSourcePicker);
+                    const [source] = await finished;
+                    return source;
+                });
         } else {
-            console.error("Unknown conf call type: %s", type);
+            console.error("Unknown conf call type: " + type);
         }
     }
 
@@ -345,12 +676,10 @@ export default class CallHandler {
         switch (payload.action) {
             case 'place_call':
                 {
-                    if (this.getAnyActiveCall()) {
-                        Modal.createTrackedDialog('Call Handler', 'Existing Call', ErrorDialog, {
-                            title: _t('Existing Call'),
-                            description: _t('You are already in a call.'),
-                        });
-                        return; // don't allow >1 call to be placed.
+                    // We might be using managed hybrid widgets
+                    if (isManagedHybridWidgetEnabled()) {
+                        addManagedHybridWidget(payload.room_id);
+                        return;
                     }
 
                     // if the runtime env doesn't do VoIP, whine.
@@ -362,9 +691,26 @@ export default class CallHandler {
                         return;
                     }
 
+                    // don't allow > 2 calls to be placed.
+                    if (this.getAllActiveCalls().length > 1) {
+                        Modal.createTrackedDialog('Call Handler', 'Existing Call', ErrorDialog, {
+                            title: _t('Too Many Calls'),
+                            description: _t("You've reached the maximum number of simultaneous calls."),
+                        });
+                        return;
+                    }
+
                     const room = MatrixClientPeg.get().getRoom(payload.room_id);
                     if (!room) {
-                        console.error("Room %s does not exist.", payload.room_id);
+                        console.error(`Room ${payload.room_id} does not exist.`);
+                        return;
+                    }
+
+                    if (this.getCallForRoom(room.roomId)) {
+                        Modal.createTrackedDialog('Call Handler', 'Existing Call with user', ErrorDialog, {
+                            title: _t('Already in call'),
+                            description: _t("You're already in a call with this person."),
+                        });
                         return;
                     }
 
@@ -375,7 +721,7 @@ export default class CallHandler {
                         });
                         return;
                     } else if (members.length === 2) {
-                        console.info("Place %s call in %s", payload.type, payload.room_id);
+                        console.info(`Place ${payload.type} call in ${payload.room_id}`);
 
                         this.placeCall(payload.room_id, payload.type, payload.local_element, payload.remote_element);
                     } else { // > 2
@@ -390,57 +736,112 @@ export default class CallHandler {
                 }
                 break;
             case 'place_conference_call':
-                console.info("Place conference call in %s", payload.room_id);
+                console.info("Place conference call in " + payload.room_id);
+                Analytics.trackEvent('voip', 'placeConferenceCall');
+                CountlyAnalytics.instance.trackStartCall(payload.room_id, payload.type === PlaceCallType.Video, true);
                 this.startCallApp(payload.room_id, payload.type);
                 break;
             case 'end_conference':
-                console.info("Terminating conference call in %s", payload.room_id);
+                console.info("Terminating conference call in " + payload.room_id);
                 this.terminateCallApp(payload.room_id);
                 break;
             case 'hangup_conference':
-                console.info("Leaving conference call in %s", payload.room_id);
+                console.info("Leaving conference call in "+ payload.room_id);
                 this.hangupCallApp(payload.room_id);
                 break;
             case 'incoming_call':
                 {
-                    if (this.getAnyActiveCall()) {
-                        // ignore multiple incoming calls. in future, we may want a line-1/line-2 setup.
-                        // we avoid rejecting with "busy" in case the user wants to answer it on a different device.
-                        // in future we could signal a "local busy" as a warning to the caller.
-                        // see https://github.com/vector-im/vector-web/issues/1964
-                        return;
-                    }
-
                     // if the runtime env doesn't do VoIP, stop here.
                     if (!MatrixClientPeg.get().supportsVoip()) {
                         return;
                     }
 
                     const call = payload.call as MatrixCall;
-                    this.calls.set(call.roomId, call)
+
+                    const mappedRoomId = CallHandler.roomIdForCall(call);
+                    if (this.getCallForRoom(mappedRoomId)) {
+                        // ignore multiple incoming calls to the same room
+                        return;
+                    }
+
+                    Analytics.trackEvent('voip', 'receiveCall', 'type', call.type);
+                    this.calls.set(mappedRoomId, call)
                     this.setCallListeners(call);
+
+                    // get ready to send encrypted events in the room, so if the user does answer
+                    // the call, we'll be ready to send. NB. This is the protocol-level room ID not
+                    // the mapped one: that's where we'll send the events.
+                    const cli = MatrixClientPeg.get();
+                    cli.prepareToEncrypt(cli.getRoom(call.roomId));
                 }
                 break;
             case 'hangup':
+            case 'reject':
                 if (!this.calls.get(payload.room_id)) {
                     return; // no call to hangup
                 }
-                this.calls.get(payload.room_id).hangup(CallErrorCode.UserHangup, false)
-                this.removeCallForRoom(payload.room_id);
+                if (payload.action === 'reject') {
+                    this.calls.get(payload.room_id).reject();
+                } else {
+                    this.calls.get(payload.room_id).hangup(CallErrorCode.UserHangup, false);
+                }
+                // don't remove the call yet: let the hangup event handler do it (otherwise it will throw
+                // the hangup event away)
                 break;
-            case 'answer':
+            case 'answer': {
                 if (!this.calls.has(payload.room_id)) {
                     return; // no call to answer
                 }
-                this.calls.get(payload.room_id).answer();
+
+                if (this.getAllActiveCalls().length > 1) {
+                    Modal.createTrackedDialog('Call Handler', 'Existing Call', ErrorDialog, {
+                        title: _t('Too Many Calls'),
+                        description: _t("You've reached the maximum number of simultaneous calls."),
+                    });
+                    return;
+                }
+
+                const call = this.calls.get(payload.room_id);
+                call.answer();
+                this.setCallAudioElement(call);
+                this.setActiveCallRoomId(payload.room_id);
+                CountlyAnalytics.instance.trackJoinCall(payload.room_id, call.type === CallType.Video, false);
                 dis.dispatch({
                     action: "view_room",
                     room_id: payload.room_id,
                 });
                 break;
+            }
         }
     }
 
+    setActiveCallRoomId(activeCallRoomId: string) {
+        logger.info("Setting call in room " + activeCallRoomId + " active");
+
+        for (const [roomId, call] of this.calls.entries()) {
+            if (call.state === CallState.Ended) continue;
+
+            if (roomId === activeCallRoomId) {
+                call.setRemoteOnHold(false);
+            } else {
+                logger.info("Holding call in room " + roomId + " because another call is being set active");
+                call.setRemoteOnHold(true);
+            }
+        }
+    }
+
+    /**
+     * @returns true if we are currently in any call where we haven't put the remote party on hold
+     */
+    hasAnyUnheldCall() {
+        for (const call of this.calls.values()) {
+            if (call.state === CallState.Ended) continue;
+            if (!call.isRemoteOnHold()) return true;
+        }
+
+        return false;
+    }
+
     private async startCallApp(roomId: string, type: string) {
         dis.dispatch({
             action: 'appsDrawer',
@@ -470,8 +871,9 @@ export default class CallHandler {
             // https://github.com/matrix-org/prosody-mod-auth-matrix-user-verification
             confId = base32.stringify(Buffer.from(roomId), { pad: false });
         } else {
-            // Create a random human readable conference ID
-            confId = `JitsiConference${generateHumanReadableId()}`;
+            // Create a random conference ID
+            const random = randomUppercaseString(1) + randomLowercaseString(23);
+            confId = 'Jitsi' + random;
         }
 
         let widgetUrl = WidgetUtils.getLocalJitsiWrapperUrl({auth: jitsiAuth});
@@ -487,6 +889,7 @@ export default class CallHandler {
             isAudioOnly: type === 'voice',
             domain: jitsiDomain,
             auth: jitsiAuth,
+            roomName: room.name,
         };
 
         const widgetId = (
diff --git a/src/ContentMessages.tsx b/src/ContentMessages.tsx
index cba8671143..bec36d49f6 100644
--- a/src/ContentMessages.tsx
+++ b/src/ContentMessages.tsx
@@ -31,6 +31,7 @@ import Spinner from "./components/views/elements/Spinner";
 // Polyfill for Canvas.toBlob API using Canvas.toDataURL
 import "blueimp-canvas-to-blob";
 import { Action } from "./dispatcher/actions";
+import CountlyAnalytics from "./CountlyAnalytics";
 
 const MAX_WIDTH = 800;
 const MAX_HEIGHT = 600;
@@ -368,10 +369,13 @@ export default class ContentMessages {
     private mediaConfig: IMediaConfig = null;
 
     sendStickerContentToRoom(url: string, roomId: string, info: string, text: string, matrixClient: MatrixClient) {
-        return MatrixClientPeg.get().sendStickerMessage(roomId, url, info, text).catch((e) => {
+        const startTime = CountlyAnalytics.getTimestamp();
+        const prom = MatrixClientPeg.get().sendStickerMessage(roomId, url, info, text).catch((e) => {
             console.warn(`Failed to send content with URL ${url} to room ${roomId}`, e);
             throw e;
         });
+        CountlyAnalytics.instance.trackSendMessage(startTime, prom, roomId, false, false, {msgtype: "m.sticker"});
+        return prom;
     }
 
     getUploadLimit() {
@@ -479,6 +483,7 @@ export default class ContentMessages {
     }
 
     private sendContentToRoom(file: File, roomId: string, matrixClient: MatrixClient, promBefore: Promise<any>) {
+        const startTime = CountlyAnalytics.getTimestamp();
         const content: IContent = {
             body: file.name || 'Attachment',
             info: {
@@ -492,7 +497,7 @@ export default class ContentMessages {
             content.info.mimetype = file.type;
         }
 
-        const prom = new Promise((resolve) => {
+        const prom = new Promise<void>((resolve) => {
             if (file.type.indexOf('image/') === 0) {
                 content.msgtype = 'm.image';
                 infoForImageFile(matrixClient, roomId, file).then((imageInfo) => {
@@ -563,7 +568,9 @@ export default class ContentMessages {
             return promBefore;
         }).then(function() {
             if (upload.canceled) throw new UploadCanceledError();
-            return matrixClient.sendMessage(roomId, content);
+            const prom = matrixClient.sendMessage(roomId, content);
+            CountlyAnalytics.instance.trackSendMessage(startTime, prom, roomId, false, false, content);
+            return prom;
         }, function(err) {
             error = err;
             if (!upload.canceled) {
diff --git a/src/CountlyAnalytics.ts b/src/CountlyAnalytics.ts
new file mode 100644
index 0000000000..974c08df18
--- /dev/null
+++ b/src/CountlyAnalytics.ts
@@ -0,0 +1,973 @@
+/*
+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 {randomString} from "matrix-js-sdk/src/randomstring";
+
+import {getCurrentLanguage} from './languageHandler';
+import PlatformPeg from './PlatformPeg';
+import SdkConfig from './SdkConfig';
+import {MatrixClientPeg} from "./MatrixClientPeg";
+import {sleep} from "./utils/promise";
+import RoomViewStore from "./stores/RoomViewStore";
+
+// polyfill textencoder if necessary
+import * as TextEncodingUtf8 from 'text-encoding-utf-8';
+let TextEncoder = window.TextEncoder;
+if (!TextEncoder) {
+    TextEncoder = TextEncodingUtf8.TextEncoder;
+}
+
+const INACTIVITY_TIME = 20; // seconds
+const HEARTBEAT_INTERVAL = 5_000; // ms
+const SESSION_UPDATE_INTERVAL = 60; // seconds
+const MAX_PENDING_EVENTS = 1000;
+
+enum Orientation {
+    Landscape = "landscape",
+    Portrait = "portrait",
+}
+
+/* eslint-disable camelcase */
+interface IMetrics {
+    _resolution?: string;
+    _app_version?: string;
+    _density?: number;
+    _ua?: string;
+    _locale?: string;
+}
+
+interface IEvent {
+    key: string;
+    count: number;
+    sum?: number;
+    dur?: number;
+    segmentation?: Record<string, unknown>;
+    timestamp?: number; // TODO should we use the timestamp when we start or end for the event timestamp
+    hour?: unknown;
+    dow?: unknown;
+}
+
+interface IViewEvent extends IEvent {
+    key: "[CLY]_view";
+}
+
+interface IOrientationEvent extends IEvent {
+    key: "[CLY]_orientation";
+    segmentation: {
+        mode: Orientation;
+    };
+}
+
+interface IStarRatingEvent extends IEvent {
+    key: "[CLY]_star_rating";
+    segmentation: {
+        // we just care about collecting feedback, no need to associate with a feedback widget
+        widget_id?: string;
+        contactMe?: boolean;
+        email?: string;
+        rating: 1 | 2 | 3 | 4 | 5;
+        comment: string;
+    };
+}
+
+type Value = string | number | boolean;
+
+interface IOperationInc {
+    "$inc": number;
+}
+interface IOperationMul {
+    "$mul": number;
+}
+interface IOperationMax {
+    "$max": number;
+}
+interface IOperationMin {
+    "$min": number;
+}
+interface IOperationSetOnce {
+    "$setOnce": Value;
+}
+interface IOperationPush {
+    "$push": Value | Value[];
+}
+interface IOperationAddToSet {
+    "$addToSet": Value | Value[];
+}
+interface IOperationPull {
+    "$pull": Value | Value[];
+}
+
+type Operation =
+    IOperationInc |
+    IOperationMul |
+    IOperationMax |
+    IOperationMin |
+    IOperationSetOnce |
+    IOperationPush |
+    IOperationAddToSet |
+    IOperationPull;
+
+interface IUserDetails {
+    name?: string;
+    username?: string;
+    email?: string;
+    organization?: string;
+    phone?: string;
+    picture?: string;
+    gender?: string;
+    byear?: number;
+    custom?: Record<string, Value | Operation>; // `.` and `$` will be stripped out
+}
+
+interface ICrash {
+    _resolution?: string;
+    _app_version: string;
+
+    _ram_current?: number;
+    _ram_total?: number;
+    _disk_current?: number;
+    _disk_total?: number;
+    _orientation?: Orientation;
+
+    _online?: boolean;
+    _muted?: boolean;
+    _background?: boolean;
+    _view?: string;
+
+    _name?: string;
+    _error: string;
+    _nonfatal?: boolean;
+    _logs?: string;
+    _run?: number;
+
+    _custom?: Record<string, string>;
+}
+
+interface IParams {
+    // APP_KEY of an app for which to report
+    app_key: string;
+    // User identifier
+    device_id: string;
+
+    // Should provide value 1 to indicate session start
+    begin_session?: number;
+    // JSON object as string to provide metrics to track with the user
+    metrics?: string;
+    // Provides session duration in seconds, can be used as heartbeat to update current sessions duration, recommended time every 60 seconds
+    session_duration?: number;
+    // Should provide value 1 to indicate session end
+    end_session?: number;
+
+    // 10 digit UTC timestamp for recording past data.
+    timestamp?: number;
+    // current user local hour (0 - 23)
+    hour?: number;
+    // day of the week (0-sunday, 1 - monday, ... 6 - saturday)
+    dow?: number;
+
+    // JSON array as string containing event objects
+    events?: string; // IEvent[]
+    // JSON object as string containing information about users
+    user_details?: string;
+
+    // provide when changing device ID, so server would merge the data
+    old_device_id?: string;
+
+    // See ICrash
+    crash?: string;
+}
+
+interface IRoomSegments extends Record<string, Value> {
+    room_id: string; // hashed
+    num_users: number;
+    is_encrypted: boolean;
+    is_public: boolean;
+}
+
+interface ISendMessageEvent extends IEvent {
+    key: "send_message";
+    dur: number; // how long it to send (until remote echo)
+    segmentation: IRoomSegments & {
+        is_edit: boolean;
+        is_reply: boolean;
+        msgtype: string;
+        format?: string;
+    };
+}
+
+interface IRoomDirectoryEvent extends IEvent {
+    key: "room_directory";
+}
+
+interface IRoomDirectoryDoneEvent extends IEvent {
+    key: "room_directory_done";
+    dur: number; // time spent in the room directory modal
+}
+
+interface IRoomDirectorySearchEvent extends IEvent {
+    key: "room_directory_search";
+    sum: number; // number of search results
+    segmentation: {
+        query_length: number;
+        query_num_words: number;
+    };
+}
+
+interface IStartCallEvent extends IEvent {
+    key: "start_call";
+    segmentation: IRoomSegments & {
+        is_video: boolean;
+        is_jitsi: boolean;
+    };
+}
+
+interface IJoinCallEvent extends IEvent {
+    key: "join_call";
+    segmentation: IRoomSegments & {
+        is_video: boolean;
+        is_jitsi: boolean;
+    };
+}
+
+interface IBeginInviteEvent extends IEvent {
+    key: "begin_invite";
+    segmentation: IRoomSegments;
+}
+
+interface ISendInviteEvent extends IEvent {
+    key: "send_invite";
+    sum: number; // quantity that was invited
+    segmentation: IRoomSegments;
+}
+
+interface ICreateRoomEvent extends IEvent {
+    key: "create_room";
+    dur: number; // how long it took to create (until remote echo)
+    segmentation: {
+        room_id: string; // hashed
+        num_users: number;
+        is_encrypted: boolean;
+        is_public: boolean;
+    }
+}
+
+interface IJoinRoomEvent extends IEvent {
+    key: "join_room";
+    dur: number; // how long it took to join (until remote echo)
+    segmentation: {
+        room_id: string; // hashed
+        num_users: number;
+        is_encrypted: boolean;
+        is_public: boolean;
+        type: "room_directory" | "slash_command" | "link" | "invite";
+    };
+}
+/* eslint-enable camelcase */
+
+const hashHex = async (input: string): Promise<string> => {
+    const buf = new TextEncoder().encode(input);
+    const digestBuf = await window.crypto.subtle.digest("sha-256", buf);
+    return [...new Uint8Array(digestBuf)].map((b: number) => b.toString(16).padStart(2, "0")).join("");
+};
+
+const knownScreens = new Set([
+    "register", "login", "forgot_password", "soft_logout", "new", "settings", "welcome", "home", "start", "directory",
+    "start_sso", "start_cas", "groups", "complete_security", "post_registration", "room", "user", "group",
+]);
+
+interface IViewData {
+    name: string;
+    url: string;
+    meta: Record<string, string>;
+}
+
+// Apply fn to all hash path parts after the 1st one
+async function getViewData(anonymous = true): Promise<IViewData> {
+    const rand = randomString(8);
+    const { origin, hash } = window.location;
+    let { pathname } = window.location;
+
+    // Redact paths which could contain unexpected PII
+    if (origin.startsWith('file://')) {
+        pathname = `/<redacted_${rand}>/`; // XXX: inject rand because Count.ly doesn't like X->X transitions
+    }
+
+    let [_, screen, ...parts] = hash.split("/");
+
+    if (!knownScreens.has(screen)) {
+        screen = `<redacted_${rand}>`;
+    }
+
+    for (let i = 0; i < parts.length; i++) {
+        parts[i] = anonymous ? `<redacted_${rand}>` : await hashHex(parts[i]);
+    }
+
+    const hashStr = `${_}/${screen}/${parts.join("/")}`;
+    const url = origin + pathname + hashStr;
+
+    const meta = {};
+
+    let name = "$/" + hash;
+    switch (screen) {
+        case "room": {
+            name = "view_room";
+            const roomId = RoomViewStore.getRoomId();
+            name += " " + parts[0]; // XXX: workaround Count.ly missing X->X transitions
+            meta["room_id"] = parts[0];
+            Object.assign(meta, getRoomStats(roomId));
+            break;
+        }
+    }
+
+    return { name, url, meta };
+}
+
+const getRoomStats = (roomId: string) => {
+    const cli = MatrixClientPeg.get();
+    const room = cli?.getRoom(roomId);
+
+    return {
+        "num_users": room?.getJoinedMemberCount(),
+        "is_encrypted": cli?.isRoomEncrypted(roomId),
+        // eslint-disable-next-line camelcase
+        "is_public": room?.currentState.getStateEvents("m.room.join_rules", "")?.getContent()?.join_rule === "public",
+    }
+}
+
+// async wrapper for regex-powered String.prototype.replace
+const strReplaceAsync = async (str: string, regex: RegExp, fn: (...args: string[]) => Promise<string>) => {
+    const promises: Promise<string>[] = [];
+    // dry-run to calculate the replace values
+    str.replace(regex, (...args: string[]) => {
+        promises.push(fn(...args));
+        return "";
+    });
+    const values = await Promise.all(promises);
+    return str.replace(regex, () => values.shift());
+};
+
+export default class CountlyAnalytics {
+    private baseUrl: URL = null;
+    private appKey: string = null;
+    private userKey: string = null;
+    private anonymous: boolean;
+    private appPlatform: string;
+    private appVersion = "unknown";
+
+    private initTime = CountlyAnalytics.getTimestamp();
+    private firstPage = true;
+    private heartbeatIntervalId: NodeJS.Timeout;
+    private activityIntervalId: NodeJS.Timeout;
+    private trackTime = true;
+    private lastBeat: number;
+    private storedDuration = 0;
+    private lastView: string;
+    private lastViewTime = 0;
+    private lastViewStoredDuration = 0;
+    private sessionStarted = false;
+    private heartbeatEnabled = false;
+    private inactivityCounter = 0;
+    private pendingEvents: IEvent[] = [];
+
+    private static internalInstance = new CountlyAnalytics();
+
+    public static get instance(): CountlyAnalytics {
+        return CountlyAnalytics.internalInstance;
+    }
+
+    public get disabled() {
+        return !this.baseUrl;
+    }
+
+    public canEnable() {
+        const config = SdkConfig.get();
+        return Boolean(navigator.doNotTrack !== "1" && config?.countly?.url && config?.countly?.appKey);
+    }
+
+    private async changeUserKey(userKey: string, merge = false) {
+        const oldUserKey = this.userKey;
+        this.userKey = userKey;
+        if (oldUserKey && merge) {
+            await this.request({ old_device_id: oldUserKey });
+        }
+    }
+
+    public async enable(anonymous = true) {
+        if (!this.disabled && this.anonymous === anonymous) return;
+        if (!this.canEnable()) return;
+
+        if (!this.disabled) {
+            // flush request queue as our userKey is going to change, no need to await it
+            this.request();
+        }
+
+        const config = SdkConfig.get();
+        this.baseUrl = new URL("/i", config.countly.url);
+        this.appKey = config.countly.appKey;
+
+        this.anonymous = anonymous;
+        if (anonymous) {
+            await this.changeUserKey(randomString(64))
+        } else {
+            await this.changeUserKey(await hashHex(MatrixClientPeg.get().getUserId()), true);
+        }
+
+        const platform = PlatformPeg.get();
+        this.appPlatform = platform.getHumanReadableName();
+        try {
+            this.appVersion = await platform.getAppVersion();
+        } catch (e) {
+            console.warn("Failed to get app version, using 'unknown'");
+        }
+
+        // start heartbeat
+        this.heartbeatIntervalId = setInterval(this.heartbeat.bind(this), HEARTBEAT_INTERVAL);
+        this.trackSessions();
+        this.trackErrors();
+    }
+
+    public async disable() {
+        if (this.disabled) return;
+        await this.track("Opt-Out" );
+        this.endSession();
+        window.clearInterval(this.heartbeatIntervalId);
+        window.clearTimeout(this.activityIntervalId)
+        this.baseUrl = null;
+        // remove listeners bound in trackSessions()
+        window.removeEventListener("beforeunload", this.endSession);
+        window.removeEventListener("unload", this.endSession);
+        window.removeEventListener("visibilitychange", this.onVisibilityChange);
+        window.removeEventListener("mousemove", this.onUserActivity);
+        window.removeEventListener("click", this.onUserActivity);
+        window.removeEventListener("keydown", this.onUserActivity);
+        window.removeEventListener("scroll", this.onUserActivity);
+    }
+
+    public reportFeedback(rating: 1 | 2 | 3 | 4 | 5, comment: string) {
+        this.track<IStarRatingEvent>("[CLY]_star_rating", { rating, comment }, null, {}, true);
+    }
+
+    public trackPageChange(generationTimeMs?: number) {
+        if (this.disabled) return;
+        // TODO use generationTimeMs
+        this.trackPageView();
+    }
+
+    private async trackPageView() {
+        this.reportViewDuration();
+
+        await sleep(0); // XXX: we sleep here because otherwise we get the old hash and not the new one
+        const viewData = await getViewData(this.anonymous);
+
+        const page = viewData.name;
+        this.lastView = page;
+        this.lastViewTime = CountlyAnalytics.getTimestamp();
+        const segments = {
+            ...viewData.meta,
+            name: page,
+            visit: 1,
+            domain: window.location.hostname,
+            view: viewData.url,
+            segment: this.appPlatform,
+            start: this.firstPage,
+        };
+
+        if (this.firstPage) {
+            this.firstPage = false;
+        }
+
+        this.track<IViewEvent>("[CLY]_view", segments);
+    }
+
+    public static getTimestamp() {
+        return Math.floor(new Date().getTime() / 1000);
+    }
+
+    // store the last ms timestamp returned
+    // we do this to prevent the ts from ever decreasing in the case of system time changing
+    private lastMsTs = 0;
+
+    private getMsTimestamp() {
+        const ts = new Date().getTime();
+        if (this.lastMsTs >= ts) {
+            // increment ts as to keep our data points well-ordered
+            this.lastMsTs++;
+        } else {
+            this.lastMsTs = ts;
+        }
+        return this.lastMsTs;
+    }
+
+    public async recordError(err: Error | string, fatal = false) {
+        if (this.disabled || this.anonymous) return;
+
+        let error = "";
+        if (typeof err === "object") {
+            if (typeof err.stack !== "undefined") {
+                error = err.stack;
+            } else {
+                if (typeof err.name !== "undefined") {
+                    error += err.name + ":";
+                }
+                if (typeof err.message !== "undefined") {
+                    error += err.message + "\n";
+                }
+                if (typeof err.fileName !== "undefined") {
+                    error += "in " + err.fileName + "\n";
+                }
+                if (typeof err.lineNumber !== "undefined") {
+                    error += "on " + err.lineNumber;
+                }
+                if (typeof err.columnNumber !== "undefined") {
+                    error += ":" + err.columnNumber;
+                }
+            }
+        } else {
+            error = err + "";
+        }
+
+        // sanitize the error from identifiers
+        error = await strReplaceAsync(error, /([!@+#]).+?:[\w:.]+/g, async (substring: string, glyph: string) => {
+            return glyph + await hashHex(substring.substring(1));
+        });
+
+        const metrics = this.getMetrics();
+        const ob: ICrash = {
+            _resolution: metrics?._resolution,
+            _error: error,
+            _app_version: this.appVersion,
+            _run: CountlyAnalytics.getTimestamp() - this.initTime,
+            _nonfatal: !fatal,
+            _view: this.lastView,
+        };
+
+        if (typeof navigator.onLine !== "undefined") {
+            ob._online = navigator.onLine;
+        }
+
+        ob._background = document.hasFocus();
+
+        this.request({ crash: JSON.stringify(ob) });
+    }
+
+    private trackErrors() {
+        //override global uncaught error handler
+        window.onerror = (msg, url, line, col, err) => {
+            if (typeof err !== "undefined") {
+                this.recordError(err, false);
+            } else {
+                let error = "";
+                if (typeof msg !== "undefined") {
+                    error += msg + "\n";
+                }
+                if (typeof url !== "undefined") {
+                    error += "at " + url;
+                }
+                if (typeof line !== "undefined") {
+                    error += ":" + line;
+                }
+                if (typeof col !== "undefined") {
+                    error += ":" + col;
+                }
+                error += "\n";
+
+                try {
+                    const stack = [];
+                    // eslint-disable-next-line no-caller
+                    let f = arguments.callee.caller;
+                    while (f) {
+                        stack.push(f.name);
+                        f = f.caller;
+                    }
+                    error += stack.join("\n");
+                } catch (ex) {
+                    //silent error
+                }
+                this.recordError(error, false);
+            }
+        };
+
+        window.addEventListener('unhandledrejection', (event) => {
+            this.recordError(new Error(`Unhandled rejection (reason: ${event.reason?.stack || event.reason}).`), true);
+        });
+    }
+
+    private heartbeat() {
+        const args: Pick<IParams, "session_duration"> = {};
+
+        // extend session if needed
+        if (this.sessionStarted && this.trackTime) {
+            const last = CountlyAnalytics.getTimestamp();
+            if (last - this.lastBeat >= SESSION_UPDATE_INTERVAL) {
+                args.session_duration = last - this.lastBeat;
+                this.lastBeat = last;
+            }
+        }
+
+        // process event queue
+        if (this.pendingEvents.length > 0 || args.session_duration) {
+            this.request(args);
+        }
+    }
+
+    private async request(
+        args: Omit<IParams, "app_key" | "device_id" | "timestamp" | "hour" | "dow">
+            & Partial<Pick<IParams, "device_id">> = {},
+    ) {
+        const request: IParams = {
+            app_key: this.appKey,
+            device_id: this.userKey,
+            ...this.getTimeParams(),
+            ...args,
+        };
+
+        if (this.pendingEvents.length > 0) {
+            const EVENT_BATCH_SIZE = 10;
+            const events = this.pendingEvents.splice(0, EVENT_BATCH_SIZE);
+            request.events = JSON.stringify(events);
+        }
+
+        const params = new URLSearchParams(request as {});
+
+        try {
+            await window.fetch(this.baseUrl.toString(), {
+                method: "POST",
+                mode: "no-cors",
+                cache: "no-cache",
+                redirect: "follow",
+                headers: {
+                    "Content-Type": "application/x-www-form-urlencoded",
+                },
+                body: params,
+            });
+        } catch (e) {
+            console.error("Analytics error: ", e);
+        }
+    }
+
+    private getTimeParams(): Pick<IParams, "timestamp" | "hour" | "dow"> {
+        const date = new Date();
+        return {
+            timestamp: this.getMsTimestamp(),
+            hour: date.getHours(),
+            dow: date.getDay(),
+        };
+    }
+
+    private queue(args: Omit<IEvent, "timestamp" | "hour" | "dow" | "count"> & Partial<Pick<IEvent, "count">>) {
+        const {count = 1, ...rest} = args;
+        const ev = {
+            ...this.getTimeParams(),
+            ...rest,
+            count,
+            platform: this.appPlatform,
+            app_version: this.appVersion,
+        }
+
+        this.pendingEvents.push(ev);
+        if (this.pendingEvents.length > MAX_PENDING_EVENTS) {
+            this.pendingEvents.shift();
+        }
+    }
+
+    private getOrientation = (): Orientation => {
+        return window.innerWidth > window.innerHeight ? Orientation.Landscape : Orientation.Portrait;
+    };
+
+    private reportOrientation = () => {
+        this.track<IOrientationEvent>("[CLY]_orientation", {
+            mode: this.getOrientation(),
+        });
+    };
+
+    private startTime() {
+        if (!this.trackTime) {
+            this.trackTime = true;
+            this.lastBeat = CountlyAnalytics.getTimestamp() - this.storedDuration;
+            this.lastViewTime = CountlyAnalytics.getTimestamp() - this.lastViewStoredDuration;
+            this.lastViewStoredDuration = 0;
+        }
+    }
+
+    private stopTime() {
+        if (this.trackTime) {
+            this.trackTime = false;
+            this.storedDuration = CountlyAnalytics.getTimestamp() - this.lastBeat;
+            this.lastViewStoredDuration = CountlyAnalytics.getTimestamp() - this.lastViewTime;
+        }
+    }
+
+    private getMetrics(): IMetrics {
+        if (this.anonymous) return undefined;
+        const metrics: IMetrics = {};
+
+        // getting app version
+        metrics._app_version = this.appVersion;
+        metrics._ua = navigator.userAgent;
+
+        // getting resolution
+        if (screen.width && screen.height) {
+            metrics._resolution = `${screen.width}x${screen.height}`;
+        }
+
+        // getting density ratio
+        if (window.devicePixelRatio) {
+            metrics._density = window.devicePixelRatio;
+        }
+
+        // getting locale
+        metrics._locale = getCurrentLanguage();
+
+        return metrics;
+    }
+
+    private async beginSession(heartbeat = true) {
+        if (!this.sessionStarted) {
+            this.reportOrientation();
+            window.addEventListener("resize", this.reportOrientation);
+
+            this.lastBeat = CountlyAnalytics.getTimestamp();
+            this.sessionStarted = true;
+            this.heartbeatEnabled = heartbeat;
+
+            const userDetails: IUserDetails = {
+                custom: {
+                    "home_server": MatrixClientPeg.get() && MatrixClientPeg.getHomeserverName(), // TODO hash?
+                    "anonymous": this.anonymous,
+                },
+            };
+
+            const request: Parameters<typeof CountlyAnalytics.prototype.request>[0] = {
+                begin_session: 1,
+                user_details: JSON.stringify(userDetails),
+            }
+
+            const metrics = this.getMetrics();
+            if (metrics) {
+                request.metrics = JSON.stringify(metrics);
+            }
+
+            await this.request(request);
+        }
+    }
+
+    private reportViewDuration() {
+        if (this.lastView) {
+            this.track<IViewEvent>("[CLY]_view", {
+                name: this.lastView,
+            }, null, {
+                dur: this.trackTime ? CountlyAnalytics.getTimestamp() - this.lastViewTime : this.lastViewStoredDuration,
+            });
+            this.lastView = null;
+        }
+    }
+
+    private endSession = () => {
+        if (this.sessionStarted) {
+            window.removeEventListener("resize", this.reportOrientation)
+
+            this.reportViewDuration();
+            this.request({
+                end_session: 1,
+                session_duration: CountlyAnalytics.getTimestamp() - this.lastBeat,
+            });
+        }
+        this.sessionStarted = false;
+    };
+
+    private onVisibilityChange = () => {
+        if (document.hidden) {
+            this.stopTime();
+        } else {
+            this.startTime();
+        }
+    };
+
+    private onUserActivity = () => {
+        if (this.inactivityCounter >= INACTIVITY_TIME) {
+            this.startTime();
+        }
+        this.inactivityCounter = 0;
+    };
+
+    private trackSessions() {
+        this.beginSession();
+        this.startTime();
+
+        window.addEventListener("beforeunload", this.endSession);
+        window.addEventListener("unload", this.endSession);
+        window.addEventListener("visibilitychange", this.onVisibilityChange);
+        window.addEventListener("mousemove", this.onUserActivity);
+        window.addEventListener("click", this.onUserActivity);
+        window.addEventListener("keydown", this.onUserActivity);
+        window.addEventListener("scroll", this.onUserActivity);
+
+        this.activityIntervalId = setInterval(() => {
+            this.inactivityCounter++;
+            if (this.inactivityCounter >= INACTIVITY_TIME) {
+                this.stopTime();
+            }
+        }, 60_000);
+    }
+
+    public trackBeginInvite(roomId: string) {
+        this.track<IBeginInviteEvent>("begin_invite", {}, roomId);
+    }
+
+    public trackSendInvite(startTime: number, roomId: string, qty: number) {
+        this.track<ISendInviteEvent>("send_invite", {}, roomId, {
+            dur: CountlyAnalytics.getTimestamp() - startTime,
+            sum: qty,
+        });
+    }
+
+    public async trackRoomCreate(startTime: number, roomId: string) {
+        if (this.disabled) return;
+
+        let endTime = CountlyAnalytics.getTimestamp();
+        const cli = MatrixClientPeg.get();
+        if (!cli.getRoom(roomId)) {
+            await new Promise<void>(resolve => {
+                const handler = (room) => {
+                    if (room.roomId === roomId) {
+                        cli.off("Room", handler);
+                        resolve();
+                    }
+                };
+                cli.on("Room", handler);
+            });
+            endTime = CountlyAnalytics.getTimestamp();
+        }
+
+        this.track<ICreateRoomEvent>("create_room", {}, roomId, {
+            dur: endTime - startTime,
+        });
+    }
+
+    public trackRoomJoin(startTime: number, roomId: string, type: IJoinRoomEvent["segmentation"]["type"]) {
+        this.track<IJoinRoomEvent>("join_room", { type }, roomId, {
+            dur: CountlyAnalytics.getTimestamp() - startTime,
+        });
+    }
+
+    public async trackSendMessage(
+        startTime: number,
+        // eslint-disable-next-line camelcase
+        sendPromise: Promise<{event_id: string}>,
+        roomId: string,
+        isEdit: boolean,
+        isReply: boolean,
+        content: {format?: string, msgtype: string},
+    ) {
+        if (this.disabled) return;
+        const cli = MatrixClientPeg.get();
+        const room = cli.getRoom(roomId);
+
+        const eventId = (await sendPromise).event_id;
+        let endTime = CountlyAnalytics.getTimestamp();
+
+        if (!room.findEventById(eventId)) {
+            await new Promise<void>(resolve => {
+                const handler = (ev) => {
+                    if (ev.getId() === eventId) {
+                        room.off("Room.localEchoUpdated", handler);
+                        resolve();
+                    }
+                };
+
+                room.on("Room.localEchoUpdated", handler);
+            });
+            endTime = CountlyAnalytics.getTimestamp();
+        }
+
+        this.track<ISendMessageEvent>("send_message", {
+            is_edit: isEdit,
+            is_reply: isReply,
+            msgtype: content.msgtype,
+            format: content.format,
+        }, roomId, {
+            dur: endTime - startTime,
+        });
+    }
+
+    public trackStartCall(roomId: string, isVideo = false, isJitsi = false) {
+        this.track<IStartCallEvent>("start_call", {
+            is_video: isVideo,
+            is_jitsi: isJitsi,
+        }, roomId);
+    }
+
+    public trackJoinCall(roomId: string, isVideo = false, isJitsi = false) {
+        this.track<IJoinCallEvent>("join_call", {
+            is_video: isVideo,
+            is_jitsi: isJitsi,
+        }, roomId);
+    }
+
+    public trackRoomDirectoryBegin() {
+        this.track<IRoomDirectoryEvent>("room_directory");
+    }
+
+    public trackRoomDirectory(startTime: number) {
+        this.track<IRoomDirectoryDoneEvent>("room_directory_done", {}, null, {
+            dur: CountlyAnalytics.getTimestamp() - startTime,
+        });
+    }
+
+    public trackRoomDirectorySearch(numResults: number, query: string) {
+        this.track<IRoomDirectorySearchEvent>("room_directory_search", {
+            query_length: query.length,
+            query_num_words: query.split(" ").length,
+        }, null, {
+            sum: numResults,
+        });
+    }
+
+    public async track<E extends IEvent>(
+        key: E["key"],
+        segments?: Omit<E["segmentation"], "room_id" | "num_users" | "is_encrypted" | "is_public">,
+        roomId?: string,
+        args?: Partial<Pick<E, "dur" | "sum" | "timestamp">>,
+        anonymous = false,
+    ) {
+        if (this.disabled && !anonymous) return;
+
+        let segmentation = segments || {};
+
+        if (roomId) {
+            segmentation = {
+                room_id: await hashHex(roomId),
+                ...getRoomStats(roomId),
+                ...segments,
+            };
+        }
+
+        this.queue({
+            key,
+            count: 1,
+            segmentation,
+            ...args,
+        });
+
+        // if this event can be sent anonymously and we are disabled then dispatch it right away
+        if (this.disabled && anonymous) {
+            await this.request({ device_id: randomString(64) });
+        }
+    }
+}
+
+// expose on window for easy access from the console
+window.mxCountlyAnalytics = CountlyAnalytics;
diff --git a/src/HtmlUtils.tsx b/src/HtmlUtils.tsx
index c503247bf7..7d6b049914 100644
--- a/src/HtmlUtils.tsx
+++ b/src/HtmlUtils.tsx
@@ -27,6 +27,10 @@ import _linkifyString from 'linkifyjs/string';
 import classNames from 'classnames';
 import EMOJIBASE_REGEX from 'emojibase-regex';
 import url from 'url';
+import katex from 'katex';
+import { AllHtmlEntities } from 'html-entities';
+import SettingsStore from './settings/SettingsStore';
+import cheerio from 'cheerio';
 
 import {MatrixClientPeg} from './MatrixClientPeg';
 import {tryTransformPermalinkToLocalHref} from "./utils/permalinks/Permalinks";
@@ -159,7 +163,7 @@ const transformTags: IExtendedSanitizeOptions["transformTags"] = { // custom to
             attribs.target = '_blank'; // by default
 
             const transformed = tryTransformPermalinkToLocalHref(attribs.href);
-            if (transformed !== attribs.href || attribs.href.match(linkifyMatrix.VECTOR_URL_PATTERN)) {
+            if (transformed !== attribs.href || attribs.href.match(linkifyMatrix.ELEMENT_URL_PATTERN)) {
                 attribs.href = transformed;
                 delete attribs.target;
             }
@@ -171,7 +175,10 @@ const transformTags: IExtendedSanitizeOptions["transformTags"] = { // custom to
         // Strip out imgs that aren't `mxc` here instead of using allowedSchemesByTag
         // because transformTags is used _before_ we filter by allowedSchemesByTag and
         // we don't want to allow images with `https?` `src`s.
-        if (!attribs.src || !attribs.src.startsWith('mxc://')) {
+        // We also drop inline images (as if they were not present at all) when the "show
+        // images" preference is disabled. Future work might expose some UI to reveal them
+        // like standalone image events have.
+        if (!attribs.src || !attribs.src.startsWith('mxc://') || !SettingsStore.getValue("showImages")) {
             return { tagName, attribs: {}};
         }
         attribs.src = MatrixClientPeg.get().mxcUrlToHttp(
@@ -236,7 +243,8 @@ const sanitizeHtmlParams: IExtendedSanitizeOptions = {
     allowedAttributes: {
         // custom ones first:
         font: ['color', 'data-mx-bg-color', 'data-mx-color', 'style'], // custom to matrix
-        span: ['data-mx-bg-color', 'data-mx-color', 'data-mx-spoiler', 'style'], // custom to matrix
+        span: ['data-mx-maths', 'data-mx-bg-color', 'data-mx-color', 'data-mx-spoiler', 'style'], // custom to matrix
+        div: ['data-mx-maths'],
         a: ['href', 'name', 'target', 'rel'], // remote target: custom to matrix
         img: ['src', 'width', 'height', 'alt', 'title'],
         ol: ['start'],
@@ -410,18 +418,36 @@ export function bodyToHtml(content: IContent, highlights: string[], opts: IOpts
         if (isHtmlMessage) {
             isDisplayedWithHtml = true;
             safeBody = sanitizeHtml(formattedBody, sanitizeParams);
+
+            if (SettingsStore.getValue("feature_latex_maths")) {
+                const phtml = cheerio.load(safeBody,
+                    { _useHtmlParser2: true, decodeEntities: false })
+                // @ts-ignore - The types for `replaceWith` wrongly expect
+                // Cheerio instance to be returned.
+                phtml('div, span[data-mx-maths!=""]').replaceWith(function(i, e) {
+                    return katex.renderToString(
+                        AllHtmlEntities.decode(phtml(e).attr('data-mx-maths')),
+                        {
+                            throwOnError: false,
+                            displayMode: e.name == 'div',
+                            output: "htmlAndMathml",
+                        });
+                });
+                safeBody = phtml.html();
+            }
         }
     } finally {
         delete sanitizeParams.textFilter;
     }
 
+    const contentBody = isDisplayedWithHtml ? safeBody : strippedBody;
     if (opts.returnString) {
-        return isDisplayedWithHtml ? safeBody : strippedBody;
+        return contentBody;
     }
 
     let emojiBody = false;
     if (!opts.disableBigEmoji && bodyHasEmoji) {
-        let contentBodyTrimmed = strippedBody !== undefined ? strippedBody.trim() : '';
+        let contentBodyTrimmed = contentBody !== undefined ? contentBody.trim() : '';
 
         // Ignore spaces in body text. Emojis with spaces in between should
         // still be counted as purely emoji messages.
@@ -511,7 +537,6 @@ export function checkBlockNode(node: Node) {
         case "H6":
         case "PRE":
         case "BLOCKQUOTE":
-        case "DIV":
         case "P":
         case "UL":
         case "OL":
@@ -524,6 +549,9 @@ export function checkBlockNode(node: Node) {
         case "TH":
         case "TD":
             return true;
+        case "DIV":
+            // don't treat math nodes as block nodes for deserializing
+            return !(node as HTMLElement).hasAttribute("data-mx-maths");
         default:
             return false;
     }
diff --git a/src/IdentityAuthClient.js b/src/IdentityAuthClient.js
index fbdb6812ee..d3bfee2380 100644
--- a/src/IdentityAuthClient.js
+++ b/src/IdentityAuthClient.js
@@ -165,6 +165,7 @@ export default class IdentityAuthClient {
             });
             const [confirmed] = await finished;
             if (confirmed) {
+                // eslint-disable-next-line react-hooks/rules-of-hooks
                 useDefaultIdentityServer();
             } else {
                 throw new AbortedIdentityActionError(
diff --git a/src/ImageUtils.js b/src/ImageUtils.ts
similarity index 90%
rename from src/ImageUtils.js
rename to src/ImageUtils.ts
index c0f7b94b81..9bfab37193 100644
--- a/src/ImageUtils.js
+++ b/src/ImageUtils.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2015, 2016, 2020 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.
@@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
-
 /**
  * Returns the actual height that an image of dimensions (fullWidth, fullHeight)
  * will occupy if resized to fit inside a thumbnail bounding box of size
@@ -30,11 +28,11 @@ limitations under the License.
  * consume in the timeline, when performing scroll offset calcuations
  * (e.g. scroll locking)
  */
-export function thumbHeight(fullWidth, fullHeight, thumbWidth, thumbHeight) {
+export function thumbHeight(fullWidth: number, fullHeight: number, thumbWidth: number, thumbHeight: number) {
     if (!fullWidth || !fullHeight) {
         // Cannot calculate thumbnail height for image: missing w/h in metadata. We can't even
         // log this because it's spammy
-        return undefined;
+        return null;
     }
     if (fullWidth < thumbWidth && fullHeight < thumbHeight) {
         // no scaling needs to be applied
diff --git a/src/Lifecycle.ts b/src/Lifecycle.ts
index 6293de063d..7780d4c87a 100644
--- a/src/Lifecycle.ts
+++ b/src/Lifecycle.ts
@@ -21,6 +21,7 @@ limitations under the License.
 import Matrix from 'matrix-js-sdk';
 import { InvalidStoreError } from "matrix-js-sdk/src/errors";
 import { MatrixClient } from "matrix-js-sdk/src/client";
+import {decryptAES, encryptAES} from "matrix-js-sdk/src/crypto/aes";
 
 import {IMatrixClientCreds, MatrixClientPeg} from './MatrixClientPeg';
 import SecurityCustomisations from "./customisations/Security";
@@ -45,8 +46,13 @@ import {IntegrationManagers} from "./integrations/IntegrationManagers";
 import {Mjolnir} from "./mjolnir/Mjolnir";
 import DeviceListener from "./DeviceListener";
 import {Jitsi} from "./widgets/Jitsi";
-import {SSO_HOMESERVER_URL_KEY, SSO_ID_SERVER_URL_KEY} from "./BasePlatform";
+import {SSO_HOMESERVER_URL_KEY, SSO_ID_SERVER_URL_KEY, SSO_IDP_ID_KEY} from "./BasePlatform";
 import ThreepidInviteStore from "./stores/ThreepidInviteStore";
+import CountlyAnalytics from "./CountlyAnalytics";
+import CallHandler from './CallHandler';
+import LifecycleCustomisations from "./customisations/Lifecycle";
+import ErrorDialog from "./components/views/dialogs/ErrorDialog";
+import {_t} from "./languageHandler";
 
 const HOMESERVER_URL_KEY = "mx_hs_url";
 const ID_SERVER_URL_KEY = "mx_is_url";
@@ -144,20 +150,13 @@ export async function loadSession(opts: ILoadSessionOpts = {}): Promise<boolean>
  * Gets the user ID of the persisted session, if one exists. This does not validate
  * that the user's credentials still work, just that they exist and that a user ID
  * is associated with them. The session is not loaded.
- * @returns {String} The persisted session's owner, if an owner exists. Null otherwise.
+ * @returns {[String, bool]} The persisted session's owner and whether the stored
+ *     session is for a guest user, if an owner exists. If there is no stored session,
+ *     return [null, null].
  */
-export function getStoredSessionOwner(): string {
-    const {hsUrl, userId, accessToken} = getLocalStorageSessionVars();
-    return hsUrl && userId && accessToken ? userId : null;
-}
-
-/**
- * @returns {bool} True if the stored session is for a guest user or false if it is
- *     for a real user. If there is no stored session, return null.
- */
-export function getStoredSessionIsGuest(): boolean {
-    const sessVars = getLocalStorageSessionVars();
-    return sessVars.hsUrl && sessVars.userId && sessVars.accessToken ? sessVars.isGuest : null;
+export async function getStoredSessionOwner(): Promise<[string, boolean]> {
+    const {hsUrl, userId, hasAccessToken, isGuest} = await getStoredSessionVars();
+    return hsUrl && userId && hasAccessToken ? [userId, isGuest] : [null, null];
 }
 
 /**
@@ -165,7 +164,8 @@ export function getStoredSessionIsGuest(): boolean {
  *     query-parameters extracted from the real query-string of the starting
  *     URI.
  *
- * @param {String} defaultDeviceDisplayName
+ * @param {string} defaultDeviceDisplayName
+ * @param {string} fragmentAfterLogin path to go to after a successful login, only used for "Try again"
  *
  * @returns {Promise} promise which resolves to true if we completed the token
  *    login, else false
@@ -173,6 +173,7 @@ export function getStoredSessionIsGuest(): boolean {
 export function attemptTokenLogin(
     queryParams: Record<string, string>,
     defaultDeviceDisplayName?: string,
+    fragmentAfterLogin?: string,
 ): Promise<boolean> {
     if (!queryParams.loginToken) {
         return Promise.resolve(false);
@@ -182,6 +183,12 @@ export function attemptTokenLogin(
     const identityServer = localStorage.getItem(SSO_ID_SERVER_URL_KEY);
     if (!homeserver) {
         console.warn("Cannot log in with token: can't determine HS URL to use");
+        Modal.createTrackedDialog("SSO", "Unknown HS", ErrorDialog, {
+            title: _t("We couldn't log you in"),
+            description: _t("We asked the browser to remember which homeserver you use to let you sign in, " +
+                "but unfortunately your browser has forgotten it. Go to the sign in page and try again."),
+            button: _t("Try again"),
+        });
         return Promise.resolve(false);
     }
 
@@ -194,15 +201,35 @@ export function attemptTokenLogin(
         },
     ).then(function(creds) {
         console.log("Logged in with token");
-        return clearStorage().then(() => {
-            persistCredentialsToLocalStorage(creds);
+        return clearStorage().then(async () => {
+            await persistCredentials(creds);
             // remember that we just logged in
             sessionStorage.setItem("mx_fresh_login", String(true));
             return true;
         });
     }).catch((err) => {
-        console.error("Failed to log in with login token: " + err + " " +
-                      err.data);
+        Modal.createTrackedDialog("SSO", "Token Rejected", ErrorDialog, {
+            title: _t("We couldn't log you in"),
+            description: err.name === "ConnectionError"
+                ? _t("Your homeserver was unreachable and was not able to log you in. Please try again. " +
+                    "If this continues, please contact your homeserver administrator.")
+                : _t("Your homeserver rejected your log in attempt. " +
+                    "This could be due to things just taking too long. Please try again. " +
+                    "If this continues, please contact your homeserver administrator."),
+            button: _t("Try again"),
+            onFinished: tryAgain => {
+                if (tryAgain) {
+                    const cli = Matrix.createClient({
+                        baseUrl: homeserver,
+                        idBaseUrl: identityServer,
+                    });
+                    const idpId = localStorage.getItem(SSO_IDP_ID_KEY) || undefined;
+                    PlatformPeg.get().startSingleSignOn(cli, "sso", fragmentAfterLogin, idpId);
+                }
+            },
+        });
+        console.error("Failed to log in with login token:");
+        console.error(err);
         return false;
     });
 }
@@ -273,24 +300,42 @@ function registerAsGuest(
     });
 }
 
-export interface ILocalStorageSession {
+export interface IStoredSession {
     hsUrl: string;
     isUrl: string;
-    accessToken: string;
+    hasAccessToken: boolean;
+    accessToken: string | object;
     userId: string;
     deviceId: string;
     isGuest: boolean;
 }
 
 /**
- * Retrieves information about the stored session in localstorage. The session
+ * Retrieves information about the stored session from the browser's storage. The session
  * may not be valid, as it is not tested for consistency here.
  * @returns {Object} Information about the session - see implementation for variables.
  */
-export function getLocalStorageSessionVars(): ILocalStorageSession {
+export async function getStoredSessionVars(): Promise<IStoredSession> {
     const hsUrl = localStorage.getItem(HOMESERVER_URL_KEY);
     const isUrl = localStorage.getItem(ID_SERVER_URL_KEY);
-    const accessToken = localStorage.getItem("mx_access_token");
+    let accessToken;
+    try {
+        accessToken = await StorageManager.idbLoad("account", "mx_access_token");
+    } catch (e) {}
+    if (!accessToken) {
+        accessToken = localStorage.getItem("mx_access_token");
+        if (accessToken) {
+            try {
+                // try to migrate access token to IndexedDB if we can
+                await StorageManager.idbSave("account", "mx_access_token", accessToken);
+                localStorage.removeItem("mx_access_token");
+            } catch (e) {}
+        }
+    }
+    // if we pre-date storing "mx_has_access_token", but we retrieved an access
+    // token, then we should say we have an access token
+    const hasAccessToken =
+        (localStorage.getItem("mx_has_access_token") === "true") || !!accessToken;
     const userId = localStorage.getItem("mx_user_id");
     const deviceId = localStorage.getItem("mx_device_id");
 
@@ -302,7 +347,43 @@ export function getLocalStorageSessionVars(): ILocalStorageSession {
         isGuest = localStorage.getItem("matrix-is-guest") === "true";
     }
 
-    return {hsUrl, isUrl, accessToken, userId, deviceId, isGuest};
+    return {hsUrl, isUrl, hasAccessToken, accessToken, userId, deviceId, isGuest};
+}
+
+// The pickle key is a string of unspecified length and format.  For AES, we
+// need a 256-bit Uint8Array.  So we HKDF the pickle key to generate the AES
+// key.  The AES key should be zeroed after it is used.
+async function pickleKeyToAesKey(pickleKey: string): Promise<Uint8Array> {
+    const pickleKeyBuffer = new Uint8Array(pickleKey.length);
+    for (let i = 0; i < pickleKey.length; i++) {
+        pickleKeyBuffer[i] = pickleKey.charCodeAt(i);
+    }
+    const hkdfKey = await window.crypto.subtle.importKey(
+        "raw", pickleKeyBuffer, "HKDF", false, ["deriveBits"],
+    );
+    pickleKeyBuffer.fill(0);
+    return new Uint8Array(await window.crypto.subtle.deriveBits(
+        {
+            name: "HKDF", hash: "SHA-256",
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore: https://github.com/microsoft/TypeScript-DOM-lib-generator/pull/879
+            salt: new Uint8Array(32), info: new Uint8Array(0),
+        },
+        hkdfKey,
+        256,
+    ));
+}
+
+async function abortLogin() {
+    const signOut = await showStorageEvictedDialog();
+    if (signOut) {
+        await clearStorage();
+        // This error feels a bit clunky, but we want to make sure we don't go any
+        // further and instead head back to sign in.
+        throw new AbortLoginAndRebuildStorage(
+            "Aborting login in progress because of storage inconsistency",
+        );
+    }
 }
 
 // returns a promise which resolves to true if a session is found in
@@ -315,14 +396,18 @@ export function getLocalStorageSessionVars(): ILocalStorageSession {
 //      The plan is to gradually move the localStorage access done here into
 //      SessionStore to avoid bugs where the view becomes out-of-sync with
 //      localStorage (e.g. isGuest etc.)
-async function restoreFromLocalStorage(opts?: { ignoreGuest?: boolean }): Promise<boolean> {
+export async function restoreFromLocalStorage(opts?: { ignoreGuest?: boolean }): Promise<boolean> {
     const ignoreGuest = opts?.ignoreGuest;
 
     if (!localStorage) {
         return false;
     }
 
-    const {hsUrl, isUrl, accessToken, userId, deviceId, isGuest} = getLocalStorageSessionVars();
+    const {hsUrl, isUrl, hasAccessToken, accessToken, userId, deviceId, isGuest} = await getStoredSessionVars();
+
+    if (hasAccessToken && !accessToken) {
+        abortLogin();
+    }
 
     if (accessToken && userId && hsUrl) {
         if (ignoreGuest && isGuest) {
@@ -330,9 +415,15 @@ async function restoreFromLocalStorage(opts?: { ignoreGuest?: boolean }): Promis
             return false;
         }
 
+        let decryptedAccessToken = accessToken;
         const pickleKey = await PlatformPeg.get().getPickleKey(userId, deviceId);
         if (pickleKey) {
             console.log("Got pickle key");
+            if (typeof accessToken !== "string") {
+                const encrKey = await pickleKeyToAesKey(pickleKey);
+                decryptedAccessToken = await decryptAES(accessToken, encrKey, "access_token");
+                encrKey.fill(0);
+            }
         } else {
             console.log("No pickle key available");
         }
@@ -344,7 +435,7 @@ async function restoreFromLocalStorage(opts?: { ignoreGuest?: boolean }): Promis
         await doSetLoggedIn({
             userId: userId,
             deviceId: deviceId,
-            accessToken: accessToken,
+            accessToken: decryptedAccessToken as string,
             homeserverUrl: hsUrl,
             identityServerUrl: isUrl,
             guest: isGuest,
@@ -483,15 +574,7 @@ async function doSetLoggedIn(
     // crypto store, we'll be generally confused when handling encrypted data.
     // Show a modal recommending a full reset of storage.
     if (results.dataInLocalStorage && results.cryptoInited && !results.dataInCryptoStore) {
-        const signOut = await showStorageEvictedDialog();
-        if (signOut) {
-            await clearStorage();
-            // This error feels a bit clunky, but we want to make sure we don't go any
-            // further and instead head back to sign in.
-            throw new AbortLoginAndRebuildStorage(
-                "Aborting login in progress because of storage inconsistency",
-            );
-        }
+        await abortLogin();
     }
 
     Analytics.setLoggedIn(credentials.guest, credentials.homeserverUrl);
@@ -513,7 +596,7 @@ async function doSetLoggedIn(
 
     if (localStorage) {
         try {
-            persistCredentialsToLocalStorage(credentials);
+            await persistCredentials(credentials);
             // make sure we don't think that it's a fresh login any more
             sessionStorage.removeItem("mx_fresh_login");
         } catch (e) {
@@ -542,18 +625,55 @@ function showStorageEvictedDialog(): Promise<boolean> {
 // `instanceof`. Babel 7 supports this natively in their class handling.
 class AbortLoginAndRebuildStorage extends Error { }
 
-function persistCredentialsToLocalStorage(credentials: IMatrixClientCreds): void {
+async function persistCredentials(credentials: IMatrixClientCreds): Promise<void> {
     localStorage.setItem(HOMESERVER_URL_KEY, credentials.homeserverUrl);
     if (credentials.identityServerUrl) {
         localStorage.setItem(ID_SERVER_URL_KEY, credentials.identityServerUrl);
     }
     localStorage.setItem("mx_user_id", credentials.userId);
-    localStorage.setItem("mx_access_token", credentials.accessToken);
     localStorage.setItem("mx_is_guest", JSON.stringify(credentials.guest));
 
+    // store whether we expect to find an access token, to detect the case
+    // where IndexedDB is blown away
+    if (credentials.accessToken) {
+        localStorage.setItem("mx_has_access_token", "true");
+    } else {
+        localStorage.deleteItem("mx_has_access_token");
+    }
+
     if (credentials.pickleKey) {
+        let encryptedAccessToken;
+        try {
+            // try to encrypt the access token using the pickle key
+            const encrKey = await pickleKeyToAesKey(credentials.pickleKey);
+            encryptedAccessToken = await encryptAES(credentials.accessToken, encrKey, "access_token");
+            encrKey.fill(0);
+        } catch (e) {
+            console.warn("Could not encrypt access token", e);
+        }
+        try {
+            // save either the encrypted access token, or the plain access
+            // token if we were unable to encrypt (e.g. if the browser doesn't
+            // have WebCrypto).
+            await StorageManager.idbSave(
+                "account", "mx_access_token",
+                encryptedAccessToken || credentials.accessToken,
+            );
+        } catch (e) {
+            // if we couldn't save to indexedDB, fall back to localStorage.  We
+            // store the access token unencrypted since localStorage only saves
+            // strings.
+            localStorage.setItem("mx_access_token", credentials.accessToken);
+        }
         localStorage.setItem("mx_has_pickle_key", String(true));
     } else {
+        try {
+            await StorageManager.idbSave(
+                "account", "mx_access_token", credentials.accessToken,
+            );
+        } catch (e) {
+            localStorage.setItem("mx_access_token", credentials.accessToken);
+        }
         if (localStorage.getItem("mx_has_pickle_key")) {
             console.error("Expected a pickle key, but none provided.  Encryption may not work.");
         }
@@ -580,12 +700,16 @@ let _isLoggingOut = false;
  */
 export function logout(): void {
     if (!MatrixClientPeg.get()) return;
+    if (!CountlyAnalytics.instance.disabled) {
+        // user has logged out, fall back to anonymous
+        CountlyAnalytics.instance.enable(/* anonymous = */ true);
+    }
 
     if (MatrixClientPeg.get().isGuest()) {
         // logout doesn't work for guest sessions
-        // Also we sometimes want to re-log in a guest session
-        // if we abort the login
-        onLoggedOut();
+        // Also we sometimes want to re-log in a guest session if we abort the login.
+        // defer until next tick because it calls a synchronous dispatch and we are likely here from a dispatch.
+        setImmediate(() => onLoggedOut());
         return;
     }
 
@@ -660,6 +784,7 @@ async function startMatrixClient(startSyncing = true): Promise<void> {
     DMRoomMap.makeShared().start();
     IntegrationManagers.sharedInstance().startWatching();
     ActiveWidgetStore.start();
+    CallHandler.sharedInstance().start();
 
     // Start Mjolnir even though we haven't checked the feature flag yet. Starting
     // the thing just wastes CPU cycles, but should result in no actual functionality
@@ -709,6 +834,7 @@ export async function onLoggedOut(): Promise<void> {
     dis.dispatch({action: 'on_logged_out'}, true);
     stopMatrixClient();
     await clearStorage({deleteEverything: true});
+    LifecycleCustomisations.onLoggedOutAndStorageCleared?.();
 }
 
 /**
@@ -724,6 +850,10 @@ async function clearStorage(opts?: { deleteEverything?: boolean }): Promise<void
 
         window.localStorage.clear();
 
+        try {
+            await StorageManager.idbDelete("account", "mx_access_token");
+        } catch (e) {}
+
         // now restore those invites
         if (!opts?.deleteEverything) {
             pendingInvites.forEach(i => {
@@ -755,6 +885,7 @@ async function clearStorage(opts?: { deleteEverything?: boolean }): Promise<void
  */
 export function stopMatrixClient(unsetClient = true): void {
     Notifier.stop();
+    CallHandler.sharedInstance().stop();
     UserActivity.sharedInstance().stop();
     TypingStore.sharedInstance().reset();
     Presence.stop();
diff --git a/src/Login.ts b/src/Login.ts
index ae4aa226ed..aecc0493c7 100644
--- a/src/Login.ts
+++ b/src/Login.ts
@@ -29,10 +29,33 @@ interface ILoginOptions {
 }
 
 // TODO: Move this to JS SDK
-interface ILoginFlow {
-    type: string;
+interface IPasswordFlow {
+    type: "m.login.password";
 }
 
+export enum IdentityProviderBrand {
+    Gitlab = "org.matrix.gitlab",
+    Github = "org.matrix.github",
+    Apple = "org.matrix.apple",
+    Google = "org.matrix.google",
+    Facebook = "org.matrix.facebook",
+    Twitter = "org.matrix.twitter",
+}
+
+export interface IIdentityProvider {
+    id: string;
+    name: string;
+    icon?: string;
+    brand?: IdentityProviderBrand | string;
+}
+
+export interface ISSOFlow {
+    type: "m.login.sso" | "m.login.cas";
+    "org.matrix.msc2858.identity_providers": IIdentityProvider[]; // Unstable prefix for MSC2858
+}
+
+export type LoginFlow = ISSOFlow | IPasswordFlow;
+
 // TODO: Move this to JS SDK
 /* eslint-disable camelcase */
 interface ILoginParams {
@@ -48,9 +71,8 @@ export default class Login {
     private hsUrl: string;
     private isUrl: string;
     private fallbackHsUrl: string;
-    private currentFlowIndex: number;
     // TODO: Flows need a type in JS SDK
-    private flows: Array<ILoginFlow>;
+    private flows: Array<LoginFlow>;
     private defaultDeviceDisplayName: string;
     private tempClient: MatrixClient;
 
@@ -63,7 +85,6 @@ export default class Login {
         this.hsUrl = hsUrl;
         this.isUrl = isUrl;
         this.fallbackHsUrl = fallbackHsUrl;
-        this.currentFlowIndex = 0;
         this.flows = [];
         this.defaultDeviceDisplayName = opts.defaultDeviceDisplayName;
         this.tempClient = null; // memoize
@@ -100,27 +121,13 @@ export default class Login {
         });
     }
 
-    public async getFlows(): Promise<Array<ILoginFlow>> {
+    public async getFlows(): Promise<Array<LoginFlow>> {
         const client = this.createTemporaryClient();
         const { flows } = await client.loginFlows();
         this.flows = flows;
-        this.currentFlowIndex = 0;
-        // technically the UI should display options for all flows for the
-        // user to then choose one, so return all the flows here.
         return this.flows;
     }
 
-    public chooseFlow(flowIndex): void {
-        this.currentFlowIndex = flowIndex;
-    }
-
-    public getCurrentFlowStep(): string {
-        // technically the flow can have multiple steps, but no one does this
-        // for login so we can ignore it.
-        const flowStep = this.flows[this.currentFlowIndex];
-        return flowStep ? flowStep.type : null;
-    }
-
     public loginViaPassword(
         username: string,
         phoneCountry: string,
diff --git a/src/Markdown.js b/src/Markdown.js
index 492450e87d..f670bded12 100644
--- a/src/Markdown.js
+++ b/src/Markdown.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import commonmark from 'commonmark';
+import * as commonmark from 'commonmark';
 import {escape} from "lodash";
 
 const ALLOWED_HTML_TAGS = ['sub', 'sup', 'del', 'u'];
@@ -23,6 +23,11 @@ const ALLOWED_HTML_TAGS = ['sub', 'sup', 'del', 'u'];
 const TEXT_NODES = ['text', 'softbreak', 'linebreak', 'paragraph', 'document'];
 
 function is_allowed_html_tag(node) {
+    if (node.literal != null &&
+        node.literal.match('^<((div|span) data-mx-maths="[^"]*"|\/(div|span))>$') != null) {
+        return true;
+    }
+
     // Regex won't work for tags with attrs, but we only
     // allow <del> anyway.
     const matches = /^<\/?(.*)>$/.exec(node.literal);
@@ -30,6 +35,7 @@ function is_allowed_html_tag(node) {
         const tag = matches[1];
         return ALLOWED_HTML_TAGS.indexOf(tag) > -1;
     }
+
     return false;
 }
 
diff --git a/src/MatrixClientPeg.ts b/src/MatrixClientPeg.ts
index 5bb10dfa89..98ca446532 100644
--- a/src/MatrixClientPeg.ts
+++ b/src/MatrixClientPeg.ts
@@ -34,6 +34,7 @@ import * as StorageManager from './utils/StorageManager';
 import IdentityAuthClient from './IdentityAuthClient';
 import { crossSigningCallbacks, tryToUnlockSecretStorageWithDehydrationKey } from './SecurityManager';
 import {SHOW_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
+import SecurityCustomisations from "./customisations/Security";
 
 export interface IMatrixClientCreds {
     homeserverUrl: string;
@@ -100,6 +101,12 @@ export interface IMatrixClientPeg {
      */
     currentUserIsJustRegistered(): boolean;
 
+    /**
+     * If the current user has been registered by this device then this
+     * returns a boolean of whether it was within the last N hours given.
+     */
+    userRegisteredWithinLastHours(hours: number): boolean;
+
     /**
      * Replace this MatrixClientPeg's client with a client instance that has
      * homeserver / identity server URLs and active credentials
@@ -150,6 +157,9 @@ class _MatrixClientPeg implements IMatrixClientPeg {
 
     public setJustRegisteredUserId(uid: string): void {
         this.justRegisteredUserId = uid;
+        if (uid) {
+            window.localStorage.setItem("mx_registration_time", String(new Date().getTime()));
+        }
     }
 
     public currentUserIsJustRegistered(): boolean {
@@ -159,6 +169,15 @@ class _MatrixClientPeg implements IMatrixClientPeg {
         );
     }
 
+    public userRegisteredWithinLastHours(hours: number): boolean {
+        try {
+            const date = new Date(window.localStorage.getItem("mx_registration_time"));
+            return ((new Date().getTime() - date.getTime()) / 36e5) <= hours;
+        } catch (e) {
+            return false;
+        }
+    }
+
     public replaceUsingCreds(creds: IMatrixClientCreds): void {
         this.currentClientCreds = creds;
         this.createClient(creds);
@@ -260,6 +279,10 @@ class _MatrixClientPeg implements IMatrixClientPeg {
             timelineSupport: true,
             forceTURN: !SettingsStore.getValue('webRtcAllowPeerToPeer'),
             fallbackICEServerAllowed: !!SettingsStore.getValue('fallbackICEServerAllowed'),
+            // Gather up to 20 ICE candidates when a call arrives: this should be more than we'd
+            // ever normally need, so effectively this should make all the gathering happen when
+            // the call arrives.
+            iceCandidatePoolSize: 20,
             verificationMethods: [
                 verificationMethods.SAS,
                 SHOW_QR_CODE_METHOD,
@@ -273,7 +296,10 @@ class _MatrixClientPeg implements IMatrixClientPeg {
         // These are always installed regardless of the labs flag so that
         // cross-signing features can toggle on without reloading and also be
         // accessed immediately after login.
-        Object.assign(opts.cryptoCallbacks, crossSigningCallbacks);
+        const customisedCallbacks = {
+            getDehydrationKey: SecurityCustomisations.getDehydrationKey,
+        };
+        Object.assign(opts.cryptoCallbacks, crossSigningCallbacks, customisedCallbacks);
 
         this.matrixClient = createMatrixClient(opts);
 
diff --git a/src/Modal.tsx b/src/Modal.tsx
index b0f6ef988e..ab582b9b22 100644
--- a/src/Modal.tsx
+++ b/src/Modal.tsx
@@ -28,7 +28,7 @@ import AsyncWrapper from './AsyncWrapper';
 const DIALOG_CONTAINER_ID = "mx_Dialog_Container";
 const STATIC_DIALOG_CONTAINER_ID = "mx_Dialog_StaticContainer";
 
-interface IModal<T extends any[]> {
+export interface IModal<T extends any[]> {
     elem: React.ReactNode;
     className?: string;
     beforeClosePromise?: Promise<boolean>;
@@ -38,7 +38,7 @@ interface IModal<T extends any[]> {
     close(...args: T): void;
 }
 
-interface IHandle<T extends any[]> {
+export interface IHandle<T extends any[]> {
     finished: Promise<T>;
     close(...args: T): void;
 }
@@ -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/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);
             }
diff --git a/src/ObjectUtils.js b/src/ObjectUtils.js
deleted file mode 100644
index 24dfe61d68..0000000000
--- a/src/ObjectUtils.js
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-Copyright 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.
-*/
-
-/**
- * For two objects of the form { key: [val1, val2, val3] }, work out the added/removed
- * values. Entirely new keys will result in the entire value array being added.
- * @param {Object} before
- * @param {Object} after
- * @return {Object[]} An array of objects with the form:
- * { key: $KEY, val: $VALUE, place: "add|del" }
- */
-export function getKeyValueArrayDiffs(before, after) {
-    const results = [];
-    const delta = {};
-    Object.keys(before).forEach(function(beforeKey) {
-        delta[beforeKey] = delta[beforeKey] || 0; // init to 0 initially
-        delta[beforeKey]--; // keys present in the past have -ve values
-    });
-    Object.keys(after).forEach(function(afterKey) {
-        delta[afterKey] = delta[afterKey] || 0; // init to 0 initially
-        delta[afterKey]++; // keys present in the future have +ve values
-    });
-
-    Object.keys(delta).forEach(function(muxedKey) {
-        switch (delta[muxedKey]) {
-            case 1: // A new key in after
-                after[muxedKey].forEach(function(afterVal) {
-                    results.push({ place: "add", key: muxedKey, val: afterVal });
-                });
-                break;
-            case -1: // A before key was removed
-                before[muxedKey].forEach(function(beforeVal) {
-                    results.push({ place: "del", key: muxedKey, val: beforeVal });
-                });
-                break;
-            case 0: {// A mix of added/removed keys
-                // compare old & new vals
-                const itemDelta = {};
-                before[muxedKey].forEach(function(beforeVal) {
-                    itemDelta[beforeVal] = itemDelta[beforeVal] || 0;
-                    itemDelta[beforeVal]--;
-                });
-                after[muxedKey].forEach(function(afterVal) {
-                    itemDelta[afterVal] = itemDelta[afterVal] || 0;
-                    itemDelta[afterVal]++;
-                });
-
-                Object.keys(itemDelta).forEach(function(item) {
-                    if (itemDelta[item] === 1) {
-                        results.push({ place: "add", key: muxedKey, val: item });
-                    } else if (itemDelta[item] === -1) {
-                        results.push({ place: "del", key: muxedKey, val: item });
-                    } else {
-                        // itemDelta of 0 means it was unchanged between before/after
-                    }
-                });
-                break;
-            }
-            default:
-                console.error("Calculated key delta of " + delta[muxedKey] + " - this should never happen!");
-                break;
-        }
-    });
-
-    return results;
-}
-
-/**
- * Shallow-compare two objects for equality: each key and value must be identical
- * @param {Object} objA First object to compare against the second
- * @param {Object} objB Second object to compare against the first
- * @return {boolean} whether the two objects have same key=values
- */
-export function shallowEqual(objA, objB) {
-    if (objA === objB) {
-        return true;
-    }
-
-    if (typeof objA !== 'object' || objA === null ||
-          typeof objB !== 'object' || objB === null) {
-        return false;
-    }
-
-    const keysA = Object.keys(objA);
-    const keysB = Object.keys(objB);
-
-    if (keysA.length !== keysB.length) {
-        return false;
-    }
-
-    for (let i = 0; i < keysA.length; i++) {
-        const key = keysA[i];
-        if (!objB.hasOwnProperty(key) || objA[key] !== objB[key]) {
-            return false;
-        }
-    }
-
-    return true;
-}
diff --git a/src/PasswordReset.js b/src/PasswordReset.js
index 9472ddc633..b38a9de960 100644
--- a/src/PasswordReset.js
+++ b/src/PasswordReset.js
@@ -40,10 +40,6 @@ export default class PasswordReset {
         this.identityServerDomain = identityUrl ? identityUrl.split("://")[1] : null;
     }
 
-    doesServerRequireIdServerParam() {
-        return this.client.doesServerRequireIdServerParam();
-    }
-
     /**
      * Attempt to reset the user's password. This will trigger a side-effect of
      * sending an email to the provided email address.
@@ -78,9 +74,6 @@ export default class PasswordReset {
             sid: this.sessionId,
             client_secret: this.clientSecret,
         };
-        if (await this.doesServerRequireIdServerParam()) {
-            creds.id_server = this.identityServerDomain;
-        }
 
         try {
             await this.client.setPassword({
diff --git a/src/PhasedRollOut.js b/src/PhasedRollOut.js
deleted file mode 100644
index b17ed37974..0000000000
--- a/src/PhasedRollOut.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2018 New Vector 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 SdkConfig from './SdkConfig';
-import {hashCode} from './utils/FormattingUtils';
-
-export function phasedRollOutExpiredForUser(username, feature, now, rollOutConfig = SdkConfig.get().phasedRollOut) {
-    if (!rollOutConfig) {
-        console.log(`no phased rollout configuration, so enabling ${feature}`);
-        return true;
-    }
-    const featureConfig = rollOutConfig[feature];
-    if (!featureConfig) {
-        console.log(`${feature} doesn't have phased rollout configured, so enabling`);
-        return true;
-    }
-    if (!Number.isFinite(featureConfig.offset) || !Number.isFinite(featureConfig.period)) {
-        console.error(`phased rollout of ${feature} is misconfigured, ` +
-            `offset and/or period are not numbers, so disabling`, featureConfig);
-        return false;
-    }
-
-    const hash = hashCode(username);
-    //ms -> min, enable users at minute granularity
-    const bucketRatio = 1000 * 60;
-    const bucketCount = featureConfig.period / bucketRatio;
-    const userBucket = hash % bucketCount;
-    const userMs = userBucket * bucketRatio;
-    const enableAt = featureConfig.offset + userMs;
-    const result = now >= enableAt;
-    const bucketStr = `(bucket ${userBucket}/${bucketCount})`;
-    if (result) {
-        console.log(`${feature} enabled for ${username} ${bucketStr}`);
-    } else {
-        console.log(`${feature} will be enabled for ${username} in ${Math.ceil((enableAt - now)/1000)}s ${bucketStr}`);
-    }
-    return result;
-}
diff --git a/src/RoomInvite.js b/src/RoomInvite.js
index 7eb7f5dbb2..503411d2b3 100644
--- a/src/RoomInvite.js
+++ b/src/RoomInvite.js
@@ -22,7 +22,7 @@ import MultiInviter from './utils/MultiInviter';
 import Modal from './Modal';
 import * as sdk from './';
 import { _t } from './languageHandler';
-import {KIND_DM, KIND_INVITE} from "./components/views/dialogs/InviteDialog";
+import InviteDialog, {KIND_DM, KIND_INVITE, KIND_SPACE_INVITE} from "./components/views/dialogs/InviteDialog";
 import CommunityPrototypeInviteDialog from "./components/views/dialogs/CommunityPrototypeInviteDialog";
 import {CommunityPrototypeStore} from "./stores/CommunityPrototypeStore";
 
@@ -40,20 +40,23 @@ 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,
     );
 }
 
 export function showRoomInviteDialog(roomId) {
+    const isSpace = MatrixClientPeg.get()?.getRoom(roomId)?.isSpaceRoom();
     // This dialog handles the room creation internally - we don't need to worry about it.
-    const InviteDialog = sdk.getComponent("dialogs.InviteDialog");
     Modal.createTrackedDialog(
-        'Invite Users', '', InviteDialog, {kind: KIND_INVITE, roomId},
+        "Invite Users", isSpace ? "Space" : "Room", InviteDialog, {
+            kind: isSpace ? KIND_SPACE_INVITE : KIND_INVITE,
+            roomId,
+        },
         /*className=*/null, /*isPriority=*/false, /*isStatic=*/true,
     );
 }
diff --git a/src/RoomNotifs.js b/src/RoomNotifs.js
index a86c521ac4..600655f635 100644
--- a/src/RoomNotifs.js
+++ b/src/RoomNotifs.js
@@ -202,12 +202,13 @@ function setRoomNotifsStateUnmuted(roomId, newState) {
 }
 
 function findOverrideMuteRule(roomId) {
-    if (!MatrixClientPeg.get().pushRules ||
-        !MatrixClientPeg.get().pushRules['global'] ||
-        !MatrixClientPeg.get().pushRules['global'].override) {
+    const cli = MatrixClientPeg.get();
+    if (!cli.pushRules ||
+        !cli.pushRules['global'] ||
+        !cli.pushRules['global'].override) {
         return null;
     }
-    for (const rule of MatrixClientPeg.get().pushRules['global'].override) {
+    for (const rule of cli.pushRules['global'].override) {
         if (isRuleForRoom(roomId, rule)) {
             if (isMuteRule(rule) && rule.enabled) {
                 return rule;
diff --git a/src/Rooms.js b/src/Rooms.js
index 3da2b9bc14..955498faaa 100644
--- a/src/Rooms.js
+++ b/src/Rooms.js
@@ -21,6 +21,9 @@ import {MatrixClientPeg} from './MatrixClientPeg';
  * if any. This could be the canonical alias if one exists, otherwise
  * an alias selected arbitrarily but deterministically from the list
  * of aliases. Otherwise return null;
+ *
+ * @param {Object} room The room object
+ * @returns {string} A display alias for the given room
  */
 export function getDisplayAliasForRoom(room) {
     return room.getCanonicalAlias() || room.getAltAliases()[0];
diff --git a/src/Searching.js b/src/Searching.js
index b1507e6a49..f65b8920b3 100644
--- a/src/Searching.js
+++ b/src/Searching.js
@@ -360,7 +360,7 @@ function combineEvents(previousSearchResult, localEvents = undefined, serverEven
     let oldestEventFrom = previousSearchResult.oldestEventFrom;
     response.highlights = previousSearchResult.highlights;
 
-    if (localEvents && serverEvents) {
+    if (localEvents && serverEvents && serverEvents.results) {
         // This is a first search call, combine the events from the server and
         // the local index. Note where our oldest event came from, we shall
         // fetch the next batch of events from the other source.
@@ -379,7 +379,7 @@ function combineEvents(previousSearchResult, localEvents = undefined, serverEven
             oldestEventFrom = "local";
         }
         combineEventSources(previousSearchResult, response, localEvents.results, cachedEvents);
-    } else if (serverEvents) {
+    } else if (serverEvents && serverEvents.results) {
         // This is a pagination call fetching more events from the server,
         // meaning that our oldest event was in the local index.
         // Change the source of the oldest event if our server event is older
@@ -454,7 +454,7 @@ function combineResponses(previousSearchResult, localEvents = undefined, serverE
     return response;
 }
 
-function restoreEncryptionInfo(searchResultSlice) {
+function restoreEncryptionInfo(searchResultSlice = []) {
     for (let i = 0; i < searchResultSlice.length; i++) {
         const timeline = searchResultSlice[i].context.getTimeline();
 
@@ -517,7 +517,7 @@ async function combinedPagination(searchResult) {
         },
     };
 
-    const oldResultCount = searchResult.results.length;
+    const oldResultCount = searchResult.results ? searchResult.results.length : 0;
 
     // Let the client process the combined result.
     const result = client._processRoomEventsSearch(searchResult, response);
diff --git a/src/SecurityManager.ts b/src/SecurityManager.ts
index 220320470a..03cbe88c22 100644
--- a/src/SecurityManager.ts
+++ b/src/SecurityManager.ts
@@ -98,11 +98,27 @@ async function getSecretStorageKey(
     { keys: keyInfos }: { keys: Record<string, ISecretStorageKeyInfo> },
     ssssItemName,
 ): Promise<[string, Uint8Array]> {
-    const keyInfoEntries = Object.entries(keyInfos);
-    if (keyInfoEntries.length > 1) {
-        throw new Error("Multiple storage key requests not implemented");
+    const cli = MatrixClientPeg.get();
+    let keyId = await cli.getDefaultSecretStorageKeyId();
+    let keyInfo;
+    if (keyId) {
+        // use the default SSSS key if set
+        keyInfo = keyInfos[keyId];
+        if (!keyInfo) {
+            // if the default key is not available, pretend the default key
+            // isn't set
+            keyId = undefined;
+        }
+    }
+    if (!keyId) {
+        // if no default SSSS key is set, fall back to a heuristic of using the
+        // only available key, if only one key is set
+        const keyInfoEntries = Object.entries(keyInfos);
+        if (keyInfoEntries.length > 1) {
+            throw new Error("Multiple storage key requests not implemented");
+        }
+        [keyId, keyInfo] = keyInfoEntries[0];
     }
-    const [keyId, keyInfo] = keyInfoEntries[0];
 
     // Check the in-memory cache
     if (isCachingAllowed() && secretStorageKeys[keyId]) {
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/src/SlashCommands.tsx b/src/SlashCommands.tsx
index a6481d5b95..6b5f261374 100644
--- a/src/SlashCommands.tsx
+++ b/src/SlashCommands.tsx
@@ -46,6 +46,9 @@ import { EffectiveMembership, getEffectiveMembership, leaveRoomBehaviour } from
 import SdkConfig from "./SdkConfig";
 import SettingsStore from "./settings/SettingsStore";
 import {UIFeature} from "./settings/UIFeature";
+import {CHAT_EFFECTS} from "./effects"
+import CallHandler from "./CallHandler";
+import {guessAndSetDMRoom} from "./Rooms";
 
 // XXX: workaround for https://github.com/microsoft/TypeScript/issues/31816
 interface HTMLInputEvent extends Event {
@@ -77,6 +80,7 @@ export const CommandCategories = {
     "actions": _td("Actions"),
     "admin": _td("Admin"),
     "advanced": _td("Advanced"),
+    "effects": _td("Effects"),
     "other": _td("Other"),
 };
 
@@ -163,6 +167,32 @@ export const Commands = [
         },
         category: CommandCategories.messages,
     }),
+    new Command({
+        command: 'tableflip',
+        args: '<message>',
+        description: _td('Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message'),
+        runFn: function(roomId, args) {
+            let message = '(╯°□°）╯︵ ┻━┻';
+            if (args) {
+                message = message + ' ' + args;
+            }
+            return success(MatrixClientPeg.get().sendTextMessage(roomId, message));
+        },
+        category: CommandCategories.messages,
+    }),
+    new Command({
+        command: 'unflip',
+        args: '<message>',
+        description: _td('Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message'),
+        runFn: function(roomId, args) {
+            let message = '┬──┬ ノ( ゜-゜ノ)';
+            if (args) {
+                message = message + ' ' + args;
+            }
+            return success(MatrixClientPeg.get().sendTextMessage(roomId, message));
+        },
+        category: CommandCategories.messages,
+    }),
     new Command({
         command: 'lenny',
         args: '<message>',
@@ -517,6 +547,7 @@ export const Commands = [
                         action: 'view_room',
                         room_alias: roomAlias,
                         auto_join: true,
+                        _type: "slash_command", // instrumentation
                     });
                     return success();
                 } else if (params[0][0] === '!') {
@@ -531,6 +562,7 @@ export const Commands = [
                         },
                         via_servers: viaServers, // for the rejoin button
                         auto_join: true,
+                        _type: "slash_command", // instrumentation
                     });
                     return success();
                 } else if (isPermalink) {
@@ -555,6 +587,7 @@ export const Commands = [
                     const dispatch = {
                         action: 'view_room',
                         auto_join: true,
+                        _type: "slash_command", // instrumentation
                     };
 
                     if (entity[0] === '!') dispatch["room_id"] = entity;
@@ -998,14 +1031,27 @@ export const Commands = [
         description: _td("Opens chat with the given user"),
         args: "<user-id>",
         runFn: function(roomId, userId) {
-            if (!userId || !userId.startsWith("@") || !userId.includes(":")) {
+            // easter-egg for now: look up phone numbers through the thirdparty API
+            // (very dumb phone number detection...)
+            const isPhoneNumber = userId && /^\+?[0123456789]+$/.test(userId);
+            if (!userId || (!userId.startsWith("@") || !userId.includes(":")) && !isPhoneNumber) {
                 return reject(this.getUsage());
             }
 
             return success((async () => {
+                if (isPhoneNumber) {
+                    const results = await CallHandler.sharedInstance().pstnLookup(this.state.value);
+                    if (!results || results.length === 0 || !results[0].userid) {
+                        throw new Error("Unable to find Matrix ID for phone number");
+                    }
+                    userId = results[0].userid;
+                }
+
+                const roomId = await ensureDMExists(MatrixClientPeg.get(), userId);
+
                 dis.dispatch({
                     action: 'view_room',
-                    room_id: await ensureDMExists(MatrixClientPeg.get(), userId),
+                    room_id: roomId,
                 });
             })());
         },
@@ -1039,6 +1085,50 @@ 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();
+        },
+    }),
+    new Command({
+        command: "converttodm",
+        description: _td("Converts the room to a DM"),
+        category: CommandCategories.other,
+        runFn: function(roomId, args) {
+            const room = MatrixClientPeg.get().getRoom(roomId);
+            return success(guessAndSetDMRoom(room, true));
+        },
+    }),
+    new Command({
+        command: "converttoroom",
+        description: _td("Converts the DM to a room"),
+        category: CommandCategories.other,
+        runFn: function(roomId, args) {
+            const room = MatrixClientPeg.get().getRoom(roomId);
+            return success(guessAndSetDMRoom(room, false));
+        },
+    }),
 
     // Command definitions for autocompletion ONLY:
     // /me is special because its not handled by SlashCommands.js and is instead done inside the Composer classes
@@ -1049,6 +1139,30 @@ export const Commands = [
         category: CommandCategories.messages,
         hideCompletionAfterSpace: true,
     }),
+
+    ...CHAT_EFFECTS.map((effect) => {
+        return new Command({
+            command: effect.command,
+            description: effect.description(),
+            args: '<message>',
+            runFn: function(roomId, args) {
+                return success((async () => {
+                    if (!args) {
+                        args = effect.fallbackMessage();
+                        MatrixClientPeg.get().sendEmoteMessage(roomId, args);
+                    } else {
+                        const content = {
+                            msgtype: effect.msgType,
+                            body: args,
+                        };
+                        MatrixClientPeg.get().sendMessage(roomId, content);
+                    }
+                    dis.dispatch({action: `effects.${effect.command}`});
+                })());
+            },
+            category: CommandCategories.effects,
+        })
+    }),
 ];
 
 // build a map from names and aliases to the Command objects.
@@ -1066,7 +1180,7 @@ export function parseCommandString(input: string) {
     input = input.replace(/\s+$/, '');
     if (input[0] !== '/') return {}; // not a command
 
-    const bits = input.match(/^(\S+?)(?: +((.|\n)*))?$/);
+    const bits = input.match(/^(\S+?)(?:[ \n]+((.|\n)*))?$/);
     let cmd;
     let args;
     if (bits) {
diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 9589299e72..3afe41d216 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -19,6 +19,7 @@ import * as Roles from './Roles';
 import {isValid3pidInvite} from "./RoomInvite";
 import SettingsStore from "./settings/SettingsStore";
 import {ALL_RULE_TYPES, ROOM_RULE_TYPES, SERVER_RULE_TYPES, USER_RULE_TYPES} from "./mjolnir/BanList";
+import {WIDGET_LAYOUT_EVENT_TYPE} from "./stores/widgets/WidgetLayoutStore";
 
 function textForMemberEvent(ev) {
     // XXX: SYJS-16 "sender is sometimes null for join messages"
@@ -300,14 +301,27 @@ function textForCallHangupEvent(event) {
         reason = _t('(not supported by this browser)');
     } else if (eventContent.reason) {
         if (eventContent.reason === "ice_failed") {
+            // We couldn't establish a connection at all
             reason = _t('(could not connect media)');
+        } else if (eventContent.reason === "ice_timeout") {
+            // We established a connection but it died
+            reason = _t('(connection failed)');
+        } else if (eventContent.reason === "user_media_failed") {
+            // The other side couldn't open capture devices
+            reason = _t("(their device couldn't start the camera / microphone)");
+        } else if (eventContent.reason === "unknown_error") {
+            // An error code the other side doesn't have a way to express
+            // (as opposed to an error code they gave but we don't know about,
+            // in which case we show the error code)
+            reason = _t("(an error occurred)");
         } else if (eventContent.reason === "invite_timeout") {
             reason = _t('(no answer)');
-        } else if (eventContent.reason === "user hangup") {
+        } else if (eventContent.reason === "user hangup" || eventContent.reason === "user_hangup") {
             // workaround for https://github.com/vector-im/element-web/issues/5178
             // it seems Android randomly sets a reason of "user hangup" which is
             // interpreted as an error code :(
             // https://github.com/vector-im/riot-android/issues/2623
+            // Also the correct hangup code as of VoIP v1 (with underscore)
             reason = '';
         } else {
             reason = _t('(unknown failure: %(reason)s)', {reason: eventContent.reason});
@@ -316,6 +330,11 @@ function textForCallHangupEvent(event) {
     return _t('%(senderName)s ended the call.', {senderName}) + ' ' + reason;
 }
 
+function textForCallRejectEvent(event) {
+    const senderName = event.sender ? event.sender.name : _t('Someone');
+    return _t('%(senderName)s declined the call.', {senderName});
+}
+
 function textForCallInviteEvent(event) {
     const senderName = event.sender ? event.sender.name : _t('Someone');
     // FIXME: Find a better way to determine this from the event?
@@ -437,7 +456,7 @@ function textForWidgetEvent(event) {
     let widgetName = name || prevName || type || prevType || '';
     // Apply sentence case to widget name
     if (widgetName && widgetName.length > 0) {
-        widgetName = widgetName[0].toUpperCase() + widgetName.slice(1) + ' ';
+        widgetName = widgetName[0].toUpperCase() + widgetName.slice(1);
     }
 
     // If the widget was removed, its content should be {}, but this is sufficiently
@@ -459,6 +478,11 @@ function textForWidgetEvent(event) {
     }
 }
 
+function textForWidgetLayoutEvent(event) {
+    const senderName = event.sender?.name || event.getSender();
+    return _t("%(senderName)s has updated the widget layout", {senderName});
+}
+
 function textForMjolnirEvent(event) {
     const senderName = event.getSender();
     const {entity: prevEntity} = event.getPrevContent();
@@ -545,6 +569,7 @@ const handlers = {
     'm.call.invite': textForCallInviteEvent,
     'm.call.answer': textForCallAnswerEvent,
     'm.call.hangup': textForCallHangupEvent,
+    'm.call.reject': textForCallRejectEvent,
 };
 
 const stateHandlers = {
@@ -564,6 +589,7 @@ const stateHandlers = {
 
     // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
     'im.vector.modular.widgets': textForWidgetEvent,
+    [WIDGET_LAYOUT_EVENT_TYPE]: textForWidgetLayoutEvent,
 };
 
 // Add all the Mjolnir stuff to the renderer
diff --git a/src/Unread.js b/src/Unread.js
index cf131cac00..ddf225ac64 100644
--- a/src/Unread.js
+++ b/src/Unread.js
@@ -16,12 +16,14 @@ limitations under the License.
 
 import {MatrixClientPeg} from "./MatrixClientPeg";
 import shouldHideEvent from './shouldHideEvent';
-import * as sdk from "./index";
 import {haveTileForEvent} from "./components/views/rooms/EventTile";
 
 /**
  * Returns true iff this event arriving in a room should affect the room's
  * count of unread messages
+ *
+ * @param {Object} ev The event
+ * @returns {boolean} True if the given event should affect the unread message count
  */
 export function eventTriggersUnreadCount(ev) {
     if (ev.sender && ev.sender.userId == MatrixClientPeg.get().credentials.userId) {
diff --git a/src/Velociraptor.js b/src/Velociraptor.js
index ce52f60dbd..2da54babe5 100644
--- a/src/Velociraptor.js
+++ b/src/Velociraptor.js
@@ -118,25 +118,10 @@ export default class Velociraptor extends React.Component {
                     domNode.style.visibility = restingStyle.visibility;
                 });
 
-            /*
-            console.log("enter:",
-                        JSON.stringify(transitionOpts[i-1]),
-                        "->",
-                        JSON.stringify(restingStyle));
-            */
-        } else if (node === null) {
-            // Velocity stores data on elements using the jQuery .data()
-            // method, and assumes you'll be using jQuery's .remove() to
-            // remove the element, but we don't use jQuery, so we need to
-            // blow away the element's data explicitly otherwise it will leak.
-            // This uses Velocity's internal jQuery compatible wrapper.
-            // See the bug at
-            // https://github.com/julianshapiro/velocity/issues/300
-            // and the FAQ entry, "Preventing memory leaks when
-            // creating/destroying large numbers of elements"
-            // (https://github.com/julianshapiro/velocity/issues/47)
-            const domNode = ReactDom.findDOMNode(this.nodes[k]);
-            if (domNode) Velocity.Utilities.removeData(domNode);
+            // console.log("enter:",
+            //             JSON.stringify(transitionOpts[i-1]),
+            //             "->",
+            //             JSON.stringify(restingStyle));
         }
         this.nodes[k] = node;
     }
diff --git a/src/VoipUserMapper.ts b/src/VoipUserMapper.ts
new file mode 100644
index 0000000000..d919615349
--- /dev/null
+++ b/src/VoipUserMapper.ts
@@ -0,0 +1,110 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { ensureVirtualRoomExists, findDMForUser } from './createRoom';
+import { MatrixClientPeg } from "./MatrixClientPeg";
+import DMRoomMap from "./utils/DMRoomMap";
+import CallHandler, { VIRTUAL_ROOM_EVENT_TYPE } from './CallHandler';
+import { Room } from 'matrix-js-sdk/src/models/room';
+
+// Functions for mapping virtual users & rooms. Currently the only lookup
+// is sip virtual: there could be others in the future.
+
+export default class VoipUserMapper {
+    private virtualRoomIdCache = new Set<string>();
+
+    public static sharedInstance(): VoipUserMapper {
+        if (window.mxVoipUserMapper === undefined) window.mxVoipUserMapper = new VoipUserMapper();
+        return window.mxVoipUserMapper;
+    }
+
+    private async userToVirtualUser(userId: string): Promise<string> {
+        const results = await CallHandler.sharedInstance().sipVirtualLookup(userId);
+        if (results.length === 0) return null;
+        return results[0].userid;
+    }
+
+    public async getOrCreateVirtualRoomForRoom(roomId: string):Promise<string> {
+        const userId = DMRoomMap.shared().getUserIdForRoomId(roomId);
+        if (!userId) return null;
+
+        const virtualUser = await this.userToVirtualUser(userId);
+        if (!virtualUser) return null;
+
+        const virtualRoomId = await ensureVirtualRoomExists(MatrixClientPeg.get(), virtualUser, roomId);
+        MatrixClientPeg.get().setRoomAccountData(virtualRoomId, VIRTUAL_ROOM_EVENT_TYPE, {
+            native_room: roomId,
+        });
+
+        return virtualRoomId;
+    }
+
+    public nativeRoomForVirtualRoom(roomId: string):string {
+        const virtualRoom = MatrixClientPeg.get().getRoom(roomId);
+        if (!virtualRoom) return null;
+        const virtualRoomEvent = virtualRoom.getAccountData(VIRTUAL_ROOM_EVENT_TYPE);
+        if (!virtualRoomEvent || !virtualRoomEvent.getContent()) return null;
+        return virtualRoomEvent.getContent()['native_room'] || null;
+    }
+
+    public isVirtualRoom(room: Room):boolean {
+        if (this.nativeRoomForVirtualRoom(room.roomId)) return true;
+
+        if (this.virtualRoomIdCache.has(room.roomId)) return true;
+
+        // also look in the create event for the claimed native room ID, which is the only
+        // way we can recognise a virtual room we've created when it first arrives down
+        // our stream. We don't trust this in general though, as it could be faked by an
+        // inviter: our main source of truth is the DM state.
+        const roomCreateEvent = room.currentState.getStateEvents("m.room.create", "");
+        if (!roomCreateEvent || !roomCreateEvent.getContent()) return false;
+        // we only look at this for rooms we created (so inviters can't just cause rooms
+        // to be invisible)
+        if (roomCreateEvent.getSender() !== MatrixClientPeg.get().getUserId()) return false;
+        const claimedNativeRoomId = roomCreateEvent.getContent()[VIRTUAL_ROOM_EVENT_TYPE];
+        return Boolean(claimedNativeRoomId);
+    }
+
+    public async onNewInvitedRoom(invitedRoom: Room) {
+        const inviterId = invitedRoom.getDMInviter();
+        console.log(`Checking virtual-ness of room ID ${invitedRoom.roomId}, invited by ${inviterId}`);
+        const result = await CallHandler.sharedInstance().sipNativeLookup(inviterId);
+        if (result.length === 0) {
+            return true;
+        }
+
+        if (result[0].fields.is_virtual) {
+            const nativeUser = result[0].userid;
+            const nativeRoom = findDMForUser(MatrixClientPeg.get(), nativeUser);
+            if (nativeRoom) {
+                // It's a virtual room with a matching native room, so set the room account data. This
+                // will make sure we know where how to map calls and also allow us know not to display
+                // it in the future.
+                MatrixClientPeg.get().setRoomAccountData(invitedRoom.roomId, VIRTUAL_ROOM_EVENT_TYPE, {
+                    native_room: nativeRoom.roomId,
+                });
+                // also auto-join the virtual room if we have a matching native room
+                // (possibly we should only join if we've also joined the native room, then we'd also have
+                // to make sure we joined virtual rooms on joining a native one)
+                MatrixClientPeg.get().joinRoom(invitedRoom.roomId);
+            }
+
+            // also put this room in the virtual room ID cache so isVirtualRoom return the right answer
+            // in however long it takes for the echo of setAccountData to come down the sync
+            this.virtualRoomIdCache.add(invitedRoom.roomId);
+        }
+    }
+}
diff --git a/src/accessibility/KeyboardShortcuts.tsx b/src/accessibility/KeyboardShortcuts.tsx
index 58d8124122..7a0ba58c97 100644
--- a/src/accessibility/KeyboardShortcuts.tsx
+++ b/src/accessibility/KeyboardShortcuts.tsx
@@ -168,6 +168,12 @@ const shortcuts: Record<Categories, IShortcut[]> = {
                 key: Key.U,
             }],
             description: _td("Upload a file"),
+        }, {
+            keybinds: [{
+                modifiers: [CMD_OR_CTRL],
+                key: Key.F,
+            }],
+            description: _td("Search (must be enabled)"),
         },
     ],
 
@@ -257,6 +263,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/accessibility/RovingTabIndex.tsx b/src/accessibility/RovingTabIndex.tsx
index 434b931296..b49a90d175 100644
--- a/src/accessibility/RovingTabIndex.tsx
+++ b/src/accessibility/RovingTabIndex.tsx
@@ -205,7 +205,7 @@ export const RovingTabIndexProvider: React.FC<IProps> = ({children, handleHomeEn
 // onFocus should be called when the index gained focus in any manner
 // isActive should be used to set tabIndex in a manner such as `tabIndex={isActive ? 0 : -1}`
 // ref should be passed to a DOM node which will be used for DOM compareDocumentPosition
-export const useRovingTabIndex = (inputRef: Ref): [FocusHandler, boolean, Ref] => {
+export const useRovingTabIndex = (inputRef?: Ref): [FocusHandler, boolean, Ref] => {
     const context = useContext(RovingTabIndexContext);
     let ref = useRef<HTMLElement>(null);
 
diff --git a/src/accessibility/context_menu/MenuItem.tsx b/src/accessibility/context_menu/MenuItem.tsx
index 0bb169abf8..9a7c1d1f0a 100644
--- a/src/accessibility/context_menu/MenuItem.tsx
+++ b/src/accessibility/context_menu/MenuItem.tsx
@@ -19,14 +19,23 @@ limitations under the License.
 import React from "react";
 
 import AccessibleButton from "../../components/views/elements/AccessibleButton";
+import AccessibleTooltipButton from "../../components/views/elements/AccessibleTooltipButton";
 
 interface IProps extends React.ComponentProps<typeof AccessibleButton> {
     label?: string;
+    tooltip?: string;
 }
 
 // Semantic component for representing a role=menuitem
-export const MenuItem: React.FC<IProps> = ({children, label, ...props}) => {
+export const MenuItem: React.FC<IProps> = ({children, label, tooltip, ...props}) => {
     const ariaLabel = props["aria-label"] || label;
+
+    if (tooltip) {
+        return <AccessibleTooltipButton {...props} role="menuitem" tabIndex={-1} aria-label={ariaLabel} title={tooltip}>
+            { children }
+        </AccessibleTooltipButton>;
+    }
+
     return (
         <AccessibleButton {...props} role="menuitem" tabIndex={-1} aria-label={ariaLabel}>
             { children }
diff --git a/src/async-components/views/dialogs/security/CreateKeyBackupDialog.js b/src/async-components/views/dialogs/security/CreateKeyBackupDialog.js
index ab39a094db..863ee2b427 100644
--- a/src/async-components/views/dialogs/security/CreateKeyBackupDialog.js
+++ b/src/async-components/views/dialogs/security/CreateKeyBackupDialog.js
@@ -95,7 +95,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
         const blob = new Blob([this._keyBackupInfo.recovery_key], {
             type: 'text/plain;charset=us-ascii',
         });
-        FileSaver.saveAs(blob, 'recovery-key.txt');
+        FileSaver.saveAs(blob, 'security-key.txt');
 
         this.setState({
             downloaded: true,
@@ -238,7 +238,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
             )}</p>
             <p>{_t(
                 "We'll store an encrypted copy of your keys on our server. " +
-                "Secure your backup with a recovery passphrase.",
+                "Secure your backup with a Security Phrase.",
             )}</p>
             <p>{_t("For maximum security, this should be different from your account password.")}</p>
 
@@ -252,10 +252,10 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
                         onValidate={this._onPassPhraseValidate}
                         fieldRef={this._passphraseField}
                         autoFocus={true}
-                        label={_td("Enter a recovery passphrase")}
-                        labelEnterPassword={_td("Enter a recovery passphrase")}
-                        labelStrongPassword={_td("Great! This recovery passphrase looks strong enough.")}
-                        labelAllowedButUnsafe={_td("Great! This recovery passphrase looks strong enough.")}
+                        label={_td("Enter a Security Phrase")}
+                        labelEnterPassword={_td("Enter a Security Phrase")}
+                        labelStrongPassword={_td("Great! This Security Phrase looks strong enough.")}
+                        labelAllowedButUnsafe={_td("Great! This Security Phrase looks strong enough.")}
                     />
                 </div>
             </div>
@@ -270,7 +270,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
             <details>
                 <summary>{_t("Advanced")}</summary>
                 <AccessibleButton kind='primary' onClick={this._onSkipPassPhraseClick} >
-                    {_t("Set up with a recovery key")}
+                    {_t("Set up with a Security Key")}
                 </AccessibleButton>
             </details>
         </form>;
@@ -310,7 +310,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         return <form onSubmit={this._onPassPhraseConfirmNextClick}>
             <p>{_t(
-                "Please enter your recovery passphrase a second time to confirm.",
+                "Please enter your Security Phrase a second time to confirm.",
             )}</p>
             <div className="mx_CreateKeyBackupDialog_primaryContainer">
                 <div className="mx_CreateKeyBackupDialog_passPhraseContainer">
@@ -319,7 +319,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
                             onChange={this._onPassPhraseConfirmChange}
                             value={this.state.passPhraseConfirm}
                             className="mx_CreateKeyBackupDialog_passPhraseInput"
-                            placeholder={_t("Repeat your recovery passphrase...")}
+                            placeholder={_t("Repeat your Security Phrase...")}
                             autoFocus={true}
                         />
                     </div>
@@ -338,15 +338,15 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
     _renderPhaseShowKey() {
         return <div>
             <p>{_t(
-                "Your recovery key is a safety net - you can use it to restore " +
-                "access to your encrypted messages if you forget your recovery passphrase.",
+                "Your Security Key is a safety net - you can use it to restore " +
+                "access to your encrypted messages if you forget your Security Phrase.",
             )}</p>
             <p>{_t(
                 "Keep a copy of it somewhere secure, like a password manager or even a safe.",
             )}</p>
             <div className="mx_CreateKeyBackupDialog_primaryContainer">
                 <div className="mx_CreateKeyBackupDialog_recoveryKeyHeader">
-                    {_t("Your recovery key")}
+                    {_t("Your Security Key")}
                 </div>
                 <div className="mx_CreateKeyBackupDialog_recoveryKeyContainer">
                     <div className="mx_CreateKeyBackupDialog_recoveryKey">
@@ -369,12 +369,12 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
         let introText;
         if (this.state.copied) {
             introText = _t(
-                "Your recovery key has been <b>copied to your clipboard</b>, paste it to:",
+                "Your Security Key has been <b>copied to your clipboard</b>, paste it to:",
                 {}, {b: s => <b>{s}</b>},
             );
         } else if (this.state.downloaded) {
             introText = _t(
-                "Your recovery key is in your <b>Downloads</b> folder.",
+                "Your Security Key is in your <b>Downloads</b> folder.",
                 {}, {b: s => <b>{s}</b>},
             );
         }
@@ -433,14 +433,14 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
     _titleForPhase(phase) {
         switch (phase) {
             case PHASE_PASSPHRASE:
-                return _t('Secure your backup with a recovery passphrase');
+                return _t('Secure your backup with a Security Phrase');
             case PHASE_PASSPHRASE_CONFIRM:
-                return _t('Confirm your recovery passphrase');
+                return _t('Confirm your Security Phrase');
             case PHASE_OPTOUT_CONFIRM:
                 return _t('Warning!');
             case PHASE_SHOWKEY:
             case PHASE_KEEPITSAFE:
-                return _t('Make a copy of your recovery key');
+                return _t('Make a copy of your Security Key');
             case PHASE_BACKINGUP:
                 return _t('Starting backup...');
             case PHASE_DONE:
diff --git a/src/async-components/views/dialogs/security/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/security/CreateSecretStorageDialog.js
index 6819742388..84cb58536a 100644
--- a/src/async-components/views/dialogs/security/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/security/CreateSecretStorageDialog.js
@@ -235,7 +235,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         const blob = new Blob([this._recoveryKey.encodedPrivateKey], {
             type: 'text/plain;charset=us-ascii',
         });
-        FileSaver.saveAs(blob, 'recovery-key.txt');
+        FileSaver.saveAs(blob, 'security-key.txt');
 
         this.setState({
             downloaded: true,
@@ -470,6 +470,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 value={CREATE_STORAGE_OPTION_KEY}
                 name="keyPassphrase"
                 checked={this.state.passPhraseKeySelected === CREATE_STORAGE_OPTION_KEY}
+                onChange={this._onKeyPassphraseChange}
                 outlined
             >
                 <div className="mx_CreateSecretStorageDialog_optionTitle">
@@ -488,6 +489,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 value={CREATE_STORAGE_OPTION_PASSPHRASE}
                 name="keyPassphrase"
                 checked={this.state.passPhraseKeySelected === CREATE_STORAGE_OPTION_PASSPHRASE}
+                onChange={this._onKeyPassphraseChange}
                 outlined
             >
                 <div className="mx_CreateSecretStorageDialog_optionTitle">
@@ -509,7 +511,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 "Safeguard against losing access to encrypted messages & data by " +
                 "backing up encryption keys on your server.",
             )}</p>
-            <div className="mx_CreateSecretStorageDialog_primaryContainer" role="radiogroup" onChange={this._onKeyPassphraseChange}>
+            <div className="mx_CreateSecretStorageDialog_primaryContainer" role="radiogroup">
                 {optionKey}
                 {optionPassphrase}
             </div>
@@ -591,10 +593,10 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                     onValidate={this._onPassPhraseValidate}
                     fieldRef={this._passphraseField}
                     autoFocus={true}
-                    label={_td("Enter a recovery passphrase")}
-                    labelEnterPassword={_td("Enter a recovery passphrase")}
-                    labelStrongPassword={_td("Great! This recovery passphrase looks strong enough.")}
-                    labelAllowedButUnsafe={_td("Great! This recovery passphrase looks strong enough.")}
+                    label={_td("Enter a Security Phrase")}
+                    labelEnterPassword={_td("Enter a Security Phrase")}
+                    labelStrongPassword={_td("Great! This Security Phrase looks strong enough.")}
+                    labelAllowedButUnsafe={_td("Great! This Security Phrase looks strong enough.")}
                 />
             </div>
 
diff --git a/src/async-components/views/dialogs/security/NewRecoveryMethodDialog.js b/src/async-components/views/dialogs/security/NewRecoveryMethodDialog.js
index 9f5045635d..8c09cc6d16 100644
--- a/src/async-components/views/dialogs/security/NewRecoveryMethodDialog.js
+++ b/src/async-components/views/dialogs/security/NewRecoveryMethodDialog.js
@@ -58,7 +58,7 @@ export default class NewRecoveryMethodDialog extends React.PureComponent {
         </span>;
 
         const newMethodDetected = <p>{_t(
-            "A new recovery passphrase and key for Secure Messages have been detected.",
+            "A new Security Phrase and key for Secure Messages have been detected.",
         )}</p>;
 
         const hackWarning = <p className="warning">{_t(
diff --git a/src/async-components/views/dialogs/security/RecoveryMethodRemovedDialog.js b/src/async-components/views/dialogs/security/RecoveryMethodRemovedDialog.js
index cda353e717..b60e6fd3cb 100644
--- a/src/async-components/views/dialogs/security/RecoveryMethodRemovedDialog.js
+++ b/src/async-components/views/dialogs/security/RecoveryMethodRemovedDialog.js
@@ -56,7 +56,7 @@ export default class RecoveryMethodRemovedDialog extends React.PureComponent {
             >
                 <div>
                     <p>{_t(
-                        "This session has detected that your recovery passphrase and key " +
+                        "This session has detected that your Security Phrase and key " +
                         "for Secure Messages have been removed.",
                     )}</p>
                     <p>{_t(
diff --git a/src/autocomplete/UserProvider.tsx b/src/autocomplete/UserProvider.tsx
index 32eea55b0b..7fc01daef9 100644
--- a/src/autocomplete/UserProvider.tsx
+++ b/src/autocomplete/UserProvider.tsx
@@ -155,6 +155,7 @@ export default class UserProvider extends AutocompleteProvider {
 
         const currentUserId = MatrixClientPeg.get().credentials.userId;
         this.users = this.room.getJoinedMembers().filter(({userId}) => userId !== currentUserId);
+        this.users = this.users.concat(this.room.getMembersWithMembership("invite"));
 
         this.users = sortBy(this.users, (member) => 1E20 - lastSpoken[member.userId] || 1E20);
 
diff --git a/src/components/structures/ContextMenu.tsx b/src/components/structures/ContextMenu.tsx
index 884f77aba5..726ff547ff 100644
--- a/src/components/structures/ContextMenu.tsx
+++ b/src/components/structures/ContextMenu.tsx
@@ -76,6 +76,7 @@ export interface IProps extends IPosition {
     hasBackground?: boolean;
     // whether this context menu should be focus managed. If false it must handle itself
     managed?: boolean;
+    wrapperClassName?: string;
 
     // Function to be called on menu close
     onFinished();
@@ -299,7 +300,7 @@ export class ContextMenu extends React.PureComponent<IProps, IState> {
             // such that it does not leave the (padded) window.
             if (contextMenuRect) {
                 const padding = 10;
-                adjusted = Math.min(position.top, document.body.clientHeight - contextMenuRect.height + padding);
+                adjusted = Math.min(position.top, document.body.clientHeight - contextMenuRect.height - padding);
             }
 
             position.top = adjusted;
@@ -365,7 +366,7 @@ export class ContextMenu extends React.PureComponent<IProps, IState> {
 
         return (
             <div
-                className="mx_ContextualMenu_wrapper"
+                className={classNames("mx_ContextualMenu_wrapper", this.props.wrapperClassName)}
                 style={{...position, ...wrapperStyle}}
                 onKeyDown={this.onKeyDown}
                 onContextMenu={this.onContextMenuPreventBubbling}
@@ -390,15 +391,16 @@ export class ContextMenu extends React.PureComponent<IProps, IState> {
 }
 
 // Placement method for <ContextMenu /> to position context menu to right of elementRect with chevronOffset
-export const toRightOf = (elementRect: DOMRect, chevronOffset = 12) => {
+export const toRightOf = (elementRect: Pick<DOMRect, "right" | "top" | "height">, chevronOffset = 12) => {
     const left = elementRect.right + window.pageXOffset + 3;
     let top = elementRect.top + (elementRect.height / 2) + window.pageYOffset;
     top -= chevronOffset + 8; // where 8 is half the height of the chevron
     return {left, top, chevronOffset};
 };
 
-// Placement method for <ContextMenu /> to position context menu right-aligned and flowing to the left of elementRect
-export const aboveLeftOf = (elementRect: DOMRect, chevronFace = ChevronFace.None) => {
+// Placement method for <ContextMenu /> to position context menu right-aligned and flowing to the left of elementRect,
+// and either above or below: wherever there is more space (maybe this should be aboveOrBelowLeftOf?)
+export const aboveLeftOf = (elementRect: DOMRect, chevronFace = ChevronFace.None, vPadding = 0) => {
     const menuOptions: IPosition & { chevronFace: ChevronFace } = { chevronFace };
 
     const buttonRight = elementRect.right + window.pageXOffset;
@@ -408,16 +410,52 @@ export const aboveLeftOf = (elementRect: DOMRect, chevronFace = ChevronFace.None
     menuOptions.right = window.innerWidth - buttonRight;
     // Align the menu vertically on whichever side of the button has more space available.
     if (buttonBottom < window.innerHeight / 2) {
-        menuOptions.top = buttonBottom;
+        menuOptions.top = buttonBottom + vPadding;
     } else {
-        menuOptions.bottom = window.innerHeight - buttonTop;
+        menuOptions.bottom = (window.innerHeight - buttonTop) + vPadding;
     }
 
     return menuOptions;
 };
 
-export const useContextMenu = (): [boolean, RefObject<HTMLElement>, () => void, () => void, (val: boolean) => void] => {
-    const button = useRef<HTMLElement>(null);
+// Placement method for <ContextMenu /> to position context menu right-aligned and flowing to the left of elementRect
+// and always above elementRect
+export const alwaysAboveLeftOf = (elementRect: DOMRect, chevronFace = ChevronFace.None, vPadding = 0) => {
+    const menuOptions: IPosition & { chevronFace: ChevronFace } = { chevronFace };
+
+    const buttonRight = elementRect.right + window.pageXOffset;
+    const buttonBottom = elementRect.bottom + window.pageYOffset;
+    const buttonTop = elementRect.top + window.pageYOffset;
+    // Align the right edge of the menu to the right edge of the button
+    menuOptions.right = window.innerWidth - buttonRight;
+    // Align the menu vertically on whichever side of the button has more space available.
+    if (buttonBottom < window.innerHeight / 2) {
+        menuOptions.top = buttonBottom + vPadding;
+    } else {
+        menuOptions.bottom = (window.innerHeight - buttonTop) + vPadding;
+    }
+
+    return menuOptions;
+};
+
+// Placement method for <ContextMenu /> to position context menu right-aligned and flowing to the right of elementRect
+// and always above elementRect
+export const alwaysAboveRightOf = (elementRect: DOMRect, chevronFace = ChevronFace.None, vPadding = 0) => {
+    const menuOptions: IPosition & { chevronFace: ChevronFace } = { chevronFace };
+
+    const buttonLeft = elementRect.left + window.pageXOffset;
+    const buttonTop = elementRect.top + window.pageYOffset;
+    // Align the left edge of the menu to the left edge of the button
+    menuOptions.left = buttonLeft;
+    // Align the menu vertically above the menu
+    menuOptions.bottom = (window.innerHeight - buttonTop) + vPadding;
+
+    return menuOptions;
+};
+
+type ContextMenuTuple<T> = [boolean, RefObject<T>, () => void, () => void, (val: boolean) => void];
+export const useContextMenu = <T extends any = HTMLElement>(): ContextMenuTuple<T> => {
+    const button = useRef<T>(null);
     const [isOpen, setIsOpen] = useState(false);
     const open = () => {
         setIsOpen(true);
diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index 4836b0f554..0e4df4621d 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -45,7 +45,7 @@ class FilePanel extends React.Component {
     };
 
     onRoomTimeline = (ev, room, toStartOfTimeline, removed, data) => {
-        if (room.roomId !== this.props.roomId) return;
+        if (room?.roomId !== this.props?.roomId) return;
         if (toStartOfTimeline || !data || !data.liveEvent || ev.isRedacted()) return;
 
         if (ev.isBeingDecrypted()) {
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/components/structures/HomePage.tsx b/src/components/structures/HomePage.tsx
index a42032c9fe..68bb4322e6 100644
--- a/src/components/structures/HomePage.tsx
+++ b/src/components/structures/HomePage.tsx
@@ -15,20 +15,83 @@ limitations under the License.
 */
 
 import * as React from "react";
+import {useContext, useState} from "react";
 
 import AutoHideScrollbar from './AutoHideScrollbar';
-import { getHomePageUrl } from "../../utils/pages";
-import { _t } from "../../languageHandler";
+import {getHomePageUrl} from "../../utils/pages";
+import {_t} from "../../languageHandler";
 import SdkConfig from "../../SdkConfig";
 import * as sdk from "../../index";
 import dis from "../../dispatcher/dispatcher";
-import { Action } from "../../dispatcher/actions";
+import {Action} from "../../dispatcher/actions";
+import BaseAvatar from "../views/avatars/BaseAvatar";
+import {OwnProfileStore} from "../../stores/OwnProfileStore";
+import AccessibleButton from "../views/elements/AccessibleButton";
+import {UPDATE_EVENT} from "../../stores/AsyncStore";
+import {useEventEmitter} from "../../hooks/useEventEmitter";
+import MatrixClientContext from "../../contexts/MatrixClientContext";
+import MiniAvatarUploader, {AVATAR_SIZE} from "../views/elements/MiniAvatarUploader";
+import Analytics from "../../Analytics";
+import CountlyAnalytics from "../../CountlyAnalytics";
 
-const onClickSendDm = () => dis.dispatch({action: 'view_create_chat'});
-const onClickExplore = () => dis.fire(Action.ViewRoomDirectory);
-const onClickNewRoom = () => dis.dispatch({action: 'view_create_room'});
+const onClickSendDm = () => {
+    Analytics.trackEvent('home_page', 'button', 'dm');
+    CountlyAnalytics.instance.track("home_page_button", { button: "dm" });
+    dis.dispatch({action: 'view_create_chat'});
+};
 
-const HomePage = () => {
+const onClickExplore = () => {
+    Analytics.trackEvent('home_page', 'button', 'room_directory');
+    CountlyAnalytics.instance.track("home_page_button", { button: "room_directory" });
+    dis.fire(Action.ViewRoomDirectory);
+};
+
+const onClickNewRoom = () => {
+    Analytics.trackEvent('home_page', 'button', 'create_room');
+    CountlyAnalytics.instance.track("home_page_button", { button: "create_room" });
+    dis.dispatch({action: 'view_create_room'});
+};
+
+interface IProps {
+    justRegistered?: boolean;
+}
+
+const getOwnProfile = (userId: string) => ({
+    displayName: OwnProfileStore.instance.displayName || userId,
+    avatarUrl: OwnProfileStore.instance.getHttpAvatarUrl(AVATAR_SIZE),
+});
+
+const UserWelcomeTop = () => {
+    const cli = useContext(MatrixClientContext);
+    const userId = cli.getUserId();
+    const [ownProfile, setOwnProfile] = useState(getOwnProfile(userId));
+    useEventEmitter(OwnProfileStore.instance, UPDATE_EVENT, () => {
+        setOwnProfile(getOwnProfile(userId));
+    });
+
+    return <div>
+        <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={AVATAR_SIZE}
+                height={AVATAR_SIZE}
+                resizeMethod="crop"
+            />
+        </MiniAvatarUploader>
+
+        <h1>{ _t("Welcome %(name)s", { name: ownProfile.displayName }) }</h1>
+        <h4>{ _t("Now, let's help you get started") }</h4>
+    </div>;
+};
+
+const HomePage: React.FC<IProps> = ({ justRegistered = false }) => {
     const config = SdkConfig.get();
     const pageUrl = getHomePageUrl(config);
 
@@ -37,18 +100,27 @@ const HomePage = () => {
         return <EmbeddedPage className="mx_HomePage" url={pageUrl} scrollbar={true} />;
     }
 
-    const brandingConfig = config.branding;
-    let logoUrl = "themes/element/img/logos/element-logo.svg";
-    if (brandingConfig && brandingConfig.authHeaderLogoUrl) {
-        logoUrl = brandingConfig.authHeaderLogoUrl;
+    let introSection;
+    if (justRegistered) {
+        introSection = <UserWelcomeTop />;
+    } else {
+        const brandingConfig = config.branding;
+        let logoUrl = "themes/element/img/logos/element-logo.svg";
+        if (brandingConfig && brandingConfig.authHeaderLogoUrl) {
+            logoUrl = brandingConfig.authHeaderLogoUrl;
+        }
+
+        introSection = <React.Fragment>
+            <img src={logoUrl} alt={config.brand} />
+            <h1>{ _t("Welcome to %(appName)s", { appName: config.brand }) }</h1>
+            <h4>{ _t("Liberate your communication") }</h4>
+        </React.Fragment>;
     }
 
-    const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
+
     return <AutoHideScrollbar className="mx_HomePage mx_HomePage_default">
         <div className="mx_HomePage_default_wrapper">
-            <img src={logoUrl} alt={config.brand || "Element"} />
-            <h1>{ _t("Welcome to %(appName)s", { appName: config.brand || "Element" }) }</h1>
-            <h4>{ _t("Liberate your communication") }</h4>
+            { introSection }
             <div className="mx_HomePage_default_buttons">
                 <AccessibleButton onClick={onClickSendDm} className="mx_HomePage_button_sendDm">
                     { _t("Send a Direct Message") }
diff --git a/src/components/structures/HostSignupAction.tsx b/src/components/structures/HostSignupAction.tsx
new file mode 100644
index 0000000000..9cf84a9379
--- /dev/null
+++ b/src/components/structures/HostSignupAction.tsx
@@ -0,0 +1,56 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from "react";
+import {
+    IconizedContextMenuOption,
+    IconizedContextMenuOptionList,
+} from "../views/context_menus/IconizedContextMenu";
+import { _t } from "../../languageHandler";
+import { HostSignupStore } from "../../stores/HostSignupStore";
+import SdkConfig from "../../SdkConfig";
+
+interface IProps {}
+
+interface IState {}
+
+export default class HostSignupAction extends React.PureComponent<IProps, IState> {
+    private openDialog = async () => {
+        await HostSignupStore.instance.setHostSignupActive(true);
+    }
+
+    public render(): React.ReactNode {
+        const hostSignupConfig = SdkConfig.get().hostSignup;
+        if (!hostSignupConfig?.brand) {
+            return null;
+        }
+
+        return (
+            <IconizedContextMenuOptionList>
+                <IconizedContextMenuOption
+                    iconClassName="mx_UserMenu_iconHosting"
+                    label={_t(
+                        "Upgrade to %(hostSignupBrand)s",
+                        {
+                            hostSignupBrand: hostSignupConfig.brand,
+                        },
+                    )}
+                    onClick={this.openDialog}
+                />
+            </IconizedContextMenuOptionList>
+        );
+    }
+}
diff --git a/src/components/structures/InteractiveAuth.js b/src/components/structures/InteractiveAuth.js
index c8fcd7e9ca..ac7049ed88 100644
--- a/src/components/structures/InteractiveAuth.js
+++ b/src/components/structures/InteractiveAuth.js
@@ -177,7 +177,14 @@ export default class InteractiveAuthComponent extends React.Component {
             stageState: stageState,
             errorText: stageState.error,
         }, () => {
-            if (oldStage != stageType) this._setFocus();
+            if (oldStage !== stageType) {
+                this._setFocus();
+            } else if (
+                !stageState.error && this._stageComponent.current &&
+                this._stageComponent.current.attemptFailed
+            ) {
+                this._stageComponent.current.attemptFailed();
+            }
         });
     };
 
diff --git a/src/components/structures/LeftPanel.tsx b/src/components/structures/LeftPanel.tsx
index 262d12a700..82dd9443cc 100644
--- a/src/components/structures/LeftPanel.tsx
+++ b/src/components/structures/LeftPanel.tsx
@@ -38,6 +38,8 @@ import AccessibleTooltipButton from "../views/elements/AccessibleTooltipButton";
 import { OwnProfileStore } from "../../stores/OwnProfileStore";
 import { MatrixClientPeg } from "../../MatrixClientPeg";
 import RoomListNumResults from "../views/rooms/RoomListNumResults";
+import LeftPanelWidget from "./LeftPanelWidget";
+import SpacePanel from "../views/spaces/SpacePanel";
 
 interface IProps {
     isMinimized: boolean;
@@ -142,7 +144,7 @@ export default class LeftPanel extends React.Component<IProps, IState> {
         const bottomEdge = list.offsetHeight + list.scrollTop;
         const sublists = list.querySelectorAll<HTMLDivElement>(".mx_RoomSublist");
 
-        const headerRightMargin = 16; // calculated from margins and widths to align with non-sticky tiles
+        const headerRightMargin = 15; // calculated from margins and widths to align with non-sticky tiles
         const headerStickyWidth = list.clientWidth - headerRightMargin;
 
         // We track which styles we want on a target before making the changes to avoid
@@ -213,10 +215,19 @@ export default class LeftPanel extends React.Component<IProps, IState> {
                 if (!header.classList.contains("mx_RoomSublist_headerContainer_stickyBottom")) {
                     header.classList.add("mx_RoomSublist_headerContainer_stickyBottom");
                 }
+
+                const offset = window.innerHeight - (list.parentElement.offsetTop + list.parentElement.offsetHeight);
+                const newBottom = `${offset}px`;
+                if (header.style.bottom !== newBottom) {
+                    header.style.bottom = newBottom;
+                }
             } else {
                 if (header.classList.contains("mx_RoomSublist_headerContainer_stickyBottom")) {
                     header.classList.remove("mx_RoomSublist_headerContainer_stickyBottom");
                 }
+                if (header.style.bottom) {
+                    header.style.removeProperty('bottom');
+                }
             }
 
             if (style.stickyTop || style.stickyBottom) {
@@ -378,17 +389,23 @@ export default class LeftPanel extends React.Component<IProps, IState> {
     }
 
     public render(): React.ReactNode {
-        const groupFilterPanel = !this.state.showGroupFilterPanel ? null : (
-            <div className="mx_LeftPanel_GroupFilterPanelContainer">
-                <GroupFilterPanel />
-                {SettingsStore.getValue("feature_custom_tags") ? <CustomRoomTagPanel /> : null}
-            </div>
-        );
+        let leftLeftPanel;
+        // Currently TagPanel.enableTagPanel is disabled when Legacy Communities are disabled so for now
+        // ignore it and force the rendering of SpacePanel if that Labs flag is enabled.
+        if (SettingsStore.getValue("feature_spaces")) {
+            leftLeftPanel = <SpacePanel />;
+        } else if (this.state.showGroupFilterPanel) {
+            leftLeftPanel = (
+                <div className="mx_LeftPanel_GroupFilterPanelContainer">
+                    <GroupFilterPanel />
+                    {SettingsStore.getValue("feature_custom_tags") ? <CustomRoomTagPanel /> : null}
+                </div>
+            );
+        }
 
         const roomList = <RoomList
             onKeyDown={this.onKeyDown}
             resizeNotifier={null}
-            collapsed={false}
             onFocus={this.onFocus}
             onBlur={this.onBlur}
             isMinimized={this.props.isMinimized}
@@ -397,7 +414,6 @@ export default class LeftPanel extends React.Component<IProps, IState> {
 
         const containerClasses = classNames({
             "mx_LeftPanel": true,
-            "mx_LeftPanel_hasGroupFilterPanel": !!groupFilterPanel,
             "mx_LeftPanel_minimized": this.props.isMinimized,
         });
 
@@ -408,7 +424,7 @@ export default class LeftPanel extends React.Component<IProps, IState> {
 
         return (
             <div className={containerClasses}>
-                {groupFilterPanel}
+                {leftLeftPanel}
                 <aside className="mx_LeftPanel_roomListContainer">
                     {this.renderHeader()}
                     {this.renderSearchExplore()}
@@ -426,6 +442,7 @@ export default class LeftPanel extends React.Component<IProps, IState> {
                             {roomList}
                         </div>
                     </div>
+                    { !this.props.isMinimized && <LeftPanelWidget onResize={this.onResize} /> }
                 </aside>
             </div>
         );
diff --git a/src/components/structures/LeftPanelWidget.tsx b/src/components/structures/LeftPanelWidget.tsx
new file mode 100644
index 0000000000..e88af282ba
--- /dev/null
+++ b/src/components/structures/LeftPanelWidget.tsx
@@ -0,0 +1,149 @@
+/*
+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, useEffect, useMemo} from "react";
+import {Resizable} from "re-resizable";
+import classNames from "classnames";
+
+import AccessibleButton from "../views/elements/AccessibleButton";
+import {useRovingTabIndex} from "../../accessibility/RovingTabIndex";
+import {Key} from "../../Keyboard";
+import {useLocalStorageState} from "../../hooks/useLocalStorageState";
+import MatrixClientContext from "../../contexts/MatrixClientContext";
+import WidgetUtils, {IWidgetEvent} from "../../utils/WidgetUtils";
+import {useAccountData} from "../../hooks/useAccountData";
+import AppTile from "../views/elements/AppTile";
+import {useSettingValue} from "../../hooks/useSettings";
+
+interface IProps {
+    onResize(): void;
+}
+
+const MIN_HEIGHT = 100;
+const MAX_HEIGHT = 500; // or 50% of the window height
+const INITIAL_HEIGHT = 280;
+
+const LeftPanelWidget: React.FC<IProps> = ({ onResize }) => {
+    const cli = useContext(MatrixClientContext);
+
+    const mWidgetsEvent = useAccountData<Record<string, IWidgetEvent>>(cli, "m.widgets");
+    const leftPanelWidgetId = useSettingValue("Widgets.leftPanel");
+    const app = useMemo(() => {
+        if (!mWidgetsEvent || !leftPanelWidgetId) return null;
+        const widgetConfig = Object.values(mWidgetsEvent).find(w => w.id === leftPanelWidgetId);
+        if (!widgetConfig) return null;
+
+        return WidgetUtils.makeAppConfig(
+            widgetConfig.state_key,
+            widgetConfig.content,
+            widgetConfig.sender,
+            null,
+            widgetConfig.id);
+    }, [mWidgetsEvent, leftPanelWidgetId]);
+
+    const [height, setHeight] = useLocalStorageState("left-panel-widget-height", INITIAL_HEIGHT);
+    const [expanded, setExpanded] = useLocalStorageState("left-panel-widget-expanded", true);
+    useEffect(onResize, [expanded, onResize]);
+
+    const [onFocus, isActive, ref] = useRovingTabIndex();
+    const tabIndex = isActive ? 0 : -1;
+
+    if (!app) return null;
+
+    let content;
+    if (expanded) {
+        content = <Resizable
+            size={{height} as any}
+            minHeight={MIN_HEIGHT}
+            maxHeight={Math.min(window.innerHeight / 2, MAX_HEIGHT)}
+            onResize={onResize}
+            onResizeStop={(e, dir, ref, d) => {
+                setHeight(height + d.height);
+            }}
+            handleWrapperClass="mx_LeftPanelWidget_resizerHandles"
+            handleClasses={{top: "mx_LeftPanelWidget_resizerHandle"}}
+            className="mx_LeftPanelWidget_resizeBox"
+            enable={{ top: true }}
+        >
+            <AppTile
+                app={app}
+                fullWidth
+                show
+                showMenubar={false}
+                userWidget
+                userId={cli.getUserId()}
+                creatorUserId={app.creatorUserId}
+                widgetPageTitle={WidgetUtils.getWidgetDataTitle(app)}
+                waitForIframeLoad={app.waitForIframeLoad}
+            />
+        </Resizable>;
+    }
+
+    return <div className="mx_LeftPanelWidget">
+        <div
+            onFocus={onFocus}
+            className="mx_LeftPanelWidget_headerContainer"
+            onKeyDown={(ev: React.KeyboardEvent) => {
+                switch (ev.key) {
+                    case Key.ARROW_LEFT:
+                        ev.stopPropagation();
+                        setExpanded(false);
+                        break;
+                    case Key.ARROW_RIGHT: {
+                        ev.stopPropagation();
+                        setExpanded(true);
+                        break;
+                    }
+                }
+            }}
+        >
+            <div className="mx_LeftPanelWidget_stickable">
+                <AccessibleButton
+                    onFocus={onFocus}
+                    inputRef={ref}
+                    tabIndex={tabIndex}
+                    className="mx_LeftPanelWidget_headerText"
+                    role="treeitem"
+                    aria-expanded={expanded}
+                    aria-level={1}
+                    onClick={() => {
+                        setExpanded(e => !e);
+                    }}
+                >
+                    <span className={classNames({
+                        "mx_LeftPanelWidget_collapseBtn": true,
+                        "mx_LeftPanelWidget_collapseBtn_collapsed": !expanded,
+                    })} />
+                    <span>{ WidgetUtils.getWidgetName(app) }</span>
+                </AccessibleButton>
+
+                {/* Code for the maximise button for once we have full screen widgets */}
+                {/*<AccessibleTooltipButton
+                    tabIndex={tabIndex}
+                    onClick={() => {
+                    }}
+                    className="mx_LeftPanelWidget_maximizeButton"
+                    tooltipClassName="mx_LeftPanelWidget_maximizeButtonTooltip"
+                    title={_t("Maximize")}
+                />*/}
+            </div>
+        </div>
+
+        { content }
+    </div>;
+};
+
+export default LeftPanelWidget;
diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index 15ea20618e..4e768bd9e5 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';
@@ -52,6 +52,10 @@ 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";
+import { ICollapseConfig } from "../../resizer/distributors/collapse";
+import HostSignupContainer from '../views/host_signup/HostSignupContainer';
+import { IOpts } from "../../createRoom";
 
 // 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.
@@ -87,6 +91,8 @@ interface IProps {
     currentUserId?: string;
     currentGroupId?: string;
     currentGroupIsNew?: boolean;
+    justRegistered?: boolean;
+    roomJustCreatedOpts?: IOpts;
 }
 
 interface IUsageLimit {
@@ -103,7 +109,9 @@ interface IState {
             errcode: string;
         };
     };
+    usageLimitDismissed: boolean;
     usageLimitEventContent?: IUsageLimit;
+    usageLimitEventTs?: number;
     useCompactLayout: boolean;
 }
 
@@ -137,7 +145,7 @@ class LoggedInView extends React.Component<IProps, IState> {
     protected readonly _matrixClient: MatrixClient;
     protected readonly _roomView: React.RefObject<any>;
     protected readonly _resizeContainer: React.RefObject<ResizeHandle>;
-    protected readonly _compactLayoutWatcherRef: string;
+    protected compactLayoutWatcherRef: string;
     protected resizer: Resizer;
 
     constructor(props, context) {
@@ -147,6 +155,7 @@ class LoggedInView extends React.Component<IProps, IState> {
             syncErrorData: undefined,
             // use compact timeline view
             useCompactLayout: SettingsStore.getValue('useCompactLayout'),
+            usageLimitDismissed: false,
         };
 
         // stash the MatrixClient in case we log out before we are unmounted
@@ -154,18 +163,6 @@ class LoggedInView extends React.Component<IProps, IState> {
 
         CallMediaHandler.loadDevices();
 
-        document.addEventListener('keydown', this._onNativeKeyDown, false);
-
-        this._updateServerNoticeEvents();
-
-        this._matrixClient.on("accountData", this.onAccountData);
-        this._matrixClient.on("sync", this.onSync);
-        this._matrixClient.on("RoomState.events", this.onRoomStateEvents);
-
-        this._compactLayoutWatcherRef = SettingsStore.watchSetting(
-            "useCompactLayout", null, this.onCompactLayoutChanged,
-        );
-
         fixupColorFonts();
 
         this._roomView = React.createRef();
@@ -173,6 +170,24 @@ class LoggedInView extends React.Component<IProps, IState> {
     }
 
     componentDidMount() {
+        document.addEventListener('keydown', this._onNativeKeyDown, false);
+
+        this._updateServerNoticeEvents();
+
+        this._matrixClient.on("accountData", this.onAccountData);
+        this._matrixClient.on("sync", this.onSync);
+        // Call `onSync` with the current state as well
+        this.onSync(
+            this._matrixClient.getSyncState(),
+            null,
+            this._matrixClient.getSyncStateData(),
+        );
+        this._matrixClient.on("RoomState.events", this.onRoomStateEvents);
+
+        this.compactLayoutWatcherRef = SettingsStore.watchSetting(
+            "useCompactLayout", null, this.onCompactLayoutChanged,
+        );
+
         this.resizer = this._createResizer();
         this.resizer.attach();
         this._loadResizerPreferences();
@@ -183,7 +198,7 @@ class LoggedInView extends React.Component<IProps, IState> {
         this._matrixClient.removeListener("accountData", this.onAccountData);
         this._matrixClient.removeListener("sync", this.onSync);
         this._matrixClient.removeListener("RoomState.events", this.onRoomStateEvents);
-        SettingsStore.unwatchSetting(this._compactLayoutWatcherRef);
+        SettingsStore.unwatchSetting(this.compactLayoutWatcherRef);
         this.resizer.detach();
     }
 
@@ -205,16 +220,20 @@ class LoggedInView extends React.Component<IProps, IState> {
     };
 
     _createResizer() {
-        const classNames = {
-            handle: "mx_ResizeHandle",
-            vertical: "mx_ResizeHandle_vertical",
-            reverse: "mx_ResizeHandle_reverse",
-        };
         let size;
-        const collapseConfig = {
-            toggleSize: 260 - 50,
-            onCollapsed: (collapsed) => {
-                if (collapsed) {
+        let collapsed;
+        const collapseConfig: ICollapseConfig = {
+            // TODO: the space panel currently does not have a fixed width,
+            // just the headers at each level have a max-width of 150px
+            // Taking 222px for the space panel for now,
+            // so this will look slightly off for now,
+            // depending on the depth of your space tree.
+            // To fix this, we'll need to turn toggleSize
+            // into a callback so it can be measured when starting the resize operation
+            toggleSize: 222 + 68,
+            onCollapsed: (_collapsed) => {
+                collapsed = _collapsed;
+                if (_collapsed) {
                     dis.dispatch({action: "hide_left_panel"}, true);
                     window.localStorage.setItem("mx_lhs_size", '0');
                 } else {
@@ -229,12 +248,19 @@ class LoggedInView extends React.Component<IProps, IState> {
                 this.props.resizeNotifier.startResizing();
             },
             onResizeStop: () => {
-                window.localStorage.setItem("mx_lhs_size", '' + size);
+                if (!collapsed) window.localStorage.setItem("mx_lhs_size", '' + size);
                 this.props.resizeNotifier.stopResizing();
             },
+            isItemCollapsed: domNode => {
+                return domNode.classList.contains("mx_LeftPanel_minimized");
+            },
         };
         const resizer = new Resizer(this._resizeContainer.current, CollapseDistributor, collapseConfig);
-        resizer.setClassNames(classNames);
+        resizer.setClassNames({
+            handle: "mx_ResizeHandle",
+            vertical: "mx_ResizeHandle_vertical",
+            reverse: "mx_ResizeHandle_reverse",
+        });
         return resizer;
     }
 
@@ -291,14 +317,27 @@ class LoggedInView extends React.Component<IProps, IState> {
         }
     };
 
+    private onUsageLimitDismissed = () => {
+        this.setState({
+            usageLimitDismissed: true,
+        });
+    }
+
     _calculateServerLimitToast(syncError: IState["syncErrorData"], usageLimitEventContent?: IUsageLimit) {
         const error = syncError && syncError.error && syncError.error.errcode === "M_RESOURCE_LIMIT_EXCEEDED";
         if (error) {
             usageLimitEventContent = syncError.error.data;
         }
 
-        if (usageLimitEventContent) {
-            showServerLimitToast(usageLimitEventContent.limit_type, usageLimitEventContent.admin_contact, error);
+        // usageLimitDismissed is true when the user has explicitly hidden the toast
+        // and it will be reset to false if a *new* usage alert comes in.
+        if (usageLimitEventContent && this.state.usageLimitDismissed) {
+            showServerLimitToast(
+                usageLimitEventContent.limit_type,
+                this.onUsageLimitDismissed,
+                usageLimitEventContent.admin_contact,
+                error,
+            );
         } else {
             hideServerLimitToast();
         }
@@ -309,10 +348,12 @@ class LoggedInView extends React.Component<IProps, IState> {
         if (!serverNoticeList) return [];
 
         const events = [];
+        let pinnedEventTs = 0;
         for (const room of serverNoticeList) {
             const pinStateEvent = room.currentState.getStateEvents("m.room.pinned_events", "");
 
             if (!pinStateEvent || !pinStateEvent.getContent().pinned) continue;
+            pinnedEventTs = pinStateEvent.getTs();
 
             const pinnedEventIds = pinStateEvent.getContent().pinned.slice(0, MAX_PINNED_NOTICES_PER_ROOM);
             for (const eventId of pinnedEventIds) {
@@ -322,6 +363,11 @@ class LoggedInView extends React.Component<IProps, IState> {
             }
         }
 
+        if (pinnedEventTs && this.state.usageLimitEventTs > pinnedEventTs) {
+            // We've processed a newer event than this one, so ignore it.
+            return;
+        }
+
         const usageLimitEvent = events.find((e) => {
             return (
                 e && e.getType() === 'm.room.message' &&
@@ -330,7 +376,12 @@ class LoggedInView extends React.Component<IProps, IState> {
         });
         const usageLimitEventContent = usageLimitEvent && usageLimitEvent.getContent();
         this._calculateServerLimitToast(this.state.syncErrorData, usageLimitEventContent);
-        this.setState({ usageLimitEventContent });
+        this.setState({
+            usageLimitEventContent,
+            usageLimitEventTs: pinnedEventTs,
+            // This is a fresh toast, we can show toasts again
+            usageLimitDismissed: false,
+        });
     };
 
     _onPaste = (ev) => {
@@ -391,6 +442,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:
@@ -416,6 +468,14 @@ class LoggedInView extends React.Component<IProps, IState> {
                     handled = true;
                 }
                 break;
+            case Key.F:
+                if (ctrlCmdOnly && SettingsStore.getValue("ctrlFForSearch")) {
+                    dis.dispatch({
+                        action: 'focus_search',
+                    });
+                    handled = true;
+                }
+                break;
             case Key.BACKTICK:
                 // Ideally this would be CTRL+P for "Profile", but that's
                 // taken by the print dialog. CTRL+I for "Information"
@@ -435,6 +495,16 @@ class LoggedInView extends React.Component<IProps, IState> {
                 }
                 break;
 
+            case Key.H:
+                if (ev.altKey && modKey) {
+                    dis.dispatch({
+                        action: 'view_home_page',
+                    });
+                    Modal.closeCurrentModal("homeKeyboardShortcut");
+                    handled = true;
+                }
+                break;
+
             case Key.ARROW_UP:
             case Key.ARROW_DOWN:
                 if (ev.altKey && !ev.ctrlKey && !ev.metaKey) {
@@ -561,6 +631,7 @@ class LoggedInView extends React.Component<IProps, IState> {
                     viaServers={this.props.viaServers}
                     key={this.props.currentRoomId || 'roomview'}
                     resizeNotifier={this.props.resizeNotifier}
+                    justCreatedOpts={this.props.roomJustCreatedOpts}
                 />;
                 break;
 
@@ -573,7 +644,7 @@ class LoggedInView extends React.Component<IProps, IState> {
                 break;
 
             case PageTypes.HomePage:
-                pageElement = <HomePage />;
+                pageElement = <HomePage justRegistered={this.props.justRegistered} />;
                 break;
 
             case PageTypes.UserView:
@@ -619,6 +690,7 @@ class LoggedInView extends React.Component<IProps, IState> {
                 </div>
                 <CallContainer />
                 <NonUrgentToastContainer />
+                <HostSignupContainer />
             </MatrixClientContext.Provider>
         );
     }
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index f7665fea8a..1700b627db 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -29,11 +29,11 @@ import 'focus-visible';
 import 'what-input';
 
 import Analytics from "../../Analytics";
+import CountlyAnalytics from "../../CountlyAnalytics";
 import { DecryptionFailureTracker } from "../../DecryptionFailureTracker";
 import { MatrixClientPeg, IMatrixClientCreds } from "../../MatrixClientPeg";
 import PlatformPeg from "../../PlatformPeg";
 import SdkConfig from "../../SdkConfig";
-import * as RoomListSorter from "../../RoomListSorter";
 import dis from "../../dispatcher/dispatcher";
 import Notifier from '../../Notifier';
 
@@ -47,9 +47,8 @@ import * as Lifecycle from '../../Lifecycle';
 // LifecycleStore is not used but does listen to and dispatch actions
 import '../../stores/LifecycleStore';
 import PageTypes from '../../PageTypes';
-import { getHomePageUrl } from '../../utils/pages';
 
-import createRoom from "../../createRoom";
+import createRoom, {IOpts} from "../../createRoom";
 import {_t, _td, getCurrentLanguage} from '../../languageHandler';
 import SettingsStore from "../../settings/SettingsStore";
 import ThemeController from "../../settings/controllers/ThemeController";
@@ -61,7 +60,7 @@ import DMRoomMap from '../../utils/DMRoomMap';
 import ThemeWatcher from "../../settings/watchers/ThemeWatcher";
 import { FontWatcher } from '../../settings/watchers/FontWatcher';
 import { storeRoomAliasInCache } from '../../RoomAliasCache';
-import { defer, IDeferred } from "../../utils/promise";
+import { defer, IDeferred, sleep } from "../../utils/promise";
 import ToastStore from "../../stores/ToastStore";
 import * as StorageManager from "../../utils/StorageManager";
 import type LoggedInViewType from "./LoggedInView";
@@ -81,42 +80,46 @@ import CreateCommunityPrototypeDialog from "../views/dialogs/CreateCommunityProt
 import ThreepidInviteStore, { IThreepidInvite, IThreepidInviteWireFormat } from "../../stores/ThreepidInviteStore";
 import {UIFeature} from "../../settings/UIFeature";
 import { CommunityPrototypeStore } from "../../stores/CommunityPrototypeStore";
+import DialPadModal from "../views/voip/DialPadModal";
+import { showToast as showMobileGuideToast } from '../../toasts/MobileGuideToast';
+import SpaceStore from "../../stores/SpaceStore";
+import SpaceRoomDirectory from "./SpaceRoomDirectory";
 
 /** constants for MatrixChat.state.view */
 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.
-    LOGGED_IN = 8,
+    // 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,
 
     // 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,
 }
 
+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.
@@ -143,6 +146,8 @@ interface IRoomInfo {
     oob_data?: object;
     via_servers?: string[];
     threepid_invite?: IThreepidInvite;
+
+    justCreatedOpts?: IOpts;
 }
 /* eslint-enable camelcase */
 
@@ -199,6 +204,8 @@ interface IState {
     roomOobData?: object;
     viaServers?: string[];
     pendingInitialSync?: boolean;
+    justRegistered?: boolean;
+    roomJustCreatedOpts?: IOpts;
 }
 
 export default class MatrixChat extends React.PureComponent<IProps, IState> {
@@ -217,6 +224,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
     private screenAfterLogin?: IScreen;
     private windowWidth: number;
     private pageChanging: boolean;
+    private tokenLogin?: boolean;
     private accountPassword?: string;
     private accountPasswordTimer?: NodeJS.Timeout;
     private focusComposer: boolean;
@@ -322,13 +330,21 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             Lifecycle.attemptTokenLogin(
                 this.props.realQueryParams,
                 this.props.defaultDeviceDisplayName,
-            ).then((loggedIn) => {
-                if (loggedIn) {
+                this.getFragmentAfterLogin(),
+            ).then(async (loggedIn) => {
+                if (this.props.realQueryParams?.loginToken) {
+                    // remove the loginToken from the URL regardless
                     this.props.onTokenLoginCompleted();
+                }
 
-                    // don't do anything else until the page reloads - just stay in
-                    // the 'loading' state.
-                    return;
+                if (loggedIn) {
+                    this.tokenLogin = true;
+
+                    // Create and start the client
+                    await Lifecycle.restoreFromLocalStorage({
+                        ignoreGuest: true,
+                    });
+                    return this.postLoginSetup();
                 }
 
                 // if the user has followed a login or register link, don't reanimate
@@ -349,6 +365,43 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         if (SettingsStore.getValue("analyticsOptIn")) {
             Analytics.enable();
         }
+        CountlyAnalytics.instance.enable(/* anonymous = */ true);
+    }
+
+    private async postLoginSetup() {
+        const cli = MatrixClientPeg.get();
+        const cryptoEnabled = cli.isCryptoEnabled();
+        if (!cryptoEnabled) {
+            this.onLoggedIn();
+        }
+
+        const promisesList = [this.firstSyncPromise.promise];
+        if (cryptoEnabled) {
+            // wait for the client to finish downloading cross-signing keys for us so we
+            // know whether or not we have keys set up on this account
+            promisesList.push(cli.downloadKeys([cli.getUserId()]));
+        }
+
+        // Now update the state to say we're waiting for the first sync to complete rather
+        // than for the login to finish.
+        this.setState({ pendingInitialSync: true });
+
+        await Promise.all(promisesList);
+
+        if (!cryptoEnabled) {
+            this.setState({ pendingInitialSync: false });
+            return;
+        }
+
+        const crossSigningIsSetUp = cli.getStoredCrossSigningForUser(cli.getUserId());
+        if (crossSigningIsSetUp) {
+            this.setStateForNewView({ view: Views.COMPLETE_SECURITY });
+        } else if (await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing")) {
+            this.setStateForNewView({ view: Views.E2E_SETUP });
+        } else {
+            this.onLoggedIn();
+        }
+        this.setState({ pendingInitialSync: false });
     }
 
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle stage
@@ -363,6 +416,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         if (this.shouldTrackPageChange(prevState, this.state)) {
             const durationMs = this.stopPageChangeTimer();
             Analytics.trackPageChange(durationMs);
+            CountlyAnalytics.instance.trackPageChange(durationMs);
         }
         if (this.focusComposer) {
             dis.fire(Action.FocusComposer);
@@ -415,6 +469,8 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 } else {
                     dis.dispatch({action: "view_welcome_page"});
                 }
+            } else if (SettingsStore.getValue("analyticsOptIn")) {
+                CountlyAnalytics.instance.enable(/* anonymous = */ false);
             }
         });
         // Note we don't catch errors from this: we catch everything within
@@ -473,6 +529,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         }
         const newState = {
             currentUserId: null,
+            justRegistered: false,
         };
         Object.assign(newState, state);
         this.setState(newState);
@@ -554,11 +611,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,
@@ -589,7 +641,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                             MatrixClientPeg.get().leave(payload.room_id).then(() => {
                                 modal.close();
                                 if (this.state.currentRoomId === payload.room_id) {
-                                    dis.dispatch({action: 'view_next_room'});
+                                    dis.dispatch({action: 'view_home_page'});
                                 }
                             }, (err) => {
                                 modal.close();
@@ -618,9 +670,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 }
                 break;
             }
-            case 'view_next_room':
-                this.viewNextRoom(1);
-                break;
             case Action.ViewUserSettings: {
                 const tabPayload = payload as OpenToTabPayload;
                 const UserSettingsDialog = sdk.getComponent("dialogs.UserSettingsDialog");
@@ -644,9 +693,17 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 break;
             }
             case Action.ViewRoomDirectory: {
-                const RoomDirectory = sdk.getComponent("structures.RoomDirectory");
-                Modal.createTrackedDialog('Room directory', '', RoomDirectory, {},
-                    'mx_RoomDirectory_dialogWrapper', false, true);
+                if (SpaceStore.instance.activeSpace) {
+                    Modal.createTrackedDialog("Space room directory", "", SpaceRoomDirectory, {
+                        space: SpaceStore.instance.activeSpace,
+                        initialText: payload.initialText,
+                    }, "mx_SpaceRoomDirectory_dialogWrapper", false, true);
+                } else {
+                    const RoomDirectory = sdk.getComponent("structures.RoomDirectory");
+                    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();
@@ -663,13 +720,13 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 this.viewWelcome();
                 break;
             case 'view_home_page':
-                this.viewHome();
+                this.viewHome(payload.justRegistered);
                 break;
             case 'view_start_chat_or_reuse':
                 this.chatCreateOrReuse(payload.user_id);
                 break;
             case 'view_create_chat':
-                showStartChatInviteDialog();
+                showStartChatInviteDialog(payload.initialText || "");
                 break;
             case 'view_invite':
                 showRoomInviteDialog(payload.roomId);
@@ -705,8 +762,13 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                     this.state.resizeNotifier.notifyLeftHandleResized();
                 });
                 break;
+            case Action.OpenDialPad:
+                Modal.createTrackedDialog('Dial pad', '', DialPadModal, {}, "mx_Dialog_dialPadWrapper");
+                break;
             case 'on_logged_in':
                 if (
+                    // Skip this handling for token login as that always calls onLoggedIn itself
+                    !this.tokenLogin &&
                     !Lifecycle.isSoftLogout() &&
                     this.state.view !== Views.LOGIN &&
                     this.state.view !== Views.REGISTER &&
@@ -750,7 +812,12 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 SettingsStore.setValue("analyticsOptIn", null, SettingLevel.DEVICE, true);
                 SettingsStore.setValue("showCookieBar", null, SettingLevel.DEVICE, false);
                 hideAnalyticsToast();
-                Analytics.enable();
+                if (Analytics.canEnable()) {
+                    Analytics.enable();
+                }
+                if (CountlyAnalytics.instance.canEnable()) {
+                    CountlyAnalytics.instance.enable(/* anonymous = */ false);
+                }
                 break;
             case 'reject_cookies':
                 SettingsStore.setValue("analyticsOptIn", null, SettingLevel.DEVICE, false);
@@ -794,35 +861,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         this.notifyNewScreen('register');
     }
 
-    // TODO: Move to RoomViewStore
-    private viewNextRoom(roomIndexDelta: number) {
-        const allRooms = RoomListSorter.mostRecentActivityFirst(
-            MatrixClientPeg.get().getRooms(),
-        );
-        // If there are 0 rooms or 1 room, view the home page because otherwise
-        // if there are 0, we end up trying to index into an empty array, and
-        // if there is 1, we end up viewing the same room.
-        if (allRooms.length < 2) {
-            dis.dispatch({
-                action: 'view_home_page',
-            });
-            return;
-        }
-        let roomIndex = -1;
-        for (let i = 0; i < allRooms.length; ++i) {
-            if (allRooms[i].roomId === this.state.currentRoomId) {
-                roomIndex = i;
-                break;
-            }
-        }
-        roomIndex = (roomIndex + roomIndexDelta) % allRooms.length;
-        if (roomIndex < 0) roomIndex = allRooms.length - 1;
-        dis.dispatch({
-            action: 'view_room',
-            room_id: allRooms[roomIndex].roomId,
-        });
-    }
-
     // switch view to the given room
     //
     // @param {Object} roomInfo Object containing data about the room to be joined
@@ -896,6 +934,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 roomOobData: roomInfo.oob_data,
                 viaServers: roomInfo.via_servers,
                 ready: true,
+                roomJustCreatedOpts: roomInfo.justCreatedOpts,
             }, () => {
                 this.notifyNewScreen('room/' + presentedId, replaceLast);
             });
@@ -942,10 +981,11 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         this.themeWatcher.recheck();
     }
 
-    private viewHome() {
+    private viewHome(justRegistered = false) {
         // The home page requires the "logged in" view, so we'll set that.
         this.setStateForNewView({
             view: Views.LOGGED_IN,
+            justRegistered,
         });
         this.setPage(PageTypes.HomePage);
         this.notifyNewScreen('home');
@@ -1041,6 +1081,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
 
     private leaveRoomWarnings(roomId: string) {
         const roomToLeave = MatrixClientPeg.get().getRoom(roomId);
+        const isSpace = roomToLeave?.isSpaceRoom();
         // Show a warning if there are additional complications.
         const joinRules = roomToLeave.currentState.getStateEvents('m.room.join_rules', '');
         const warnings = [];
@@ -1050,7 +1091,9 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 warnings.push((
                     <span className="warning" key="non_public_warning">
                         {' '/* Whitespace, otherwise the sentences get smashed together */ }
-                        { _t("This room is not public. You will not be able to rejoin without an invite.") }
+                        { isSpace
+                            ? _t("This space is not public. You will not be able to rejoin without an invite.")
+                            : _t("This room is not public. You will not be able to rejoin without an invite.") }
                     </span>
                 ));
             }
@@ -1063,11 +1106,14 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         const roomToLeave = MatrixClientPeg.get().getRoom(roomId);
         const warnings = this.leaveRoomWarnings(roomId);
 
-        Modal.createTrackedDialog('Leave room', '', QuestionDialog, {
-            title: _t("Leave room"),
+        const isSpace = roomToLeave?.isSpaceRoom();
+        Modal.createTrackedDialog(isSpace ? "Leave space" : "Leave room", '', QuestionDialog, {
+            title: isSpace ? _t("Leave space") : _t("Leave room"),
             description: (
                 <span>
-                    { _t("Are you sure you want to leave the room '%(roomName)s'?", {roomName: roomToLeave.name}) }
+                    { isSpace
+                        ? _t("Are you sure you want to leave the space '%(spaceName)s'?", {spaceName: roomToLeave.name})
+                        : _t("Are you sure you want to leave the room '%(roomName)s'?", {roomName: roomToLeave.name}) }
                     { warnings }
                 </span>
             ),
@@ -1081,6 +1127,10 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                     const modal = Modal.createDialog(Loader, null, 'mx_Dialog_spinner');
 
                     d.finally(() => modal.close());
+                    dis.dispatch({
+                        action: "after_leave_room",
+                        room_id: roomId,
+                    });
                 }
             },
         });
@@ -1088,9 +1138,9 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
 
     private forgetRoom(roomId: string) {
         MatrixClientPeg.get().forget(roomId).then(() => {
-            // Switch to another room view if we're currently viewing the historical room
+            // Switch to home page if we're currently viewing the forgotten room
             if (this.state.currentRoomId === roomId) {
-                dis.dispatch({ action: "view_next_room" });
+                dis.dispatch({ action: "view_home_page" });
             }
         }).catch((err) => {
             const errCode = err.errcode || _td("unknown error code");
@@ -1179,7 +1229,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 if (welcomeUserRoom === null) {
                     // We didn't redirect to the welcome user room, so show
                     // the homepage.
-                    dis.dispatch({action: 'view_home_page'});
+                    dis.dispatch({action: 'view_home_page', justRegistered: true});
                 }
             } else if (ThreepidInviteStore.instance.pickBestInvite()) {
                 // The user has a 3pid invite pending - show them that
@@ -1192,7 +1242,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             } else {
                 // The user has just logged in after registering,
                 // so show the homepage.
-                dis.dispatch({action: 'view_home_page'});
+                dis.dispatch({action: 'view_home_page', justRegistered: true});
             }
         } else {
             this.showScreenAfterLogin();
@@ -1200,9 +1250,18 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
 
         StorageManager.tryPersistStorage();
 
-        if (SettingsStore.getValue("showCookieBar") && Analytics.canEnable()) {
+        // defer the following actions by 30 seconds to not throw them at the user immediately
+        await sleep(30);
+        if (SettingsStore.getValue("showCookieBar") &&
+            (Analytics.canEnable() || CountlyAnalytics.instance.canEnable())
+        ) {
             showAnalyticsToast(this.props.config.piwik?.policyUrl);
         }
+        if (SdkConfig.get().mobileGuideToast) {
+            // The toast contains further logic to detect mobile platforms,
+            // check if it has been dismissed before, etc.
+            showMobileGuideToast();
+        }
     }
 
     private showScreenAfterLogin() {
@@ -1220,12 +1279,8 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         } else {
             if (MatrixClientPeg.get().isGuest()) {
                 dis.dispatch({action: 'view_welcome_page'});
-            } else if (getHomePageUrl(this.props.config)) {
-                dis.dispatch({action: 'view_home_page'});
             } else {
-                this.firstSyncPromise.promise.then(() => {
-                    dis.dispatch({action: 'view_next_room'});
-                });
+                dis.dispatch({action: 'view_home_page'});
             }
         }
     }
@@ -1330,8 +1385,8 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             this.firstSyncComplete = true;
             this.firstSyncPromise.resolve();
 
-            if (Notifier.shouldShowPrompt()) {
-                showNotificationsToast();
+            if (Notifier.shouldShowPrompt() && !MatrixClientPeg.userRegisteredWithinLastHours(24)) {
+                showNotificationsToast(false);
             }
 
             dis.fire(Action.FocusComposer);
@@ -1340,21 +1395,12 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             });
         });
 
-        if (SettingsStore.getValue(UIFeature.Voip)) {
-            cli.on('Call.incoming', function(call) {
-                // we dispatch this synchronously to make sure that the event
-                // handlers on the call are set up immediately (so that if
-                // we get an immediate hangup, we don't get a stuck call)
-                dis.dispatch({
-                    action: 'incoming_call',
-                    call: call,
-                }, true);
-            });
-        }
-
         cli.on('Session.logged_out', function(errObj) {
             if (Lifecycle.isLoggingOut()) return;
 
+            // A modal might have been open when we were logged out by the server
+            Modal.closeCurrentModal('Session.logged_out');
+
             if (errObj.httpStatus === 401 && errObj.data && errObj.data['soft_logout']) {
                 console.warn("Soft logout issued by server - avoiding data deletion");
                 Lifecycle.softLogout();
@@ -1365,6 +1411,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 title: _t('Signed Out'),
                 description: _t('For security, this session has been signed out. Please sign in again.'),
             });
+
             dis.dispatch({
                 action: 'logout',
             });
@@ -1394,6 +1441,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
 
         const dft = new DecryptionFailureTracker((total, errorCode) => {
             Analytics.trackEvent('E2E', 'Decryption failure', errorCode, total);
+            CountlyAnalytics.instance.track("decryption_failure", { errorCode }, null, { sum: total });
         }, (errorCode) => {
             // Map JS-SDK error codes to tracker codes for aggregation
             switch (errorCode) {
@@ -1535,6 +1583,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',
@@ -1551,7 +1607,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 {
@@ -1581,6 +1637,9 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 action: 'require_registration',
             });
         } else if (screen === 'directory') {
+            if (this.state.view === Views.WELCOME) {
+                CountlyAnalytics.instance.track("onboarding_room_directory");
+            }
             dis.fire(Action.ViewRoomDirectory);
         } else if (screen === "start_sso" || screen === "start_cas") {
             // TODO if logged in, skip SSO
@@ -1599,14 +1658,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
@@ -1630,10 +1681,16 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             // TODO: Handle encoded room/event IDs: https://github.com/vector-im/element-web/issues/9149
 
             let threepidInvite: IThreepidInvite;
+            // if we landed here from a 3PID invite, persist it
             if (params.signurl && params.email) {
                 threepidInvite = ThreepidInviteStore.instance
                     .storeInvite(roomString, params as IThreepidInviteWireFormat);
             }
+            // otherwise check that this room doesn't already have a known invite
+            if (!threepidInvite) {
+                const invites = ThreepidInviteStore.instance.getInvites();
+                threepidInvite = invites.find(invite => invite.roomId === roomString);
+            }
 
             // on our URLs there might be a ?via=matrix.org or similar to help
             // joins to the room succeed. We'll pass these through as an array
@@ -1777,14 +1834,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) {
@@ -1870,40 +1919,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
 
         // Create and start the client
         await Lifecycle.setLoggedIn(credentials);
-
-        const cli = MatrixClientPeg.get();
-        const cryptoEnabled = cli.isCryptoEnabled();
-        if (!cryptoEnabled) {
-            this.onLoggedIn();
-        }
-
-        const promisesList = [this.firstSyncPromise.promise];
-        if (cryptoEnabled) {
-            // wait for the client to finish downloading cross-signing keys for us so we
-            // know whether or not we have keys set up on this account
-            promisesList.push(cli.downloadKeys([cli.getUserId()]));
-        }
-
-        // Now update the state to say we're waiting for the first sync to complete rather
-        // than for the login to finish.
-        this.setState({ pendingInitialSync: true });
-
-        await Promise.all(promisesList);
-
-        if (!cryptoEnabled) {
-            this.setState({ pendingInitialSync: false });
-            return;
-        }
-
-        const crossSigningIsSetUp = cli.getStoredCrossSigningForUser(cli.getUserId());
-        if (crossSigningIsSetUp) {
-            this.setStateForNewView({ view: Views.COMPLETE_SECURITY });
-        } else if (await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing")) {
-            this.setStateForNewView({ view: Views.E2E_SETUP });
-        } else {
-            this.onLoggedIn();
-        }
-        this.setState({ pendingInitialSync: false });
+        await this.postLoginSetup();
     };
 
     // complete security / e2e setup has finished
@@ -1947,15 +1963,9 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 <E2eSetup
                     onFinished={this.onCompleteSecurityE2eSetupFinished}
                     accountPassword={this.accountPassword}
+                    tokenLogin={!!this.tokenLogin}
                 />
             );
-        } 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.
@@ -2019,6 +2029,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                     onLoginClick={this.onLoginClick}
                     onServerConfigChange={this.onServerConfigChange}
                     defaultDeviceDisplayName={this.props.defaultDeviceDisplayName}
+                    fragmentAfterLogin={fragmentAfterLogin}
                     {...this.getServerProperties()}
                 />
             );
diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index e2e3592536..161227a139 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -23,13 +23,17 @@ import classNames from 'classnames';
 import shouldHideEvent from '../../shouldHideEvent';
 import {wantsDateSeparator} from '../../DateUtils';
 import * as sdk from '../../index';
+import dis from "../../dispatcher/dispatcher";
 
 import {MatrixClientPeg} from '../../MatrixClientPeg';
 import SettingsStore from '../../settings/SettingsStore';
+import {Layout, LayoutPropType} from "../../settings/Layout";
 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";
+import NewRoomIntro from "../views/rooms/NewRoomIntro";
 
 const CONTINUATION_MAX_INTERVAL = 5 * 60 * 1000; // 5 minutes
 const continuedTypes = ['m.sticker', 'm.room.message'];
@@ -133,14 +137,13 @@ export default class MessagePanel extends React.Component {
         // whether to show reactions for an event
         showReactions: PropTypes.bool,
 
-        // whether to use the irc layout
-        useIRCLayout: PropTypes.bool,
+        // which layout to use
+        layout: LayoutPropType,
 
         // whether or not to show flair at all
         enableFlair: PropTypes.bool,
     };
 
-    // Force props to be loaded for useIRCLayout
     constructor(props) {
         super(props);
 
@@ -205,11 +208,13 @@ export default class MessagePanel extends React.Component {
 
     componentDidMount() {
         this._isMounted = true;
+        this.dispatcherRef = dis.register(this.onAction);
     }
 
     componentWillUnmount() {
         this._isMounted = false;
         SettingsStore.unwatchSetting(this._showTypingNotificationsWatcherRef);
+        dis.unregister(this.dispatcherRef);
     }
 
     componentDidUpdate(prevProps, prevState) {
@@ -222,6 +227,14 @@ export default class MessagePanel extends React.Component {
         }
     }
 
+    onAction = (payload) => {
+        switch (payload.action) {
+            case "scroll_to_bottom":
+                this.scrollToBottom();
+                break;
+        }
+    }
+
     onShowTypingNotificationsChange = () => {
         this.setState({
             showTypingNotifications: SettingsStore.getValue("showTypingNotifications"),
@@ -610,7 +623,7 @@ export default class MessagePanel extends React.Component {
                         isSelectedEvent={highlight}
                         getRelationsForEvent={this.props.getRelationsForEvent}
                         showReactions={this.props.showReactions}
-                        useIRCLayout={this.props.useIRCLayout}
+                        layout={this.props.layout}
                         enableFlair={this.props.enableFlair}
                     />
                 </TileErrorBoundary>
@@ -808,7 +821,7 @@ export default class MessagePanel extends React.Component {
         }
 
         let ircResizer = null;
-        if (this.props.useIRCLayout) {
+        if (this.props.layout == Layout.IRC) {
             ircResizer = <IRCTimelineProfileResizer
                 minWidth={20}
                 maxWidth={600}
@@ -952,15 +965,25 @@ 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 roomId = ev.getRoomId();
+        const creator = ev.sender ? ev.sender.name : ev.getSender();
+        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 key="newroomintro" />);
+
         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/structures/NotificationPanel.js b/src/components/structures/NotificationPanel.js
index 2889afc1fc..b4eb6c187b 100644
--- a/src/components/structures/NotificationPanel.js
+++ b/src/components/structures/NotificationPanel.js
@@ -39,7 +39,7 @@ class NotificationPanel extends React.Component {
 
         const emptyState = (<div className="mx_RightPanel_empty mx_NotificationPanel_empty">
             <h2>{_t('You’re all caught up')}</h2>
-            <p>{_t('You have no visible notifications in this room.')}</p>
+            <p>{_t('You have no visible notifications.')}</p>
         </div>);
 
         let content;
diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 41f4d83743..3d9df2e927 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -24,13 +24,16 @@ import dis from '../../dispatcher/dispatcher';
 import RateLimitedFunc from '../../ratelimitedfunc';
 import { showGroupInviteDialog, showGroupAddRoomDialog } from '../../GroupAddressPicker';
 import GroupStore from '../../stores/GroupStore';
-import {RightPanelPhases, RIGHT_PANEL_PHASES_NO_ARGS} from "../../stores/RightPanelStorePhases";
+import {
+    RightPanelPhases,
+    RIGHT_PANEL_PHASES_NO_ARGS,
+    RIGHT_PANEL_SPACE_PHASES,
+} from "../../stores/RightPanelStorePhases";
 import RightPanelStore from "../../stores/RightPanelStore";
 import MatrixClientContext from "../../contexts/MatrixClientContext";
 import {Action} from "../../dispatcher/actions";
 import RoomSummaryCard from "../views/right_panel/RoomSummaryCard";
 import WidgetCard from "../views/right_panel/WidgetCard";
-import defaultDispatcher from "../../dispatcher/dispatcher";
 
 export default class RightPanel extends React.Component {
     static get propTypes() {
@@ -80,6 +83,8 @@ export default class RightPanel extends React.Component {
                 return RightPanelPhases.GroupMemberList;
             }
             return rps.groupPanelPhase;
+        } else if (this.props.room?.isSpaceRoom() && !RIGHT_PANEL_SPACE_PHASES.includes(rps.roomPanelPhase)) {
+            return RightPanelPhases.SpaceMemberList;
         } else if (userForPanel) {
             // XXX FIXME AAAAAARGH: What is going on with this class!? It takes some of its state
             // from its props and some from a store, except if the contents of the store changes
@@ -100,9 +105,8 @@ export default class RightPanel extends React.Component {
                 return rps.roomPanelPhase;
             }
             return RightPanelPhases.RoomMemberInfo;
-        } else {
-            return rps.roomPanelPhase;
         }
+        return rps.roomPanelPhase;
     }
 
     componentDidMount() {
@@ -182,11 +186,12 @@ export default class RightPanel extends React.Component {
                 verificationRequest: payload.verificationRequest,
                 verificationRequestPromise: payload.verificationRequestPromise,
                 widgetId: payload.widgetId,
+                space: payload.space,
             });
         }
     }
 
-    onCloseUserInfo = () => {
+    onClose = () => {
         // XXX: There are three different ways of 'closing' this panel depending on what state
         // things are in... this knows far more than it should do about the state of the rest
         // of the app and is generally a bit silly.
@@ -198,31 +203,21 @@ export default class RightPanel extends React.Component {
             dis.dispatch({
                 action: "view_home_page",
             });
-        } else if (this.state.phase === RightPanelPhases.EncryptionPanel &&
+        } else if (
+            this.state.phase === RightPanelPhases.EncryptionPanel &&
             this.state.verificationRequest && this.state.verificationRequest.pending
         ) {
             // When the user clicks close on the encryption panel cancel the pending request first if any
             this.state.verificationRequest.cancel();
         } else {
-            // Otherwise we have got our user from RoomViewStore which means we're being shown
-            // within a room/group, so go back to the member panel if we were in the encryption panel,
-            // or the member list if we were in the member panel... phew.
-            const isEncryptionPhase = this.state.phase === RightPanelPhases.EncryptionPanel;
+            // the RightPanelStore has no way of knowing which mode room/group it is in, so we handle closing here
             dis.dispatch({
-                action: Action.ViewUser,
-                member: isEncryptionPhase ? this.state.member : null,
+                action: Action.ToggleRightPanel,
+                type: this.props.groupId ? "group" : "room",
             });
         }
     };
 
-    onClose = () => {
-        // the RightPanelStore has no way of knowing which mode room/group it is in, so we handle closing here
-        defaultDispatcher.dispatch({
-            action: Action.ToggleRightPanel,
-            type: this.props.groupId ? "group" : "room",
-        });
-    };
-
     render() {
         const MemberList = sdk.getComponent('rooms.MemberList');
         const UserInfo = sdk.getComponent('right_panel.UserInfo');
@@ -243,6 +238,13 @@ export default class RightPanel extends React.Component {
                     panel = <MemberList roomId={roomId} key={roomId} onClose={this.onClose} />;
                 }
                 break;
+            case RightPanelPhases.SpaceMemberList:
+                panel = <MemberList
+                    roomId={this.state.space ? this.state.space.roomId : roomId}
+                    key={this.state.space ? this.state.space.roomId : roomId}
+                    onClose={this.onClose}
+                />;
+                break;
 
             case RightPanelPhases.GroupMemberList:
                 if (this.props.groupId) {
@@ -255,12 +257,13 @@ export default class RightPanel extends React.Component {
                 break;
 
             case RightPanelPhases.RoomMemberInfo:
+            case RightPanelPhases.SpaceMemberInfo:
             case RightPanelPhases.EncryptionPanel:
                 panel = <UserInfo
                     user={this.state.member}
-                    room={this.props.room}
+                    room={this.state.phase === RightPanelPhases.SpaceMemberInfo ? this.state.space : this.props.room}
                     key={roomId || this.state.member.userId}
-                    onClose={this.onCloseUserInfo}
+                    onClose={this.onClose}
                     phase={this.state.phase}
                     verificationRequest={this.state.verificationRequest}
                     verificationRequestPromise={this.state.verificationRequestPromise}
@@ -268,6 +271,7 @@ export default class RightPanel extends React.Component {
                 break;
 
             case RightPanelPhases.Room3pidMemberInfo:
+            case RightPanelPhases.Space3pidMemberInfo:
                 panel = <ThirdPartyMemberInfo event={this.state.event} key={roomId} />;
                 break;
 
@@ -276,7 +280,7 @@ export default class RightPanel extends React.Component {
                     user={this.state.member}
                     groupId={this.props.groupId}
                     key={this.state.member.userId}
-                    onClose={this.onCloseUserInfo} />;
+                    onClose={this.onClose} />;
                 break;
 
             case RightPanelPhases.GroupRoomInfo:
diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js
index 97e1f82a77..7387e1aac0 100644
--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@@ -33,6 +33,7 @@ import SettingsStore from "../../settings/SettingsStore";
 import GroupFilterOrderStore from "../../stores/GroupFilterOrderStore";
 import GroupStore from "../../stores/GroupStore";
 import FlairStore from "../../stores/FlairStore";
+import CountlyAnalytics from "../../CountlyAnalytics";
 
 const MAX_NAME_LENGTH = 80;
 const MAX_TOPIC_LENGTH = 800;
@@ -43,12 +44,16 @@ function track(action) {
 
 export default class RoomDirectory extends React.Component {
     static propTypes = {
+        initialText: PropTypes.string,
         onFinished: PropTypes.func.isRequired,
     };
 
     constructor(props) {
         super(props);
 
+        CountlyAnalytics.instance.trackRoomDirectoryBegin();
+        this.startTime = CountlyAnalytics.getTimestamp();
+
         const selectedCommunityId = GroupFilterOrderStore.getSelectedTags()[0];
         this.state = {
             publicRooms: [],
@@ -57,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,
@@ -198,6 +203,11 @@ export default class RoomDirectory extends React.Component {
                 return;
             }
 
+            if (this.state.filterString) {
+                const count = data.total_room_count_estimate || data.chunk.length;
+                CountlyAnalytics.instance.trackRoomDirectorySearch(count, this.state.filterString);
+            }
+
             this.nextBatch = data.next_batch;
             this.setState((s) => {
                 s.publicRooms.push(...(data.chunk || []));
@@ -407,7 +417,7 @@ export default class RoomDirectory extends React.Component {
     };
 
     onCreateRoomClick = room => {
-        this.props.onFinished();
+        this.onFinished();
         dis.dispatch({
             action: 'view_create_room',
             public: true,
@@ -419,11 +429,12 @@ export default class RoomDirectory extends React.Component {
     }
 
     showRoom(room, room_alias, autoJoin = false, shouldPeek = false) {
-        this.props.onFinished();
+        this.onFinished();
         const payload = {
             action: 'view_room',
             auto_join: autoJoin,
             should_peek: shouldPeek,
+            _type: "room_directory", // instrumentation
         };
         if (room) {
             // Don't let the user view a room they won't be able to either
@@ -466,7 +477,7 @@ export default class RoomDirectory extends React.Component {
         dis.dispatch(payload);
     }
 
-    getRow(room) {
+    createRoomCells(room) {
         const client = MatrixClientPeg.get();
         const clientRoom = client.getRoom(room.room_id);
         const hasJoinedRoom = clientRoom && clientRoom.getMyMembership() === "join";
@@ -476,7 +487,11 @@ export default class RoomDirectory extends React.Component {
         let previewButton;
         let joinOrViewButton;
 
-        if (room.world_readable && !hasJoinedRoom) {
+        // Element Web currently does not allow guests to join rooms, so we
+        // instead show them preview buttons for all rooms. If the room is not
+        // world readable, a modal will appear asking you to register first. If
+        // it is readable, the preview appears as normal.
+        if (!hasJoinedRoom && (room.world_readable || isGuest)) {
             previewButton = (
                 <AccessibleButton kind="secondary" onClick={(ev) => this.onPreviewClick(ev, room)}>{_t("Preview")}</AccessibleButton>
             );
@@ -485,7 +500,7 @@ export default class RoomDirectory extends React.Component {
             joinOrViewButton = (
                 <AccessibleButton kind="secondary" onClick={(ev) => this.onViewClick(ev, room)}>{_t("View")}</AccessibleButton>
             );
-        } else if (!isGuest || room.guest_can_join) {
+        } else if (!isGuest) {
             joinOrViewButton = (
                 <AccessibleButton kind="primary" onClick={(ev) => this.onJoinClick(ev, room)}>{_t("Join")}</AccessibleButton>
             );
@@ -508,31 +523,56 @@ export default class RoomDirectory extends React.Component {
                                 MatrixClientPeg.get().getHomeserverUrl(),
                                 room.avatar_url, 32, 32, "crop",
                             );
-        return (
-            <tr key={ room.room_id }
+        return [
+            <div key={ `${room.room_id}_avatar` }
                 onClick={(ev) => this.onRoomClicked(room, ev)}
                 // cancel onMouseDown otherwise shift-clicking highlights text
                 onMouseDown={(ev) => {ev.preventDefault();}}
+                className="mx_RoomDirectory_roomAvatar"
             >
-                <td className="mx_RoomDirectory_roomAvatar">
-                    <BaseAvatar width={32} height={32} resizeMethod='crop'
-                        name={ name } idName={ name }
-                        url={ avatarUrl } />
-                </td>
-                <td className="mx_RoomDirectory_roomDescription">
-                    <div className="mx_RoomDirectory_name">{ name }</div>&nbsp;
-                    <div className="mx_RoomDirectory_topic"
-                        onClick={ (ev) => { ev.stopPropagation(); } }
-                        dangerouslySetInnerHTML={{ __html: topic }} />
-                    <div className="mx_RoomDirectory_alias">{ get_display_alias_for_room(room) }</div>
-                </td>
-                <td className="mx_RoomDirectory_roomMemberCount">
-                    { room.num_joined_members }
-                </td>
-                <td className="mx_RoomDirectory_preview">{previewButton}</td>
-                <td className="mx_RoomDirectory_join">{joinOrViewButton}</td>
-            </tr>
-        );
+                <BaseAvatar width={32} height={32} resizeMethod='crop'
+                    name={ name } idName={ name }
+                    url={ avatarUrl }
+                />
+            </div>,
+            <div key={ `${room.room_id}_description` }
+                onClick={(ev) => this.onRoomClicked(room, ev)}
+                // cancel onMouseDown otherwise shift-clicking highlights text
+                onMouseDown={(ev) => {ev.preventDefault();}}
+                className="mx_RoomDirectory_roomDescription"
+            >
+                <div className="mx_RoomDirectory_name">{ name }</div>&nbsp;
+                <div className="mx_RoomDirectory_topic"
+                    onClick={ (ev) => { ev.stopPropagation(); } }
+                    dangerouslySetInnerHTML={{ __html: topic }}
+                />
+                <div className="mx_RoomDirectory_alias">{ get_display_alias_for_room(room) }</div>
+            </div>,
+            <div key={ `${room.room_id}_memberCount` }
+                onClick={(ev) => this.onRoomClicked(room, ev)}
+                // cancel onMouseDown otherwise shift-clicking highlights text
+                onMouseDown={(ev) => {ev.preventDefault();}}
+                className="mx_RoomDirectory_roomMemberCount"
+            >
+                { room.num_joined_members }
+            </div>,
+            <div key={ `${room.room_id}_preview` }
+                onClick={(ev) => this.onRoomClicked(room, ev)}
+                // cancel onMouseDown otherwise shift-clicking highlights text
+                onMouseDown={(ev) => {ev.preventDefault();}}
+                className="mx_RoomDirectory_preview"
+            >
+                {previewButton}
+            </div>,
+            <div key={ `${room.room_id}_join` }
+                onClick={(ev) => this.onRoomClicked(room, ev)}
+                // cancel onMouseDown otherwise shift-clicking highlights text
+                onMouseDown={(ev) => {ev.preventDefault();}}
+                className="mx_RoomDirectory_join"
+            >
+                {joinOrViewButton}
+            </div>,
+        ];
     }
 
     collectScrollPanel = (element) => {
@@ -575,6 +615,11 @@ export default class RoomDirectory extends React.Component {
         }
     };
 
+    onFinished = () => {
+        CountlyAnalytics.instance.trackRoomDirectory(this.startTime);
+        this.props.onFinished();
+    };
+
     render() {
         const Loader = sdk.getComponent("elements.Spinner");
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
@@ -586,7 +631,8 @@ export default class RoomDirectory extends React.Component {
         } else if (this.state.protocolsLoading) {
             content = <Loader />;
         } else {
-            const rows = (this.state.publicRooms || []).map(room => this.getRow(room));
+            const cells = (this.state.publicRooms || [])
+                .reduce((cells, room) => cells.concat(this.createRoomCells(room)), [],);
             // we still show the scrollpanel, at least for now, because
             // otherwise we don't fetch more because we don't get a fill
             // request from the scrollpanel because there isn't one
@@ -597,14 +643,12 @@ export default class RoomDirectory extends React.Component {
             }
 
             let scrollpanel_content;
-            if (rows.length === 0 && !this.state.loading) {
+            if (cells.length === 0 && !this.state.loading) {
                 scrollpanel_content = <i>{ _t('No rooms to show') }</i>;
             } else {
-                scrollpanel_content = <table className="mx_RoomDirectory_table">
-                    <tbody>
-                        { rows }
-                    </tbody>
-                </table>;
+                scrollpanel_content = <div className="mx_RoomDirectory_table">
+                    { cells }
+                </div>;
             }
             const ScrollPanel = sdk.getComponent("structures.ScrollPanel");
             content = <ScrollPanel ref={this.collectScrollPanel}
@@ -671,6 +715,7 @@ export default class RoomDirectory extends React.Component {
                     onJoinClick={this.onJoinFromSearchClick}
                     placeholder={placeholder}
                     showJoinButton={showJoinButton}
+                    initialText={this.props.initialText}
                 />
                 {dropdown}
             </div>;
@@ -693,7 +738,7 @@ export default class RoomDirectory extends React.Component {
             <BaseDialog
                 className={'mx_RoomDirectory_dialog'}
                 hasCancel={true}
-                onFinished={this.props.onFinished}
+                onFinished={this.onFinished}
                 title={title}
             >
                 <div className="mx_RoomDirectory">
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/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index e390be6979..c1c4ad6292 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -18,13 +18,11 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import Matrix from 'matrix-js-sdk';
 import { _t, _td } from '../../languageHandler';
-import * as sdk from '../../index';
 import {MatrixClientPeg} from '../../MatrixClientPeg';
 import Resend from '../../Resend';
 import dis from '../../dispatcher/dispatcher';
 import {messageForResourceLimitError, messageForSendError} from '../../utils/ErrorUtils';
 import {Action} from "../../dispatcher/actions";
-import { CallState, CallType } from 'matrix-js-sdk/lib/webrtc/call';
 
 const STATUS_BAR_HIDDEN = 0;
 const STATUS_BAR_EXPANDED = 1;
@@ -41,16 +39,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)
-        callState: PropTypes.string,
-
-        // The type of the call in progress, or null if no call is in progress
-        callType: PropTypes.string,
 
         // true if the room is being peeked at. This affects components that shouldn't
         // logically be shown when peeking, such as a prompt to invite people to a room.
@@ -68,10 +56,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.
@@ -122,12 +106,6 @@ export default class RoomStatusBar extends React.Component {
         });
     };
 
-    _showCallBar() {
-        return (this.props.callState &&
-            (this.props.callState !== CallState.Ended && this.props.callState !== CallState.Ringing)
-        );
-    }
-
     _onResendAllClick = () => {
         Resend.resendUnsentEvents(this.props.room);
         dis.fire(Action.FocusComposer);
@@ -159,10 +137,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()) {
             return STATUS_BAR_EXPANDED;
         } else if (this.state.unsentMessages.length > 0) {
             return STATUS_BAR_EXPANDED_LARGE;
@@ -170,22 +145,6 @@ export default class RoomStatusBar extends React.Component {
         return STATUS_BAR_HIDDEN;
     }
 
-    // return suitable content for the image on the left of the status bar.
-    _getIndicator() {
-        if (this._showCallBar()) {
-            const TintableSvg = sdk.getComponent("elements.TintableSvg");
-            return (
-                <TintableSvg src={require("../../../res/img/element-icons/room/in-call.svg")} width="23" height="20" />
-            );
-        }
-
-        if (this._shouldShowConnectionError()) {
-            return null;
-        }
-
-        return null;
-    }
-
     _shouldShowConnectionError() {
         // no conn bar trumps the "some not sent" msg since you can't resend without
         // a connection!
@@ -276,25 +235,6 @@ export default class RoomStatusBar extends React.Component {
         </div>;
     }
 
-    _getCallStatusText() {
-        switch (this.props.callState) {
-            case CallState.CreateOffer:
-            case CallState.InviteSent:
-                return _t('Calling...');
-            case CallState.Connecting:
-            case CallState.CreateAnswer:
-                return _t('Call connecting...');
-            case CallState.Connected:
-                return _t('Active call');
-            case CallState.WaitLocalMedia:
-                if (this.props.callType === CallType.Video) {
-                    return _t('Starting camera...');
-                } else {
-                    return _t('Starting microphone...');
-                }
-        }
-    }
-
     // return suitable content for the main (text) part of the status bar.
     _getContent() {
         if (this._shouldShowConnectionError()) {
@@ -317,44 +257,14 @@ export default class RoomStatusBar extends React.Component {
             return this._getUnsentMessageContent();
         }
 
-        if (this._showCallBar()) {
-            return (
-                <div className="mx_RoomStatusBar_callBar">
-                    <b>{ this._getCallStatusText() }</b>
-                </div>
-            );
-        }
-
-        // 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;
     }
 
     render() {
         const content = this._getContent();
-        const indicator = this._getIndicator();
 
         return (
             <div className="mx_RoomStatusBar">
-                <div className="mx_RoomStatusBar_indicator">
-                    { indicator }
-                </div>
                 <div role="alert">
                     { content }
                 </div>
diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index 2952568e2f..1961779d0e 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -21,43 +21,42 @@ limitations under the License.
 //  - Search results component
 //  - Drag and drop
 
-import React, {createRef} from 'react';
+import React, { createRef } from 'react';
 import classNames from 'classnames';
-import {Room} from "matrix-js-sdk/src/models/room";
-import {MatrixEvent} from "matrix-js-sdk/src/models/event";
-import {EventSubscription} from "fbemitter";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { EventSubscription } from "fbemitter";
 
 import shouldHideEvent from '../../shouldHideEvent';
-import {_t} from '../../languageHandler';
-import {RoomPermalinkCreator} from '../../utils/permalinks/Permalinks';
+import { _t } from '../../languageHandler';
+import { RoomPermalinkCreator } from '../../utils/permalinks/Permalinks';
 import ResizeNotifier from '../../utils/ResizeNotifier';
 import ContentMessages from '../../ContentMessages';
 import Modal from '../../Modal';
 import * as sdk from '../../index';
-import CallHandler from '../../CallHandler';
+import CallHandler, { PlaceCallType } from '../../CallHandler';
 import dis from '../../dispatcher/dispatcher';
 import Tinter from '../../Tinter';
 import rateLimitedFunc from '../../ratelimitedfunc';
-import * as ObjectUtils from '../../ObjectUtils';
 import * as Rooms from '../../Rooms';
-import eventSearch, {searchPagination} from '../../Searching';
-import {isOnlyCtrlOrCmdIgnoreShiftKeyEvent, isOnlyCtrlOrCmdKeyEvent, Key} from '../../Keyboard';
+import eventSearch, { searchPagination } from '../../Searching';
+import { isOnlyCtrlOrCmdIgnoreShiftKeyEvent, Key } from '../../Keyboard';
 import MainSplit from './MainSplit';
 import RightPanel from './RightPanel';
 import RoomViewStore from '../../stores/RoomViewStore';
 import RoomScrollStateStore from '../../stores/RoomScrollStateStore';
 import WidgetEchoStore from '../../stores/WidgetEchoStore';
 import SettingsStore from "../../settings/SettingsStore";
+import {Layout} from "../../settings/Layout";
 import AccessibleButton from "../views/elements/AccessibleButton";
 import RightPanelStore from "../../stores/RightPanelStore";
-import {haveTileForEvent} from "../views/rooms/EventTile";
+import { haveTileForEvent } from "../views/rooms/EventTile";
 import RoomContext from "../../contexts/RoomContext";
 import MatrixClientContext from "../../contexts/MatrixClientContext";
-import {E2EStatus, shieldStatusForRoom} from '../../utils/ShieldUtils';
-import {Action} from "../../dispatcher/actions";
-import {SettingLevel} from "../../settings/SettingLevel";
-import {RightPanelPhases} from "../../stores/RightPanelStorePhases";
-import {IMatrixClientCreds} from "../../MatrixClientPeg";
+import { E2EStatus, shieldStatusForRoom } from '../../utils/ShieldUtils';
+import { Action } from "../../dispatcher/actions";
+import { SettingLevel } from "../../settings/SettingLevel";
+import { IMatrixClientCreds } from "../../MatrixClientPeg";
 import ScrollPanel from "./ScrollPanel";
 import TimelinePanel from "./TimelinePanel";
 import ErrorBoundary from "../views/elements/ErrorBoundary";
@@ -68,10 +67,21 @@ import RoomUpgradeWarningBar from "../views/rooms/RoomUpgradeWarningBar";
 import PinnedEventsPanel from "../views/rooms/PinnedEventsPanel";
 import AuxPanel from "../views/rooms/AuxPanel";
 import RoomHeader from "../views/rooms/RoomHeader";
-import TintableSvg from "../views/elements/TintableSvg";
-import {XOR} from "../../@types/common";
+import { XOR } from "../../@types/common";
 import { IThreepidInvite } from "../../stores/ThreepidInviteStore";
-import { CallState, CallType, MatrixCall } from "matrix-js-sdk/lib/webrtc/call";
+import EffectsOverlay from "../views/elements/EffectsOverlay";
+import { containsEmoji } from '../../effects/utils';
+import { CHAT_EFFECTS } from '../../effects';
+import { CallState, MatrixCall } from "matrix-js-sdk/src/webrtc/call";
+import WidgetStore from "../../stores/WidgetStore";
+import { UPDATE_EVENT } from "../../stores/AsyncStore";
+import Notifier from "../../Notifier";
+import { showToast as showNotificationsToast } from "../../toasts/DesktopNotificationsToast";
+import { RoomNotificationStateStore } from "../../stores/notifications/RoomNotificationStateStore";
+import { Container, WidgetLayoutStore } from "../../stores/widgets/WidgetLayoutStore";
+import { objectHasDiff } from "../../utils/objects";
+import SpaceRoomView from "./SpaceRoomView";
+import { IOpts } from "../../createRoom";
 
 const DEBUG = false;
 let debuglog = function(msg: string) {};
@@ -106,6 +116,7 @@ interface IProps {
 
     autoJoin?: boolean;
     resizeNotifier: ResizeNotifier;
+    justCreatedOpts?: IOpts;
 
     // Called with the credentials of a registered user (if they were a ROU that transitioned to PWLU)
     onRegistered?(credentials: IMatrixClientCreds): void;
@@ -127,6 +138,7 @@ export interface IState {
     initialEventPixelOffset?: number;
     // Whether to highlight the event scrolled to
     isInitialEventHighlighted?: boolean;
+    replyToEvent?: MatrixEvent;
     forwardingEvent?: MatrixEvent;
     numUnreadMessages: number;
     draggingFile: boolean;
@@ -145,7 +157,6 @@ export interface IState {
     guestsCanJoin: boolean;
     canPeek: boolean;
     showApps: boolean;
-    isAlone: boolean;
     isPeeking: boolean;
     showingPinned: boolean;
     showReadReceipts: boolean;
@@ -174,12 +185,13 @@ export interface IState {
     };
     canReact: boolean;
     canReply: boolean;
-    useIRCLayout: boolean;
+    layout: Layout;
     matrixClientIsReady: boolean;
     showUrlPreview?: boolean;
     e2eStatus?: E2EStatus;
     rejecting?: boolean;
     rejectError?: Error;
+    hasPinnedWidgets?: boolean;
 }
 
 export default class RoomView extends React.Component<IProps, IState> {
@@ -217,7 +229,6 @@ export default class RoomView extends React.Component<IProps, IState> {
             guestsCanJoin: false,
             canPeek: false,
             showApps: false,
-            isAlone: false,
             isPeeking: false,
             showingPinned: false,
             showReadReceipts: true,
@@ -229,7 +240,7 @@ export default class RoomView extends React.Component<IProps, IState> {
             statusBarVisible: false,
             canReact: false,
             canReply: false,
-            useIRCLayout: SettingsStore.getValue("useIRCLayout"),
+            layout: SettingsStore.getValue("layout"),
             matrixClientIsReady: this.context && this.context.isInitialSyncComplete(),
         };
 
@@ -246,22 +257,33 @@ export default class RoomView extends React.Component<IProps, IState> {
         this.context.on("deviceVerificationChanged", this.onDeviceVerificationChanged);
         this.context.on("userTrustStatusChanged", this.onUserVerificationChanged);
         this.context.on("crossSigning.keysChanged", this.onCrossSigningKeysChanged);
+        this.context.on("Event.decrypted", this.onEventDecrypted);
+        this.context.on("event", this.onEvent);
         // Start listening for RoomViewStore updates
         this.roomStoreToken = RoomViewStore.addListener(this.onRoomViewStoreUpdate);
         this.rightPanelStoreToken = RightPanelStore.getSharedInstance().addListener(this.onRightPanelStoreUpdate);
 
-        WidgetEchoStore.on('update', this.onWidgetEchoStoreUpdate);
+        WidgetEchoStore.on(UPDATE_EVENT, this.onWidgetEchoStoreUpdate);
+        WidgetStore.instance.on(UPDATE_EVENT, this.onWidgetStoreUpdate);
+
         this.showReadReceiptsWatchRef = SettingsStore.watchSetting("showReadReceipts", null,
             this.onReadReceiptsChange);
-        this.layoutWatcherRef = SettingsStore.watchSetting("useIRCLayout", null, this.onLayoutChange);
+        this.layoutWatcherRef = SettingsStore.watchSetting("layout", null, this.onLayoutChange);
     }
 
-    // TODO: [REACT-WARNING] Move into constructor
-    // eslint-disable-next-line camelcase
-    UNSAFE_componentWillMount() {
-        this.onRoomViewStoreUpdate(true);
+    private onWidgetStoreUpdate = () => {
+        if (this.state.room) {
+            this.checkWidgets(this.state.room);
+        }
     }
 
+    private checkWidgets = (room) => {
+        this.setState({
+            hasPinnedWidgets: WidgetLayoutStore.instance.getContainerWidgets(room, Container.Top).length > 0,
+            showApps: this.shouldShowApps(room),
+        });
+    };
+
     private onReadReceiptsChange = () => {
         this.setState({
             showReadReceipts: SettingsStore.getValue("showReadReceipts", this.state.roomId),
@@ -298,6 +320,7 @@ export default class RoomView extends React.Component<IProps, IState> {
             joining: RoomViewStore.isJoining(),
             initialEventId: RoomViewStore.getInitialEventId(),
             isInitialEventHighlighted: RoomViewStore.isInitialEventHighlighted(),
+            replyToEvent: RoomViewStore.getQuotingEvent(),
             forwardingEvent: RoomViewStore.getForwardingEvent(),
             // we should only peek once we have a ready client
             shouldPeek: this.state.matrixClientIsReady && RoomViewStore.shouldPeek(),
@@ -395,11 +418,17 @@ export default class RoomView extends React.Component<IProps, IState> {
     }
 
     private onWidgetEchoStoreUpdate = () => {
+        if (!this.state.room) return;
         this.setState({
+            hasPinnedWidgets: WidgetLayoutStore.instance.getContainerWidgets(this.state.room, Container.Top).length > 0,
             showApps: this.shouldShowApps(this.state.room),
         });
     };
 
+    private onWidgetLayoutChange = () => {
+        this.onWidgetEchoStoreUpdate(); // we cheat here by calling the thing that matters
+    };
+
     private setupRoom(room: Room, roomId: string, joining: boolean, shouldPeek: boolean) {
         // if this is an unknown room then we're in one of three states:
         // - This is a room we can peek into (search engine) (we can /peek)
@@ -465,7 +494,7 @@ export default class RoomView extends React.Component<IProps, IState> {
     }
 
     private shouldShowApps(room: Room) {
-        if (!BROWSER_SUPPORTS_SANDBOX) return false;
+        if (!BROWSER_SUPPORTS_SANDBOX || !room) return false;
 
         // Check if user has previously chosen to hide the app drawer for this
         // room. If so, do not show apps
@@ -474,10 +503,15 @@ export default class RoomView extends React.Component<IProps, IState> {
 
         // This is confusing, but it means to say that we default to the tray being
         // hidden unless the user clicked to open it.
-        return hideWidgetDrawer === "false";
+        const isManuallyShown = hideWidgetDrawer === "false";
+
+        const widgets = WidgetLayoutStore.instance.getContainerWidgets(room, Container.Top);
+        return widgets.length > 0 || isManuallyShown;
     }
 
     componentDidMount() {
+        this.onRoomViewStoreUpdate(true);
+
         const call = this.getCallForRoom();
         const callState = call ? call.state : null;
         this.setState({
@@ -489,13 +523,10 @@ export default class RoomView extends React.Component<IProps, IState> {
             this.props.resizeNotifier.on("middlePanelResized", this.onResize);
         }
         this.onResize();
-
-        document.addEventListener("keydown", this.onNativeKeyDown);
     }
 
     shouldComponentUpdate(nextProps, nextState) {
-        return (!ObjectUtils.shallowEqual(this.props, nextProps) ||
-                !ObjectUtils.shallowEqual(this.state, nextState));
+        return (objectHasDiff(this.props, nextProps) || objectHasDiff(this.state, nextState));
     }
 
     componentDidUpdate() {
@@ -566,6 +597,8 @@ export default class RoomView extends React.Component<IProps, IState> {
             this.context.removeListener("deviceVerificationChanged", this.onDeviceVerificationChanged);
             this.context.removeListener("userTrustStatusChanged", this.onUserVerificationChanged);
             this.context.removeListener("crossSigning.keysChanged", this.onCrossSigningKeysChanged);
+            this.context.removeListener("Event.decrypted", this.onEventDecrypted);
+            this.context.removeListener("event", this.onEvent);
         }
 
         window.removeEventListener('beforeunload', this.onPageUnload);
@@ -573,8 +606,6 @@ export default class RoomView extends React.Component<IProps, IState> {
             this.props.resizeNotifier.removeListener("middlePanelResized", this.onResize);
         }
 
-        document.removeEventListener("keydown", this.onNativeKeyDown);
-
         // Remove RoomStore listener
         if (this.roomStoreToken) {
             this.roomStoreToken.remove();
@@ -584,7 +615,15 @@ export default class RoomView extends React.Component<IProps, IState> {
             this.rightPanelStoreToken.remove();
         }
 
-        WidgetEchoStore.removeListener('update', this.onWidgetEchoStoreUpdate);
+        WidgetEchoStore.removeListener(UPDATE_EVENT, this.onWidgetEchoStoreUpdate);
+        WidgetStore.instance.removeListener(UPDATE_EVENT, this.onWidgetStoreUpdate);
+
+        if (this.state.room) {
+            WidgetLayoutStore.instance.off(
+                WidgetLayoutStore.emissionForRoom(this.state.room),
+                this.onWidgetLayoutChange,
+            );
+        }
 
         if (this.showReadReceiptsWatchRef) {
             SettingsStore.unwatchSetting(this.showReadReceiptsWatchRef);
@@ -602,7 +641,7 @@ export default class RoomView extends React.Component<IProps, IState> {
 
     private onLayoutChange = () => {
         this.setState({
-            useIRCLayout: SettingsStore.getValue("useIRCLayout"),
+            layout: SettingsStore.getValue("layout"),
         });
     };
 
@@ -622,33 +661,6 @@ export default class RoomView extends React.Component<IProps, IState> {
         }
     };
 
-    // we register global shortcuts here, they *must not conflict* with local shortcuts elsewhere or both will fire
-    private onNativeKeyDown = ev => {
-        let handled = false;
-        const ctrlCmdOnly = isOnlyCtrlOrCmdKeyEvent(ev);
-
-        switch (ev.key) {
-            case Key.D:
-                if (ctrlCmdOnly) {
-                    this.onMuteAudioClick();
-                    handled = true;
-                }
-                break;
-
-            case Key.E:
-                if (ctrlCmdOnly) {
-                    this.onMuteVideoClick();
-                    handled = true;
-                }
-                break;
-        }
-
-        if (handled) {
-            ev.stopPropagation();
-            ev.preventDefault();
-        }
-    };
-
     private onReactKeyDown = ev => {
         let handled = false;
 
@@ -683,9 +695,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(
@@ -754,6 +765,9 @@ export default class RoomView extends React.Component<IProps, IState> {
                     });
                 }
                 break;
+            case 'focus_search':
+                this.onSearchClick();
+                break;
         }
     };
 
@@ -795,6 +809,30 @@ export default class RoomView extends React.Component<IProps, IState> {
         }
     };
 
+    private onEventDecrypted = (ev) => {
+        if (ev.isDecryptionFailure()) return;
+        this.handleEffects(ev);
+    };
+
+    private onEvent = (ev) => {
+        if (ev.isBeingDecrypted() || ev.isDecryptionFailure()) return;
+        this.handleEffects(ev);
+    };
+
+    private handleEffects = (ev) => {
+        if (!this.state.room || !this.state.matrixClientIsReady) return; // not ready at all
+        if (ev.getRoomId() !== this.state.room.roomId) return; // not for us
+
+        const notifState = RoomNotificationStateStore.instance.getRoomState(this.state.room);
+        if (!notifState.isUnread) return;
+
+        CHAT_EFFECTS.forEach(effect => {
+            if (containsEmoji(ev.getContent(), effect.emojis) || ev.getContent().msgtype === effect.msgType) {
+                dis.dispatch({action: `effects.${effect.command}`});
+            }
+        });
+    };
+
     private onRoomName = (room: Room) => {
         if (this.state.room && room.roomId == this.state.room.roomId) {
             this.forceUpdate();
@@ -817,12 +855,17 @@ export default class RoomView extends React.Component<IProps, IState> {
     // called when state.room is first initialised (either at initial load,
     // after a successful peek, or after we join the room).
     private onRoomLoaded = (room: Room) => {
+        // Attach a widget store listener only when we get a room
+        WidgetLayoutStore.instance.on(WidgetLayoutStore.emissionForRoom(room), this.onWidgetLayoutChange);
+        this.onWidgetLayoutChange(); // provoke an update
+
         this.calculatePeekRules(room);
         this.updatePreviewUrlVisibility(room);
         this.loadMembersIfJoined(room);
         this.calculateRecommendedVersion(room);
         this.updateE2EStatus(room);
         this.updatePermissions(room);
+        this.checkWidgets(room);
     };
 
     private async calculateRecommendedVersion(room: Room) {
@@ -878,6 +921,15 @@ export default class RoomView extends React.Component<IProps, IState> {
         if (!room || room.roomId !== this.state.roomId) {
             return;
         }
+
+        // Detach the listener if the room is changing for some reason
+        if (this.state.room) {
+            WidgetLayoutStore.instance.off(
+                WidgetLayoutStore.emissionForRoom(this.state.room),
+                this.onWidgetLayoutChange,
+            );
+        }
+
         this.setState({
             room: room,
         }, () => {
@@ -1002,33 +1054,17 @@ 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));
+    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);
         }
-        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});
     }
 
     private updateDMState() {
@@ -1063,14 +1099,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 = () => {
@@ -1092,6 +1120,7 @@ export default class RoomView extends React.Component<IProps, IState> {
                 dis.dispatch({
                     action: 'join_room',
                     opts: { inviteSignUrl: signUrl, viaServers: this.props.viaServers },
+                    _type: "unknown", // TODO: instrumentation
                 });
                 return Promise.resolve();
             });
@@ -1118,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';
         }
     };
 
@@ -1258,7 +1280,7 @@ export default class RoomView extends React.Component<IProps, IState> {
         }
 
         if (!this.state.searchResults.next_batch) {
-            if (this.state.searchResults.results.length == 0) {
+            if (!this.state.searchResults?.results?.length) {
                 ret.push(<li key="search-top-marker">
                     <h2 className="mx_RoomView_topMarker">{ _t("No results") }</h2>
                 </li>,
@@ -1282,7 +1304,7 @@ export default class RoomView extends React.Component<IProps, IState> {
 
         let lastRoomId;
 
-        for (let i = this.state.searchResults.results.length - 1; i >= 0; i--) {
+        for (let i = (this.state.searchResults?.results?.length || 0) - 1; i >= 0; i--) {
             const result = this.state.searchResults.results[i];
 
             const mxEv = result.context.getEvent();
@@ -1333,13 +1355,18 @@ export default class RoomView extends React.Component<IProps, IState> {
         SettingsStore.setValue("PinnedEvents.isOpen", roomId, SettingLevel.ROOM_DEVICE, nowShowingPinned);
     };
 
-    private onSettingsClick = () => {
+    private onCallPlaced = (type: PlaceCallType) => {
         dis.dispatch({
-            action: Action.SetRightPanelPhase,
-            phase: RightPanelPhases.RoomSummary,
+            action: 'place_call',
+            type: type,
+            room_id: this.state.room.roomId,
         });
     };
 
+    private onSettingsClick = () => {
+        dis.dispatch({ action: "open_room_settings" });
+    };
+
     private onCancelClick = () => {
         console.log("updateTint from onCancelClick");
         this.updateTint();
@@ -1352,6 +1379,13 @@ export default class RoomView extends React.Component<IProps, IState> {
         dis.fire(Action.FocusComposer);
     };
 
+    private onAppsClick = () => {
+        dis.dispatch({
+            action: "appsDrawer",
+            show: !this.state.showApps,
+        });
+    };
+
     private onLeaveClick = () => {
         dis.dispatch({
             action: 'leave_room',
@@ -1366,12 +1400,12 @@ export default class RoomView extends React.Component<IProps, IState> {
         });
     };
 
-    private onRejectButtonClicked = ev => {
+    private onRejectButtonClicked = () => {
         this.setState({
             rejecting: true,
         });
         this.context.leave(this.state.roomId).then(() => {
-            dis.dispatch({ action: 'view_next_room' });
+            dis.dispatch({ action: 'view_home_page' });
             this.setState({
                 rejecting: false,
             });
@@ -1405,7 +1439,7 @@ export default class RoomView extends React.Component<IProps, IState> {
             await this.context.setIgnoredUsers(ignoredUsers);
 
             await this.context.leave(this.state.roomId);
-            dis.dispatch({ action: 'view_next_room' });
+            dis.dispatch({ action: 'view_home_page' });
             this.setState({
                 rejecting: false,
             });
@@ -1426,7 +1460,7 @@ export default class RoomView extends React.Component<IProps, IState> {
         }
     };
 
-    private onRejectThreepidInviteButtonClicked = ev => {
+    private onRejectThreepidInviteButtonClicked = () => {
         // We can reject 3pid invites in the same way that we accept them,
         // using /leave rather than /join. In the short term though, we
         // just ignore them.
@@ -1689,7 +1723,7 @@ export default class RoomView extends React.Component<IProps, IState> {
         }
 
         const myMembership = this.state.room.getMyMembership();
-        if (myMembership == 'invite') {
+        if (myMembership === "invite" && !this.state.room.isSpaceRoom()) { // SpaceRoomView handles invites itself
             if (this.state.joining || this.state.rejecting) {
                 return (
                     <ErrorBoundary>
@@ -1761,12 +1795,8 @@ 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}
             />;
@@ -1822,7 +1852,7 @@ export default class RoomView extends React.Component<IProps, IState> {
                     room={this.state.room}
                 />
             );
-            if (!this.state.canPeek) {
+            if (!this.state.canPeek && !this.state.room?.isSpaceRoom()) {
                 return (
                     <div className="mx_RoomView">
                         { previewBar }
@@ -1844,6 +1874,18 @@ export default class RoomView extends React.Component<IProps, IState> {
             );
         }
 
+        if (this.state.room?.isSpaceRoom()) {
+            return <SpaceRoomView
+                space={this.state.room}
+                justCreatedOpts={this.props.justCreatedOpts}
+                resizeNotifier={this.props.resizeNotifier}
+                onJoinButtonClicked={this.onJoinButtonClicked}
+                onRejectButtonClicked={this.props.threepidInvite
+                    ? this.onRejectThreepidInviteButtonClicked
+                    : this.onRejectButtonClicked}
+            />;
+        }
+
         const auxPanel = (
             <AuxPanel
                 room={this.state.room}
@@ -1873,6 +1915,7 @@ export default class RoomView extends React.Component<IProps, IState> {
                     showApps={this.state.showApps}
                     e2eStatus={this.state.e2eStatus}
                     resizeNotifier={this.props.resizeNotifier}
+                    replyToEvent={this.state.replyToEvent}
                     permalinkCreator={this.getPermalinkCreatorForRoom(this.state.room)}
                 />;
         }
@@ -1887,56 +1930,6 @@ export default class RoomView extends React.Component<IProps, IState> {
             };
         }
 
-        if (activeCall) {
-            let zoomButton; let videoMuteButton;
-
-            if (activeCall.type === CallType.Video) {
-                zoomButton = (
-                    <div className="mx_RoomView_voipButton" onClick={this.onFullscreenClick} title={_t("Fill screen")}>
-                        <TintableSvg
-                            src={require("../../../res/img/element-icons/call/fullscreen.svg")}
-                            width="29"
-                            height="22"
-                            style={{ marginTop: 1, marginRight: 4 }}
-                        />
-                    </div>
-                );
-
-                videoMuteButton =
-                    <div className="mx_RoomView_voipButton" onClick={this.onMuteVideoClick}>
-                        <TintableSvg
-                            src={activeCall.isLocalVideoMuted() ?
-                                require("../../../res/img/element-icons/call/video-muted.svg") :
-                                require("../../../res/img/element-icons/call/video-call.svg")}
-                            alt={activeCall.isLocalVideoMuted() ? _t("Click to unmute video") :
-                                _t("Click to mute video")}
-                            width=""
-                            height="27"
-                        />
-                    </div>;
-            }
-            const voiceMuteButton =
-                <div className="mx_RoomView_voipButton" onClick={this.onMuteAudioClick}>
-                    <TintableSvg
-                        src={activeCall.isMicrophoneMuted() ?
-                            require("../../../res/img/element-icons/call/voice-muted.svg") :
-                            require("../../../res/img/element-icons/call/voice-unmuted.svg")}
-                        alt={activeCall.isMicrophoneMuted() ? _t("Click to unmute audio") : _t("Click to mute audio")}
-                        width="21"
-                        height="26"
-                    />
-                </div>;
-
-            // wrap the existing status bar into a 'callStatusBar' which adds more knobs.
-            statusBar =
-                <div className="mx_RoomView_callStatusBar">
-                    { voiceMuteButton }
-                    { videoMuteButton }
-                    { zoomButton }
-                    { statusBar }
-                </div>;
-        }
-
         // if we have search results, we keep the messagepanel (so that it preserves its
         // scroll state), but hide it.
         let searchResultsPanel;
@@ -1944,7 +1937,7 @@ export default class RoomView extends React.Component<IProps, IState> {
 
         if (this.state.searchResults) {
             // show searching spinner
-            if (this.state.searchResults.results === undefined) {
+            if (this.state.searchResults.count === undefined) {
                 searchResultsPanel = (
                     <div className="mx_RoomView_messagePanel mx_RoomView_messagePanelSearchSpinner" />
                 );
@@ -1975,8 +1968,8 @@ export default class RoomView extends React.Component<IProps, IState> {
         const messagePanelClassNames = classNames(
             "mx_RoomView_messagePanel",
             {
-                "mx_IRCLayout": this.state.useIRCLayout,
-                "mx_GroupLayout": !this.state.useIRCLayout,
+                "mx_IRCLayout": this.state.layout == Layout.IRC,
+                "mx_GroupLayout": this.state.layout == Layout.Group,
             });
 
         // console.info("ShowUrlPreview for %s is %s", this.state.room.roomId, this.state.showUrlPreview);
@@ -1999,7 +1992,7 @@ export default class RoomView extends React.Component<IProps, IState> {
                 permalinkCreator={this.getPermalinkCreatorForRoom(this.state.room)}
                 resizeNotifier={this.props.resizeNotifier}
                 showReactions={true}
-                useIRCLayout={this.state.useIRCLayout}
+                layout={this.state.layout}
             />);
 
         let topUnreadMessagesBar = null;
@@ -2038,9 +2031,14 @@ export default class RoomView extends React.Component<IProps, IState> {
             mx_RoomView_inCall: Boolean(activeCall),
         });
 
+        const showChatEffects = SettingsStore.getValue('showChatEffects');
+
         return (
             <RoomContext.Provider value={this.state}>
                 <main className={mainClasses} ref={this.roomView} onKeyDown={this.onReactKeyDown}>
+                    {showChatEffects && this.roomView.current &&
+                        <EffectsOverlay roomWidth={this.roomView.current.offsetWidth} />
+                    }
                     <ErrorBoundary>
                         <RoomHeader
                             room={this.state.room}
@@ -2054,6 +2052,9 @@ export default class RoomView extends React.Component<IProps, IState> {
                             onForgetClick={(myMembership === "leave") ? this.onForgetClick : null}
                             onLeaveClick={(myMembership === "join") ? this.onLeaveClick : null}
                             e2eStatus={this.state.e2eStatus}
+                            onAppsClick={this.state.hasPinnedWidgets ? this.onAppsClick : null}
+                            appsShown={this.state.showApps}
+                            onCallPlaced={this.onCallPlaced}
                         />
                         <MainSplit panel={rightPanel} resizeNotifier={this.props.resizeNotifier}>
                             <div className="mx_RoomView_body">
diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index 99a3da2565..744400df3c 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -704,7 +704,7 @@ export default class ScrollPanel extends React.Component {
             if (itemlist.style.height !== newHeight) {
                 itemlist.style.height = newHeight;
             }
-            if (sn.scrollTop !== sn.scrollHeight){
+            if (sn.scrollTop !== sn.scrollHeight) {
                 sn.scrollTop = sn.scrollHeight;
             }
             debuglog("updateHeight to", newHeight);
diff --git a/src/components/structures/SpaceRoomDirectory.tsx b/src/components/structures/SpaceRoomDirectory.tsx
new file mode 100644
index 0000000000..06df6a528e
--- /dev/null
+++ b/src/components/structures/SpaceRoomDirectory.tsx
@@ -0,0 +1,576 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, {useMemo, useRef, useState} from "react";
+import Room from "matrix-js-sdk/src/models/room";
+import MatrixEvent from "matrix-js-sdk/src/models/event";
+import {EventType, RoomType} from "matrix-js-sdk/src/@types/event";
+
+import {MatrixClientPeg} from "../../MatrixClientPeg";
+import dis from "../../dispatcher/dispatcher";
+import {_t} from "../../languageHandler";
+import AccessibleButton from "../views/elements/AccessibleButton";
+import BaseDialog from "../views/dialogs/BaseDialog";
+import FormButton from "../views/elements/FormButton";
+import SearchBox from "./SearchBox";
+import RoomAvatar from "../views/avatars/RoomAvatar";
+import RoomName from "../views/elements/RoomName";
+import {useAsyncMemo} from "../../hooks/useAsyncMemo";
+import {shouldShowSpaceSettings} from "../../utils/space";
+import {EnhancedMap} from "../../utils/maps";
+import StyledCheckbox from "../views/elements/StyledCheckbox";
+import AutoHideScrollbar from "./AutoHideScrollbar";
+import BaseAvatar from "../views/avatars/BaseAvatar";
+
+interface IProps {
+    space: Room;
+    initialText?: string;
+    onFinished(): void;
+}
+
+/* eslint-disable camelcase */
+export interface ISpaceSummaryRoom {
+    canonical_alias?: string;
+    aliases: string[];
+    avatar_url?: string;
+    guest_can_join: boolean;
+    name?: string;
+    num_joined_members: number
+    room_id: string;
+    topic?: string;
+    world_readable: boolean;
+    num_refs: number;
+    room_type: string;
+}
+
+export interface ISpaceSummaryEvent {
+    room_id: string;
+    event_id: string;
+    origin_server_ts: number;
+    type: string;
+    state_key: string;
+    content: {
+        order?: string;
+        auto_join?: boolean;
+        via?: string;
+    };
+}
+/* eslint-enable camelcase */
+
+interface ISubspaceProps {
+    space: ISpaceSummaryRoom;
+    event?: MatrixEvent;
+    editing?: boolean;
+    onPreviewClick?(): void;
+    queueAction?(action: IAction): void;
+    onJoinClick?(): void;
+}
+
+const SubSpace: React.FC<ISubspaceProps> = ({
+    space,
+    editing,
+    event,
+    queueAction,
+    onJoinClick,
+    onPreviewClick,
+    children,
+}) => {
+    const name = space.name || space.canonical_alias || space.aliases?.[0] || _t("Unnamed Space");
+
+    const evContent = event?.getContent();
+    const [autoJoin, _setAutoJoin] = useState(evContent?.auto_join);
+    const [removed, _setRemoved] = useState(!evContent?.via);
+
+    const cli = MatrixClientPeg.get();
+    const cliRoom = cli.getRoom(space.room_id);
+    const myMembership = cliRoom?.getMyMembership();
+
+    // TODO DRY code
+    let actions;
+    if (editing && queueAction) {
+        if (event && cli.getRoom(event.getRoomId())?.currentState.maySendStateEvent(event.getType(), cli.getUserId())) {
+            const setAutoJoin = () => {
+                _setAutoJoin(v => {
+                    queueAction({
+                        event,
+                        removed,
+                        autoJoin: !v,
+                    });
+                    return !v;
+                });
+            };
+
+            const setRemoved = () => {
+                _setRemoved(v => {
+                    queueAction({
+                        event,
+                        removed: !v,
+                        autoJoin,
+                    });
+                    return !v;
+                });
+            };
+
+            if (removed) {
+                actions = <React.Fragment>
+                    <FormButton kind="danger" onClick={setRemoved} label={_t("Undo")} />
+                </React.Fragment>;
+            } else {
+                actions = <React.Fragment>
+                    <FormButton kind="danger" onClick={setRemoved} label={_t("Remove from Space")} />
+                    <StyledCheckbox checked={autoJoin} onChange={setAutoJoin} />
+                </React.Fragment>;
+            }
+        } else {
+            actions = <span className="mx_SpaceRoomDirectory_actionsText">
+                { _t("No permissions")}
+            </span>;
+        }
+        // TODO confirm remove from space click behaviour here
+    } else {
+        if (myMembership === "join") {
+            actions = <span className="mx_SpaceRoomDirectory_actionsText">
+                { _t("You're in this space")}
+            </span>;
+        } else if (onJoinClick) {
+            actions = <React.Fragment>
+                <AccessibleButton onClick={onPreviewClick} kind="link">
+                    { _t("Preview") }
+                </AccessibleButton>
+                <FormButton onClick={onJoinClick} label={_t("Join")} />
+            </React.Fragment>
+        }
+    }
+
+    let url: string;
+    if (space.avatar_url) {
+        url = MatrixClientPeg.get().mxcUrlToHttp(
+            space.avatar_url,
+            Math.floor(24 * window.devicePixelRatio),
+            Math.floor(24 * window.devicePixelRatio),
+            "crop",
+        );
+    }
+
+    return <div className="mx_SpaceRoomDirectory_subspace">
+        <div className="mx_SpaceRoomDirectory_subspace_info">
+            <BaseAvatar name={name} idName={space.room_id} url={url} width={24} height={24} />
+            { name }
+
+            <div className="mx_SpaceRoomDirectory_actions">
+                { actions }
+            </div>
+        </div>
+        <div className="mx_SpaceRoomDirectory_subspace_children">
+            { children }
+        </div>
+    </div>
+};
+
+interface IAction {
+    event: MatrixEvent;
+    removed: boolean;
+    autoJoin: boolean;
+}
+
+interface IRoomTileProps {
+    room: ISpaceSummaryRoom;
+    event?: MatrixEvent;
+    editing?: boolean;
+    onPreviewClick(): void;
+    queueAction?(action: IAction): void;
+    onJoinClick?(): void;
+}
+
+const RoomTile = ({ room, event, editing, queueAction, onPreviewClick, onJoinClick }: IRoomTileProps) => {
+    const name = room.name || room.canonical_alias || room.aliases?.[0] || _t("Unnamed Room");
+
+    const evContent = event?.getContent();
+    const [autoJoin, _setAutoJoin] = useState(evContent?.auto_join);
+    const [removed, _setRemoved] = useState(!evContent?.via);
+
+    const cli = MatrixClientPeg.get();
+    const cliRoom = cli.getRoom(room.room_id);
+    const myMembership = cliRoom?.getMyMembership();
+
+    let actions;
+    if (editing && queueAction) {
+        if (event && cli.getRoom(event.getRoomId())?.currentState.maySendStateEvent(event.getType(), cli.getUserId())) {
+            const setAutoJoin = () => {
+                _setAutoJoin(v => {
+                    queueAction({
+                        event,
+                        removed,
+                        autoJoin: !v,
+                    });
+                    return !v;
+                });
+            };
+
+            const setRemoved = () => {
+                _setRemoved(v => {
+                    queueAction({
+                        event,
+                        removed: !v,
+                        autoJoin,
+                    });
+                    return !v;
+                });
+            };
+
+            if (removed) {
+                actions = <React.Fragment>
+                    <FormButton kind="danger" onClick={setRemoved} label={_t("Undo")} />
+                </React.Fragment>;
+            } else {
+                actions = <React.Fragment>
+                    <FormButton kind="danger" onClick={setRemoved} label={_t("Remove from Space")} />
+                    <StyledCheckbox checked={autoJoin} onChange={setAutoJoin} />
+                </React.Fragment>;
+            }
+        } else {
+            actions = <span className="mx_SpaceRoomDirectory_actionsText">
+                { _t("No permissions")}
+            </span>;
+        }
+        // TODO confirm remove from space click behaviour here
+    } else {
+        if (myMembership === "join") {
+            actions = <span className="mx_SpaceRoomDirectory_actionsText">
+                { _t("You're in this room")}
+            </span>;
+        } else if (onJoinClick) {
+            actions = <React.Fragment>
+                <AccessibleButton onClick={onPreviewClick} kind="link">
+                    { _t("Preview") }
+                </AccessibleButton>
+                <FormButton onClick={onJoinClick} label={_t("Join")} />
+            </React.Fragment>
+        }
+    }
+
+    let url: string;
+    if (room.avatar_url) {
+        url = cli.mxcUrlToHttp(
+            room.avatar_url,
+            Math.floor(32 * window.devicePixelRatio),
+            Math.floor(32 * window.devicePixelRatio),
+            "crop",
+        );
+    }
+
+    const content = <React.Fragment>
+        <BaseAvatar name={name} idName={room.room_id} url={url} width={32} height={32} />
+
+        <div className="mx_SpaceRoomDirectory_roomTile_info">
+            <div className="mx_SpaceRoomDirectory_roomTile_name">
+                { name }
+            </div>
+            <div className="mx_SpaceRoomDirectory_roomTile_topic">
+                { room.topic }
+            </div>
+        </div>
+        <div className="mx_SpaceRoomDirectory_roomTile_memberCount">
+            { room.num_joined_members }
+        </div>
+
+        <div className="mx_SpaceRoomDirectory_actions">
+            { actions }
+        </div>
+    </React.Fragment>;
+
+    if (editing) {
+        return <div className="mx_SpaceRoomDirectory_roomTile">
+            { content }
+        </div>
+    }
+
+    return <AccessibleButton className="mx_SpaceRoomDirectory_roomTile" onClick={onPreviewClick}>
+        { content }
+    </AccessibleButton>;
+};
+
+export const showRoom = (room: ISpaceSummaryRoom, viaServers?: string[], autoJoin = false) => {
+    // Don't let the user view a room they won't be able to either peek or join:
+    // fail earlier so they don't have to click back to the directory.
+    if (MatrixClientPeg.get().isGuest()) {
+        if (!room.world_readable && !room.guest_can_join) {
+            dis.dispatch({ action: "require_registration" });
+            return;
+        }
+    }
+
+    const roomAlias = getDisplayAliasForRoom(room) || undefined;
+    dis.dispatch({
+        action: "view_room",
+        auto_join: autoJoin,
+        should_peek: true,
+        _type: "room_directory", // instrumentation
+        room_alias: roomAlias,
+        room_id: room.room_id,
+        via_servers: viaServers,
+        oob_data: {
+            avatarUrl: room.avatar_url,
+            // XXX: This logic is duplicated from the JS SDK which would normally decide what the name is.
+            name: room.name || roomAlias || _t("Unnamed room"),
+        },
+    });
+};
+
+interface IHierarchyLevelProps {
+    spaceId: string;
+    rooms: Map<string, ISpaceSummaryRoom>;
+    editing?: boolean;
+    relations: EnhancedMap<string, string[]>;
+    parents: Set<string>;
+    queueAction?(action: IAction): void;
+    onPreviewClick(roomId: string): void;
+    onRemoveFromSpaceClick?(roomId: string): void;
+    onJoinClick?(roomId: string): void;
+}
+
+export const HierarchyLevel = ({
+    spaceId,
+    rooms,
+    editing,
+    relations,
+    parents,
+    onPreviewClick,
+    onJoinClick,
+    queueAction,
+}: IHierarchyLevelProps) => {
+    const cli = MatrixClientPeg.get();
+    const space = cli.getRoom(spaceId);
+    // TODO respect order
+    const [subspaces, childRooms] = relations.get(spaceId)?.reduce((result, roomId: string) => {
+        if (!rooms.has(roomId)) return result; // TODO wat
+        result[rooms.get(roomId).room_type === RoomType.Space ? 0 : 1].push(roomId);
+        return result;
+    }, [[], []]) || [[], []];
+
+    // Don't render this subspace if it has no rooms we can show
+    // TODO this is broken - as a space may have subspaces we still need to show
+    // if (!childRooms.length) return null;
+
+    const userId = cli.getUserId();
+
+    const newParents = new Set(parents).add(spaceId);
+    return <React.Fragment>
+        {
+            childRooms.map(roomId => (
+                <RoomTile
+                    key={roomId}
+                    room={rooms.get(roomId)}
+                    event={space?.currentState.maySendStateEvent(EventType.SpaceChild, userId)
+                        ? space?.currentState.getStateEvents(EventType.SpaceChild, roomId)
+                        : undefined}
+                    editing={editing}
+                    queueAction={queueAction}
+                    onPreviewClick={() => {
+                        onPreviewClick(roomId);
+                    }}
+                    onJoinClick={onJoinClick ? () => {
+                        onJoinClick(roomId);
+                    } : undefined}
+                />
+            ))
+        }
+
+        {
+            subspaces.filter(roomId => !newParents.has(roomId)).map(roomId => (
+                <SubSpace
+                    key={roomId}
+                    space={rooms.get(roomId)}
+                    event={space?.currentState.getStateEvents(EventType.SpaceChild, roomId)}
+                    editing={editing}
+                    queueAction={queueAction}
+                    onPreviewClick={() => {
+                        onPreviewClick(roomId);
+                    }}
+                    onJoinClick={() => {
+                        onJoinClick(roomId);
+                    }}
+                >
+                    <HierarchyLevel
+                        spaceId={roomId}
+                        rooms={rooms}
+                        editing={editing}
+                        relations={relations}
+                        parents={newParents}
+                        onPreviewClick={onPreviewClick}
+                        onJoinClick={onJoinClick}
+                        queueAction={queueAction}
+                    />
+                </SubSpace>
+            ))
+        }
+    </React.Fragment>
+};
+
+const SpaceRoomDirectory: React.FC<IProps> = ({ space, initialText = "", onFinished }) => {
+    // TODO pagination
+    const cli = MatrixClientPeg.get();
+    const [query, setQuery] = useState(initialText);
+    const [isEditing, setIsEditing] = useState(false);
+
+    const onCreateRoomClick = () => {
+        dis.dispatch({
+            action: 'view_create_room',
+            public: true,
+        });
+        onFinished();
+    };
+
+    // stored within a ref as we don't need to re-render when it changes
+    const pendingActions = useRef(new Map<string, IAction>());
+
+    let adminButton;
+    if (shouldShowSpaceSettings(cli, space)) { // TODO this is an imperfect test
+        const onManageButtonClicked = () => {
+            setIsEditing(true);
+        };
+
+        const onSaveButtonClicked = () => {
+            // TODO setBusy
+            pendingActions.current.forEach(({event, autoJoin, removed}) => {
+                const content = {
+                    ...event.getContent(),
+                    auto_join: autoJoin,
+                };
+
+                if (removed) {
+                    delete content["via"];
+                }
+
+                cli.sendStateEvent(event.getRoomId(), event.getType(), content, event.getStateKey());
+            });
+            setIsEditing(false);
+        };
+
+        if (isEditing) {
+            adminButton = <React.Fragment>
+                <FormButton label={_t("Save changes")} onClick={onSaveButtonClicked} />
+                <span>{ _t("All users join by default") }</span>
+            </React.Fragment>;
+        } else {
+            adminButton = <FormButton label={_t("Manage rooms")} onClick={onManageButtonClicked} />;
+        }
+    }
+
+    const [rooms, relations, viaMap] = useAsyncMemo(async () => {
+        try {
+            const data = await cli.getSpaceSummary(space.roomId);
+
+            const parentChildRelations = new EnhancedMap<string, string[]>();
+            const viaMap = new EnhancedMap<string, Set<string>>();
+            data.events.map((ev: ISpaceSummaryEvent) => {
+                if (ev.type === EventType.SpaceChild) {
+                    parentChildRelations.getOrCreate(ev.room_id, []).push(ev.state_key);
+                }
+                if (Array.isArray(ev.content["via"])) {
+                    const set = viaMap.getOrCreate(ev.state_key, new Set());
+                    ev.content["via"].forEach(via => set.add(via));
+                }
+            });
+
+            return [data.rooms, parentChildRelations, viaMap];
+        } catch (e) {
+            console.error(e); // TODO
+        }
+
+        return [];
+    }, [space], []);
+
+    const roomsMap = useMemo(() => {
+        if (!rooms) return null;
+        const lcQuery = query.toLowerCase();
+
+        const filteredRooms = rooms.filter(r => {
+            return r.room_type === RoomType.Space // always include spaces to allow filtering of sub-space rooms
+                || r.name?.toLowerCase().includes(lcQuery)
+                || r.topic?.toLowerCase().includes(lcQuery);
+        });
+
+        return new Map<string, ISpaceSummaryRoom>(filteredRooms.map(r => [r.room_id, r]));
+        // const root = rooms.get(space.roomId);
+    }, [rooms, query]);
+
+    const title = <React.Fragment>
+        <RoomAvatar room={space} height={40} width={40} />
+        <div>
+            <h1>{ _t("Explore rooms") }</h1>
+            <div><RoomName room={space} /></div>
+        </div>
+    </React.Fragment>;
+    const explanation =
+        _t("If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.", null,
+            {a: sub => {
+                return <AccessibleButton kind="link" onClick={onCreateRoomClick}>{sub}</AccessibleButton>;
+            }},
+        );
+
+    let content;
+    if (roomsMap) {
+        content = <AutoHideScrollbar className="mx_SpaceRoomDirectory_list">
+            <HierarchyLevel
+                spaceId={space.roomId}
+                rooms={roomsMap}
+                editing={isEditing}
+                relations={relations}
+                parents={new Set()}
+                queueAction={action => {
+                    pendingActions.current.set(action.event.room_id, action);
+                }}
+                onPreviewClick={roomId => {
+                    showRoom(roomsMap.get(roomId), Array.from(viaMap.get(roomId) || []), false);
+                    onFinished();
+                }}
+                onJoinClick={(roomId) => {
+                    showRoom(roomsMap.get(roomId), Array.from(viaMap.get(roomId) || []), true);
+                    onFinished();
+                }}
+            />
+        </AutoHideScrollbar>;
+    }
+
+    // TODO loading state/error state
+    return (
+        <BaseDialog className="mx_SpaceRoomDirectory" hasCancel={true} onFinished={onFinished} title={title}>
+            <div className="mx_Dialog_content">
+                { explanation }
+
+                <SearchBox
+                    className="mx_textinput_icon mx_textinput_search"
+                    placeholder={ _t("Find a room...") }
+                    onSearch={setQuery}
+                />
+
+                <div className="mx_SpaceRoomDirectory_listHeader">
+                    { adminButton }
+                </div>
+                { content }
+            </div>
+        </BaseDialog>
+    );
+};
+
+export default SpaceRoomDirectory;
+
+// Similar to matrix-react-sdk's MatrixTools.getDisplayAliasForRoom
+// but works with the objects we get from the public room list
+function getDisplayAliasForRoom(room: ISpaceSummaryRoom) {
+    return room.canonical_alias || (room.aliases ? room.aliases[0] : "");
+}
diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx
new file mode 100644
index 0000000000..5c91efc1c0
--- /dev/null
+++ b/src/components/structures/SpaceRoomView.tsx
@@ -0,0 +1,604 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, {RefObject, useContext, useRef, useState} from "react";
+import {EventType, RoomType} from "matrix-js-sdk/src/@types/event";
+import {Room} from "matrix-js-sdk/src/models/room";
+
+import MatrixClientContext from "../../contexts/MatrixClientContext";
+import RoomAvatar from "../views/avatars/RoomAvatar";
+import {_t} from "../../languageHandler";
+import AccessibleButton from "../views/elements/AccessibleButton";
+import RoomName from "../views/elements/RoomName";
+import RoomTopic from "../views/elements/RoomTopic";
+import InlineSpinner from "../views/elements/InlineSpinner";
+import FormButton from "../views/elements/FormButton";
+import {inviteMultipleToRoom, showRoomInviteDialog} from "../../RoomInvite";
+import {useRoomMembers} from "../../hooks/useRoomMembers";
+import createRoom, {IOpts, Preset} from "../../createRoom";
+import Field from "../views/elements/Field";
+import {useEventEmitter} from "../../hooks/useEventEmitter";
+import StyledRadioGroup from "../views/elements/StyledRadioGroup";
+import withValidation from "../views/elements/Validation";
+import * as Email from "../../email";
+import defaultDispatcher from "../../dispatcher/dispatcher";
+import {Action} from "../../dispatcher/actions";
+import ResizeNotifier from "../../utils/ResizeNotifier"
+import MainSplit from './MainSplit';
+import ErrorBoundary from "../views/elements/ErrorBoundary";
+import {ActionPayload} from "../../dispatcher/payloads";
+import RightPanel from "./RightPanel";
+import RightPanelStore from "../../stores/RightPanelStore";
+import {EventSubscription} from "fbemitter";
+import {RightPanelPhases} from "../../stores/RightPanelStorePhases";
+import {SetRightPanelPhasePayload} from "../../dispatcher/payloads/SetRightPanelPhasePayload";
+import {useStateArray} from "../../hooks/useStateArray";
+import SpacePublicShare from "../views/spaces/SpacePublicShare";
+import {showAddExistingRooms, showCreateNewRoom, shouldShowSpaceSettings, showSpaceSettings} from "../../utils/space";
+import {HierarchyLevel, ISpaceSummaryEvent, ISpaceSummaryRoom, showRoom} from "./SpaceRoomDirectory";
+import {useAsyncMemo} from "../../hooks/useAsyncMemo";
+import {EnhancedMap} from "../../utils/maps";
+import AutoHideScrollbar from "./AutoHideScrollbar";
+import MemberAvatar from "../views/avatars/MemberAvatar";
+import {useStateToggle} from "../../hooks/useStateToggle";
+
+interface IProps {
+    space: Room;
+    justCreatedOpts?: IOpts;
+    resizeNotifier: ResizeNotifier;
+    onJoinButtonClicked(): void;
+    onRejectButtonClicked(): void;
+}
+
+interface IState {
+    phase: Phase;
+    showRightPanel: boolean;
+}
+
+enum Phase {
+    Landing,
+    PublicCreateRooms,
+    PublicShare,
+    PrivateScope,
+    PrivateInvite,
+    PrivateCreateRooms,
+    PrivateExistingRooms,
+}
+
+const RoomMemberCount = ({ room, children }) => {
+    const members = useRoomMembers(room);
+    const count = members.length;
+
+    if (children) return children(count);
+    return count;
+};
+
+const useMyRoomMembership = (room: Room) => {
+    const [membership, setMembership] = useState(room.getMyMembership());
+    useEventEmitter(room, "Room.myMembership", () => {
+        setMembership(room.getMyMembership());
+    });
+    return membership;
+};
+
+const SpaceLanding = ({ space, onJoinButtonClicked, onRejectButtonClicked }) => {
+    const cli = useContext(MatrixClientContext);
+    const myMembership = useMyRoomMembership(space);
+    const joinRule = space.getJoinRule();
+    const userId = cli.getUserId();
+
+    let joinButtons;
+    if (myMembership === "invite") {
+        joinButtons = <div className="mx_SpaceRoomView_landing_joinButtons">
+            <FormButton label={_t("Accept Invite")} onClick={onJoinButtonClicked} />
+            <AccessibleButton kind="link" onClick={onRejectButtonClicked}>
+                {_t("Decline")}
+            </AccessibleButton>
+        </div>;
+    } else if (myMembership !== "join" && joinRule === "public") {
+        joinButtons = <div className="mx_SpaceRoomView_landing_joinButtons">
+            <FormButton label={_t("Join")} onClick={onJoinButtonClicked} />
+        </div>;
+    }
+
+    let inviteButton;
+    if (myMembership === "join" && space.canInvite(userId)) {
+        inviteButton = (
+            <AccessibleButton className="mx_SpaceRoomView_landing_inviteButton" onClick={() => {
+                showRoomInviteDialog(space.roomId);
+            }}>
+                { _t("Invite people") }
+            </AccessibleButton>
+        );
+    }
+
+    const canAddRooms = myMembership === "join" && space.currentState.maySendStateEvent(EventType.SpaceChild, userId);
+
+    const [_, forceUpdate] = useStateToggle(false); // TODO
+
+    let addRoomButtons;
+    if (canAddRooms) {
+        addRoomButtons = <React.Fragment>
+            <AccessibleButton className="mx_SpaceRoomView_landing_addButton" onClick={async () => {
+                const [added] = await showAddExistingRooms(cli, space);
+                if (added) {
+                    forceUpdate();
+                }
+            }}>
+                { _t("Add existing rooms & spaces") }
+            </AccessibleButton>
+            <AccessibleButton className="mx_SpaceRoomView_landing_createButton" onClick={() => {
+                showCreateNewRoom(cli, space);
+            }}>
+                { _t("Create a new room") }
+            </AccessibleButton>
+        </React.Fragment>;
+    }
+
+    let settingsButton;
+    if (shouldShowSpaceSettings(cli, space)) {
+        settingsButton = <AccessibleButton className="mx_SpaceRoomView_landing_settingsButton" onClick={() => {
+            showSpaceSettings(cli, space);
+        }}>
+            { _t("Settings") }
+        </AccessibleButton>;
+    }
+
+    const [loading, roomsMap, relations, numRooms] = useAsyncMemo(async () => {
+        try {
+            const data = await cli.getSpaceSummary(space.roomId, undefined, myMembership !== "join");
+
+            const parentChildRelations = new EnhancedMap<string, string[]>();
+            data.events.map((ev: ISpaceSummaryEvent) => {
+                if (ev.type === EventType.SpaceChild) {
+                    parentChildRelations.getOrCreate(ev.room_id, []).push(ev.state_key);
+                }
+            });
+
+            const roomsMap = new Map<string, ISpaceSummaryRoom>(data.rooms.map(r => [r.room_id, r]));
+            const numRooms = data.rooms.filter(r => r.room_type !== RoomType.Space).length;
+            return [false, roomsMap, parentChildRelations, numRooms];
+        } catch (e) {
+            console.error(e); // TODO
+        }
+
+        return [false];
+    }, [space, _], [true]);
+
+    let previewRooms;
+    if (roomsMap) {
+        previewRooms = <AutoHideScrollbar className="mx_SpaceRoomDirectory_list">
+            <div className="mx_SpaceRoomDirectory_roomCount">
+                <h3>{ myMembership === "join" ? _t("Rooms") : _t("Default Rooms")}</h3>
+                <span>{ numRooms }</span>
+            </div>
+            <HierarchyLevel
+                spaceId={space.roomId}
+                rooms={roomsMap}
+                editing={false}
+                relations={relations}
+                parents={new Set()}
+                onPreviewClick={roomId => {
+                    showRoom(roomsMap.get(roomId), [], false); // TODO
+                }}
+            />
+        </AutoHideScrollbar>;
+    } else if (loading) {
+        previewRooms = <InlineSpinner />;
+    } else {
+        previewRooms = <p>{_t("Your server does not support showing space hierarchies.")}</p>;
+    }
+
+    return <div className="mx_SpaceRoomView_landing">
+        <RoomAvatar room={space} height={80} width={80} viewAvatarOnClick={true} />
+        <div className="mx_SpaceRoomView_landing_name">
+            <RoomName room={space}>
+                {(name) => {
+                    const tags = { name: () => <div className="mx_SpaceRoomView_landing_nameRow">
+                        <h1>{ name }</h1>
+                        <RoomMemberCount room={space}>
+                            {(count) => count > 0 ? (
+                                <AccessibleButton
+                                    className="mx_SpaceRoomView_landing_memberCount"
+                                    kind="link"
+                                    onClick={() => {
+                                        defaultDispatcher.dispatch<SetRightPanelPhasePayload>({
+                                            action: Action.SetRightPanelPhase,
+                                            phase: RightPanelPhases.RoomMemberList,
+                                            refireParams: { space },
+                                        });
+                                    }}
+                                >
+                                    { _t("%(count)s members", { count }) }
+                                </AccessibleButton>
+                            ) : null}
+                        </RoomMemberCount>
+                    </div> };
+                    if (myMembership === "invite") {
+                        const inviteSender = space.getMember(userId)?.events.member?.getSender();
+                        const inviter = inviteSender && space.getMember(inviteSender);
+
+                        if (inviteSender) {
+                            return _t("<inviter/> invited you to <name/>", {}, {
+                                name: tags.name,
+                                inviter: () => inviter
+                                    ? <span className="mx_SpaceRoomView_landing_inviter">
+                                        <MemberAvatar member={inviter} width={26} height={26} viewUserOnClick={true} />
+                                        { inviter.name }
+                                    </span>
+                                    : <span className="mx_SpaceRoomView_landing_inviter">
+                                        { inviteSender }
+                                    </span>,
+                            }) as JSX.Element;
+                        } else {
+                            return _t("You have been invited to <name/>", {}, tags) as JSX.Element;
+                        }
+                    } else if (shouldShowSpaceSettings(cli, space)) {
+                        if (space.getJoinRule() === "public") {
+                            return _t("Your public space <name/>", {}, tags) as JSX.Element;
+                        } else {
+                            return _t("Your private space <name/>", {}, tags) as JSX.Element;
+                        }
+                    }
+                    return _t("Welcome to <name/>", {}, tags) as JSX.Element;
+                }}
+            </RoomName>
+        </div>
+        <div className="mx_SpaceRoomView_landing_topic">
+            <RoomTopic room={space} />
+        </div>
+        { joinButtons }
+        <div className="mx_SpaceRoomView_landing_adminButtons">
+            { inviteButton }
+            { addRoomButtons }
+            { settingsButton }
+        </div>
+
+        { previewRooms }
+    </div>;
+};
+
+const SpaceSetupFirstRooms = ({ space, title, description, onFinished }) => {
+    const [busy, setBusy] = useState(false);
+    const [error, setError] = useState("");
+    const numFields = 3;
+    const placeholders = [_t("General"), _t("Random"), _t("Support")];
+    // TODO vary default prefills for "Just Me" spaces
+    const [roomNames, setRoomName] = useStateArray(numFields, [_t("General"), _t("Random"), ""]);
+    const fields = new Array(numFields).fill(0).map((_, i) => {
+        const name = "roomName" + i;
+        return <Field
+            key={name}
+            name={name}
+            type="text"
+            label={_t("Room name")}
+            placeholder={placeholders[i]}
+            value={roomNames[i]}
+            onChange={ev => setRoomName(i, ev.target.value)}
+        />;
+    });
+
+    const onNextClick = async () => {
+        setError("");
+        setBusy(true);
+        try {
+            await Promise.all(roomNames.map(name => name.trim()).filter(Boolean).map(name => {
+                return createRoom({
+                    createOpts: {
+                        preset: space.getJoinRule() === "public" ? Preset.PublicChat : Preset.PrivateChat,
+                        name,
+                    },
+                    spinner: false,
+                    encryption: false,
+                    andView: false,
+                    inlineErrors: true,
+                    parentSpace: space,
+                });
+            }));
+            onFinished();
+        } catch (e) {
+            console.error("Failed to create initial space rooms", e);
+            setError(_t("Failed to create initial space rooms"));
+        }
+        setBusy(false);
+    };
+
+    let onClick = onFinished;
+    let buttonLabel = _t("Skip for now");
+    if (roomNames.some(name => name.trim())) {
+        onClick = onNextClick;
+        buttonLabel = busy ? _t("Creating rooms...") : _t("Next")
+    }
+
+    return <div>
+        <h1>{ title }</h1>
+        <div className="mx_SpaceRoomView_description">{ description }</div>
+
+        { error && <div className="mx_SpaceRoomView_errorText">{ error }</div> }
+        { fields }
+
+        <div className="mx_SpaceRoomView_buttons">
+            <FormButton
+                label={buttonLabel}
+                disabled={busy}
+                onClick={onClick}
+            />
+        </div>
+    </div>;
+};
+
+const SpaceSetupPublicShare = ({ space, onFinished }) => {
+    return <div className="mx_SpaceRoomView_publicShare">
+        <h1>{ _t("Share your public space") }</h1>
+        <div className="mx_SpacePublicShare_description">{ _t("At the moment only you can see it.") }</div>
+
+        <SpacePublicShare space={space} onFinished={onFinished} />
+
+        <div className="mx_SpaceRoomView_buttons">
+            <FormButton label={_t("Finish")} onClick={onFinished} />
+        </div>
+    </div>;
+};
+
+const SpaceSetupPrivateScope = ({ onFinished }) => {
+    const [option, setOption] = useState<string>(null);
+
+    return <div className="mx_SpaceRoomView_privateScope">
+        <h1>{ _t("Who are you working with?") }</h1>
+        <div className="mx_SpaceRoomView_description">{ _t("Ensure the right people have access to the space.") }</div>
+
+        <StyledRadioGroup
+            name="privateSpaceScope"
+            value={option}
+            onChange={setOption}
+            definitions={[
+                {
+                    value: "justMe",
+                    className: "mx_SpaceRoomView_privateScope_justMeButton",
+                    label: <React.Fragment>
+                        <h3>{ _t("Just Me") }</h3>
+                        <div>{ _t("A private space just for you") }</div>
+                    </React.Fragment>,
+                }, {
+                    value: "meAndMyTeammates",
+                    className: "mx_SpaceRoomView_privateScope_meAndMyTeammatesButton",
+                    label: <React.Fragment>
+                        <h3>{ _t("Me and my teammates") }</h3>
+                        <div>{ _t("A private space for you and your teammates") }</div>
+                    </React.Fragment>,
+                },
+            ]}
+        />
+
+        <div className="mx_SpaceRoomView_buttons">
+            <FormButton label={_t("Next")} disabled={!option} onClick={() => onFinished(option !== "justMe")} />
+        </div>
+    </div>;
+};
+
+const validateEmailRules = withValidation({
+    rules: [{
+        key: "email",
+        test: ({ value }) => !value || Email.looksValid(value),
+        invalid: () => _t("Doesn't look like a valid email address"),
+    }],
+});
+
+const SpaceSetupPrivateInvite = ({ space, onFinished }) => {
+    const [busy, setBusy] = useState(false);
+    const [error, setError] = useState("");
+    const numFields = 3;
+    const fieldRefs: RefObject<Field>[] = [useRef(), useRef(), useRef()];
+    const [emailAddresses, setEmailAddress] = useStateArray(numFields, "");
+    const fields = new Array(numFields).fill(0).map((_, i) => {
+        const name = "emailAddress" + i;
+        return <Field
+            key={name}
+            name={name}
+            type="text"
+            label={_t("Email address")}
+            placeholder={_t("Email")}
+            value={emailAddresses[i]}
+            onChange={ev => setEmailAddress(i, ev.target.value)}
+            ref={fieldRefs[i]}
+            onValidate={validateEmailRules}
+        />;
+    });
+
+    const onNextClick = async () => {
+        setError("");
+        for (let i = 0; i < fieldRefs.length; i++) {
+            const fieldRef = fieldRefs[i];
+            const valid = await fieldRef.current.validate({ allowEmpty: true });
+
+            if (valid === false) { // true/null are allowed
+                fieldRef.current.focus();
+                fieldRef.current.validate({ allowEmpty: true, focused: true });
+                return;
+            }
+        }
+
+        setBusy(true);
+        const targetIds = emailAddresses.map(name => name.trim()).filter(Boolean);
+        try {
+            const result = await inviteMultipleToRoom(space.roomId, targetIds);
+
+            const failedUsers = Object.keys(result.states).filter(a => result.states[a] === "error");
+            if (failedUsers.length > 0) {
+                console.log("Failed to invite users to space: ", result);
+                setError(_t("Failed to invite the following users to your space: %(csvUsers)s", {
+                    csvUsers: failedUsers.join(", "),
+                }));
+            } else {
+                onFinished();
+            }
+        } catch (err) {
+            console.error("Failed to invite users to space: ", err);
+            setError(_t("We couldn't invite those users. Please check the users you want to invite and try again."));
+        }
+        setBusy(false);
+    };
+
+    return <div className="mx_SpaceRoomView_inviteTeammates">
+        <h1>{ _t("Invite your teammates") }</h1>
+        <div className="mx_SpaceRoomView_description">{ _t("Ensure the right people have access to the space.") }</div>
+
+        { error && <div className="mx_SpaceRoomView_errorText">{ error }</div> }
+        { fields }
+
+        <div className="mx_SpaceRoomView_inviteTeammates_buttons">
+            <AccessibleButton
+                className="mx_SpaceRoomView_inviteTeammates_inviteDialogButton"
+                onClick={() => showRoomInviteDialog(space.roomId)}
+            >
+                { _t("Invite by username") }
+            </AccessibleButton>
+        </div>
+
+        <div className="mx_SpaceRoomView_buttons">
+            <AccessibleButton onClick={onFinished} kind="link">{_t("Skip for now")}</AccessibleButton>
+            <FormButton label={busy ? _t("Inviting...") : _t("Next")} disabled={busy} onClick={onNextClick} />
+        </div>
+    </div>;
+};
+
+export default class SpaceRoomView extends React.PureComponent<IProps, IState> {
+    static contextType = MatrixClientContext;
+
+    private readonly creator: string;
+    private readonly dispatcherRef: string;
+    private readonly rightPanelStoreToken: EventSubscription;
+
+    constructor(props, context) {
+        super(props, context);
+
+        let phase = Phase.Landing;
+
+        this.creator = this.props.space.currentState.getStateEvents(EventType.RoomCreate, "")?.getSender();
+        const showSetup = this.props.justCreatedOpts && this.context.getUserId() === this.creator;
+
+        if (showSetup) {
+            phase = this.props.justCreatedOpts.createOpts.preset === Preset.PublicChat
+                ? Phase.PublicCreateRooms : Phase.PrivateScope;
+        }
+
+        this.state = {
+            phase,
+            showRightPanel: RightPanelStore.getSharedInstance().isOpenForRoom,
+        };
+
+        this.dispatcherRef = defaultDispatcher.register(this.onAction);
+        this.rightPanelStoreToken = RightPanelStore.getSharedInstance().addListener(this.onRightPanelStoreUpdate);
+    }
+
+    componentWillUnmount() {
+        defaultDispatcher.unregister(this.dispatcherRef);
+        this.rightPanelStoreToken.remove();
+    }
+
+    private onRightPanelStoreUpdate = () => {
+        this.setState({
+            showRightPanel: RightPanelStore.getSharedInstance().isOpenForRoom,
+        });
+    };
+
+    private onAction = (payload: ActionPayload) => {
+        if (payload.action !== Action.ViewUser && payload.action !== "view_3pid_invite") return;
+
+        if (payload.action === Action.ViewUser && payload.member) {
+            defaultDispatcher.dispatch<SetRightPanelPhasePayload>({
+                action: Action.SetRightPanelPhase,
+                phase: RightPanelPhases.SpaceMemberInfo,
+                refireParams: {
+                    space: this.props.space,
+                    member: payload.member,
+                },
+            });
+        } else if (payload.action === "view_3pid_invite" && payload.event) {
+            defaultDispatcher.dispatch<SetRightPanelPhasePayload>({
+                action: Action.SetRightPanelPhase,
+                phase: RightPanelPhases.Space3pidMemberInfo,
+                refireParams: {
+                    space: this.props.space,
+                    event: payload.event,
+                },
+            });
+        } else {
+            defaultDispatcher.dispatch<SetRightPanelPhasePayload>({
+                action: Action.SetRightPanelPhase,
+                phase: RightPanelPhases.SpaceMemberList,
+                refireParams: { space: this.props.space },
+            });
+        }
+    };
+
+    private renderBody() {
+        switch (this.state.phase) {
+            case Phase.Landing:
+                return <SpaceLanding
+                    space={this.props.space}
+                    onJoinButtonClicked={this.props.onJoinButtonClicked}
+                    onRejectButtonClicked={this.props.onRejectButtonClicked}
+                />;
+
+            case Phase.PublicCreateRooms:
+                return <SpaceSetupFirstRooms
+                    space={this.props.space}
+                    title={_t("What discussions do you want to have?")}
+                    description={_t("We'll create rooms for each topic.")}
+                    onFinished={() => this.setState({ phase: Phase.PublicShare })}
+                />;
+            case Phase.PublicShare:
+                return <SpaceSetupPublicShare
+                    space={this.props.space}
+                    onFinished={() => this.setState({ phase: Phase.Landing })}
+                />;
+
+            case Phase.PrivateScope:
+                return <SpaceSetupPrivateScope
+                    onFinished={(invite: boolean) => {
+                        this.setState({ phase: invite ? Phase.PrivateInvite : Phase.PrivateCreateRooms });
+                    }}
+                />;
+            case Phase.PrivateInvite:
+                return <SpaceSetupPrivateInvite
+                    space={this.props.space}
+                    onFinished={() => this.setState({ phase: Phase.PrivateCreateRooms })}
+                />;
+            case Phase.PrivateCreateRooms:
+                return <SpaceSetupFirstRooms
+                    space={this.props.space}
+                    title={_t("What projects are you working on?")}
+                    description={_t("We'll create rooms for each of them. You can add existing rooms after setup.")}
+                    onFinished={() => this.setState({ phase: Phase.Landing })}
+                />;
+        }
+    }
+
+    render() {
+        const rightPanel = this.state.showRightPanel && this.state.phase === Phase.Landing
+            ? <RightPanel room={this.props.space} resizeNotifier={this.props.resizeNotifier} />
+            : null;
+
+        return <main className="mx_SpaceRoomView">
+            <ErrorBoundary>
+                <MainSplit panel={rightPanel} resizeNotifier={this.props.resizeNotifier}>
+                    { this.renderBody() }
+                </MainSplit>
+            </ErrorBoundary>
+        </main>;
+    }
+}
diff --git a/src/components/structures/TabbedView.tsx b/src/components/structures/TabbedView.tsx
index 6bc35eb2a4..21f9f3f5d6 100644
--- a/src/components/structures/TabbedView.tsx
+++ b/src/components/structures/TabbedView.tsx
@@ -20,7 +20,6 @@ import * as React from "react";
 import {_t} from '../../languageHandler';
 import * as sdk from "../../index";
 import AutoHideScrollbar from './AutoHideScrollbar';
-import { ReactNode } from "react";
 
 /**
  * Represents a tab for the TabbedView.
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 8bbc66bf40..6bc1f70ba1 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -18,6 +18,7 @@ limitations under the License.
 */
 
 import SettingsStore from "../../settings/SettingsStore";
+import {LayoutPropType} from "../../settings/Layout";
 import React, {createRef} from 'react';
 import ReactDOM from "react-dom";
 import PropTypes from 'prop-types';
@@ -25,7 +26,6 @@ import {EventTimeline} from "matrix-js-sdk";
 import * as Matrix from "matrix-js-sdk";
 import { _t } from '../../languageHandler';
 import {MatrixClientPeg} from "../../MatrixClientPeg";
-import * as ObjectUtils from "../../ObjectUtils";
 import UserActivity from "../../UserActivity";
 import Modal from "../../Modal";
 import dis from "../../dispatcher/dispatcher";
@@ -36,6 +36,7 @@ import shouldHideEvent from '../../shouldHideEvent';
 import EditorStateTransfer from '../../utils/EditorStateTransfer';
 import {haveTileForEvent} from "../views/rooms/EventTile";
 import {UIFeature} from "../../settings/UIFeature";
+import {objectHasDiff} from "../../utils/objects";
 
 const PAGINATE_SIZE = 20;
 const INITIAL_SIZE = 20;
@@ -111,8 +112,8 @@ class TimelinePanel extends React.Component {
         // whether to show reactions for an event
         showReactions: PropTypes.bool,
 
-        // whether to use the irc layout
-        useIRCLayout: PropTypes.bool,
+        // which layout to use
+        layout: LayoutPropType,
     }
 
     // a map from room id to read marker event timestamp
@@ -260,7 +261,7 @@ class TimelinePanel extends React.Component {
     }
 
     shouldComponentUpdate(nextProps, nextState) {
-        if (!ObjectUtils.shallowEqual(this.props, nextProps)) {
+        if (objectHasDiff(this.props, nextProps)) {
             if (DEBUG) {
                 console.group("Timeline.shouldComponentUpdate: props change");
                 console.log("props before:", this.props);
@@ -270,7 +271,7 @@ class TimelinePanel extends React.Component {
             return true;
         }
 
-        if (!ObjectUtils.shallowEqual(this.state, nextState)) {
+        if (objectHasDiff(this.state, nextState)) {
             if (DEBUG) {
                 console.group("Timeline.shouldComponentUpdate: state change");
                 console.log("state before:", this.state);
@@ -715,26 +716,22 @@ class TimelinePanel extends React.Component {
             }
             this.lastRMSentEventId = this.state.readMarkerEventId;
 
-            const roomId = this.props.timelineSet.room.roomId;
-            const hiddenRR = !SettingsStore.getValue("sendReadReceipts", roomId);
-
             debuglog('TimelinePanel: Sending Read Markers for ',
                 this.props.timelineSet.room.roomId,
                 'rm', this.state.readMarkerEventId,
                 lastReadEvent ? 'rr ' + lastReadEvent.getId() : '',
-                ' hidden:' + hiddenRR,
             );
             MatrixClientPeg.get().setRoomReadMarkers(
                 this.props.timelineSet.room.roomId,
                 this.state.readMarkerEventId,
                 lastReadEvent, // Could be null, in which case no RR is sent
-                {hidden: hiddenRR},
+                {},
             ).catch((e) => {
                 // /read_markers API is not implemented on this HS, fallback to just RR
                 if (e.errcode === 'M_UNRECOGNIZED' && lastReadEvent) {
                     return MatrixClientPeg.get().sendReadReceipt(
                         lastReadEvent,
-                        {hidden: hiddenRR},
+                        {},
                     ).catch((e) => {
                         console.error(e);
                         this.lastRRSentEventId = undefined;
@@ -1446,7 +1443,7 @@ class TimelinePanel extends React.Component {
                 getRelationsForEvent={this.getRelationsForEvent}
                 editState={this.state.editState}
                 showReactions={this.props.showReactions}
-                useIRCLayout={this.props.useIRCLayout}
+                layout={this.props.layout}
                 enableFlair={SettingsStore.getValue(UIFeature.Flair)}
             />
         );
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/components/structures/UploadBar.js b/src/components/structures/UploadBar.js
index 0865764c5a..16cc4cb987 100644
--- a/src/components/structures/UploadBar.js
+++ b/src/components/structures/UploadBar.js
@@ -86,7 +86,9 @@ export default class UploadBar extends React.Component {
         }
 
         // MUST use var name 'count' for pluralization to kick in
-        const uploadText = _t("Uploading %(filename)s and %(count)s others", {filename: upload.fileName, count: (uploads.length - 1)});
+        const uploadText = _t(
+            "Uploading %(filename)s and %(count)s others", {filename: upload.fileName, count: (uploads.length - 1)},
+        );
 
         return (
             <div className="mx_UploadBar">
diff --git a/src/components/structures/UserMenu.tsx b/src/components/structures/UserMenu.tsx
index 81d25e6a0c..b31a5f4b8e 100644
--- a/src/components/structures/UserMenu.tsx
+++ b/src/components/structures/UserMenu.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 2020, 2021 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,27 +15,30 @@ limitations under the License.
 */
 
 import React, { createRef } from "react";
+import { Room } from "matrix-js-sdk/src/models/room";
+import classNames from "classnames";
+import * as fbEmitter from "fbemitter";
+
 import { MatrixClientPeg } from "../../MatrixClientPeg";
 import defaultDispatcher from "../../dispatcher/dispatcher";
+import dis from "../../dispatcher/dispatcher";
 import { ActionPayload } from "../../dispatcher/payloads";
 import { Action } from "../../dispatcher/actions";
 import { _t } from "../../languageHandler";
 import { ContextMenuButton } from "./ContextMenu";
-import {USER_NOTIFICATIONS_TAB, USER_SECURITY_TAB} from "../views/dialogs/UserSettingsDialog";
+import { USER_NOTIFICATIONS_TAB, USER_SECURITY_TAB } from "../views/dialogs/UserSettingsDialog";
 import { OpenToTabPayload } from "../../dispatcher/payloads/OpenToTabPayload";
-import RedesignFeedbackDialog from "../views/dialogs/RedesignFeedbackDialog";
+import FeedbackDialog from "../views/dialogs/FeedbackDialog";
 import Modal from "../../Modal";
 import LogoutDialog from "../views/dialogs/LogoutDialog";
 import SettingsStore from "../../settings/SettingsStore";
 import {getCustomTheme} from "../../theme";
-import {getHostingLink} from "../../utils/HostingLink";
-import {ButtonEvent} from "../views/elements/AccessibleButton";
+import AccessibleButton, {ButtonEvent} from "../views/elements/AccessibleButton";
 import SdkConfig from "../../SdkConfig";
-import {getHomePageUrl} from "../../utils/pages";
+import { getHomePageUrl } from "../../utils/pages";
 import { OwnProfileStore } from "../../stores/OwnProfileStore";
 import { UPDATE_EVENT } from "../../stores/AsyncStore";
 import BaseAvatar from '../views/avatars/BaseAvatar';
-import classNames from "classnames";
 import AccessibleTooltipButton from "../views/elements/AccessibleTooltipButton";
 import { SettingLevel } from "../../settings/SettingLevel";
 import IconizedContextMenu, {
@@ -43,14 +46,16 @@ import IconizedContextMenu, {
     IconizedContextMenuOptionList,
 } from "../views/context_menus/IconizedContextMenu";
 import { CommunityPrototypeStore } from "../../stores/CommunityPrototypeStore";
-import * as fbEmitter from "fbemitter";
 import GroupFilterOrderStore from "../../stores/GroupFilterOrderStore";
 import { showCommunityInviteDialog } from "../../RoomInvite";
-import dis from "../../dispatcher/dispatcher";
 import { RightPanelPhases } from "../../stores/RightPanelStorePhases";
 import ErrorDialog from "../views/dialogs/ErrorDialog";
 import EditCommunityPrototypeDialog from "../views/dialogs/EditCommunityPrototypeDialog";
-import {UIFeature} from "../../settings/UIFeature";
+import { UIFeature } from "../../settings/UIFeature";
+import HostSignupAction from "./HostSignupAction";
+import { IHostSignupConfig } from "../views/dialogs/HostSignupDialogTypes";
+import SpaceStore, { UPDATE_SELECTED_SPACE } from "../../stores/SpaceStore";
+import RoomName from "../views/elements/RoomName";
 
 interface IProps {
     isMinimized: boolean;
@@ -61,6 +66,7 @@ type PartialDOMRect = Pick<DOMRect, "width" | "left" | "top" | "height">;
 interface IState {
     contextMenuPosition: PartialDOMRect;
     isDarkTheme: boolean;
+    selectedSpace?: Room;
 }
 
 export default class UserMenu extends React.Component<IProps, IState> {
@@ -78,6 +84,9 @@ export default class UserMenu extends React.Component<IProps, IState> {
         };
 
         OwnProfileStore.instance.on(UPDATE_EVENT, this.onProfileUpdate);
+        if (SettingsStore.getValue("feature_spaces")) {
+            SpaceStore.instance.on(UPDATE_SELECTED_SPACE, this.onSelectedSpaceUpdate);
+        }
     }
 
     private get hasHomePage(): boolean {
@@ -95,6 +104,9 @@ export default class UserMenu extends React.Component<IProps, IState> {
         if (this.dispatcherRef) defaultDispatcher.unregister(this.dispatcherRef);
         OwnProfileStore.instance.off(UPDATE_EVENT, this.onProfileUpdate);
         this.tagStoreRef.remove();
+        if (SettingsStore.getValue("feature_spaces")) {
+            SpaceStore.instance.off(UPDATE_SELECTED_SPACE, this.onSelectedSpaceUpdate);
+        }
     }
 
     private onTagStoreUpdate = () => {
@@ -102,11 +114,15 @@ export default class UserMenu extends React.Component<IProps, IState> {
     };
 
     private isUserOnDarkTheme(): boolean {
-        const theme = SettingsStore.getValue("theme");
-        if (theme.startsWith("custom-")) {
-            return getCustomTheme(theme.substring("custom-".length)).is_dark;
+        if (SettingsStore.getValue("use_system_theme")) {
+            return window.matchMedia("(prefers-color-scheme: dark)").matches;
+        } else {
+            const theme = SettingsStore.getValue("theme");
+            if (theme.startsWith("custom-")) {
+                return getCustomTheme(theme.substring("custom-".length)).is_dark;
+            }
+            return theme === "dark";
         }
-        return theme === "dark";
     }
 
     private onProfileUpdate = async () => {
@@ -115,6 +131,10 @@ export default class UserMenu extends React.Component<IProps, IState> {
         this.forceUpdate();
     };
 
+    private onSelectedSpaceUpdate = async (selectedSpace?: Room) => {
+        this.setState({ selectedSpace });
+    };
+
     private onThemeChanged = () => {
         this.setState({isDarkTheme: this.isUserOnDarkTheme()});
     };
@@ -186,15 +206,32 @@ export default class UserMenu extends React.Component<IProps, IState> {
         ev.preventDefault();
         ev.stopPropagation();
 
-        Modal.createTrackedDialog('Report bugs & give feedback', '', RedesignFeedbackDialog);
+        Modal.createTrackedDialog('Feedback Dialog', '', FeedbackDialog);
         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
+    };
+
+    private onSignInClick = () => {
+        dis.dispatch({ action: 'start_login' });
+        this.setState({contextMenuPosition: null}); // also close the menu
+    };
+
+    private onRegisterClick = () => {
+        dis.dispatch({ action: 'start_registration' });
         this.setState({contextMenuPosition: null}); // also close the menu
     };
 
@@ -203,6 +240,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) => {
@@ -253,26 +291,40 @@ export default class UserMenu extends React.Component<IProps, IState> {
 
         const prototypeCommunityName = CommunityPrototypeStore.instance.getSelectedCommunityName();
 
-        let hostingLink;
-        const signupLink = getHostingLink("user-context-menu");
-        if (signupLink) {
-            hostingLink = (
-                <div className="mx_UserMenu_contextMenu_header">
-                    {_t(
-                        "<a>Upgrade</a> to your own domain", {},
-                        {
-                            a: sub => (
-                                <a
-                                    href={signupLink}
-                                    target="_blank"
-                                    rel="noreferrer noopener"
-                                    tabIndex={-1}
-                                >{sub}</a>
-                            ),
-                        },
-                    )}
+        let topSection;
+        const hostSignupConfig: IHostSignupConfig = SdkConfig.get().hostSignup;
+        if (MatrixClientPeg.get().isGuest()) {
+            topSection = (
+                <div className="mx_UserMenu_contextMenu_header mx_UserMenu_contextMenu_guestPrompts">
+                    {_t("Got an account? <a>Sign in</a>", {}, {
+                        a: sub => (
+                            <AccessibleButton kind="link" onClick={this.onSignInClick}>
+                                {sub}
+                            </AccessibleButton>
+                        ),
+                    })}
+                    {_t("New here? <a>Create an account</a>", {}, {
+                        a: sub => (
+                            <AccessibleButton kind="link" onClick={this.onRegisterClick}>
+                                {sub}
+                            </AccessibleButton>
+                        ),
+                    })}
                 </div>
-            );
+            )
+        } else if (hostSignupConfig) {
+            if (hostSignupConfig && hostSignupConfig.url) {
+                // If hostSignup.domains is set to a non-empty array, only show
+                // dialog if the user is on the domain or a subdomain.
+                const hostSignupDomains = hostSignupConfig.domains || [];
+                const mxDomain = MatrixClientPeg.get().getDomain();
+                const validDomains = hostSignupDomains.filter(d => (d === mxDomain || mxDomain.endsWith(`.${d}`)));
+                if (!hostSignupConfig.domains || validDomains.length > 0) {
+                    topSection = <div onClick={this.onCloseMenu}>
+                        <HostSignupAction />
+                    </div>;
+                }
+            }
         }
 
         let homeButton = null;
@@ -414,6 +466,20 @@ export default class UserMenu extends React.Component<IProps, IState> {
                     </IconizedContextMenuOptionList>
                 </React.Fragment>
             )
+        } else if (MatrixClientPeg.get().isGuest()) {
+            primaryOptionList = (
+                <React.Fragment>
+                    <IconizedContextMenuOptionList>
+                        { homeButton }
+                        <IconizedContextMenuOption
+                            iconClassName="mx_UserMenu_iconSettings"
+                            label={_t("Settings")}
+                            onClick={(e) => this.onSettingsOpen(e, null)}
+                        />
+                        { feedbackButton }
+                    </IconizedContextMenuOptionList>
+                </React.Fragment>
+            );
         }
 
         const classes = classNames({
@@ -443,7 +509,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
                     />
                 </AccessibleTooltipButton>
             </div>
-            {hostingLink}
+            {topSection}
             {primaryOptionList}
             {secondarySection}
         </IconizedContextMenu>;
@@ -452,7 +518,8 @@ export default class UserMenu extends React.Component<IProps, IState> {
     public render() {
         const avatarSize = 32; // should match border-radius of the avatar
 
-        const displayName = OwnProfileStore.instance.displayName || MatrixClientPeg.get().getUserId();
+        const userId = MatrixClientPeg.get().getUserId();
+        const displayName = OwnProfileStore.instance.displayName || userId;
         const avatarUrl = OwnProfileStore.instance.getHttpAvatarUrl(avatarSize);
 
         const prototypeCommunityName = CommunityPrototypeStore.instance.getSelectedCommunityName();
@@ -465,7 +532,16 @@ export default class UserMenu extends React.Component<IProps, IState> {
                 {/* masked image in CSS */}
             </span>
         );
-        if (prototypeCommunityName) {
+        if (this.state.selectedSpace) {
+            name = (
+                <div className="mx_UserMenu_doubleName">
+                    <span className="mx_UserMenu_userName">{displayName}</span>
+                    <RoomName room={this.state.selectedSpace}>
+                        {(roomName) => <span className="mx_UserMenu_subUserName">{roomName}</span>}
+                    </RoomName>
+                </div>
+            );
+        } else if (prototypeCommunityName) {
             name = (
                 <div className="mx_UserMenu_doubleName">
                     <span className="mx_UserMenu_userName">{prototypeCommunityName}</span>
@@ -507,7 +583,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
                     <div className="mx_UserMenu_row">
                         <span className="mx_UserMenu_userAvatarContainer">
                             <BaseAvatar
-                                idName={displayName}
+                                idName={userId}
                                 name={displayName}
                                 url={avatarUrl}
                                 width={avatarSize}
diff --git a/src/components/structures/auth/E2eSetup.js b/src/components/structures/auth/E2eSetup.js
index 6df8158002..d97a972718 100644
--- a/src/components/structures/auth/E2eSetup.js
+++ b/src/components/structures/auth/E2eSetup.js
@@ -24,6 +24,7 @@ export default class E2eSetup extends React.Component {
     static propTypes = {
         onFinished: PropTypes.func.isRequired,
         accountPassword: PropTypes.string,
+        tokenLogin: PropTypes.bool,
     };
 
     render() {
@@ -33,6 +34,7 @@ export default class E2eSetup extends React.Component {
                     <CreateCrossSigningDialog
                         onFinished={this.props.onFinished}
                         accountPassword={this.props.accountPassword}
+                        tokenLogin={this.props.tokenLogin}
                     />
                 </CompleteSecurityBody>
             </AuthPage>
diff --git a/src/components/structures/auth/ForgotPassword.js b/src/components/structures/auth/ForgotPassword.js
index 3fa2713a35..5a39fe9fd9 100644
--- a/src/components/structures/auth/ForgotPassword.js
+++ b/src/components/structures/auth/ForgotPassword.js
@@ -21,15 +21,14 @@ import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 import * as sdk from '../../../index';
 import Modal from "../../../Modal";
-import SdkConfig from "../../../SdkConfig";
 import PasswordReset from "../../../PasswordReset";
 import AutoDiscoveryUtils, {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
 import classNames from 'classnames';
 import AuthPage from "../../views/auth/AuthPage";
+import CountlyAnalytics from "../../../CountlyAnalytics";
+import ServerPicker from "../../views/elements/ServerPicker";
 
 // Phases
-// Show controls to configure server details
-const PHASE_SERVER_DETAILS = 0;
 // Show the forgot password inputs
 const PHASE_FORGOT = 1;
 // Email is in the process of being sent
@@ -61,9 +60,14 @@ export default class ForgotPassword extends React.Component {
         serverIsAlive: true,
         serverErrorIsFatal: false,
         serverDeadError: "",
-        serverRequiresIdServer: null,
     };
 
+    constructor(props) {
+        super(props);
+
+        CountlyAnalytics.instance.track("onboarding_forgot_password_begin");
+    }
+
     componentDidMount() {
         this.reset = null;
         this._checkServerLiveliness(this.props.serverConfig);
@@ -86,12 +90,8 @@ export default class ForgotPassword extends React.Component {
                 serverConfig.isUrl,
             );
 
-            const pwReset = new PasswordReset(serverConfig.hsUrl, serverConfig.isUrl);
-            const serverRequiresIdServer = await pwReset.doesServerRequireIdServerParam();
-
             this.setState({
                 serverIsAlive: true,
-                serverRequiresIdServer,
             });
         } catch (e) {
             this.setState(AutoDiscoveryUtils.authComponentStateForError(e, "forgot_password"));
@@ -170,20 +170,6 @@ export default class ForgotPassword extends React.Component {
         });
     };
 
-    onServerDetailsNextPhaseClick = async () => {
-        this.setState({
-            phase: PHASE_FORGOT,
-        });
-    };
-
-    onEditServerDetailsClick = ev => {
-        ev.preventDefault();
-        ev.stopPropagation();
-        this.setState({
-            phase: PHASE_SERVER_DETAILS,
-        });
-    };
-
     onLoginClick = ev => {
         ev.preventDefault();
         ev.stopPropagation();
@@ -198,24 +184,6 @@ export default class ForgotPassword extends React.Component {
         });
     }
 
-    renderServerDetails() {
-        const ServerConfig = sdk.getComponent("auth.ServerConfig");
-
-        if (SdkConfig.get()['disable_custom_urls']) {
-            return null;
-        }
-
-        return <ServerConfig
-            serverConfig={this.props.serverConfig}
-            onServerConfigChange={this.props.onServerConfigChange}
-            delayTimeMs={0}
-            showIdentityServerIfRequiredByHomeserver={true}
-            onAfterSubmit={this.onServerDetailsNextPhaseClick}
-            submitText={_t("Next")}
-            submitClass="mx_Login_submit"
-        />;
-    }
-
     renderForgot() {
         const Field = sdk.getComponent('elements.Field');
 
@@ -239,57 +207,13 @@ export default class ForgotPassword extends React.Component {
             );
         }
 
-        let yourMatrixAccountText = _t('Your Matrix account on %(serverName)s', {
-            serverName: this.props.serverConfig.hsName,
-        });
-        if (this.props.serverConfig.hsNameIsDifferent) {
-            const TextWithTooltip = sdk.getComponent("elements.TextWithTooltip");
-
-            yourMatrixAccountText = _t('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, wire up the server details edit link.
-        let editLink = null;
-        if (!SdkConfig.get()['disable_custom_urls']) {
-            editLink = <a className="mx_AuthBody_editServerDetails"
-                href="#" onClick={this.onEditServerDetailsClick}
-            >
-                {_t('Change')}
-            </a>;
-        }
-
-        if (!this.props.serverConfig.isUrl && this.state.serverRequiresIdServer) {
-            return <div>
-                <h3>
-                    {yourMatrixAccountText}
-                    {editLink}
-                </h3>
-                {_t(
-                    "No identity server is configured: " +
-                    "add one in server settings to reset your password.",
-                )}
-                <a className="mx_AuthBody_changeFlow" onClick={this.onLoginClick} href="#">
-                    {_t('Sign in instead')}
-                </a>
-            </div>;
-        }
-
         return <div>
             {errorText}
             {serverDeadSection}
-            <h3>
-                {yourMatrixAccountText}
-                {editLink}
-            </h3>
+            <ServerPicker
+                serverConfig={this.props.serverConfig}
+                onServerConfigChange={this.props.onServerConfigChange}
+            />
             <form onSubmit={this.onSubmitForm}>
                 <div className="mx_AuthBody_fieldRow">
                     <Field
@@ -299,15 +223,20 @@ export default class ForgotPassword extends React.Component {
                         value={this.state.email}
                         onChange={this.onInputChanged.bind(this, "email")}
                         autoFocus
+                        onFocus={() => CountlyAnalytics.instance.track("onboarding_forgot_password_email_focus")}
+                        onBlur={() => CountlyAnalytics.instance.track("onboarding_forgot_password_email_blur")}
                     />
                 </div>
                 <div className="mx_AuthBody_fieldRow">
                     <Field
                         name="reset_password"
                         type="password"
-                        label={_t('Password')}
+                        label={_t('New Password')}
                         value={this.state.password}
                         onChange={this.onInputChanged.bind(this, "password")}
+                        onFocus={() => CountlyAnalytics.instance.track("onboarding_forgot_password_newPassword_focus")}
+                        onBlur={() => CountlyAnalytics.instance.track("onboarding_forgot_password_newPassword_blur")}
+                        autoComplete="new-password"
                     />
                     <Field
                         name="reset_password_confirm"
@@ -315,6 +244,9 @@ export default class ForgotPassword extends React.Component {
                         label={_t('Confirm')}
                         value={this.state.password2}
                         onChange={this.onInputChanged.bind(this, "password2")}
+                        onFocus={() => CountlyAnalytics.instance.track("onboarding_forgot_password_newPassword2_focus")}
+                        onBlur={() => CountlyAnalytics.instance.track("onboarding_forgot_password_newPassword2_blur")}
+                        autoComplete="new-password"
                     />
                 </div>
                 <span>{_t(
@@ -367,9 +299,6 @@ export default class ForgotPassword extends React.Component {
 
         let resetPasswordJsx;
         switch (this.state.phase) {
-            case PHASE_SERVER_DETAILS:
-                resetPasswordJsx = this.renderServerDetails();
-                break;
             case PHASE_FORGOT:
                 resetPasswordJsx = this.renderForgot();
                 break;
diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.tsx
similarity index 55%
rename from src/components/structures/auth/Login.js
rename to src/components/structures/auth/Login.tsx
index 118eed59e3..a217f1b4d9 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.tsx
@@ -1,7 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 Vector Creations Ltd
-Copyright 2018, 2019 New Vector Ltd
+Copyright 2015, 2016, 2017, 2018, 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.
@@ -16,32 +14,27 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
-import PropTypes from 'prop-types';
+import React, {ReactNode} from 'react';
+import {MatrixError} from "matrix-js-sdk/src/http-api";
+
 import {_t, _td} from '../../../languageHandler';
 import * as sdk from '../../../index';
-import Login from '../../../Login';
+import Login, {ISSOFlow, LoginFlow} from '../../../Login';
 import SdkConfig from '../../../SdkConfig';
 import { messageForResourceLimitError } from '../../../utils/ErrorUtils';
 import AutoDiscoveryUtils, {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
 import classNames from "classnames";
 import AuthPage from "../../views/auth/AuthPage";
-import SSOButton from "../../views/elements/SSOButton";
 import PlatformPeg from '../../../PlatformPeg';
 import SettingsStore from "../../../settings/SettingsStore";
 import {UIFeature} from "../../../settings/UIFeature";
-
-// For validating phone numbers without country codes
-const PHONE_NUMBER_REGEX = /^[0-9()\-\s]*$/;
-
-// Phases
-// Show controls to configure server details
-const PHASE_SERVER_DETAILS = 0;
-// Show the appropriate login flow(s) for the server
-const PHASE_LOGIN = 1;
-
-// Enable phases for login
-const PHASES_ENABLED = true;
+import CountlyAnalytics from "../../../CountlyAnalytics";
+import {IMatrixClientCreds} from "../../../MatrixClientPeg";
+import PasswordLogin from "../../views/auth/PasswordLogin";
+import InlineSpinner from "../../views/elements/InlineSpinner";
+import Spinner from "../../views/elements/Spinner";
+import SSOButtons from "../../views/elements/SSOButtons";
+import ServerPicker from "../../views/elements/ServerPicker";
 
 // These are used in several places, and come from the js-sdk's autodiscovery
 // stuff. We define them here so that they'll be picked up by i18n.
@@ -54,64 +47,80 @@ _td("Invalid base_url for m.identity_server");
 _td("Identity server URL does not appear to be a valid identity server");
 _td("General failure");
 
+interface IProps {
+    serverConfig: ValidatedServerConfig;
+    // If true, the component will consider itself busy.
+    busy?: boolean;
+    isSyncing?: boolean;
+    // Secondary HS which we try to log into if the user is using
+    // the default HS but login fails. Useful for migrating to a
+    // different homeserver without confusing users.
+    fallbackHsUrl?: string;
+    defaultDeviceDisplayName?: string;
+    fragmentAfterLogin?: string;
+
+    // Called when the user has logged in. Params:
+    // - The object returned by the login API
+    // - The user's password, if applicable, (may be cached in memory for a
+    //   short time so the user is not required to re-enter their password
+    //   for operations like uploading cross-signing keys).
+    onLoggedIn(data: IMatrixClientCreds, password: string): void;
+
+    // login shouldn't know or care how registration, password recovery, etc is done.
+    onRegisterClick(): void;
+    onForgotPasswordClick?(): void;
+    onServerConfigChange(config: ValidatedServerConfig): void;
+}
+
+interface IState {
+    busy: boolean;
+    busyLoggingIn?: boolean;
+    errorText?: ReactNode;
+    loginIncorrect: boolean;
+    // can we attempt to log in or are there validation errors?
+    canTryLogin: boolean;
+
+    flows?: LoginFlow[];
+
+    // used for preserving form values when changing homeserver
+    username: string;
+    phoneCountry?: string;
+    phoneNumber: string;
+
+    // We perform liveliness checks later, but for now suppress the errors.
+    // We also track the server dead errors independently of the regular errors so
+    // that we can render it differently, and override any other error the user may
+    // be seeing.
+    serverIsAlive: boolean;
+    serverErrorIsFatal: boolean;
+    serverDeadError: string;
+}
+
 /*
  * A wire component which glues together login UI components and Login logic
  */
-export default class LoginComponent extends React.Component {
-    static propTypes = {
-        // Called when the user has logged in. Params:
-        // - The object returned by the login API
-        // - The user's password, if applicable, (may be cached in memory for a
-        //   short time so the user is not required to re-enter their password
-        //   for operations like uploading cross-signing keys).
-        onLoggedIn: PropTypes.func.isRequired,
+export default class LoginComponent extends React.PureComponent<IProps, IState> {
+    private unmounted = false;
+    private loginLogic: Login;
 
-        // If true, the component will consider itself busy.
-        busy: PropTypes.bool,
-
-        // Secondary HS which we try to log into if the user is using
-        // the default HS but login fails. Useful for migrating to a
-        // different homeserver without confusing users.
-        fallbackHsUrl: PropTypes.string,
-
-        defaultDeviceDisplayName: PropTypes.string,
-
-        // login shouldn't know or care how registration, password recovery,
-        // etc is done.
-        onRegisterClick: PropTypes.func.isRequired,
-        onForgotPasswordClick: PropTypes.func,
-        onServerConfigChange: PropTypes.func.isRequired,
-
-        serverConfig: PropTypes.instanceOf(ValidatedServerConfig).isRequired,
-        isSyncing: PropTypes.bool,
-    };
+    private readonly stepRendererMap: Record<string, () => ReactNode>;
 
     constructor(props) {
         super(props);
 
-        this._unmounted = false;
-
         this.state = {
             busy: false,
             busyLoggingIn: null,
             errorText: null,
             loginIncorrect: false,
-            canTryLogin: true, // can we attempt to log in or are there validation errors?
+            canTryLogin: true,
+
+            flows: null,
 
-            // used for preserving form values when changing homeserver
             username: "",
             phoneCountry: null,
             phoneNumber: "",
 
-            // Phase of the overall login dialog.
-            phase: PHASE_LOGIN,
-            // The current login flow, such as password, SSO, etc.
-            currentFlow: null, // we need to load the flows from the server
-
-            // We perform liveliness checks later, but for now suppress the errors.
-            // We also track the server dead errors independently of the regular errors so
-            // that we can render it differently, and override any other error the user may
-            // be seeing.
             serverIsAlive: true,
             serverErrorIsFatal: false,
             serverDeadError: "",
@@ -119,23 +128,25 @@ export default class LoginComponent extends React.Component {
 
         // map from login step type to a function which will render a control
         // letting you do that login type
-        this._stepRendererMap = {
-            'm.login.password': this._renderPasswordStep,
+        this.stepRendererMap = {
+            'm.login.password': this.renderPasswordStep,
 
             // CAS and SSO are the same thing, modulo the url we link to
-            'm.login.cas': () => this._renderSsoStep("cas"),
-            'm.login.sso': () => this._renderSsoStep("sso"),
+            'm.login.cas': () => this.renderSsoStep("cas"),
+            'm.login.sso': () => this.renderSsoStep("sso"),
         };
+
+        CountlyAnalytics.instance.track("onboarding_login_begin");
     }
 
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
     // eslint-disable-next-line camelcase
     UNSAFE_componentWillMount() {
-        this._initLoginLogic();
+        this.initLoginLogic(this.props.serverConfig);
     }
 
     componentWillUnmount() {
-        this._unmounted = true;
+        this.unmounted = true;
     }
 
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
@@ -145,16 +156,9 @@ export default class LoginComponent extends React.Component {
             newProps.serverConfig.isUrl === this.props.serverConfig.isUrl) return;
 
         // Ensure that we end up actually logging in to the right place
-        this._initLoginLogic(newProps.serverConfig.hsUrl, newProps.serverConfig.isUrl);
+        this.initLoginLogic(newProps.serverConfig);
     }
 
-    onPasswordLoginError = errorText => {
-        this.setState({
-            errorText,
-            loginIncorrect: Boolean(errorText),
-        });
-    };
-
     isBusy = () => this.state.busy || this.props.busy;
 
     onPasswordLogin = async (username, phoneCountry, phoneNumber, password) => {
@@ -191,13 +195,13 @@ export default class LoginComponent extends React.Component {
             loginIncorrect: false,
         });
 
-        this._loginLogic.loginViaPassword(
+        this.loginLogic.loginViaPassword(
             username, phoneCountry, phoneNumber, password,
         ).then((data) => {
             this.setState({serverIsAlive: true}); // it must be, we logged in.
             this.props.onLoggedIn(data, password);
         }, (error) => {
-            if (this._unmounted) {
+            if (this.unmounted) {
                 return;
             }
             let errorText;
@@ -209,21 +213,23 @@ export default class LoginComponent extends React.Component {
             } else if (error.errcode === 'M_RESOURCE_LIMIT_EXCEEDED') {
                 const errorTop = messageForResourceLimitError(
                     error.data.limit_type,
-                    error.data.admin_contact, {
-                    'monthly_active_user': _td(
-                        "This homeserver has hit its Monthly Active User limit.",
-                    ),
-                    '': _td(
-                        "This homeserver has exceeded one of its resource limits.",
-                    ),
-                });
+                    error.data.admin_contact,
+                    {
+                        'monthly_active_user': _td(
+                            "This homeserver has hit its Monthly Active User limit.",
+                        ),
+                        '': _td(
+                            "This homeserver has exceeded one of its resource limits.",
+                        ),
+                    },
+                );
                 const errorDetail = messageForResourceLimitError(
                     error.data.limit_type,
-                    error.data.admin_contact, {
-                    '': _td(
-                        "Please <a>contact your service administrator</a> to continue using this service.",
-                    ),
-                });
+                    error.data.admin_contact,
+                    {
+                        '': _td("Please <a>contact your service administrator</a> to continue using this service."),
+                    },
+                );
                 errorText = (
                     <div>
                         <div>{errorTop}</div>
@@ -250,7 +256,7 @@ export default class LoginComponent extends React.Component {
                 }
             } else {
                 // other errors, not specific to doing a password login
-                errorText = this._errorTextFromError(error);
+                errorText = this.errorTextFromError(error);
             }
 
             this.setState({
@@ -288,7 +294,7 @@ export default class LoginComponent extends React.Component {
                 // the busy state. In the case of a full MXID that resolves to the same
                 // HS as Element's default HS though, there may not be any server change.
                 // To avoid this trap, we clear busy here. For cases where the server
-                // actually has changed, `_initLoginLogic` will be called and manages
+                // actually has changed, `initLoginLogic` will be called and manages
                 // busy state for its own liveness check.
                 this.setState({
                     busy: false,
@@ -301,7 +307,7 @@ export default class LoginComponent extends React.Component {
                     message = e.translatedMessage;
                 }
 
-                let errorText = message;
+                let errorText: ReactNode = message;
                 let discoveryState = {};
                 if (AutoDiscoveryUtils.isLivelinessError(e)) {
                     errorText = this.state.errorText;
@@ -327,21 +333,6 @@ export default class LoginComponent extends React.Component {
         });
     };
 
-    onPhoneNumberBlur = phoneNumber => {
-        // Validate the phone number entered
-        if (!PHONE_NUMBER_REGEX.test(phoneNumber)) {
-            this.setState({
-                errorText: _t('The phone number entered looks invalid'),
-                canTryLogin: false,
-            });
-        } else {
-            this.setState({
-                errorText: null,
-                canTryLogin: true,
-            });
-        }
-    };
-
     onRegisterClick = ev => {
         ev.preventDefault();
         ev.stopPropagation();
@@ -349,14 +340,16 @@ export default class LoginComponent extends React.Component {
     };
 
     onTryRegisterClick = ev => {
-        const step = this._getCurrentFlowStep();
-        if (step === 'm.login.sso' || step === 'm.login.cas') {
-            // If we're showing SSO it means that registration is also probably disabled,
-            // so intercept the click and instead pretend the user clicked 'Sign in with SSO'.
+        const hasPasswordFlow = this.state.flows?.find(flow => flow.type === "m.login.password");
+        const ssoFlow = this.state.flows?.find(flow => flow.type === "m.login.sso" || flow.type === "m.login.cas");
+        // If has no password flow but an SSO flow guess that the user wants to register with SSO.
+        // TODO: instead hide the Register button if registration is disabled by checking with the server,
+        // has no specific errCode currently and uses M_FORBIDDEN.
+        if (ssoFlow && !hasPasswordFlow) {
             ev.preventDefault();
             ev.stopPropagation();
-            const ssoKind = step === 'm.login.sso' ? 'sso' : 'cas';
-            PlatformPeg.get().startSingleSignOn(this._loginLogic.createTemporaryClient(), ssoKind,
+            const ssoKind = ssoFlow.type === 'm.login.sso' ? 'sso' : 'cas';
+            PlatformPeg.get().startSingleSignOn(this.loginLogic.createTemporaryClient(), ssoKind,
                 this.props.fragmentAfterLogin);
         } else {
             // Don't intercept - just go through to the register page
@@ -364,24 +357,7 @@ export default class LoginComponent extends React.Component {
         }
     };
 
-    onServerDetailsNextPhaseClick = () => {
-        this.setState({
-            phase: PHASE_LOGIN,
-        });
-    };
-
-    onEditServerDetailsClick = ev => {
-        ev.preventDefault();
-        ev.stopPropagation();
-        this.setState({
-            phase: PHASE_SERVER_DETAILS,
-        });
-    };
-
-    async _initLoginLogic(hsUrl, isUrl) {
-        hsUrl = hsUrl || this.props.serverConfig.hsUrl;
-        isUrl = isUrl || this.props.serverConfig.isUrl;
-
+    private async initLoginLogic({hsUrl, isUrl}: ValidatedServerConfig) {
         let isDefaultServer = false;
         if (this.props.serverConfig.isDefault
             && hsUrl === this.props.serverConfig.hsUrl
@@ -394,11 +370,10 @@ export default class LoginComponent extends React.Component {
         const loginLogic = new Login(hsUrl, isUrl, fallbackHsUrl, {
             defaultDeviceDisplayName: this.props.defaultDeviceDisplayName,
         });
-        this._loginLogic = loginLogic;
+        this.loginLogic = loginLogic;
 
         this.setState({
             busy: true,
-            currentFlow: null, // reset flow
             loginIncorrect: false,
         });
 
@@ -422,42 +397,26 @@ export default class LoginComponent extends React.Component {
                 busy: false,
                 ...AutoDiscoveryUtils.authComponentStateForError(e),
             });
-            if (this.state.serverErrorIsFatal) {
-                // Server is dead: show server details prompt instead
-                this.setState({
-                    phase: PHASE_SERVER_DETAILS,
-                });
-                return;
-            }
         }
 
         loginLogic.getFlows().then((flows) => {
             // look for a flow where we understand all of the steps.
-            for (let i = 0; i < flows.length; i++ ) {
-                if (!this._isSupportedFlow(flows[i])) {
-                    continue;
-                }
+            const supportedFlows = flows.filter(this.isSupportedFlow);
 
-                // we just pick the first flow where we support all the
-                // steps. (we don't have a UI for multiple logins so let's skip
-                // that for now).
-                loginLogic.chooseFlow(i);
+            if (supportedFlows.length > 0) {
                 this.setState({
-                    currentFlow: this._getCurrentFlowStep(),
+                    flows: supportedFlows,
                 });
                 return;
             }
-            // we got to the end of the list without finding a suitable
-            // flow.
+
+            // we got to the end of the list without finding a suitable flow.
             this.setState({
-                errorText: _t(
-                    "This homeserver doesn't offer any login flows which are " +
-                        "supported by this client.",
-                ),
+                errorText: _t("This homeserver doesn't offer any login flows which are supported by this client."),
             });
         }, (err) => {
             this.setState({
-                errorText: this._errorTextFromError(err),
+                errorText: this.errorTextFromError(err),
                 loginIncorrect: false,
                 canTryLogin: false,
             });
@@ -468,28 +427,24 @@ export default class LoginComponent extends React.Component {
         });
     }
 
-    _isSupportedFlow(flow) {
+    private isSupportedFlow = (flow: LoginFlow): boolean => {
         // technically the flow can have multiple steps, but no one does this
         // for login and loginLogic doesn't support it so we can ignore it.
-        if (!this._stepRendererMap[flow.type]) {
+        if (!this.stepRendererMap[flow.type]) {
             console.log("Skipping flow", flow, "due to unsupported login type", flow.type);
             return false;
         }
         return true;
-    }
+    };
 
-    _getCurrentFlowStep() {
-        return this._loginLogic ? this._loginLogic.getCurrentFlowStep() : null;
-    }
-
-    _errorTextFromError(err) {
+    private errorTextFromError(err: MatrixError): ReactNode {
         let errCode = err.errcode;
         if (!errCode && err.httpStatus) {
             errCode = "HTTP " + err.httpStatus;
         }
 
-        let errorText = _t("Error: Problem communicating with the given homeserver.") +
-                (errCode ? " (" + errCode + ")" : "");
+        let errorText: ReactNode = _t("There was a problem communicating with the homeserver, " +
+            "please try again later.") + (errCode ? " (" + errCode + ")" : "");
 
         if (err.cors === 'rejected') {
             if (window.location.protocol === 'https:' &&
@@ -499,29 +454,27 @@ export default class LoginComponent extends React.Component {
                 errorText = <span>
                     { _t("Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. " +
                         "Either use HTTPS or <a>enable unsafe scripts</a>.", {},
-                        {
-                            'a': (sub) => {
-                                return <a target="_blank" rel="noreferrer noopener"
-                                    href="https://www.google.com/search?&q=enable%20unsafe%20scripts"
-                                >
-                                    { sub }
-                                </a>;
-                            },
+                    {
+                        'a': (sub) => {
+                            return <a target="_blank" rel="noreferrer noopener"
+                                href="https://www.google.com/search?&q=enable%20unsafe%20scripts"
+                            >
+                                { sub }
+                            </a>;
                         },
-                    ) }
+                    }) }
                 </span>;
             } else {
                 errorText = <span>
                     { _t("Can't connect to homeserver - please check your connectivity, ensure your " +
                         "<a>homeserver's SSL certificate</a> is trusted, and that a browser extension " +
                         "is not blocking requests.", {},
-                        {
-                            'a': (sub) =>
-                                <a target="_blank" rel="noreferrer noopener" href={this.props.serverConfig.hsUrl}>
-                                    { sub }
-                                </a>,
-                        },
-                    ) }
+                    {
+                        'a': (sub) =>
+                            <a target="_blank" rel="noreferrer noopener" href={this.props.serverConfig.hsUrl}>
+                                { sub }
+                            </a>,
+                    }) }
                 </span>;
             }
         }
@@ -529,121 +482,63 @@ export default class LoginComponent extends React.Component {
         return errorText;
     }
 
-    renderServerComponent() {
-        const ServerConfig = sdk.getComponent("auth.ServerConfig");
+    renderLoginComponentForFlows() {
+        if (!this.state.flows) return null;
 
-        if (SdkConfig.get()['disable_custom_urls']) {
-            return null;
-        }
+        // this is the ideal order we want to show the flows in
+        const order = [
+            "m.login.password",
+            "m.login.sso",
+        ];
 
-        if (PHASES_ENABLED && this.state.phase !== PHASE_SERVER_DETAILS) {
-            return null;
-        }
-
-        const serverDetailsProps = {};
-        if (PHASES_ENABLED) {
-            serverDetailsProps.onAfterSubmit = this.onServerDetailsNextPhaseClick;
-            serverDetailsProps.submitText = _t("Next");
-            serverDetailsProps.submitClass = "mx_Login_submit";
-        }
-
-        return <ServerConfig
-            serverConfig={this.props.serverConfig}
-            onServerConfigChange={this.props.onServerConfigChange}
-            delayTimeMs={250}
-            {...serverDetailsProps}
-        />;
+        const flows = order.map(type => this.state.flows.find(flow => flow.type === type)).filter(Boolean);
+        return <React.Fragment>
+            { flows.map(flow => {
+                const stepRenderer = this.stepRendererMap[flow.type];
+                return <React.Fragment key={flow.type}>{ stepRenderer() }</React.Fragment>
+            }) }
+        </React.Fragment>
     }
 
-    renderLoginComponentForStep() {
-        if (PHASES_ENABLED && this.state.phase !== PHASE_LOGIN) {
-            return null;
-        }
-
-        const step = this.state.currentFlow;
-
-        if (!step) {
-            return null;
-        }
-
-        const stepRenderer = this._stepRendererMap[step];
-
-        if (stepRenderer) {
-            return stepRenderer();
-        }
-
-        return null;
-    }
-
-    _renderPasswordStep = () => {
-        const PasswordLogin = sdk.getComponent('auth.PasswordLogin');
-
-        let onEditServerDetailsClick = null;
-        // If custom URLs are allowed, wire up the server details edit link.
-        if (PHASES_ENABLED && !SdkConfig.get()['disable_custom_urls']) {
-            onEditServerDetailsClick = this.onEditServerDetailsClick;
-        }
-
+    private renderPasswordStep = () => {
         return (
             <PasswordLogin
-               onSubmit={this.onPasswordLogin}
-               onError={this.onPasswordLoginError}
-               onEditServerDetailsClick={onEditServerDetailsClick}
-               initialUsername={this.state.username}
-               initialPhoneCountry={this.state.phoneCountry}
-               initialPhoneNumber={this.state.phoneNumber}
-               onUsernameChanged={this.onUsernameChanged}
-               onUsernameBlur={this.onUsernameBlur}
-               onPhoneCountryChanged={this.onPhoneCountryChanged}
-               onPhoneNumberChanged={this.onPhoneNumberChanged}
-               onPhoneNumberBlur={this.onPhoneNumberBlur}
-               onForgotPasswordClick={this.props.onForgotPasswordClick}
-               loginIncorrect={this.state.loginIncorrect}
-               serverConfig={this.props.serverConfig}
-               disableSubmit={this.isBusy()}
-               busy={this.props.isSyncing || this.state.busyLoggingIn}
+                onSubmit={this.onPasswordLogin}
+                username={this.state.username}
+                phoneCountry={this.state.phoneCountry}
+                phoneNumber={this.state.phoneNumber}
+                onUsernameChanged={this.onUsernameChanged}
+                onUsernameBlur={this.onUsernameBlur}
+                onPhoneCountryChanged={this.onPhoneCountryChanged}
+                onPhoneNumberChanged={this.onPhoneNumberChanged}
+                onForgotPasswordClick={this.props.onForgotPasswordClick}
+                loginIncorrect={this.state.loginIncorrect}
+                serverConfig={this.props.serverConfig}
+                disableSubmit={this.isBusy()}
+                busy={this.props.isSyncing || this.state.busyLoggingIn}
             />
         );
     };
 
-    _renderSsoStep = loginType => {
-        const SignInToText = sdk.getComponent('views.auth.SignInToText');
+    private renderSsoStep = loginType => {
+        const flow = this.state.flows.find(flow => flow.type === "m.login." + loginType) as ISSOFlow;
 
-        let onEditServerDetailsClick = null;
-        // If custom URLs are allowed, wire up the server details edit link.
-        if (PHASES_ENABLED && !SdkConfig.get()['disable_custom_urls']) {
-            onEditServerDetailsClick = this.onEditServerDetailsClick;
-        }
-        // XXX: This link does *not* have a target="_blank" because single sign-on relies on
-        // redirecting the user back to a URI once they're logged in. On the web, this means
-        // we use the same window and redirect back to Element. On Electron, this actually
-        // opens the SSO page in the Electron app itself due to
-        // https://github.com/electron/electron/issues/8841 and so happens to work.
-        // If this bug gets fixed, it will break SSO since it will open the SSO page in the
-        // user's browser, let them log into their SSO provider, then redirect their browser
-        // to vector://vector which, of course, will not work.
         return (
-            <div>
-                <SignInToText serverConfig={this.props.serverConfig}
-                    onEditServerDetailsClick={onEditServerDetailsClick} />
-
-                <SSOButton
-                    className="mx_Login_sso_link mx_Login_submit"
-                    matrixClient={this._loginLogic.createTemporaryClient()}
-                    loginType={loginType}
-                    fragmentAfterLogin={this.props.fragmentAfterLogin}
-                />
-            </div>
+            <SSOButtons
+                matrixClient={this.loginLogic.createTemporaryClient()}
+                flow={flow}
+                loginType={loginType}
+                fragmentAfterLogin={this.props.fragmentAfterLogin}
+                primary={!this.state.flows.find(flow => flow.type === "m.login.password")}
+            />
         );
     };
 
     render() {
-        const Loader = sdk.getComponent("elements.Spinner");
-        const InlineSpinner = sdk.getComponent("elements.InlineSpinner");
         const AuthHeader = sdk.getComponent("auth.AuthHeader");
         const AuthBody = sdk.getComponent("auth.AuthBody");
         const loader = this.isBusy() && !this.state.busyLoggingIn ?
-            <div className="mx_Login_loader"><Loader /></div> : null;
+            <div className="mx_Login_loader"><Spinner /></div> : null;
 
         const errorText = this.state.errorText;
 
@@ -683,9 +578,11 @@ export default class LoginComponent extends React.Component {
             </div>;
         } else if (SettingsStore.getValue(UIFeature.Registration)) {
             footer = (
-                <a className="mx_AuthBody_changeFlow" onClick={this.onTryRegisterClick} href="#">
-                    { _t('Create account') }
-                </a>
+                <span className="mx_AuthBody_changeFlow">
+                    {_t("New? <a>Create account</a>", {}, {
+                        a: sub => <a onClick={this.onTryRegisterClick} href="#">{ sub }</a>,
+                    })}
+                </span>
             );
         }
 
@@ -699,8 +596,11 @@ export default class LoginComponent extends React.Component {
                     </h2>
                     { errorTextSection }
                     { serverDeadSection }
-                    { this.renderServerComponent() }
-                    { this.renderLoginComponentForStep() }
+                    <ServerPicker
+                        serverConfig={this.props.serverConfig}
+                        onServerConfigChange={this.props.onServerConfigChange}
+                    />
+                    { this.renderLoginComponentForFlows() }
                     { footer }
                 </AuthBody>
             </AuthPage>
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>
-        );
-    }
-}
diff --git a/src/components/structures/auth/Registration.js b/src/components/structures/auth/Registration.tsx
similarity index 54%
rename from src/components/structures/auth/Registration.js
rename to src/components/structures/auth/Registration.tsx
index 630e04da9c..095f3d3433 100644
--- a/src/components/structures/auth/Registration.js
+++ b/src/components/structures/auth/Registration.tsx
@@ -1,8 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 Vector Creations Ltd
-Copyright 2018, 2019 New Vector Ltd
-Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
+Copyright 2015, 2016, 2017, 2018, 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.
@@ -18,109 +15,128 @@ limitations under the License.
 */
 
 import Matrix from 'matrix-js-sdk';
-import React from 'react';
-import PropTypes from 'prop-types';
+import React, {ReactNode} from 'react';
+import {MatrixClient} from "matrix-js-sdk/src/client";
+
 import * as sdk from '../../../index';
 import { _t, _td } from '../../../languageHandler';
-import SdkConfig from '../../../SdkConfig';
 import { messageForResourceLimitError } from '../../../utils/ErrorUtils';
-import * as ServerType from '../../views/auth/ServerTypeSelector';
 import AutoDiscoveryUtils, {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
 import classNames from "classnames";
 import * as Lifecycle from '../../../Lifecycle';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import AuthPage from "../../views/auth/AuthPage";
-import Login from "../../../Login";
+import Login, {ISSOFlow} from "../../../Login";
 import dis from "../../../dispatcher/dispatcher";
+import SSOButtons from "../../views/elements/SSOButtons";
+import ServerPicker from '../../views/elements/ServerPicker';
 
-// Phases
-// Show controls to configure server details
-const PHASE_SERVER_DETAILS = 0;
-// Show the appropriate registration flow(s) for the server
-const PHASE_REGISTRATION = 1;
+interface IProps {
+    serverConfig: ValidatedServerConfig;
+    defaultDeviceDisplayName: string;
+    email?: string;
+    brand?: string;
+    clientSecret?: string;
+    sessionId?: string;
+    idSid?: string;
+    fragmentAfterLogin?: string;
 
-// Enable phases for registration
-const PHASES_ENABLED = true;
+    // Called when the user has logged in. Params:
+    // - object with userId, deviceId, homeserverUrl, identityServerUrl, accessToken
+    // - The user's password, if available and applicable (may be cached in memory
+    //   for a short time so the user is not required to re-enter their password
+    //   for operations like uploading cross-signing keys).
+    onLoggedIn(params: {
+        userId: string;
+        deviceId: string
+        homeserverUrl: string;
+        identityServerUrl?: string;
+        accessToken: string;
+    }, password: string): void;
+    makeRegistrationUrl(params: {
+        /* eslint-disable camelcase */
+        client_secret: string;
+        hs_url: string;
+        is_url?: string;
+        session_id: string;
+        /* eslint-enable camelcase */
+    }): void;
+    // registration shouldn't know or care how login is done.
+    onLoginClick(): void;
+    onServerConfigChange(config: ValidatedServerConfig): void;
+}
 
-export default class Registration extends React.Component {
-    static propTypes = {
-        // Called when the user has logged in. Params:
-        // - object with userId, deviceId, homeserverUrl, identityServerUrl, accessToken
-        // - The user's password, if available and applicable (may be cached in memory
-        //   for a short time so the user is not required to re-enter their password
-        //   for operations like uploading cross-signing keys).
-        onLoggedIn: PropTypes.func.isRequired,
+interface IState {
+    busy: boolean;
+    errorText?: ReactNode;
+    // true if we're waiting for the user to complete
+    // We remember the values entered by the user because
+    // the registration form will be unmounted during the
+    // course of registration, but if there's an error we
+    // want to bring back the registration form with the
+    // values the user entered still in it. We can keep
+    // them in this component's state since this component
+    // persist for the duration of the registration process.
+    formVals: Record<string, string>;
+    // user-interactive auth
+    // If we've been given a session ID, we're resuming
+    // straight back into UI auth
+    doingUIAuth: boolean;
+    // If set, we've registered but are not going to log
+    // the user in to their new account automatically.
+    completedNoSignin: boolean;
+    flows: {
+        stages: string[];
+    }[];
+    // We perform liveliness checks later, but for now suppress the errors.
+    // We also track the server dead errors independently of the regular errors so
+    // that we can render it differently, and override any other error the user may
+    // be seeing.
+    serverIsAlive: boolean;
+    serverErrorIsFatal: boolean;
+    serverDeadError: string;
 
-        clientSecret: PropTypes.string,
-        sessionId: PropTypes.string,
-        makeRegistrationUrl: PropTypes.func.isRequired,
-        idSid: PropTypes.string,
-        serverConfig: PropTypes.instanceOf(ValidatedServerConfig).isRequired,
-        brand: PropTypes.string,
-        email: PropTypes.string,
-        // registration shouldn't know or care how login is done.
-        onLoginClick: PropTypes.func.isRequired,
-        onServerConfigChange: PropTypes.func.isRequired,
-        defaultDeviceDisplayName: PropTypes.string,
-    };
+    // Our matrix client - part of state because we can't render the UI auth
+    // component without it.
+    matrixClient?: MatrixClient;
+    // The user ID we've just registered
+    registeredUsername?: string;
+    // if a different user ID to the one we just registered is logged in,
+    // this is the user ID that's logged in.
+    differentLoggedInUserId?: string;
+    // the SSO flow definition, this is fetched from /login as that's the only
+    // place it is exposed.
+    ssoFlow?: ISSOFlow;
+}
+
+export default class Registration extends React.Component<IProps, IState> {
+    loginLogic: Login;
 
     constructor(props) {
         super(props);
 
-        const serverType = ServerType.getTypeFromServerConfig(this.props.serverConfig);
         this.state = {
             busy: false,
             errorText: null,
-            // We remember the values entered by the user because
-            // the registration form will be unmounted during the
-            // course of registration, but if there's an error we
-            // want to bring back the registration form with the
-            // values the user entered still in it. We can keep
-            // them in this component's state since this component
-            // persist for the duration of the registration process.
             formVals: {
                 email: this.props.email,
             },
-            // true if we're waiting for the user to complete
-            // user-interactive auth
-            // If we've been given a session ID, we're resuming
-            // straight back into UI auth
             doingUIAuth: Boolean(this.props.sessionId),
-            serverType,
-            // Phase of the overall registration dialog.
-            phase: PHASE_REGISTRATION,
             flows: null,
-            // If set, we've registered but are not going to log
-            // the user in to their new account automatically.
             completedNoSignin: false,
-
-            // We perform liveliness checks later, but for now suppress the errors.
-            // We also track the server dead errors independently of the regular errors so
-            // that we can render it differently, and override any other error the user may
-            // be seeing.
             serverIsAlive: true,
             serverErrorIsFatal: false,
             serverDeadError: "",
-
-            // Our matrix client - part of state because we can't render the UI auth
-            // component without it.
-            matrixClient: null,
-
-            // whether the HS requires an ID server to register with a threepid
-            serverRequiresIdServer: null,
-
-            // The user ID we've just registered
-            registeredUsername: null,
-
-            // if a different user ID to the one we just registered is logged in,
-            // this is the user ID that's logged in.
-            differentLoggedInUserId: null,
         };
+
+        const {hsUrl, isUrl} = this.props.serverConfig;
+        this.loginLogic = new Login(hsUrl, isUrl, null, {
+            defaultDeviceDisplayName: "Element login check", // We shouldn't ever be used
+        });
     }
 
     componentDidMount() {
-        this._unmounted = false;
-        this._replaceClient();
+        this.replaceClient(this.props.serverConfig);
     }
 
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
@@ -129,63 +145,10 @@ export default class Registration extends React.Component {
         if (newProps.serverConfig.hsUrl === this.props.serverConfig.hsUrl &&
             newProps.serverConfig.isUrl === this.props.serverConfig.isUrl) return;
 
-        this._replaceClient(newProps.serverConfig);
-
-        // Handle cases where the user enters "https://matrix.org" for their server
-        // from the advanced option - we should default to FREE at that point.
-        const serverType = ServerType.getTypeFromServerConfig(newProps.serverConfig);
-        if (serverType !== this.state.serverType) {
-            // Reset the phase to default phase for the server type.
-            this.setState({
-                serverType,
-                phase: this.getDefaultPhaseForServerType(serverType),
-            });
-        }
+        this.replaceClient(newProps.serverConfig);
     }
 
-    getDefaultPhaseForServerType(type) {
-        switch (type) {
-            case ServerType.FREE: {
-                // Move directly to the registration phase since the server
-                // details are fixed.
-                return PHASE_REGISTRATION;
-            }
-            case ServerType.PREMIUM:
-            case ServerType.ADVANCED:
-                return PHASE_SERVER_DETAILS;
-        }
-    }
-
-    onServerTypeChange = type => {
-        this.setState({
-            serverType: type,
-        });
-
-        // When changing server types, set the HS / IS URLs to reasonable defaults for the
-        // the new type.
-        switch (type) {
-            case ServerType.FREE: {
-                const { serverConfig } = ServerType.TYPES.FREE;
-                this.props.onServerConfigChange(serverConfig);
-                break;
-            }
-            case ServerType.PREMIUM:
-                // We can accept whatever server config was the default here as this essentially
-                // acts as a slightly different "custom server"/ADVANCED option.
-                break;
-            case ServerType.ADVANCED:
-                // Use the default config from the config
-                this.props.onServerConfigChange(SdkConfig.get()["validated_server_config"]);
-                break;
-        }
-
-        // Reset the phase to default phase for the server type.
-        this.setState({
-            phase: this.getDefaultPhaseForServerType(type),
-        });
-    };
-
-    async _replaceClient(serverConfig) {
+    private async replaceClient(serverConfig: ValidatedServerConfig) {
         this.setState({
             errorText: null,
             serverDeadError: null,
@@ -194,7 +157,6 @@ export default class Registration extends React.Component {
             // the UI auth component while we don't have a matrix client)
             busy: true,
         });
-        if (!serverConfig) serverConfig = this.props.serverConfig;
 
         // Do a liveliness check on the URLs
         try {
@@ -222,16 +184,20 @@ export default class Registration extends React.Component {
             idBaseUrl: isUrl,
         });
 
-        let serverRequiresIdServer = true;
+        this.loginLogic.setHomeserverUrl(hsUrl);
+        this.loginLogic.setIdentityServerUrl(isUrl);
+
+        let ssoFlow: ISSOFlow;
         try {
-            serverRequiresIdServer = await cli.doesServerRequireIdServerParam();
+            const loginFlows = await this.loginLogic.getFlows();
+            ssoFlow = loginFlows.find(f => f.type === "m.login.sso" || f.type === "m.login.cas") as ISSOFlow;
         } catch (e) {
-            console.log("Unable to determine is server needs id_server param", e);
+            console.error("Failed to get login flows to check for SSO support", e);
         }
 
         this.setState({
             matrixClient: cli,
-            serverRequiresIdServer,
+            ssoFlow,
             busy: false,
         });
         const showGenericError = (e) => {
@@ -246,7 +212,7 @@ export default class Registration extends React.Component {
             // do SSO instead. If we've already started the UI Auth process though, we don't
             // need to.
             if (!this.state.doingUIAuth) {
-                await this._makeRegisterRequest(null);
+                await this.makeRegisterRequest(null);
                 // This should never succeed since we specified no auth object.
                 console.log("Expecting 401 from register request but got success!");
             }
@@ -259,26 +225,16 @@ export default class Registration extends React.Component {
                 // At this point registration is pretty much disabled, but before we do that let's
                 // quickly check to see if the server supports SSO instead. If it does, we'll send
                 // the user off to the login page to figure their account out.
-                try {
-                    const loginLogic = new Login(hsUrl, isUrl, null, {
-                        defaultDeviceDisplayName: "Element login check", // We shouldn't ever be used
+                if (ssoFlow) {
+                    // Redirect to login page - server probably expects SSO only
+                    dis.dispatch({action: 'start_login'});
+                } else {
+                    this.setState({
+                        serverErrorIsFatal: true, // fatal because user cannot continue on this server
+                        errorText: _t("Registration has been disabled on this homeserver."),
+                        // add empty flows array to get rid of spinner
+                        flows: [],
                     });
-                    const flows = await loginLogic.getFlows();
-                    const hasSsoFlow = flows.find(f => f.type === 'm.login.sso' || f.type === 'm.login.cas');
-                    if (hasSsoFlow) {
-                        // Redirect to login page - server probably expects SSO only
-                        dis.dispatch({action: 'start_login'});
-                    } else {
-                        this.setState({
-                            serverErrorIsFatal: true, // fatal because user cannot continue on this server
-                            errorText: _t("Registration has been disabled on this homeserver."),
-                            // add empty flows array to get rid of spinner
-                            flows: [],
-                        });
-                    }
-                } catch (e) {
-                    console.error("Failed to get login flows to check for SSO support", e);
-                    showGenericError(e);
                 }
             } else {
                 console.log("Unable to query for supported registration methods.", e);
@@ -287,7 +243,7 @@ export default class Registration extends React.Component {
         }
     }
 
-    onFormSubmit = formVals => {
+    private onFormSubmit = formVals => {
         this.setState({
             errorText: "",
             busy: true,
@@ -296,7 +252,7 @@ export default class Registration extends React.Component {
         });
     };
 
-    _requestEmailToken = (emailAddress, clientSecret, sendAttempt, sessionId) => {
+    private requestEmailToken = (emailAddress, clientSecret, sendAttempt, sessionId) => {
         return this.state.matrixClient.requestRegisterEmailToken(
             emailAddress,
             clientSecret,
@@ -310,28 +266,26 @@ export default class Registration extends React.Component {
         );
     }
 
-    _onUIAuthFinished = async (success, response, extra) => {
+    private onUIAuthFinished = async (success, response, extra) => {
         if (!success) {
             let msg = response.message || response.toString();
             // can we give a better error message?
             if (response.errcode === 'M_RESOURCE_LIMIT_EXCEEDED') {
                 const errorTop = messageForResourceLimitError(
                     response.data.limit_type,
-                    response.data.admin_contact, {
-                    'monthly_active_user': _td(
-                        "This homeserver has hit its Monthly Active User limit.",
-                    ),
-                    '': _td(
-                        "This homeserver has exceeded one of its resource limits.",
-                    ),
-                });
+                    response.data.admin_contact,
+                    {
+                        'monthly_active_user': _td("This homeserver has hit its Monthly Active User limit."),
+                        '': _td("This homeserver has exceeded one of its resource limits."),
+                    },
+                );
                 const errorDetail = messageForResourceLimitError(
                     response.data.limit_type,
-                    response.data.admin_contact, {
-                    '': _td(
-                        "Please <a>contact your service administrator</a> to continue using this service.",
-                    ),
-                });
+                    response.data.admin_contact,
+                    {
+                        '': _td("Please <a>contact your service administrator</a> to continue using this service."),
+                    },
+                );
                 msg = <div>
                     <p>{errorTop}</p>
                     <p>{errorDetail}</p>
@@ -339,11 +293,13 @@ export default class Registration extends React.Component {
             } else if (response.required_stages && response.required_stages.indexOf('m.login.msisdn') > -1) {
                 let msisdnAvailable = false;
                 for (const flow of response.available_flows) {
-                    msisdnAvailable |= flow.stages.indexOf('m.login.msisdn') > -1;
+                    msisdnAvailable = msisdnAvailable || flow.stages.includes('m.login.msisdn');
                 }
                 if (!msisdnAvailable) {
                     msg = _t('This server does not support authentication with a phone number.');
                 }
+            } else if (response.errcode === "M_USER_IN_USE") {
+                msg = _t("That username already exists, please try another.");
             }
             this.setState({
                 busy: false,
@@ -358,6 +314,10 @@ export default class Registration extends React.Component {
         const newState = {
             doingUIAuth: false,
             registeredUsername: response.user_id,
+            differentLoggedInUserId: null,
+            completedNoSignin: false,
+            // we're still busy until we get unmounted: don't show the registration form again
+            busy: true,
         };
 
         // The user came in through an email validation link. To avoid overwriting
@@ -365,15 +325,12 @@ export default class Registration extends React.Component {
         // isn't a guest user since we'll usually have set a guest user session before
         // starting the registration process. This isn't perfect since it's possible
         // the user had a separate guest session they didn't actually mean to replace.
-        const sessionOwner = Lifecycle.getStoredSessionOwner();
-        const sessionIsGuest = Lifecycle.getStoredSessionIsGuest();
+        const [sessionOwner, sessionIsGuest] = await Lifecycle.getStoredSessionOwner();
         if (sessionOwner && !sessionIsGuest && sessionOwner !== response.userId) {
             console.log(
                 `Found a session for ${sessionOwner} but ${response.userId} has just registered.`,
             );
             newState.differentLoggedInUserId = sessionOwner;
-        } else {
-            newState.differentLoggedInUserId = null;
         }
 
         if (response.access_token) {
@@ -385,9 +342,7 @@ export default class Registration extends React.Component {
                 accessToken: response.access_token,
             }, this.state.formVals.password);
 
-            this._setupPushers();
-            // we're still busy until we get unmounted: don't show the registration form again
-            newState.busy = true;
+            this.setupPushers();
         } else {
             newState.busy = false;
             newState.completedNoSignin = true;
@@ -396,7 +351,7 @@ export default class Registration extends React.Component {
         this.setState(newState);
     };
 
-    _setupPushers() {
+    private setupPushers() {
         if (!this.props.brand) {
             return Promise.resolve();
         }
@@ -419,38 +374,23 @@ export default class Registration extends React.Component {
         });
     }
 
-    onLoginClick = ev => {
+    private onLoginClick = ev => {
         ev.preventDefault();
         ev.stopPropagation();
         this.props.onLoginClick();
     };
 
-    onGoToFormClicked = ev => {
+    private onGoToFormClicked = ev => {
         ev.preventDefault();
         ev.stopPropagation();
-        this._replaceClient();
+        this.replaceClient(this.props.serverConfig);
         this.setState({
             busy: false,
             doingUIAuth: false,
-            phase: PHASE_REGISTRATION,
         });
     };
 
-    onServerDetailsNextPhaseClick = async () => {
-        this.setState({
-            phase: PHASE_REGISTRATION,
-        });
-    };
-
-    onEditServerDetailsClick = ev => {
-        ev.preventDefault();
-        ev.stopPropagation();
-        this.setState({
-            phase: PHASE_SERVER_DETAILS,
-        });
-    };
-
-    _makeRegisterRequest = auth => {
+    private makeRegisterRequest = auth => {
         // We inhibit login if we're trying to register with an email address: this
         // avoids a lot of complex race conditions that can occur if we try to log
         // the user in one one or both of the tabs they might end up with after
@@ -466,13 +406,15 @@ export default class Registration extends React.Component {
             username: this.state.formVals.username,
             password: this.state.formVals.password,
             initial_device_display_name: this.props.defaultDeviceDisplayName,
+            auth: undefined,
+            inhibit_login: undefined,
         };
         if (auth) registerParams.auth = auth;
         if (inhibitLogin !== undefined && inhibitLogin !== null) registerParams.inhibit_login = inhibitLogin;
         return this.state.matrixClient.registerRequest(registerParams);
     };
 
-    _getUIAuthInputs() {
+    private getUIAuthInputs() {
         return {
             emailAddress: this.state.formVals.email,
             phoneCountry: this.state.formVals.phoneCountry,
@@ -483,7 +425,7 @@ export default class Registration extends React.Component {
     // Links to the login page shown after registration is completed are routed through this
     // which checks the user hasn't already logged in somewhere else (perhaps we should do
     // this more generally?)
-    _onLoginClickWithCheck = async ev => {
+    private onLoginClickWithCheck = async ev => {
         ev.preventDefault();
 
         const sessionLoaded = await Lifecycle.loadSession({ignoreGuest: true});
@@ -493,72 +435,7 @@ export default class Registration extends React.Component {
         }
     };
 
-    renderServerComponent() {
-        const ServerTypeSelector = sdk.getComponent("auth.ServerTypeSelector");
-        const ServerConfig = sdk.getComponent("auth.ServerConfig");
-        const ModularServerConfig = sdk.getComponent("auth.ModularServerConfig");
-
-        if (SdkConfig.get()['disable_custom_urls']) {
-            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;
-            serverDetailsProps.submitText = _t("Next");
-            serverDetailsProps.submitClass = "mx_Login_submit";
-        }
-
-        let serverDetails = null;
-        switch (this.state.serverType) {
-            case ServerType.FREE:
-                break;
-            case ServerType.PREMIUM:
-                serverDetails = <ModularServerConfig
-                    serverConfig={this.props.serverConfig}
-                    onServerConfigChange={this.props.onServerConfigChange}
-                    delayTimeMs={250}
-                    {...serverDetailsProps}
-                />;
-                break;
-            case ServerType.ADVANCED:
-                serverDetails = <ServerConfig
-                    serverConfig={this.props.serverConfig}
-                    onServerConfigChange={this.props.onServerConfigChange}
-                    delayTimeMs={250}
-                    showIdentityServerIfRequiredByHomeserver={true}
-                    {...serverDetailsProps}
-                />;
-                break;
-        }
-
-        return <div>
-            <ServerTypeSelector
-                selected={this.state.serverType}
-                onChange={this.onServerTypeChange}
-            />
-            {serverDetails}
-        </div>;
-    }
-
-    renderRegisterComponent() {
-        if (PHASES_ENABLED && this.state.phase !== PHASE_REGISTRATION) {
-            return null;
-        }
-
+    private renderRegisterComponent() {
         const InteractiveAuth = sdk.getComponent('structures.InteractiveAuth');
         const Spinner = sdk.getComponent('elements.Spinner');
         const RegistrationForm = sdk.getComponent('auth.RegistrationForm');
@@ -566,10 +443,10 @@ export default class Registration extends React.Component {
         if (this.state.matrixClient && this.state.doingUIAuth) {
             return <InteractiveAuth
                 matrixClient={this.state.matrixClient}
-                makeRequest={this._makeRegisterRequest}
-                onAuthFinished={this._onUIAuthFinished}
-                inputs={this._getUIAuthInputs()}
-                requestEmailToken={this._requestEmailToken}
+                makeRequest={this.makeRegisterRequest}
+                onAuthFinished={this.onUIAuthFinished}
+                inputs={this.getUIAuthInputs()}
+                requestEmailToken={this.requestEmailToken}
                 sessionId={this.props.sessionId}
                 clientSecret={this.props.clientSecret}
                 emailSid={this.props.idSid}
@@ -582,30 +459,47 @@ 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;
+            let ssoSection;
+            if (this.state.ssoFlow) {
+                let continueWithSection;
+                const providers = this.state.ssoFlow["org.matrix.msc2858.identity_providers"] || [];
+                // when there is only a single (or 0) providers we show a wide button with `Continue with X` text
+                if (providers.length > 1) {
+                    // i18n: ssoButtons is a placeholder to help translators understand context
+                    continueWithSection = <h3 className="mx_AuthBody_centered">
+                        { _t("Continue with %(ssoButtons)s", { ssoButtons: "" }).trim() }
+                    </h3>;
+                }
+
+                // i18n: ssoButtons & usernamePassword are placeholders to help translators understand context
+                ssoSection = <React.Fragment>
+                    { continueWithSection }
+                    <SSOButtons
+                        matrixClient={this.loginLogic.createTemporaryClient()}
+                        flow={this.state.ssoFlow}
+                        loginType={this.state.ssoFlow.type === "m.login.sso" ? "sso" : "cas"}
+                        fragmentAfterLogin={this.props.fragmentAfterLogin}
+                    />
+                    <h3 className="mx_AuthBody_centered">
+                        { _t("%(ssoButtons)s Or %(usernamePassword)s", { ssoButtons: "", usernamePassword: ""}).trim() }
+                    </h3>
+                </React.Fragment>;
             }
 
-            return <RegistrationForm
-                defaultUsername={this.state.formVals.username}
-                defaultEmail={this.state.formVals.email}
-                defaultPhoneCountry={this.state.formVals.phoneCountry}
-                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}
-                serverRequiresIdServer={this.state.serverRequiresIdServer}
-            />;
+            return <React.Fragment>
+                { ssoSection }
+                <RegistrationForm
+                    defaultUsername={this.state.formVals.username}
+                    defaultEmail={this.state.formVals.email}
+                    defaultPhoneCountry={this.state.formVals.phoneCountry}
+                    defaultPhoneNumber={this.state.formVals.phoneNumber}
+                    defaultPassword={this.state.formVals.password}
+                    onRegisterClick={this.onFormSubmit}
+                    flows={this.state.flows}
+                    serverConfig={this.props.serverConfig}
+                    canSubmit={!this.state.serverErrorIsFatal}
+                />
+            </React.Fragment>;
         }
     }
 
@@ -634,13 +528,15 @@ export default class Registration extends React.Component {
             );
         }
 
-        const signIn = <a className="mx_AuthBody_changeFlow" onClick={this.onLoginClick} href="#">
-            { _t('Sign in instead') }
-        </a>;
+        const signIn = <span className="mx_AuthBody_changeFlow">
+            {_t("Already have an account? <a>Sign in here</a>", {}, {
+                a: sub => <a onClick={this.onLoginClick} href="#">{ sub }</a>,
+            })}
+        </span>;
 
         // Only show the 'go back' button if you're not looking at the form
         let goBack;
-        if ((PHASES_ENABLED && this.state.phase !== PHASE_REGISTRATION) || this.state.doingUIAuth) {
+        if (this.state.doingUIAuth) {
             goBack = <a className="mx_AuthBody_changeFlow" onClick={this.onGoToFormClicked} href="#">
                 { _t('Go back') }
             </a>;
@@ -658,7 +554,7 @@ export default class Registration extends React.Component {
                             loggedInUserId: this.state.differentLoggedInUserId,
                         },
                     )}</p>
-                    <p><AccessibleButton element="span" className="mx_linkButton" onClick={this._onLoginClickWithCheck}>
+                    <p><AccessibleButton element="span" className="mx_linkButton" onClick={this.onLoginClickWithCheck}>
                         {_t("Continue with previous account")}
                     </AccessibleButton></p>
                 </div>;
@@ -667,7 +563,7 @@ export default class Registration extends React.Component {
                 regDoneText = <h3>{_t(
                     "<a>Log in</a> to your new account.", {},
                     {
-                        a: (sub) => <a href="#/login" onClick={this._onLoginClickWithCheck}>{sub}</a>,
+                        a: (sub) => <a href="#/login" onClick={this.onLoginClickWithCheck}>{sub}</a>,
                     },
                 )}</h3>;
             } else {
@@ -677,7 +573,7 @@ export default class Registration extends React.Component {
                 regDoneText = <h3>{_t(
                     "You can now close this window or <a>log in</a> to your new account.", {},
                     {
-                        a: (sub) => <a href="#/login" onClick={this._onLoginClickWithCheck}>{sub}</a>,
+                        a: (sub) => <a href="#/login" onClick={this.onLoginClickWithCheck}>{sub}</a>,
                     },
                 )}</h3>;
             }
@@ -687,10 +583,15 @@ export default class Registration extends React.Component {
             </div>;
         } else {
             body = <div>
-                <h2>{ _t('Create your account') }</h2>
+                <h2>{ _t('Create account') }</h2>
                 { errorText }
                 { serverDeadSection }
-                { this.renderServerComponent() }
+                <ServerPicker
+                    title={_t("Host account on")}
+                    dialogTitle={_t("Decide where your account is hosted")}
+                    serverConfig={this.props.serverConfig}
+                    onServerConfigChange={this.state.doingUIAuth ? undefined : this.props.onServerConfigChange}
+                />
                 { this.renderRegisterComponent() }
                 { goBack }
                 { signIn }
diff --git a/src/components/structures/auth/SetupEncryptionBody.js b/src/components/structures/auth/SetupEncryptionBody.js
index 6d090936e5..3e7264dfec 100644
--- a/src/components/structures/auth/SetupEncryptionBody.js
+++ b/src/components/structures/auth/SetupEncryptionBody.js
@@ -120,9 +120,9 @@ export default class SetupEncryptionBody extends React.Component {
             const store = SetupEncryptionStore.sharedInstance();
             let recoveryKeyPrompt;
             if (store.keyInfo && keyHasPassphrase(store.keyInfo)) {
-                recoveryKeyPrompt = _t("Use Recovery Key or Passphrase");
+                recoveryKeyPrompt = _t("Use Security Key or Phrase");
             } else if (store.keyInfo) {
-                recoveryKeyPrompt = _t("Use Recovery Key");
+                recoveryKeyPrompt = _t("Use Security Key");
             }
 
             let useRecoveryKeyButton;
diff --git a/src/components/structures/auth/SoftLogout.js b/src/components/structures/auth/SoftLogout.js
index a539c8c9ee..a7fe340457 100644
--- a/src/components/structures/auth/SoftLogout.js
+++ b/src/components/structures/auth/SoftLogout.js
@@ -24,8 +24,8 @@ import Modal from '../../../Modal';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {sendLoginRequest} from "../../../Login";
 import AuthPage from "../../views/auth/AuthPage";
-import SSOButton from "../../views/elements/SSOButton";
 import {SSO_HOMESERVER_URL_KEY, SSO_ID_SERVER_URL_KEY} from "../../../BasePlatform";
+import SSOButtons from "../../views/elements/SSOButtons";
 
 const LOGIN_VIEW = {
     LOADING: 1,
@@ -72,9 +72,12 @@ export default class SoftLogout extends React.Component {
 
         this._initLogin();
 
-        MatrixClientPeg.get().countSessionsNeedingBackup().then(remaining => {
-            this.setState({keyBackupNeeded: remaining > 0});
-        });
+        const cli = MatrixClientPeg.get();
+        if (cli.isCryptoEnabled()) {
+            cli.countSessionsNeedingBackup().then(remaining => {
+                this.setState({ keyBackupNeeded: remaining > 0 });
+            });
+        }
     }
 
     onClearAll = () => {
@@ -101,10 +104,11 @@ export default class SoftLogout extends React.Component {
         // Note: we don't use the existing Login class because it is heavily flow-based. We don't
         // care about login flows here, unless it is the single flow we support.
         const client = MatrixClientPeg.get();
-        const loginViews = (await client.loginFlows()).flows.map(f => FLOWS_TO_VIEWS[f.type]);
+        const flows = (await client.loginFlows()).flows;
+        const loginViews = flows.map(f => FLOWS_TO_VIEWS[f.type]);
 
         const chosenView = loginViews.filter(f => !!f)[0] || LOGIN_VIEW.UNSUPPORTED;
-        this.setState({loginView: chosenView});
+        this.setState({ flows, loginView: chosenView });
     }
 
     onPasswordChange = (ev) => {
@@ -240,13 +244,18 @@ export default class SoftLogout extends React.Component {
                 introText = _t("Sign in and regain access to your account.");
             } // else we already have a message and should use it (key backup warning)
 
+            const loginType = this.state.loginView === LOGIN_VIEW.CAS ? "cas" : "sso";
+            const flow = this.state.flows.find(flow => flow.type === "m.login." + loginType);
+
             return (
                 <div>
                     <p>{introText}</p>
-                    <SSOButton
+                    <SSOButtons
                         matrixClient={MatrixClientPeg.get()}
-                        loginType={this.state.loginView === LOGIN_VIEW.CAS ? "cas" : "sso"}
+                        flow={flow}
+                        loginType={loginType}
                         fragmentAfterLogin={this.props.fragmentAfterLogin}
+                        primary={!this.state.flows.find(flow => flow.type === "m.login.password")}
                     />
                 </div>
             );
diff --git a/src/components/views/auth/CaptchaForm.js b/src/components/views/auth/CaptchaForm.js
index 783d519621..e2d7d594fa 100644
--- a/src/components/views/auth/CaptchaForm.js
+++ b/src/components/views/auth/CaptchaForm.js
@@ -17,6 +17,7 @@ limitations under the License.
 import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
+import CountlyAnalytics from "../../../CountlyAnalytics";
 
 const DIV_ID = 'mx_recaptcha';
 
@@ -45,6 +46,8 @@ export default class CaptchaForm extends React.Component {
         this._captchaWidgetId = null;
 
         this._recaptchaContainer = createRef();
+
+        CountlyAnalytics.instance.track("onboarding_grecaptcha_begin");
     }
 
     componentDidMount() {
@@ -99,10 +102,16 @@ 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({
                 errorText: e.toString(),
             });
+            CountlyAnalytics.instance.track("onboarding_grecaptcha_error", { error: e.toString() });
         }
     }
 
diff --git a/src/components/views/auth/CountryDropdown.js b/src/components/views/auth/CountryDropdown.js
index 37b1967c48..3296b574a4 100644
--- a/src/components/views/auth/CountryDropdown.js
+++ b/src/components/views/auth/CountryDropdown.js
@@ -123,7 +123,7 @@ export default class CountryDropdown extends React.Component {
         const options = displayedCountries.map((country) => {
             return <div className="mx_CountryDropdown_option" key={country.iso2}>
                 { this._flagImgForIso2(country.iso2) }
-                { country.name } (+{ country.prefix })
+                { _t(country.name) } (+{ country.prefix })
             </div>;
         });
 
diff --git a/src/components/views/auth/CustomServerDialog.js b/src/components/views/auth/CustomServerDialog.js
deleted file mode 100644
index 138f8c4689..0000000000
--- a/src/components/views/auth/CustomServerDialog.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-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.
-*/
-
-import React from 'react';
-import { _t } from '../../../languageHandler';
-import SdkConfig from '../../../SdkConfig';
-
-export default class CustomServerDialog extends React.Component {
-    render() {
-        const brand = SdkConfig.get().brand;
-        return (
-            <div className="mx_ErrorDialog">
-                <div className="mx_Dialog_title">
-                    { _t("Custom Server Options") }
-                </div>
-                <div className="mx_Dialog_content">
-                    <p>{_t(
-                        "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.",
-                        { brand },
-                    )}</p>
-                </div>
-                <div className="mx_Dialog_buttons">
-                    <button onClick={this.props.onFinished} autoFocus={true}>
-                        { _t("Dismiss") }
-                    </button>
-                </div>
-            </div>
-        );
-    }
-}
diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.js b/src/components/views/auth/InteractiveAuthEntryComponents.js
index 47263c1e21..7dc1976641 100644
--- a/src/components/views/auth/InteractiveAuthEntryComponents.js
+++ b/src/components/views/auth/InteractiveAuthEntryComponents.js
@@ -18,7 +18,6 @@ limitations under the License.
 
 import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
-import url from 'url';
 import classnames from 'classnames';
 
 import * as sdk from '../../../index';
@@ -26,6 +25,7 @@ import { _t } from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
 import AccessibleButton from "../elements/AccessibleButton";
 import Spinner from "../elements/Spinner";
+import CountlyAnalytics from "../../../CountlyAnalytics";
 
 /* This file contains a collection of components which are used by the
  * InteractiveAuth to prompt the user to enter the information needed
@@ -189,6 +189,7 @@ export class RecaptchaAuthEntry extends React.Component {
     }
 
     _onCaptchaResponse = response => {
+        CountlyAnalytics.instance.track("onboarding_grecaptcha_submit");
         this.props.submitAuthDict({
             type: RecaptchaAuthEntry.LOGIN_TYPE,
             response: response,
@@ -297,6 +298,8 @@ export class TermsAuthEntry extends React.Component {
             toggledPolicies: initToggles,
             policies: pickedPolicies,
         };
+
+        CountlyAnalytics.instance.track("onboarding_terms_begin");
     }
 
 
@@ -326,8 +329,12 @@ export class TermsAuthEntry extends React.Component {
             allChecked = allChecked && checked;
         }
 
-        if (allChecked) this.props.submitAuthDict({type: TermsAuthEntry.LOGIN_TYPE});
-        else this.setState({errorText: _t("Please review and accept all of the homeserver's policies")});
+        if (allChecked) {
+            this.props.submitAuthDict({type: TermsAuthEntry.LOGIN_TYPE});
+            CountlyAnalytics.instance.track("onboarding_terms_complete");
+        } else {
+            this.setState({errorText: _t("Please review and accept all of the homeserver's policies")});
+        }
     };
 
     render() {
@@ -413,12 +420,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>
             );
         }
@@ -492,17 +499,11 @@ export class MsisdnAuthEntry extends React.Component {
         });
 
         try {
-            const requiresIdServerParam =
-                await this.props.matrixClient.doesServerRequireIdServerParam();
             let result;
             if (this._submitUrl) {
                 result = await this.props.matrixClient.submitMsisdnTokenOtherUrl(
                     this._submitUrl, this._sid, this.props.clientSecret, this.state.token,
                 );
-            } else if (requiresIdServerParam) {
-                result = await this.props.matrixClient.submitMsisdnToken(
-                    this._sid, this.props.clientSecret, this.state.token,
-                );
             } else {
                 throw new Error("The registration with MSISDN flow is misconfigured");
             }
@@ -511,12 +512,6 @@ export class MsisdnAuthEntry extends React.Component {
                     sid: this._sid,
                     client_secret: this.props.clientSecret,
                 };
-                if (requiresIdServerParam) {
-                    const idServerParsedUrl = url.parse(
-                        this.props.matrixClient.getIdentityServerUrl(),
-                    );
-                    creds.id_server = idServerParsedUrl.host;
-                }
                 this.props.submitAuthDict({
                     type: MsisdnAuthEntry.LOGIN_TYPE,
                     // TODO: Remove `threepid_creds` once servers support proper UIA
@@ -614,8 +609,12 @@ export class SSOAuthEntry extends React.Component {
             this.props.authSessionId,
         );
 
+        this._popupWindow = null;
+        window.addEventListener("message", this._onReceiveMessage);
+
         this.state = {
             phase: SSOAuthEntry.PHASE_PREAUTH,
+            attemptFailed: false,
         };
     }
 
@@ -623,12 +622,35 @@ export class SSOAuthEntry extends React.Component {
         this.props.onPhaseChange(SSOAuthEntry.PHASE_PREAUTH);
     }
 
+    componentWillUnmount() {
+        window.removeEventListener("message", this._onReceiveMessage);
+        if (this._popupWindow) {
+            this._popupWindow.close();
+            this._popupWindow = null;
+        }
+    }
+
+    attemptFailed = () => {
+        this.setState({
+            attemptFailed: true,
+        });
+    };
+
+    _onReceiveMessage = event => {
+        if (event.data === "authDone" && event.origin === this.props.matrixClient.getHomeserverUrl()) {
+            if (this._popupWindow) {
+                this._popupWindow.close();
+                this._popupWindow = null;
+            }
+        }
+    };
+
     onStartAuthClick = () => {
         // Note: We don't use PlatformPeg's startSsoAuth functions because we almost
         // certainly will need to open the thing in a new tab to avoid losing application
         // context.
 
-        window.open(this._ssoUrl, '_blank');
+        this._popupWindow = window.open(this._ssoUrl, "_blank");
         this.setState({phase: SSOAuthEntry.PHASE_POSTAUTH});
         this.props.onPhaseChange(SSOAuthEntry.PHASE_POSTAUTH);
     };
@@ -661,10 +683,28 @@ export class SSOAuthEntry extends React.Component {
             );
         }
 
-        return <div className='mx_InteractiveAuthEntryComponents_sso_buttons'>
-            {cancelButton}
-            {continueButton}
-        </div>;
+        let errorSection;
+        if (this.props.errorText) {
+            errorSection = (
+                <div className="error" role="alert">
+                    { this.props.errorText }
+                </div>
+            );
+        } else if (this.state.attemptFailed) {
+            errorSection = (
+                <div className="error" role="alert">
+                    { _t("Something went wrong in confirming your identity. Cancel and try again.") }
+                </div>
+            );
+        }
+
+        return <React.Fragment>
+            { errorSection }
+            <div className="mx_InteractiveAuthEntryComponents_sso_buttons">
+                {cancelButton}
+                {continueButton}
+            </div>
+        </React.Fragment>;
     }
 }
 
@@ -715,8 +755,7 @@ export class FallbackAuthEntry extends React.Component {
             this.props.loginType,
             this.props.authSessionId,
         );
-        this._popupWindow = window.open(url);
-        this._popupWindow.opener = null;
+        this._popupWindow = window.open(url, "_blank");
     };
 
     _onReceiveMessage = event => {
diff --git a/src/components/views/auth/ModularServerConfig.js b/src/components/views/auth/ModularServerConfig.js
deleted file mode 100644
index 28fd16379d..0000000000
--- a/src/components/views/auth/ModularServerConfig.js
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-Copyright 2019 New Vector 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 * as sdk from '../../../index';
-import { _t } from '../../../languageHandler';
-import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
-import SdkConfig from "../../../SdkConfig";
-import AutoDiscoveryUtils from "../../../utils/AutoDiscoveryUtils";
-import * as ServerType from '../../views/auth/ServerTypeSelector';
-import ServerConfig from "./ServerConfig";
-
-const MODULAR_URL = 'https://element.io/matrix-services' +
-    '?utm_source=element-web&utm_medium=web&utm_campaign=element-web-authentication';
-
-// TODO: TravisR - Can this extend ServerConfig for most things?
-
-/*
- * Configure the Modular server name.
- *
- * This is a variant of ServerConfig with only the HS field and different body
- * text that is specific to the Modular case.
- */
-export default class ModularServerConfig extends ServerConfig {
-    static propTypes = ServerConfig.propTypes;
-
-    async validateAndApplyServer(hsUrl, isUrl) {
-        // Always try and use the defaults first
-        const defaultConfig: ValidatedServerConfig = SdkConfig.get()["validated_server_config"];
-        if (defaultConfig.hsUrl === hsUrl && defaultConfig.isUrl === isUrl) {
-            this.setState({busy: false, errorText: ""});
-            this.props.onServerConfigChange(defaultConfig);
-            return defaultConfig;
-        }
-
-        this.setState({
-            hsUrl,
-            isUrl,
-            busy: true,
-            errorText: "",
-        });
-
-        try {
-            const result = await AutoDiscoveryUtils.validateServerConfigWithStaticUrls(hsUrl, isUrl);
-            this.setState({busy: false, errorText: ""});
-            this.props.onServerConfigChange(result);
-            return result;
-        } catch (e) {
-            console.error(e);
-            let message = _t("Unable to validate homeserver/identity server");
-            if (e.translatedMessage) {
-                message = e.translatedMessage;
-            }
-            this.setState({
-                busy: false,
-                errorText: message,
-            });
-
-            return null;
-        }
-    }
-
-    async validateServer() {
-        // TODO: Do we want to support .well-known lookups here?
-        // If for some reason someone enters "matrix.org" for a URL, we could do a lookup to
-        // find their homeserver without demanding they use "https://matrix.org"
-        return this.validateAndApplyServer(this.state.hsUrl, ServerType.TYPES.PREMIUM.identityServerUrl);
-    }
-
-    render() {
-        const Field = sdk.getComponent('elements.Field');
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-
-        const submitButton = this.props.submitText
-            ? <AccessibleButton
-                element="button"
-                type="submit"
-                className={this.props.submitClass}
-                onClick={this.onSubmit}
-                disabled={this.state.busy}>{this.props.submitText}</AccessibleButton>
-            : null;
-
-        return (
-            <div className="mx_ServerConfig">
-                <h3>{_t("Your server")}</h3>
-                {_t(
-                    "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>.",
-                    {}, {
-                        a: sub => <a href={MODULAR_URL} target="_blank" rel="noreferrer noopener">
-                            {sub}
-                        </a>,
-                    },
-                )}
-                <form onSubmit={this.onSubmit} autoComplete="off" action={null}>
-                    <div className="mx_ServerConfig_fields">
-                        <Field
-                            id="mx_ServerConfig_hsUrl"
-                            label={_t("Server Name")}
-                            placeholder={this.props.serverConfig.hsUrl}
-                            value={this.state.hsUrl}
-                            onBlur={this.onHomeserverBlur}
-                            onChange={this.onHomeserverChange}
-                        />
-                    </div>
-                    {submitButton}
-                </form>
-            </div>
-        );
-    }
-}
diff --git a/src/components/views/auth/PassphraseField.tsx b/src/components/views/auth/PassphraseField.tsx
index b420ed0872..e240ad61ca 100644
--- a/src/components/views/auth/PassphraseField.tsx
+++ b/src/components/views/auth/PassphraseField.tsx
@@ -21,9 +21,9 @@ import zxcvbn from "zxcvbn";
 import SdkConfig from "../../../SdkConfig";
 import withValidation, {IFieldState, IValidationResult} from "../elements/Validation";
 import {_t, _td} from "../../../languageHandler";
-import Field from "../elements/Field";
+import Field, {IInputProps} from "../elements/Field";
 
-interface IProps {
+interface IProps extends Omit<IInputProps, "onValidate"> {
     autoFocus?: boolean;
     id?: string;
     className?: string;
diff --git a/src/components/views/auth/PasswordLogin.js b/src/components/views/auth/PasswordLogin.js
deleted file mode 100644
index 3bd9b557bc..0000000000
--- a/src/components/views/auth/PasswordLogin.js
+++ /dev/null
@@ -1,354 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 Vector Creations Ltd
-Copyright 2019 New Vector 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 classNames from 'classnames';
-import * as sdk from '../../../index';
-import { _t } from '../../../languageHandler';
-import SdkConfig from '../../../SdkConfig';
-import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
-import AccessibleButton from "../elements/AccessibleButton";
-
-/**
- * A pure UI component which displays a username/password form.
- */
-export default class PasswordLogin extends React.Component {
-    static propTypes = {
-        onSubmit: PropTypes.func.isRequired, // fn(username, password)
-        onError: PropTypes.func,
-        onEditServerDetailsClick: PropTypes.func,
-        onForgotPasswordClick: PropTypes.func, // fn()
-        initialUsername: PropTypes.string,
-        initialPhoneCountry: PropTypes.string,
-        initialPhoneNumber: PropTypes.string,
-        initialPassword: PropTypes.string,
-        onUsernameChanged: PropTypes.func,
-        onPhoneCountryChanged: PropTypes.func,
-        onPhoneNumberChanged: PropTypes.func,
-        onPasswordChanged: PropTypes.func,
-        loginIncorrect: PropTypes.bool,
-        disableSubmit: PropTypes.bool,
-        serverConfig: PropTypes.instanceOf(ValidatedServerConfig).isRequired,
-        busy: PropTypes.bool,
-    };
-
-    static defaultProps = {
-        onError: function() {},
-        onEditServerDetailsClick: null,
-        onUsernameChanged: function() {},
-        onUsernameBlur: function() {},
-        onPasswordChanged: function() {},
-        onPhoneCountryChanged: function() {},
-        onPhoneNumberChanged: function() {},
-        onPhoneNumberBlur: function() {},
-        initialUsername: "",
-        initialPhoneCountry: "",
-        initialPhoneNumber: "",
-        initialPassword: "",
-        loginIncorrect: false,
-        disableSubmit: false,
-    };
-
-    static LOGIN_FIELD_EMAIL = "login_field_email";
-    static LOGIN_FIELD_MXID = "login_field_mxid";
-    static LOGIN_FIELD_PHONE = "login_field_phone";
-
-    constructor(props) {
-        super(props);
-        this.state = {
-            username: this.props.initialUsername,
-            password: this.props.initialPassword,
-            phoneCountry: this.props.initialPhoneCountry,
-            phoneNumber: this.props.initialPhoneNumber,
-            loginType: PasswordLogin.LOGIN_FIELD_MXID,
-        };
-
-        this.onForgotPasswordClick = this.onForgotPasswordClick.bind(this);
-        this.onSubmitForm = this.onSubmitForm.bind(this);
-        this.onUsernameChanged = this.onUsernameChanged.bind(this);
-        this.onUsernameBlur = this.onUsernameBlur.bind(this);
-        this.onLoginTypeChange = this.onLoginTypeChange.bind(this);
-        this.onPhoneCountryChanged = this.onPhoneCountryChanged.bind(this);
-        this.onPhoneNumberChanged = this.onPhoneNumberChanged.bind(this);
-        this.onPhoneNumberBlur = this.onPhoneNumberBlur.bind(this);
-        this.onPasswordChanged = this.onPasswordChanged.bind(this);
-        this.isLoginEmpty = this.isLoginEmpty.bind(this);
-    }
-
-    onForgotPasswordClick(ev) {
-        ev.preventDefault();
-        ev.stopPropagation();
-        this.props.onForgotPasswordClick();
-    }
-
-    onSubmitForm(ev) {
-        ev.preventDefault();
-
-        let username = ''; // XXX: Synapse breaks if you send null here:
-        let phoneCountry = null;
-        let phoneNumber = null;
-        let error;
-
-        switch (this.state.loginType) {
-            case PasswordLogin.LOGIN_FIELD_EMAIL:
-                username = this.state.username;
-                if (!username) {
-                    error = _t('The email field must not be blank.');
-                }
-                break;
-            case PasswordLogin.LOGIN_FIELD_MXID:
-                username = this.state.username;
-                if (!username) {
-                    error = _t('The username field must not be blank.');
-                }
-                break;
-            case PasswordLogin.LOGIN_FIELD_PHONE:
-                phoneCountry = this.state.phoneCountry;
-                phoneNumber = this.state.phoneNumber;
-                if (!phoneNumber) {
-                    error = _t('The phone number field must not be blank.');
-                }
-                break;
-        }
-
-        if (error) {
-            this.props.onError(error);
-            return;
-        }
-
-        if (!this.state.password) {
-            this.props.onError(_t('The password field must not be blank.'));
-            return;
-        }
-
-        this.props.onSubmit(
-            username,
-            phoneCountry,
-            phoneNumber,
-            this.state.password,
-        );
-    }
-
-    onUsernameChanged(ev) {
-        this.setState({username: ev.target.value});
-        this.props.onUsernameChanged(ev.target.value);
-    }
-
-    onUsernameBlur(ev) {
-        this.props.onUsernameBlur(ev.target.value);
-    }
-
-    onLoginTypeChange(ev) {
-        const loginType = ev.target.value;
-        this.props.onError(null); // send a null error to clear any error messages
-        this.setState({
-            loginType: loginType,
-            username: "", // Reset because email and username use the same state
-        });
-    }
-
-    onPhoneCountryChanged(country) {
-        this.setState({
-            phoneCountry: country.iso2,
-            phonePrefix: country.prefix,
-        });
-        this.props.onPhoneCountryChanged(country.iso2);
-    }
-
-    onPhoneNumberChanged(ev) {
-        this.setState({phoneNumber: ev.target.value});
-        this.props.onPhoneNumberChanged(ev.target.value);
-    }
-
-    onPhoneNumberBlur(ev) {
-        this.props.onPhoneNumberBlur(ev.target.value);
-    }
-
-    onPasswordChanged(ev) {
-        this.setState({password: ev.target.value});
-        this.props.onPasswordChanged(ev.target.value);
-    }
-
-    renderLoginField(loginType, autoFocus) {
-        const Field = sdk.getComponent('elements.Field');
-
-        const classes = {};
-
-        switch (loginType) {
-            case PasswordLogin.LOGIN_FIELD_EMAIL:
-                classes.error = this.props.loginIncorrect && !this.state.username;
-                return <Field
-                    className={classNames(classes)}
-                    name="username" // make it a little easier for browser's remember-password
-                    key="email_input"
-                    type="text"
-                    label={_t("Email")}
-                    placeholder="joe@example.com"
-                    value={this.state.username}
-                    onChange={this.onUsernameChanged}
-                    onBlur={this.onUsernameBlur}
-                    disabled={this.props.disableSubmit}
-                    autoFocus={autoFocus}
-                />;
-            case PasswordLogin.LOGIN_FIELD_MXID:
-                classes.error = this.props.loginIncorrect && !this.state.username;
-                return <Field
-                    className={classNames(classes)}
-                    name="username" // make it a little easier for browser's remember-password
-                    key="username_input"
-                    type="text"
-                    label={_t("Username")}
-                    value={this.state.username}
-                    onChange={this.onUsernameChanged}
-                    onBlur={this.onUsernameBlur}
-                    disabled={this.props.disableSubmit}
-                    autoFocus={autoFocus}
-                />;
-            case PasswordLogin.LOGIN_FIELD_PHONE: {
-                const CountryDropdown = sdk.getComponent('views.auth.CountryDropdown');
-                classes.error = this.props.loginIncorrect && !this.state.phoneNumber;
-
-                const phoneCountry = <CountryDropdown
-                    value={this.state.phoneCountry}
-                    isSmall={true}
-                    showPrefix={true}
-                    onOptionChange={this.onPhoneCountryChanged}
-                />;
-
-                return <Field
-                    className={classNames(classes)}
-                    name="phoneNumber"
-                    key="phone_input"
-                    type="text"
-                    label={_t("Phone")}
-                    value={this.state.phoneNumber}
-                    prefixComponent={phoneCountry}
-                    onChange={this.onPhoneNumberChanged}
-                    onBlur={this.onPhoneNumberBlur}
-                    disabled={this.props.disableSubmit}
-                    autoFocus={autoFocus}
-                />;
-            }
-        }
-    }
-
-    isLoginEmpty() {
-        switch (this.state.loginType) {
-            case PasswordLogin.LOGIN_FIELD_EMAIL:
-            case PasswordLogin.LOGIN_FIELD_MXID:
-                return !this.state.username;
-            case PasswordLogin.LOGIN_FIELD_PHONE:
-                return !this.state.phoneCountry || !this.state.phoneNumber;
-        }
-    }
-
-    render() {
-        const Field = sdk.getComponent('elements.Field');
-        const SignInToText = sdk.getComponent('views.auth.SignInToText');
-
-        let forgotPasswordJsx;
-
-        if (this.props.onForgotPasswordClick) {
-            forgotPasswordJsx = <span>
-                {_t('Not sure of your password? <a>Set a new one</a>', {}, {
-                    a: sub => (
-                        <AccessibleButton
-                            className="mx_Login_forgot"
-                            disabled={this.props.busy}
-                            kind="link"
-                            onClick={this.onForgotPasswordClick}
-                        >
-                            {sub}
-                        </AccessibleButton>
-                    ),
-                })}
-            </span>;
-        }
-
-        const pwFieldClass = classNames({
-            error: this.props.loginIncorrect && !this.isLoginEmpty(), // only error password if error isn't top field
-        });
-
-        // If login is empty, autoFocus login, otherwise autoFocus password.
-        // this is for when auto server discovery remounts us when the user tries to tab from username to password
-        const autoFocusPassword = !this.isLoginEmpty();
-        const loginField = this.renderLoginField(this.state.loginType, !autoFocusPassword);
-
-        let loginType;
-        if (!SdkConfig.get().disable_3pid_login) {
-            loginType = (
-                <div className="mx_Login_type_container">
-                    <label className="mx_Login_type_label">{ _t('Sign in with') }</label>
-                    <Field
-                        element="select"
-                        value={this.state.loginType}
-                        onChange={this.onLoginTypeChange}
-                        disabled={this.props.disableSubmit}
-                    >
-                        <option
-                            key={PasswordLogin.LOGIN_FIELD_MXID}
-                            value={PasswordLogin.LOGIN_FIELD_MXID}
-                        >
-                            {_t('Username')}
-                        </option>
-                        <option
-                            key={PasswordLogin.LOGIN_FIELD_EMAIL}
-                            value={PasswordLogin.LOGIN_FIELD_EMAIL}
-                        >
-                            {_t('Email address')}
-                        </option>
-                        <option
-                            key={PasswordLogin.LOGIN_FIELD_PHONE}
-                            value={PasswordLogin.LOGIN_FIELD_PHONE}
-                        >
-                            {_t('Phone')}
-                        </option>
-                    </Field>
-                </div>
-            );
-        }
-
-        return (
-            <div>
-                <SignInToText serverConfig={this.props.serverConfig}
-                    onEditServerDetailsClick={this.props.onEditServerDetailsClick} />
-                <form onSubmit={this.onSubmitForm}>
-                    {loginType}
-                    {loginField}
-                    <Field
-                        className={pwFieldClass}
-                        type="password"
-                        name="password"
-                        label={_t('Password')}
-                        value={this.state.password}
-                        onChange={this.onPasswordChanged}
-                        disabled={this.props.disableSubmit}
-                        autoFocus={autoFocusPassword}
-                    />
-                    {forgotPasswordJsx}
-                    { !this.props.busy && <input className="mx_Login_submit"
-                        type="submit"
-                        value={_t('Sign in')}
-                        disabled={this.props.disableSubmit}
-                    /> }
-                </form>
-            </div>
-        );
-    }
-}
diff --git a/src/components/views/auth/PasswordLogin.tsx b/src/components/views/auth/PasswordLogin.tsx
new file mode 100644
index 0000000000..b2a3d62f55
--- /dev/null
+++ b/src/components/views/auth/PasswordLogin.tsx
@@ -0,0 +1,485 @@
+/*
+Copyright 2015, 2016, 2017, 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 classNames from 'classnames';
+
+import { _t } from '../../../languageHandler';
+import SdkConfig from '../../../SdkConfig';
+import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
+import AccessibleButton from "../elements/AccessibleButton";
+import CountlyAnalytics from "../../../CountlyAnalytics";
+import withValidation from "../elements/Validation";
+import * as Email from "../../../email";
+import Field from "../elements/Field";
+import CountryDropdown from "./CountryDropdown";
+
+// For validating phone numbers without country codes
+const PHONE_NUMBER_REGEX = /^[0-9()\-\s]*$/;
+
+interface IProps {
+    username: string; // also used for email address
+    phoneCountry: string;
+    phoneNumber: string;
+
+    serverConfig: ValidatedServerConfig;
+    loginIncorrect?: boolean;
+    disableSubmit?: boolean;
+    busy?: boolean;
+
+    onSubmit(username: string, phoneCountry: void, phoneNumber: void, password: string): void;
+    onSubmit(username: void, phoneCountry: string, phoneNumber: string, password: string): void;
+    onUsernameChanged?(username: string): void;
+    onUsernameBlur?(username: string): void;
+    onPhoneCountryChanged?(phoneCountry: string): void;
+    onPhoneNumberChanged?(phoneNumber: string): void;
+    onForgotPasswordClick?(): void;
+}
+
+interface IState {
+    fieldValid: Partial<Record<LoginField, boolean>>;
+    loginType: LoginField.Email | LoginField.MatrixId | LoginField.Phone,
+    password: "",
+}
+
+enum LoginField {
+    Email = "login_field_email",
+    MatrixId = "login_field_mxid",
+    Phone = "login_field_phone",
+    Password = "login_field_phone",
+}
+
+/*
+ * A pure UI component which displays a username/password form.
+ * The email/username/phone fields are fully-controlled, the password field is not.
+ */
+export default class PasswordLogin extends React.PureComponent<IProps, IState> {
+    static defaultProps = {
+        onUsernameChanged: function() {},
+        onUsernameBlur: function() {},
+        onPhoneCountryChanged: function() {},
+        onPhoneNumberChanged: function() {},
+        loginIncorrect: false,
+        disableSubmit: false,
+    };
+
+    constructor(props) {
+        super(props);
+        this.state = {
+            // Field error codes by field ID
+            fieldValid: {},
+            loginType: LoginField.MatrixId,
+            password: "",
+        };
+    }
+
+    private onForgotPasswordClick = ev => {
+        ev.preventDefault();
+        ev.stopPropagation();
+        this.props.onForgotPasswordClick();
+    };
+
+    private onSubmitForm = async ev => {
+        ev.preventDefault();
+
+        const allFieldsValid = await this.verifyFieldsBeforeSubmit();
+        if (!allFieldsValid) {
+            CountlyAnalytics.instance.track("onboarding_registration_submit_failed");
+            return;
+        }
+
+        let username = ''; // XXX: Synapse breaks if you send null here:
+        let phoneCountry = null;
+        let phoneNumber = null;
+
+        switch (this.state.loginType) {
+            case LoginField.Email:
+            case LoginField.MatrixId:
+                username = this.props.username;
+                break;
+            case LoginField.Phone:
+                phoneCountry = this.props.phoneCountry;
+                phoneNumber = this.props.phoneNumber;
+                break;
+        }
+
+        this.props.onSubmit(username, phoneCountry, phoneNumber, this.state.password);
+    };
+
+    private onUsernameChanged = ev => {
+        this.props.onUsernameChanged(ev.target.value);
+    };
+
+    private onUsernameFocus = () => {
+        if (this.state.loginType === LoginField.MatrixId) {
+            CountlyAnalytics.instance.track("onboarding_login_mxid_focus");
+        } else {
+            CountlyAnalytics.instance.track("onboarding_login_email_focus");
+        }
+    };
+
+    private onUsernameBlur = ev => {
+        if (this.state.loginType === LoginField.MatrixId) {
+            CountlyAnalytics.instance.track("onboarding_login_mxid_blur");
+        } else {
+            CountlyAnalytics.instance.track("onboarding_login_email_blur");
+        }
+        this.props.onUsernameBlur(ev.target.value);
+    };
+
+    private onLoginTypeChange = ev => {
+        const loginType = ev.target.value;
+        this.setState({ loginType });
+        this.props.onUsernameChanged(""); // Reset because email and username use the same state
+        CountlyAnalytics.instance.track("onboarding_login_type_changed", { loginType });
+    };
+
+    private onPhoneCountryChanged = country => {
+        this.props.onPhoneCountryChanged(country.iso2);
+    };
+
+    private onPhoneNumberChanged = ev => {
+        this.props.onPhoneNumberChanged(ev.target.value);
+    };
+
+    private onPhoneNumberFocus = () => {
+        CountlyAnalytics.instance.track("onboarding_login_phone_number_focus");
+    };
+
+    private onPhoneNumberBlur = ev => {
+        CountlyAnalytics.instance.track("onboarding_login_phone_number_blur");
+    };
+
+    private onPasswordChanged = ev => {
+        this.setState({password: ev.target.value});
+    };
+
+    private async verifyFieldsBeforeSubmit() {
+        // Blur the active element if any, so we first run its blur validation,
+        // which is less strict than the pass we're about to do below for all fields.
+        const activeElement = document.activeElement as HTMLElement;
+        if (activeElement) {
+            activeElement.blur();
+        }
+
+        const fieldIDsInDisplayOrder = [
+            this.state.loginType,
+            LoginField.Password,
+        ];
+
+        // Run all fields with stricter validation that no longer allows empty
+        // values for required fields.
+        for (const fieldID of fieldIDsInDisplayOrder) {
+            const field = this[fieldID];
+            if (!field) {
+                continue;
+            }
+            // We must wait for these validations to finish before queueing
+            // up the setState below so our setState goes in the queue after
+            // all the setStates from these validate calls (that's how we
+            // know they've finished).
+            await field.validate({ allowEmpty: false });
+        }
+
+        // Validation and state updates are async, so we need to wait for them to complete
+        // first. Queue a `setState` callback and wait for it to resolve.
+        await new Promise<void>(resolve => this.setState({}, resolve));
+
+        if (this.allFieldsValid()) {
+            return true;
+        }
+
+        const invalidField = this.findFirstInvalidField(fieldIDsInDisplayOrder);
+
+        if (!invalidField) {
+            return true;
+        }
+
+        // Focus the first invalid field and show feedback in the stricter mode
+        // that no longer allows empty values for required fields.
+        invalidField.focus();
+        invalidField.validate({ allowEmpty: false, focused: true });
+        return false;
+    }
+
+    private allFieldsValid() {
+        const keys = Object.keys(this.state.fieldValid);
+        for (let i = 0; i < keys.length; ++i) {
+            if (!this.state.fieldValid[keys[i]]) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private findFirstInvalidField(fieldIDs: LoginField[]) {
+        for (const fieldID of fieldIDs) {
+            if (!this.state.fieldValid[fieldID] && this[fieldID]) {
+                return this[fieldID];
+            }
+        }
+        return null;
+    }
+
+    private markFieldValid(fieldID: LoginField, valid: boolean) {
+        const { fieldValid } = this.state;
+        fieldValid[fieldID] = valid;
+        this.setState({
+            fieldValid,
+        });
+    }
+
+    private validateUsernameRules = withValidation({
+        rules: [
+            {
+                key: "required",
+                test({ value, allowEmpty }) {
+                    return allowEmpty || !!value;
+                },
+                invalid: () => _t("Enter username"),
+            },
+        ],
+    });
+
+    private onUsernameValidate = async (fieldState) => {
+        const result = await this.validateUsernameRules(fieldState);
+        this.markFieldValid(LoginField.MatrixId, result.valid);
+        return result;
+    };
+
+    private validateEmailRules = withValidation({
+        rules: [
+            {
+                key: "required",
+                test({ value, allowEmpty }) {
+                    return allowEmpty || !!value;
+                },
+                invalid: () => _t("Enter email address"),
+            }, {
+                key: "email",
+                test: ({ value }) => !value || Email.looksValid(value),
+                invalid: () => _t("Doesn't look like a valid email address"),
+            },
+        ],
+    });
+
+    private onEmailValidate = async (fieldState) => {
+        const result = await this.validateEmailRules(fieldState);
+        this.markFieldValid(LoginField.Email, result.valid);
+        return result;
+    };
+
+    private validatePhoneNumberRules = withValidation({
+        rules: [
+            {
+                key: "required",
+                test({ value, allowEmpty }) {
+                    return allowEmpty || !!value;
+                },
+                invalid: () => _t("Enter phone number"),
+            }, {
+                key: "number",
+                test: ({ value }) => !value || PHONE_NUMBER_REGEX.test(value),
+                invalid: () => _t("That phone number doesn't look quite right, please check and try again"),
+            },
+        ],
+    });
+
+    private onPhoneNumberValidate = async (fieldState) => {
+        const result = await this.validatePhoneNumberRules(fieldState);
+        this.markFieldValid(LoginField.Password, result.valid);
+        return result;
+    };
+
+    private validatePasswordRules = withValidation({
+        rules: [
+            {
+                key: "required",
+                test({ value, allowEmpty }) {
+                    return allowEmpty || !!value;
+                },
+                invalid: () => _t("Enter password"),
+            },
+        ],
+    });
+
+    private onPasswordValidate = async (fieldState) => {
+        const result = await this.validatePasswordRules(fieldState);
+        this.markFieldValid(LoginField.Password, result.valid);
+        return result;
+    }
+
+    private renderLoginField(loginType: IState["loginType"], autoFocus: boolean) {
+        const classes = {
+            error: false,
+        };
+
+        switch (loginType) {
+            case LoginField.Email:
+                classes.error = this.props.loginIncorrect && !this.props.username;
+                return <Field
+                    className={classNames(classes)}
+                    name="username" // make it a little easier for browser's remember-password
+                    key="email_input"
+                    type="text"
+                    label={_t("Email")}
+                    placeholder="joe@example.com"
+                    value={this.props.username}
+                    onChange={this.onUsernameChanged}
+                    onFocus={this.onUsernameFocus}
+                    onBlur={this.onUsernameBlur}
+                    disabled={this.props.disableSubmit}
+                    autoFocus={autoFocus}
+                    onValidate={this.onEmailValidate}
+                    ref={field => this[LoginField.Email] = field}
+                />;
+            case LoginField.MatrixId:
+                classes.error = this.props.loginIncorrect && !this.props.username;
+                return <Field
+                    className={classNames(classes)}
+                    name="username" // make it a little easier for browser's remember-password
+                    key="username_input"
+                    type="text"
+                    label={_t("Username")}
+                    placeholder={_t("Username").toLocaleLowerCase()}
+                    value={this.props.username}
+                    onChange={this.onUsernameChanged}
+                    onFocus={this.onUsernameFocus}
+                    onBlur={this.onUsernameBlur}
+                    disabled={this.props.disableSubmit}
+                    autoFocus={autoFocus}
+                    onValidate={this.onUsernameValidate}
+                    ref={field => this[LoginField.MatrixId] = field}
+                />;
+            case LoginField.Phone: {
+                classes.error = this.props.loginIncorrect && !this.props.phoneNumber;
+
+                const phoneCountry = <CountryDropdown
+                    value={this.props.phoneCountry}
+                    isSmall={true}
+                    showPrefix={true}
+                    onOptionChange={this.onPhoneCountryChanged}
+                />;
+
+                return <Field
+                    className={classNames(classes)}
+                    name="phoneNumber"
+                    key="phone_input"
+                    type="text"
+                    label={_t("Phone")}
+                    value={this.props.phoneNumber}
+                    prefixComponent={phoneCountry}
+                    onChange={this.onPhoneNumberChanged}
+                    onFocus={this.onPhoneNumberFocus}
+                    onBlur={this.onPhoneNumberBlur}
+                    disabled={this.props.disableSubmit}
+                    autoFocus={autoFocus}
+                    onValidate={this.onPhoneNumberValidate}
+                    ref={field => this[LoginField.Password] = field}
+                />;
+            }
+        }
+    }
+
+    private isLoginEmpty() {
+        switch (this.state.loginType) {
+            case LoginField.Email:
+            case LoginField.MatrixId:
+                return !this.props.username;
+            case LoginField.Phone:
+                return !this.props.phoneCountry || !this.props.phoneNumber;
+        }
+    }
+
+    render() {
+        let forgotPasswordJsx;
+
+        if (this.props.onForgotPasswordClick) {
+            forgotPasswordJsx = <AccessibleButton
+                className="mx_Login_forgot"
+                disabled={this.props.busy}
+                kind="link"
+                onClick={this.onForgotPasswordClick}
+            >
+                {_t("Forgot password?")}
+            </AccessibleButton>;
+        }
+
+        const pwFieldClass = classNames({
+            error: this.props.loginIncorrect && !this.isLoginEmpty(), // only error password if error isn't top field
+        });
+
+        // If login is empty, autoFocus login, otherwise autoFocus password.
+        // this is for when auto server discovery remounts us when the user tries to tab from username to password
+        const autoFocusPassword = !this.isLoginEmpty();
+        const loginField = this.renderLoginField(this.state.loginType, !autoFocusPassword);
+
+        let loginType;
+        if (!SdkConfig.get().disable_3pid_login) {
+            loginType = (
+                <div className="mx_Login_type_container">
+                    <label className="mx_Login_type_label">{ _t('Sign in with') }</label>
+                    <Field
+                        element="select"
+                        value={this.state.loginType}
+                        onChange={this.onLoginTypeChange}
+                        disabled={this.props.disableSubmit}
+                    >
+                        <option key={LoginField.MatrixId} value={LoginField.MatrixId}>
+                            {_t('Username')}
+                        </option>
+                        <option
+                            key={LoginField.Email}
+                            value={LoginField.Email}
+                        >
+                            {_t('Email address')}
+                        </option>
+                        <option key={LoginField.Password} value={LoginField.Password}>
+                            {_t('Phone')}
+                        </option>
+                    </Field>
+                </div>
+            );
+        }
+
+        return (
+            <div>
+                <form onSubmit={this.onSubmitForm}>
+                    {loginType}
+                    {loginField}
+                    <Field
+                        className={pwFieldClass}
+                        type="password"
+                        name="password"
+                        label={_t('Password')}
+                        value={this.state.password}
+                        onChange={this.onPasswordChanged}
+                        disabled={this.props.disableSubmit}
+                        autoFocus={autoFocusPassword}
+                        onValidate={this.onPasswordValidate}
+                        ref={field => this[LoginField.Password] = field}
+                    />
+                    {forgotPasswordJsx}
+                    { !this.props.busy && <input className="mx_Login_submit"
+                        type="submit"
+                        value={_t('Sign in')}
+                        disabled={this.props.disableSubmit}
+                    /> }
+                </form>
+            </div>
+        );
+    }
+}
diff --git a/src/components/views/auth/RegistrationForm.js b/src/components/views/auth/RegistrationForm.tsx
similarity index 60%
rename from src/components/views/auth/RegistrationForm.js
rename to src/components/views/auth/RegistrationForm.tsx
index c07486d3bd..e42ed88f99 100644
--- a/src/components/views/auth/RegistrationForm.js
+++ b/src/components/views/auth/RegistrationForm.tsx
@@ -1,8 +1,6 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 Vector Creations Ltd
-Copyright 2018, 2019 New Vector Ltd
 Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
+Copyright 2015, 2016, 2017, 2018, 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.
@@ -18,7 +16,7 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
+
 import * as sdk from '../../../index';
 import * as Email from '../../../email';
 import { looksValid as phoneNumberLooksValid } from '../../../phonenumber';
@@ -29,34 +27,60 @@ import { SAFE_LOCALPART_REGEX } from '../../../Registration';
 import withValidation from '../elements/Validation';
 import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
 import PassphraseField from "./PassphraseField";
+import CountlyAnalytics from "../../../CountlyAnalytics";
+import Field from '../elements/Field';
+import RegistrationEmailPromptDialog from '../dialogs/RegistrationEmailPromptDialog';
 
-const FIELD_EMAIL = 'field_email';
-const FIELD_PHONE_NUMBER = 'field_phone_number';
-const FIELD_USERNAME = 'field_username';
-const FIELD_PASSWORD = 'field_password';
-const FIELD_PASSWORD_CONFIRM = 'field_password_confirm';
+enum RegistrationField {
+    Email = "field_email",
+    PhoneNumber = "field_phone_number",
+    Username = "field_username",
+    Password = "field_password",
+    PasswordConfirm = "field_password_confirm",
+}
 
 const PASSWORD_MIN_SCORE = 3; // safely unguessable: moderate protection from offline slow-hash scenario.
 
+interface IProps {
+    // Values pre-filled in the input boxes when the component loads
+    defaultEmail?: string;
+    defaultPhoneCountry?: string;
+    defaultPhoneNumber?: string;
+    defaultUsername?: string;
+    defaultPassword?: string;
+    flows: {
+        stages: string[];
+    }[];
+    serverConfig: ValidatedServerConfig;
+    canSubmit?: boolean;
+
+    onRegisterClick(params: {
+        username: string;
+        password: string;
+        email?: string;
+        phoneCountry?: string;
+        phoneNumber?: string;
+    }): Promise<void>;
+    onEditServerDetailsClick?(): void;
+}
+
+interface IState {
+    // Field error codes by field ID
+    fieldValid: Partial<Record<RegistrationField, boolean>>;
+    // The ISO2 country code selected in the phone number entry
+    phoneCountry: string;
+    username: string;
+    email: string;
+    phoneNumber: string;
+    password: string;
+    passwordConfirm: string;
+    passwordComplexity?: number;
+}
+
 /*
  * A pure UI component which displays a registration form.
  */
-export default class RegistrationForm extends React.Component {
-    static propTypes = {
-        // Values pre-filled in the input boxes when the component loads
-        defaultEmail: PropTypes.string,
-        defaultPhoneCountry: PropTypes.string,
-        defaultPhoneNumber: PropTypes.string,
-        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,
-        serverRequiresIdServer: PropTypes.bool,
-    };
-
+export default class RegistrationForm extends React.PureComponent<IProps, IState> {
     static defaultProps = {
         onValidationChange: console.error,
         canSubmit: true,
@@ -66,9 +90,7 @@ export default class RegistrationForm extends React.Component {
         super(props);
 
         this.state = {
-            // Field error codes by field ID
             fieldValid: {},
-            // The ISO2 country code selected in the phone number entry
             phoneCountry: this.props.defaultPhoneCountry,
             username: this.props.defaultUsername || "",
             email: this.props.defaultEmail || "",
@@ -77,57 +99,53 @@ export default class RegistrationForm extends React.Component {
             passwordConfirm: this.props.defaultPassword || "",
             passwordComplexity: null,
         };
+
+        CountlyAnalytics.instance.track("onboarding_registration_begin");
     }
 
-    onSubmit = async ev => {
+    private onSubmit = async ev => {
         ev.preventDefault();
+        ev.persist();
 
         if (!this.props.canSubmit) return;
 
         const allFieldsValid = await this.verifyFieldsBeforeSubmit();
         if (!allFieldsValid) {
+            CountlyAnalytics.instance.track("onboarding_registration_submit_failed");
             return;
         }
 
-        const self = this;
         if (this.state.email === '') {
-            const haveIs = Boolean(this.props.serverConfig.isUrl);
-
-            let desc;
-            if (this.props.serverRequiresIdServer && !haveIs) {
-                desc = _t(
-                    "No identity server is configured so you cannot add an email address in order to " +
-                    "reset your password in the future.",
-                );
-            } else if (this._showEmail()) {
-                desc = _t(
-                    "If you don't specify an email address, you won't be able to reset your password. " +
-                    "Are you sure?",
-                );
+            if (this.showEmail()) {
+                CountlyAnalytics.instance.track("onboarding_registration_submit_warn");
+                Modal.createTrackedDialog("Email prompt dialog", '', RegistrationEmailPromptDialog, {
+                    onFinished: async (confirmed: boolean, email?: string) => {
+                        if (confirmed) {
+                            this.setState({
+                                email,
+                            }, () => {
+                                this.doSubmit(ev);
+                            });
+                        }
+                    },
+                });
             } else {
                 // user can't set an e-mail so don't prompt them to
-                self._doSubmit(ev);
+                this.doSubmit(ev);
                 return;
             }
-
-            const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-            Modal.createTrackedDialog('If you don\'t specify an email address...', '', QuestionDialog, {
-                title: _t("Warning!"),
-                description: desc,
-                button: _t("Continue"),
-                onFinished(confirmed) {
-                    if (confirmed) {
-                        self._doSubmit(ev);
-                    }
-                },
-            });
         } else {
-            self._doSubmit(ev);
+            this.doSubmit(ev);
         }
     };
 
-    _doSubmit(ev) {
+    private doSubmit(ev) {
         const email = this.state.email.trim();
+
+        CountlyAnalytics.instance.track("onboarding_registration_submit_ok", {
+            email: !!email,
+        });
+
         const promise = this.props.onRegisterClick({
             username: this.state.username.trim(),
             password: this.state.password.trim(),
@@ -144,20 +162,20 @@ export default class RegistrationForm extends React.Component {
         }
     }
 
-    async verifyFieldsBeforeSubmit() {
+    private async verifyFieldsBeforeSubmit() {
         // Blur the active element if any, so we first run its blur validation,
         // which is less strict than the pass we're about to do below for all fields.
-        const activeElement = document.activeElement;
+        const activeElement = document.activeElement as HTMLElement;
         if (activeElement) {
             activeElement.blur();
         }
 
         const fieldIDsInDisplayOrder = [
-            FIELD_USERNAME,
-            FIELD_PASSWORD,
-            FIELD_PASSWORD_CONFIRM,
-            FIELD_EMAIL,
-            FIELD_PHONE_NUMBER,
+            RegistrationField.Username,
+            RegistrationField.Password,
+            RegistrationField.PasswordConfirm,
+            RegistrationField.Email,
+            RegistrationField.PhoneNumber,
         ];
 
         // Run all fields with stricter validation that no longer allows empty
@@ -176,7 +194,7 @@ export default class RegistrationForm extends React.Component {
 
         // Validation and state updates are async, so we need to wait for them to complete
         // first. Queue a `setState` callback and wait for it to resolve.
-        await new Promise(resolve => this.setState({}, resolve));
+        await new Promise<void>(resolve => this.setState({}, resolve));
 
         if (this.allFieldsValid()) {
             return true;
@@ -198,7 +216,7 @@ export default class RegistrationForm extends React.Component {
     /**
      * @returns {boolean} true if all fields were valid last time they were validated.
      */
-    allFieldsValid() {
+    private allFieldsValid() {
         const keys = Object.keys(this.state.fieldValid);
         for (let i = 0; i < keys.length; ++i) {
             if (!this.state.fieldValid[keys[i]]) {
@@ -208,7 +226,7 @@ export default class RegistrationForm extends React.Component {
         return true;
     }
 
-    findFirstInvalidField(fieldIDs) {
+    private findFirstInvalidField(fieldIDs: RegistrationField[]) {
         for (const fieldID of fieldIDs) {
             if (!this.state.fieldValid[fieldID] && this[fieldID]) {
                 return this[fieldID];
@@ -217,7 +235,7 @@ export default class RegistrationForm extends React.Component {
         return null;
     }
 
-    markFieldValid(fieldID, valid) {
+    private markFieldValid(fieldID: RegistrationField, valid: boolean) {
         const { fieldValid } = this.state;
         fieldValid[fieldID] = valid;
         this.setState({
@@ -225,25 +243,26 @@ export default class RegistrationForm extends React.Component {
         });
     }
 
-    onEmailChange = ev => {
+    private onEmailChange = ev => {
         this.setState({
             email: ev.target.value,
         });
     };
 
-    onEmailValidate = async fieldState => {
+    private onEmailValidate = async fieldState => {
         const result = await this.validateEmailRules(fieldState);
-        this.markFieldValid(FIELD_EMAIL, result.valid);
+        this.markFieldValid(RegistrationField.Email, result.valid);
         return result;
     };
 
-    validateEmailRules = withValidation({
+    private validateEmailRules = withValidation({
         description: () => _t("Use an email address to recover your account"),
+        hideDescriptionIfValid: true,
         rules: [
             {
                 key: "required",
-                test({ value, allowEmpty }) {
-                    return allowEmpty || !this._authStepIsRequired('m.login.email.identity') || !!value;
+                test(this: RegistrationForm, { value, allowEmpty }) {
+                    return allowEmpty || !this.authStepIsRequired('m.login.email.identity') || !!value;
                 },
                 invalid: () => _t("Enter email address (required on this homeserver)"),
             },
@@ -255,29 +274,29 @@ export default class RegistrationForm extends React.Component {
         ],
     });
 
-    onPasswordChange = ev => {
+    private onPasswordChange = ev => {
         this.setState({
             password: ev.target.value,
         });
     };
 
-    onPasswordValidate = result => {
-        this.markFieldValid(FIELD_PASSWORD, result.valid);
+    private onPasswordValidate = result => {
+        this.markFieldValid(RegistrationField.Password, result.valid);
     };
 
-    onPasswordConfirmChange = ev => {
+    private onPasswordConfirmChange = ev => {
         this.setState({
             passwordConfirm: ev.target.value,
         });
     };
 
-    onPasswordConfirmValidate = async fieldState => {
+    private onPasswordConfirmValidate = async fieldState => {
         const result = await this.validatePasswordConfirmRules(fieldState);
-        this.markFieldValid(FIELD_PASSWORD_CONFIRM, result.valid);
+        this.markFieldValid(RegistrationField.PasswordConfirm, result.valid);
         return result;
     };
 
-    validatePasswordConfirmRules = withValidation({
+    private validatePasswordConfirmRules = withValidation({
         rules: [
             {
                 key: "required",
@@ -286,65 +305,66 @@ export default class RegistrationForm extends React.Component {
             },
             {
                 key: "match",
-                test({ value }) {
+                test(this: RegistrationForm, { value }) {
                     return !value || value === this.state.password;
                 },
                 invalid: () => _t("Passwords don't match"),
             },
-         ],
+        ],
     });
 
-    onPhoneCountryChange = newVal => {
+    private onPhoneCountryChange = newVal => {
         this.setState({
             phoneCountry: newVal.iso2,
-            phonePrefix: newVal.prefix,
         });
     };
 
-    onPhoneNumberChange = ev => {
+    private onPhoneNumberChange = ev => {
         this.setState({
             phoneNumber: ev.target.value,
         });
     };
 
-    onPhoneNumberValidate = async fieldState => {
+    private onPhoneNumberValidate = async fieldState => {
         const result = await this.validatePhoneNumberRules(fieldState);
-        this.markFieldValid(FIELD_PHONE_NUMBER, result.valid);
+        this.markFieldValid(RegistrationField.PhoneNumber, result.valid);
         return result;
     };
 
-    validatePhoneNumberRules = withValidation({
+    private validatePhoneNumberRules = withValidation({
         description: () => _t("Other users can invite you to rooms using your contact details"),
+        hideDescriptionIfValid: true,
         rules: [
             {
                 key: "required",
-                test({ value, allowEmpty }) {
-                    return allowEmpty || !this._authStepIsRequired('m.login.msisdn') || !!value;
+                test(this: RegistrationForm, { value, allowEmpty }) {
+                    return allowEmpty || !this.authStepIsRequired('m.login.msisdn') || !!value;
                 },
                 invalid: () => _t("Enter phone number (required on this homeserver)"),
             },
             {
                 key: "email",
                 test: ({ value }) => !value || phoneNumberLooksValid(value),
-                invalid: () => _t("Doesn't look like a valid phone number"),
+                invalid: () => _t("That phone number doesn't look quite right, please check and try again"),
             },
         ],
     });
 
-    onUsernameChange = ev => {
+    private onUsernameChange = ev => {
         this.setState({
             username: ev.target.value,
         });
     };
 
-    onUsernameValidate = async fieldState => {
+    private onUsernameValidate = async fieldState => {
         const result = await this.validateUsernameRules(fieldState);
-        this.markFieldValid(FIELD_USERNAME, result.valid);
+        this.markFieldValid(RegistrationField.Username, result.valid);
         return result;
     };
 
-    validateUsernameRules = withValidation({
+    private validateUsernameRules = withValidation({
         description: () => _t("Use lowercase letters, numbers, dashes and underscores only"),
+        hideDescriptionIfValid: true,
         rules: [
             {
                 key: "required",
@@ -365,7 +385,7 @@ export default class RegistrationForm extends React.Component {
      * @param {string} step A stage name to check
      * @returns {boolean} Whether it is required
      */
-    _authStepIsRequired(step) {
+    private authStepIsRequired(step: string) {
         return this.props.flows.every((flow) => {
             return flow.stages.includes(step);
         });
@@ -377,86 +397,80 @@ export default class RegistrationForm extends React.Component {
      * @param {string} step A stage name to check
      * @returns {boolean} Whether it is used
      */
-    _authStepIsUsed(step) {
+    private authStepIsUsed(step: string) {
         return this.props.flows.some((flow) => {
             return flow.stages.includes(step);
         });
     }
 
-    _showEmail() {
-        const haveIs = Boolean(this.props.serverConfig.isUrl);
-        if (
-            (this.props.serverRequiresIdServer && !haveIs) ||
-            !this._authStepIsUsed('m.login.email.identity')
-        ) {
+    private showEmail() {
+        if (!this.authStepIsUsed('m.login.email.identity')) {
             return false;
         }
         return true;
     }
 
-    _showPhoneNumber() {
+    private showPhoneNumber() {
         const threePidLogin = !SdkConfig.get().disable_3pid_login;
-        const haveIs = Boolean(this.props.serverConfig.isUrl);
-        if (
-            !threePidLogin ||
-            (this.props.serverRequiresIdServer && !haveIs) ||
-            !this._authStepIsUsed('m.login.msisdn')
-        ) {
+        if (!threePidLogin || !this.authStepIsUsed('m.login.msisdn')) {
             return false;
         }
         return true;
     }
 
-    renderEmail() {
-        if (!this._showEmail()) {
+    private renderEmail() {
+        if (!this.showEmail()) {
             return null;
         }
-        const Field = sdk.getComponent('elements.Field');
-        const emailPlaceholder = this._authStepIsRequired('m.login.email.identity') ?
+        const emailPlaceholder = this.authStepIsRequired('m.login.email.identity') ?
             _t("Email") :
             _t("Email (optional)");
         return <Field
-            ref={field => this[FIELD_EMAIL] = field}
+            ref={field => this[RegistrationField.Email] = field}
             type="text"
             label={emailPlaceholder}
             value={this.state.email}
             onChange={this.onEmailChange}
             onValidate={this.onEmailValidate}
+            onFocus={() => CountlyAnalytics.instance.track("onboarding_registration_email_focus")}
+            onBlur={() => CountlyAnalytics.instance.track("onboarding_registration_email_blur")}
         />;
     }
 
-    renderPassword() {
+    private renderPassword() {
         return <PassphraseField
             id="mx_RegistrationForm_password"
-            fieldRef={field => this[FIELD_PASSWORD] = field}
+            fieldRef={field => this[RegistrationField.Password] = field}
             minScore={PASSWORD_MIN_SCORE}
             value={this.state.password}
             onChange={this.onPasswordChange}
             onValidate={this.onPasswordValidate}
+            onFocus={() => CountlyAnalytics.instance.track("onboarding_registration_password_focus")}
+            onBlur={() => CountlyAnalytics.instance.track("onboarding_registration_password_blur")}
         />;
     }
 
     renderPasswordConfirm() {
-        const Field = sdk.getComponent('elements.Field');
         return <Field
             id="mx_RegistrationForm_passwordConfirm"
-            ref={field => this[FIELD_PASSWORD_CONFIRM] = field}
+            ref={field => this[RegistrationField.PasswordConfirm] = field}
             type="password"
             autoComplete="new-password"
-            label={_t("Confirm")}
+            label={_t("Confirm password")}
             value={this.state.passwordConfirm}
             onChange={this.onPasswordConfirmChange}
             onValidate={this.onPasswordConfirmValidate}
+            onFocus={() => CountlyAnalytics.instance.track("onboarding_registration_passwordConfirm_focus")}
+            onBlur={() => CountlyAnalytics.instance.track("onboarding_registration_passwordConfirm_blur")}
         />;
     }
 
     renderPhoneNumber() {
-        if (!this._showPhoneNumber()) {
+        if (!this.showPhoneNumber()) {
             return null;
         }
         const CountryDropdown = sdk.getComponent('views.auth.CountryDropdown');
-        const Field = sdk.getComponent('elements.Field');
-        const phoneLabel = this._authStepIsRequired('m.login.msisdn') ?
+        const phoneLabel = this.authStepIsRequired('m.login.msisdn') ?
             _t("Phone") :
             _t("Phone (optional)");
         const phoneCountry = <CountryDropdown
@@ -466,7 +480,7 @@ export default class RegistrationForm extends React.Component {
             onOptionChange={this.onPhoneCountryChange}
         />;
         return <Field
-            ref={field => this[FIELD_PHONE_NUMBER] = field}
+            ref={field => this[RegistrationField.PhoneNumber] = field}
             type="text"
             label={phoneLabel}
             value={this.state.phoneNumber}
@@ -477,86 +491,49 @@ export default class RegistrationForm extends React.Component {
     }
 
     renderUsername() {
-        const Field = sdk.getComponent('elements.Field');
         return <Field
             id="mx_RegistrationForm_username"
-            ref={field => this[FIELD_USERNAME] = field}
+            ref={field => this[RegistrationField.Username] = field}
             type="text"
             autoFocus={true}
             label={_t("Username")}
+            placeholder={_t("Username").toLocaleLowerCase()}
             value={this.state.username}
             onChange={this.onUsernameChange}
             onValidate={this.onUsernameValidate}
+            onFocus={() => CountlyAnalytics.instance.track("onboarding_registration_username_focus")}
+            onBlur={() => CountlyAnalytics.instance.track("onboarding_registration_username_blur")}
         />;
     }
 
     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} />
         );
 
         let emailHelperText = null;
-        if (this._showEmail()) {
-            if (this._showPhoneNumber()) {
+        if (this.showEmail()) {
+            if (this.showPhoneNumber()) {
                 emailHelperText = <div>
-                    {_t(
-                        "Set an email for account recovery. " +
-                        "Use email or phone to optionally be discoverable by existing contacts.",
-                    )}
+                    {
+                        _t("Add an email to be able to reset your password.")
+                    } {
+                        _t("Use email or phone to optionally be discoverable by existing contacts.")
+                    }
                 </div>;
             } else {
                 emailHelperText = <div>
-                    {_t(
-                        "Set an email for account recovery. " +
-                        "Use email to optionally be discoverable by existing contacts.",
-                    )}
+                    {
+                        _t("Add an email to be able to reset your password.")
+                    } {
+                        _t("Use email to optionally be discoverable by existing contacts.")
+                    }
                 </div>;
             }
         }
-        const haveIs = Boolean(this.props.serverConfig.isUrl);
-        let noIsText = null;
-        if (this.props.serverRequiresIdServer && !haveIs) {
-            noIsText = <div>
-                {_t(
-                    "No identity server is configured so you cannot add an email address in order to " +
-                    "reset your password in the future.",
-                )}
-            </div>;
-        }
 
         return (
             <div>
-                <h3>
-                    {yourMatrixAccountText}
-                    {editLink}
-                </h3>
                 <form onSubmit={this.onSubmit}>
                     <div className="mx_AuthBody_fieldRow">
                         {this.renderUsername()}
@@ -570,7 +547,6 @@ export default class RegistrationForm extends React.Component {
                         {this.renderPhoneNumber()}
                     </div>
                     { emailHelperText }
-                    { noIsText }
                     { registerButton }
                 </form>
             </div>
diff --git a/src/components/views/auth/ServerConfig.js b/src/components/views/auth/ServerConfig.js
deleted file mode 100644
index ee6f57a521..0000000000
--- a/src/components/views/auth/ServerConfig.js
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2019 New Vector 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 from 'react';
-import PropTypes from 'prop-types';
-import Modal from '../../../Modal';
-import * as sdk from '../../../index';
-import { _t } from '../../../languageHandler';
-import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
-import AutoDiscoveryUtils from "../../../utils/AutoDiscoveryUtils";
-import SdkConfig from "../../../SdkConfig";
-import { createClient } from 'matrix-js-sdk/src/matrix';
-import classNames from 'classnames';
-
-/*
- * A pure UI component which displays the HS and IS to use.
- */
-
-export default class ServerConfig extends React.PureComponent {
-    static propTypes = {
-        onServerConfigChange: PropTypes.func.isRequired,
-
-        // The current configuration that the user is expecting to change.
-        serverConfig: PropTypes.instanceOf(ValidatedServerConfig).isRequired,
-
-        delayTimeMs: PropTypes.number, // time to wait before invoking onChanged
-
-        // Called after the component calls onServerConfigChange
-        onAfterSubmit: PropTypes.func,
-
-        // Optional text for the submit button. If falsey, no button will be shown.
-        submitText: PropTypes.string,
-
-        // Optional class for the submit button. Only applies if the submit button
-        // is to be rendered.
-        submitClass: PropTypes.string,
-
-        // Whether the flow this component is embedded in requires an identity
-        // server when the homeserver says it will need one. Default false.
-        showIdentityServerIfRequiredByHomeserver: PropTypes.bool,
-    };
-
-    static defaultProps = {
-        onServerConfigChange: function() {},
-        delayTimeMs: 0,
-    };
-
-    constructor(props) {
-        super(props);
-
-        this.state = {
-            busy: false,
-            errorText: "",
-            hsUrl: props.serverConfig.hsUrl,
-            isUrl: props.serverConfig.isUrl,
-            showIdentityServer: false,
-        };
-    }
-
-    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    UNSAFE_componentWillReceiveProps(newProps) { // eslint-disable-line camelcase
-        if (newProps.serverConfig.hsUrl === this.state.hsUrl &&
-            newProps.serverConfig.isUrl === this.state.isUrl) return;
-
-        this.validateAndApplyServer(newProps.serverConfig.hsUrl, newProps.serverConfig.isUrl);
-    }
-
-    async validateServer() {
-        // TODO: Do we want to support .well-known lookups here?
-        // If for some reason someone enters "matrix.org" for a URL, we could do a lookup to
-        // find their homeserver without demanding they use "https://matrix.org"
-        const result = this.validateAndApplyServer(this.state.hsUrl, this.state.isUrl);
-        if (!result) {
-            return result;
-        }
-
-        // If the UI flow this component is embedded in requires an identity
-        // server when the homeserver says it will need one, check first and
-        // reveal this field if not already shown.
-        // XXX: This a backward compatibility path for homeservers that require
-        // an identity server to be passed during certain flows.
-        // See also https://github.com/matrix-org/synapse/pull/5868.
-        if (
-            this.props.showIdentityServerIfRequiredByHomeserver &&
-            !this.state.showIdentityServer &&
-            await this.isIdentityServerRequiredByHomeserver()
-        ) {
-            this.setState({
-                showIdentityServer: true,
-            });
-            return null;
-        }
-
-        return result;
-    }
-
-    async validateAndApplyServer(hsUrl, isUrl) {
-        // Always try and use the defaults first
-        const defaultConfig: ValidatedServerConfig = SdkConfig.get()["validated_server_config"];
-        if (defaultConfig.hsUrl === hsUrl && defaultConfig.isUrl === isUrl) {
-            this.setState({
-                hsUrl: defaultConfig.hsUrl,
-                isUrl: defaultConfig.isUrl,
-                busy: false,
-                errorText: "",
-            });
-            this.props.onServerConfigChange(defaultConfig);
-            return defaultConfig;
-        }
-
-        this.setState({
-            hsUrl,
-            isUrl,
-            busy: true,
-            errorText: "",
-        });
-
-        try {
-            const result = await AutoDiscoveryUtils.validateServerConfigWithStaticUrls(hsUrl, isUrl);
-            this.setState({busy: false, errorText: ""});
-            this.props.onServerConfigChange(result);
-            return result;
-        } catch (e) {
-            console.error(e);
-
-            const stateForError = AutoDiscoveryUtils.authComponentStateForError(e);
-            if (!stateForError.isFatalError) {
-                this.setState({
-                    busy: false,
-                });
-                // carry on anyway
-                const result = await AutoDiscoveryUtils.validateServerConfigWithStaticUrls(hsUrl, isUrl, true);
-                this.props.onServerConfigChange(result);
-                return result;
-            } else {
-                let message = _t("Unable to validate homeserver/identity server");
-                if (e.translatedMessage) {
-                    message = e.translatedMessage;
-                }
-                this.setState({
-                    busy: false,
-                    errorText: message,
-                });
-
-                return null;
-            }
-        }
-    }
-
-    async isIdentityServerRequiredByHomeserver() {
-        // XXX: We shouldn't have to create a whole new MatrixClient just to
-        // check if the homeserver requires an identity server... Should it be
-        // extracted to a static utils function...?
-        return createClient({
-            baseUrl: this.state.hsUrl,
-        }).doesServerRequireIdServerParam();
-    }
-
-    onHomeserverBlur = (ev) => {
-        this._hsTimeoutId = this._waitThenInvoke(this._hsTimeoutId, () => {
-            this.validateServer();
-        });
-    };
-
-    onHomeserverChange = (ev) => {
-        const hsUrl = ev.target.value;
-        this.setState({ hsUrl });
-    };
-
-    onIdentityServerBlur = (ev) => {
-        this._isTimeoutId = this._waitThenInvoke(this._isTimeoutId, () => {
-            this.validateServer();
-        });
-    };
-
-    onIdentityServerChange = (ev) => {
-        const isUrl = ev.target.value;
-        this.setState({ isUrl });
-    };
-
-    onSubmit = async (ev) => {
-        ev.preventDefault();
-        ev.stopPropagation();
-        const result = await this.validateServer();
-        if (!result) return; // Do not continue.
-
-        if (this.props.onAfterSubmit) {
-            this.props.onAfterSubmit();
-        }
-    };
-
-    _waitThenInvoke(existingTimeoutId, fn) {
-        if (existingTimeoutId) {
-            clearTimeout(existingTimeoutId);
-        }
-        return setTimeout(fn.bind(this), this.props.delayTimeMs);
-    }
-
-    showHelpPopup = () => {
-        const CustomServerDialog = sdk.getComponent('auth.CustomServerDialog');
-        Modal.createTrackedDialog('Custom Server Dialog', '', CustomServerDialog);
-    };
-
-    _renderHomeserverSection() {
-        const Field = sdk.getComponent('elements.Field');
-        return <div>
-            {_t("Enter your custom homeserver URL <a>What does this mean?</a>", {}, {
-                a: sub => <a className="mx_ServerConfig_help" href="#" onClick={this.showHelpPopup}>
-                    {sub}
-                </a>,
-            })}
-            <Field
-                id="mx_ServerConfig_hsUrl"
-                label={_t("Homeserver URL")}
-                placeholder={this.props.serverConfig.hsUrl}
-                value={this.state.hsUrl}
-                onBlur={this.onHomeserverBlur}
-                onChange={this.onHomeserverChange}
-                disabled={this.state.busy}
-            />
-        </div>;
-    }
-
-    _renderIdentityServerSection() {
-        const Field = sdk.getComponent('elements.Field');
-        const classes = classNames({
-            "mx_ServerConfig_identityServer": true,
-            "mx_ServerConfig_identityServer_shown": this.state.showIdentityServer,
-        });
-        return <div className={classes}>
-            {_t("Enter your custom identity server URL <a>What does this mean?</a>", {}, {
-                a: sub => <a className="mx_ServerConfig_help" href="#" onClick={this.showHelpPopup}>
-                    {sub}
-            </a>,
-            })}
-            <Field
-                label={_t("Identity Server URL")}
-                placeholder={this.props.serverConfig.isUrl}
-                value={this.state.isUrl || ''}
-                onBlur={this.onIdentityServerBlur}
-                onChange={this.onIdentityServerChange}
-                disabled={this.state.busy}
-            />
-        </div>;
-    }
-
-    render() {
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-
-        const errorText = this.state.errorText
-            ? <span className='mx_ServerConfig_error'>{this.state.errorText}</span>
-            : null;
-
-        const submitButton = this.props.submitText
-            ? <AccessibleButton
-                  element="button"
-                  type="submit"
-                  className={this.props.submitClass}
-                  onClick={this.onSubmit}
-                  disabled={this.state.busy}>{this.props.submitText}</AccessibleButton>
-            : null;
-
-        return (
-            <form className="mx_ServerConfig" onSubmit={this.onSubmit} autoComplete="off">
-                <h3>{_t("Other servers")}</h3>
-                {errorText}
-                {this._renderHomeserverSection()}
-                {this._renderIdentityServerSection()}
-                {submitButton}
-            </form>
-        );
-    }
-}
diff --git a/src/components/views/auth/ServerTypeSelector.js b/src/components/views/auth/ServerTypeSelector.js
deleted file mode 100644
index 71e7ac7f0e..0000000000
--- a/src/components/views/auth/ServerTypeSelector.js
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
-Copyright 2019 New Vector 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 { _t } from '../../../languageHandler';
-import * as sdk from '../../../index';
-import classnames from 'classnames';
-import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
-import {makeType} from "../../../utils/TypeUtils";
-
-const MODULAR_URL = 'https://element.io/matrix-services' +
-    '?utm_source=element-web&utm_medium=web&utm_campaign=element-web-authentication';
-
-export const FREE = 'Free';
-export const PREMIUM = 'Premium';
-export const ADVANCED = 'Advanced';
-
-export const TYPES = {
-    FREE: {
-        id: FREE,
-        label: () => _t('Free'),
-        logo: () => <img src={require('../../../../res/img/matrix-org-bw-logo.svg')} />,
-        description: () => _t('Join millions for free on the largest public server'),
-        serverConfig: makeType(ValidatedServerConfig, {
-            hsUrl: "https://matrix-client.matrix.org",
-            hsName: "matrix.org",
-            hsNameIsDifferent: false,
-            isUrl: "https://vector.im",
-        }),
-    },
-    PREMIUM: {
-        id: PREMIUM,
-        label: () => _t('Premium'),
-        logo: () => <img src={require('../../../../res/img/ems-logo.svg')} height={16} />,
-        description: () => _t('Premium hosting for organisations <a>Learn more</a>', {}, {
-            a: sub => <a href={MODULAR_URL} target="_blank" rel="noreferrer noopener">
-                {sub}
-            </a>,
-        }),
-        identityServerUrl: "https://vector.im",
-    },
-    ADVANCED: {
-        id: ADVANCED,
-        label: () => _t('Advanced'),
-        logo: () => <div>
-            <img src={require('../../../../res/img/feather-customised/globe.svg')} />
-            {_t('Other')}
-        </div>,
-        description: () => _t('Find other public servers or use a custom server'),
-    },
-};
-
-export function getTypeFromServerConfig(config) {
-    const {hsUrl} = config;
-    if (!hsUrl) {
-        return null;
-    } else if (hsUrl === TYPES.FREE.serverConfig.hsUrl) {
-        return FREE;
-    } else if (new URL(hsUrl).hostname.endsWith('.modular.im')) {
-        // This is an unlikely case to reach, as Modular defaults to hiding the
-        // server type selector.
-        return PREMIUM;
-    } else {
-        return ADVANCED;
-    }
-}
-
-export default class ServerTypeSelector extends React.PureComponent {
-    static propTypes = {
-        // The default selected type.
-        selected: PropTypes.string,
-        // Handler called when the selected type changes.
-        onChange: PropTypes.func.isRequired,
-    };
-
-    constructor(props) {
-        super(props);
-
-        const {
-            selected,
-        } = props;
-
-        this.state = {
-            selected,
-        };
-    }
-
-    updateSelectedType(type) {
-        if (this.state.selected === type) {
-            return;
-        }
-        this.setState({
-            selected: type,
-        });
-        if (this.props.onChange) {
-            this.props.onChange(type);
-        }
-    }
-
-    onClick = (e) => {
-        e.stopPropagation();
-        const type = e.currentTarget.dataset.id;
-        this.updateSelectedType(type);
-    };
-
-    render() {
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-
-        const serverTypes = [];
-        for (const type of Object.values(TYPES)) {
-            const { id, label, logo, description } = type;
-            const classes = classnames(
-                "mx_ServerTypeSelector_type",
-                `mx_ServerTypeSelector_type_${id}`,
-                {
-                    "mx_ServerTypeSelector_type_selected": id === this.state.selected,
-                },
-            );
-
-            serverTypes.push(<div className={classes} key={id} >
-                <div className="mx_ServerTypeSelector_label">
-                    {label()}
-                </div>
-                <AccessibleButton onClick={this.onClick} data-id={id}>
-                    <div className="mx_ServerTypeSelector_logo">
-                        {logo()}
-                    </div>
-                    <div className="mx_ServerTypeSelector_description">
-                        {description()}
-                    </div>
-                </AccessibleButton>
-            </div>);
-        }
-
-        return <div className="mx_ServerTypeSelector">
-            {serverTypes}
-        </div>;
-    }
-}
diff --git a/src/components/views/auth/SignInToText.js b/src/components/views/auth/SignInToText.js
deleted file mode 100644
index 7564096b7d..0000000000
--- a/src/components/views/auth/SignInToText.js
+++ /dev/null
@@ -1,62 +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 {_t} from "../../../languageHandler";
-import * as sdk from "../../../index";
-import PropTypes from "prop-types";
-import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
-
-export default class SignInToText extends React.PureComponent {
-    static propTypes = {
-        serverConfig: PropTypes.instanceOf(ValidatedServerConfig).isRequired,
-        onEditServerDetailsClick: PropTypes.func,
-    };
-
-    render() {
-        let signInToText = _t('Sign in to your Matrix account on %(serverName)s', {
-            serverName: this.props.serverConfig.hsName,
-        });
-        if (this.props.serverConfig.hsNameIsDifferent) {
-            const TextWithTooltip = sdk.getComponent("elements.TextWithTooltip");
-
-            signInToText = _t('Sign in to 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>;
-        }
-
-        return <h3>
-            {signInToText}
-            {editLink}
-        </h3>;
-    }
-}
diff --git a/src/components/views/auth/Welcome.js b/src/components/views/auth/Welcome.js
index 21032f4f1a..0205f4e0b9 100644
--- a/src/components/views/auth/Welcome.js
+++ b/src/components/views/auth/Welcome.js
@@ -23,11 +23,18 @@ import AuthPage from "./AuthPage";
 import {_td} from "../../../languageHandler";
 import SettingsStore from "../../../settings/SettingsStore";
 import {UIFeature} from "../../../settings/UIFeature";
+import CountlyAnalytics from "../../../CountlyAnalytics";
 
 // translatable strings for Welcome pages
 _td("Sign in with SSO");
 
 export default class Welcome extends React.PureComponent {
+    constructor(props) {
+        super(props);
+
+        CountlyAnalytics.instance.track("onboarding_welcome");
+    }
+
     render() {
         const EmbeddedPage = sdk.getComponent('structures.EmbeddedPage');
         const LanguageSelector = sdk.getComponent('auth.LanguageSelector');
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];
         }
     }
 
diff --git a/src/components/views/avatars/RoomAvatar.tsx b/src/components/views/avatars/RoomAvatar.tsx
index cbdae765f7..952b9d4cb6 100644
--- a/src/components/views/avatars/RoomAvatar.tsx
+++ b/src/components/views/avatars/RoomAvatar.tsx
@@ -13,7 +13,7 @@ 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 React, {ComponentProps} from 'react';
 import Room from 'matrix-js-sdk/src/models/room';
 import {getHttpUriForMxc} from 'matrix-js-sdk/src/content-repo';
 
@@ -24,7 +24,7 @@ import Modal from '../../../Modal';
 import * as Avatar from '../../../Avatar';
 import {ResizeMethod} from "../../../Avatar";
 
-interface IProps {
+interface IProps extends Omit<ComponentProps<typeof BaseAvatar>, "name" | "idName" | "url" | "onClick"> {
     // Room may be left unset here, but if it is,
     // oobData.avatarUrl should be set (else there
     // would be nowhere to get the avatar from)
@@ -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/avatars/WidgetAvatar.tsx b/src/components/views/avatars/WidgetAvatar.tsx
new file mode 100644
index 0000000000..04cfce7670
--- /dev/null
+++ b/src/components/views/avatars/WidgetAvatar.tsx
@@ -0,0 +1,58 @@
+/*
+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, {ComponentProps, useContext} from 'react';
+import classNames from 'classnames';
+import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
+
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import {IApp} from "../../../stores/WidgetStore";
+import BaseAvatar, {BaseAvatarType} from "./BaseAvatar";
+
+interface IProps extends Omit<ComponentProps<BaseAvatarType>, "name" | "url" | "urls"> {
+    app: IApp;
+}
+
+const WidgetAvatar: React.FC<IProps> = ({ app, className, width = 20, height = 20, ...props }) => {
+    const cli = useContext(MatrixClientContext);
+
+    let iconUrls = [require("../../../../res/img/element-icons/room/default_app.svg")];
+    // heuristics for some better icons until Widgets support their own icons
+    if (app.type.includes("jitsi")) {
+        iconUrls = [require("../../../../res/img/element-icons/room/default_video.svg")];
+    } else if (app.type.includes("meeting") || app.type.includes("calendar")) {
+        iconUrls = [require("../../../../res/img/element-icons/room/default_cal.svg")];
+    } else if (app.type.includes("pad") || app.type.includes("doc") || app.type.includes("calc")) {
+        iconUrls = [require("../../../../res/img/element-icons/room/default_doc.svg")];
+    } else if (app.type.includes("clock")) {
+        iconUrls = [require("../../../../res/img/element-icons/room/default_clock.svg")];
+    }
+
+    return (
+        <BaseAvatar
+            {...props}
+            name={app.id}
+            className={classNames("mx_WidgetAvatar", className)}
+            // MSC2765
+            url={app.avatar_url ? getHttpUriForMxc(cli.getHomeserverUrl(), app.avatar_url, 20, 20, "crop") : undefined}
+            urls={iconUrls}
+            width={width}
+            height={height}
+        />
+    )
+};
+
+export default WidgetAvatar;
diff --git a/src/components/views/context_menus/CallContextMenu.tsx b/src/components/views/context_menus/CallContextMenu.tsx
new file mode 100644
index 0000000000..3557976326
--- /dev/null
+++ b/src/components/views/context_menus/CallContextMenu.tsx
@@ -0,0 +1,77 @@
+/*
+Copyright 2020 New Vector 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 { _t } from '../../../languageHandler';
+import { ContextMenu, IProps as IContextMenuProps, MenuItem } from '../../structures/ContextMenu';
+import { MatrixCall } from 'matrix-js-sdk/src/webrtc/call';
+import CallHandler from '../../../CallHandler';
+import InviteDialog, { KIND_CALL_TRANSFER } from '../dialogs/InviteDialog';
+import Modal from '../../../Modal';
+
+interface IProps extends IContextMenuProps {
+    call: MatrixCall;
+}
+
+export default class CallContextMenu extends React.Component<IProps> {
+    static propTypes = {
+        // js-sdk User object. Not required because it might not exist.
+        user: PropTypes.object,
+    };
+
+    constructor(props) {
+        super(props);
+    }
+
+    onHoldClick = () => {
+        this.props.call.setRemoteOnHold(true);
+        this.props.onFinished();
+    }
+
+    onUnholdClick = () => {
+        CallHandler.sharedInstance().setActiveCallRoomId(this.props.call.roomId);
+
+        this.props.onFinished();
+    }
+
+    onTransferClick = () => {
+        Modal.createTrackedDialog(
+            'Transfer Call', '', InviteDialog, {kind: KIND_CALL_TRANSFER, call: this.props.call},
+            /*className=*/null, /*isPriority=*/false, /*isStatic=*/true,
+        );
+        this.props.onFinished();
+    }
+
+    render() {
+        const holdUnholdCaption = this.props.call.isRemoteOnHold() ? _t("Resume") : _t("Hold");
+        const handler = this.props.call.isRemoteOnHold() ? this.onUnholdClick : this.onHoldClick;
+
+        let transferItem;
+        if (this.props.call.opponentCanBeTransferred()) {
+            transferItem = <MenuItem className="mx_CallContextMenu_item" onClick={this.onTransferClick}>
+                {_t("Transfer")}
+            </MenuItem>;
+        }
+
+        return <ContextMenu {...this.props}>
+            <MenuItem className="mx_CallContextMenu_item" onClick={handler}>
+                {holdUnholdCaption}
+            </MenuItem>
+            {transferItem}
+        </ContextMenu>;
+    }
+}
diff --git a/src/components/views/context_menus/DialpadContextMenu.tsx b/src/components/views/context_menus/DialpadContextMenu.tsx
new file mode 100644
index 0000000000..e3aed0179b
--- /dev/null
+++ b/src/components/views/context_menus/DialpadContextMenu.tsx
@@ -0,0 +1,59 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import { _t } from '../../../languageHandler';
+import { ContextMenu, IProps as IContextMenuProps } from '../../structures/ContextMenu';
+import { MatrixCall } from 'matrix-js-sdk/src/webrtc/call';
+import Dialpad from '../voip/DialPad';
+
+interface IProps extends IContextMenuProps {
+    call: MatrixCall;
+}
+
+interface IState {
+    value: string;
+}
+
+export default class DialpadContextMenu extends React.Component<IProps, IState> {
+    constructor(props) {
+        super(props);
+
+        this.state = {
+            value: '',
+        }
+    }
+
+    onDigitPress = (digit) => {
+        this.props.call.sendDtmfDigit(digit);
+        this.setState({value: this.state.value + digit});
+    }
+
+    render() {
+        return <ContextMenu {...this.props}>
+            <div className="mx_DialPadContextMenu_header">
+                <div>
+                    <span className="mx_DialPadContextMenu_title">{_t("Dial pad")}</span>
+                </div>
+                <div className="mx_DialPadContextMenu_dialled">{this.state.value}</div>
+            </div>
+            <div className="mx_DialPadContextMenu_horizSep" />
+            <div className="mx_DialPadContextMenu_dialPad">
+                <Dialpad onDigitPress={this.onDigitPress} hasDialAndDelete={false} />
+            </div>
+        </ContextMenu>;
+    }
+}
diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index d760c8defa..6b871e4f24 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -31,6 +31,7 @@ import SettingsStore from '../../../settings/SettingsStore';
 import { isUrlPermitted } from '../../../HtmlUtils';
 import { isContentActionable } from '../../../utils/EventUtils';
 import {MenuItem} from "../../structures/ContextMenu";
+import {EventType} from "matrix-js-sdk/src/@types/event";
 
 function canCancel(eventStatus) {
     return eventStatus === EventStatus.QUEUED || eventStatus === EventStatus.NOT_SENT;
@@ -72,7 +73,10 @@ export default class MessageContextMenu extends React.Component {
         const cli = MatrixClientPeg.get();
         const room = cli.getRoom(this.props.mxEvent.getRoomId());
 
-        const canRedact = room.currentState.maySendRedactionForEvent(this.props.mxEvent, cli.credentials.userId);
+        // We explicitly decline to show the redact option on ACL events as it has a potential
+        // to obliterate the room - https://github.com/matrix-org/synapse/issues/4042
+        const canRedact = room.currentState.maySendRedactionForEvent(this.props.mxEvent, cli.credentials.userId)
+            && this.props.mxEvent.getType() !== EventType.RoomServerAcl;
         let canPin = room.currentState.mayClientSendStateEvent('m.room.pinned_events', cli);
 
         // HACK: Intentionally say we can't pin if the user doesn't want to use the functionality
@@ -145,7 +149,7 @@ export default class MessageContextMenu extends React.Component {
     onRedactClick = () => {
         const ConfirmRedactDialog = sdk.getComponent("dialogs.ConfirmRedactDialog");
         Modal.createTrackedDialog('Confirm Redact Dialog', '', ConfirmRedactDialog, {
-            onFinished: async (proceed) => {
+            onFinished: async (proceed, reason) => {
                 if (!proceed) return;
 
                 const cli = MatrixClientPeg.get();
@@ -153,6 +157,8 @@ export default class MessageContextMenu extends React.Component {
                     await cli.redactEvent(
                         this.props.mxEvent.getRoomId(),
                         this.props.mxEvent.getId(),
+                        undefined,
+                        reason ? { reason } : {},
                     );
                 } catch (e) {
                     const code = e.errcode || e.statusCode;
diff --git a/src/components/views/context_menus/WidgetContextMenu.js b/src/components/views/context_menus/WidgetContextMenu.js
deleted file mode 100644
index 6ed32daa5c..0000000000
--- a/src/components/views/context_menus/WidgetContextMenu.js
+++ /dev/null
@@ -1,142 +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 {_t} from '../../../languageHandler';
-import {MenuItem} from "../../structures/ContextMenu";
-
-export default class WidgetContextMenu extends React.Component {
-    static propTypes = {
-        onFinished: PropTypes.func,
-
-        // Callback for when the revoke button is clicked. Required.
-        onRevokeClicked: PropTypes.func.isRequired,
-
-        // Callback for when the unpin button is clicked. If absent, unpin will be hidden.
-        onUnpinClicked: PropTypes.func,
-
-        // Callback for when the snapshot button is clicked. Button not shown
-        // without a callback.
-        onSnapshotClicked: PropTypes.func,
-
-        // Callback for when the reload button is clicked. Button not shown
-        // without a callback.
-        onReloadClicked: PropTypes.func,
-
-        // Callback for when the edit button is clicked. Button not shown
-        // without a callback.
-        onEditClicked: PropTypes.func,
-
-        // Callback for when the delete button is clicked. Button not shown
-        // without a callback.
-        onDeleteClicked: PropTypes.func,
-    };
-
-    proxyClick(fn) {
-        fn();
-        if (this.props.onFinished) this.props.onFinished();
-    }
-
-    // XXX: It's annoying that our context menus require us to hit onFinished() to close :(
-
-    onEditClicked = () => {
-        this.proxyClick(this.props.onEditClicked);
-    };
-
-    onReloadClicked = () => {
-        this.proxyClick(this.props.onReloadClicked);
-    };
-
-    onSnapshotClicked = () => {
-        this.proxyClick(this.props.onSnapshotClicked);
-    };
-
-    onDeleteClicked = () => {
-        this.proxyClick(this.props.onDeleteClicked);
-    };
-
-    onRevokeClicked = () => {
-        this.proxyClick(this.props.onRevokeClicked);
-    };
-
-    onUnpinClicked = () => this.proxyClick(this.props.onUnpinClicked);
-
-    render() {
-        const options = [];
-
-        if (this.props.onEditClicked) {
-            options.push(
-                <MenuItem className='mx_WidgetContextMenu_option' onClick={this.onEditClicked} key='edit'>
-                    {_t("Edit")}
-                </MenuItem>,
-            );
-        }
-
-        if (this.props.onUnpinClicked) {
-            options.push(
-                <MenuItem className="mx_WidgetContextMenu_option" onClick={this.onUnpinClicked} key="unpin">
-                    {_t("Unpin")}
-                </MenuItem>,
-            );
-        }
-
-        if (this.props.onReloadClicked) {
-            options.push(
-                <MenuItem className='mx_WidgetContextMenu_option' onClick={this.onReloadClicked} key='reload'>
-                    {_t("Reload")}
-                </MenuItem>,
-            );
-        }
-
-        if (this.props.onSnapshotClicked) {
-            options.push(
-                <MenuItem className='mx_WidgetContextMenu_option' onClick={this.onSnapshotClicked} key='snap'>
-                    {_t("Take picture")}
-                </MenuItem>,
-            );
-        }
-
-        if (this.props.onDeleteClicked) {
-            options.push(
-                <MenuItem className='mx_WidgetContextMenu_option' onClick={this.onDeleteClicked} key='delete'>
-                    {_t("Remove for everyone")}
-                </MenuItem>,
-            );
-        }
-
-        // Push this last so it appears last. It's always present.
-        options.push(
-            <MenuItem className='mx_WidgetContextMenu_option' onClick={this.onRevokeClicked} key='revoke'>
-                {_t("Remove for me")}
-            </MenuItem>,
-        );
-
-        // Put separators between the options
-        if (options.length > 1) {
-            const length = options.length;
-            for (let i = 0; i < length - 1; i++) {
-                const sep = <hr key={i} className="mx_WidgetContextMenu_separator" />;
-
-                // Insert backwards so the insertions don't affect our math on where to place them.
-                // We also use our cached length to avoid worrying about options.length changing
-                options.splice(length - 1 - i, 0, sep);
-            }
-        }
-
-        return <div className="mx_WidgetContextMenu">{options}</div>;
-    }
-}
diff --git a/src/components/views/context_menus/WidgetContextMenu.tsx b/src/components/views/context_menus/WidgetContextMenu.tsx
new file mode 100644
index 0000000000..c1af86eae6
--- /dev/null
+++ b/src/components/views/context_menus/WidgetContextMenu.tsx
@@ -0,0 +1,178 @@
+/*
+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 {MatrixCapabilities} from "matrix-widget-api";
+
+import IconizedContextMenu, {IconizedContextMenuOption, IconizedContextMenuOptionList} from "./IconizedContextMenu";
+import {ChevronFace} from "../../structures/ContextMenu";
+import {_t} from "../../../languageHandler";
+import {IApp} from "../../../stores/WidgetStore";
+import WidgetUtils from "../../../utils/WidgetUtils";
+import {WidgetMessagingStore} from "../../../stores/widgets/WidgetMessagingStore";
+import RoomContext from "../../../contexts/RoomContext";
+import dis from "../../../dispatcher/dispatcher";
+import SettingsStore from "../../../settings/SettingsStore";
+import Modal from "../../../Modal";
+import QuestionDialog from "../dialogs/QuestionDialog";
+import {WidgetType} from "../../../widgets/WidgetType";
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import { Container, WidgetLayoutStore } from "../../../stores/widgets/WidgetLayoutStore";
+
+interface IProps extends React.ComponentProps<typeof IconizedContextMenu> {
+    app: IApp;
+    userWidget?: boolean;
+    showUnpin?: boolean;
+    // override delete handler
+    onDeleteClick?(): void;
+}
+
+const WidgetContextMenu: React.FC<IProps> = ({
+    onFinished,
+    app,
+    userWidget,
+    onDeleteClick,
+    showUnpin,
+    ...props
+}) => {
+    const cli = useContext(MatrixClientContext);
+    const {room, roomId} = useContext(RoomContext);
+
+    const widgetMessaging = WidgetMessagingStore.instance.getMessagingForId(app.id);
+    const canModify = userWidget || WidgetUtils.canUserModifyWidgets(roomId);
+
+    let unpinButton;
+    if (showUnpin) {
+        const onUnpinClick = () => {
+            WidgetLayoutStore.instance.moveToContainer(room, app, Container.Right);
+            onFinished();
+        };
+
+        unpinButton = <IconizedContextMenuOption onClick={onUnpinClick} label={_t("Unpin")} />;
+    }
+
+    let editButton;
+    if (canModify && WidgetUtils.isManagedByManager(app)) {
+        const onEditClick = () => {
+            WidgetUtils.editWidget(room, app);
+            onFinished();
+        };
+
+        editButton = <IconizedContextMenuOption onClick={onEditClick} label={_t("Edit")} />;
+    }
+
+    let snapshotButton;
+    if (widgetMessaging?.hasCapability(MatrixCapabilities.Screenshots)) {
+        const onSnapshotClick = () => {
+            widgetMessaging?.takeScreenshot().then(data => {
+                dis.dispatch({
+                    action: 'picture_snapshot',
+                    file: data.screenshot,
+                });
+            }).catch(err => {
+                console.error("Failed to take screenshot: ", err);
+            });
+            onFinished();
+        };
+
+        snapshotButton = <IconizedContextMenuOption onClick={onSnapshotClick} label={_t("Take a picture")} />;
+    }
+
+    let deleteButton;
+    if (onDeleteClick || canModify) {
+        const onDeleteClickDefault = () => {
+            // Show delete confirmation dialog
+            Modal.createTrackedDialog('Delete Widget', '', QuestionDialog, {
+                title: _t("Delete Widget"),
+                description: _t(
+                    "Deleting a widget removes it for all users in this room." +
+                    " Are you sure you want to delete this widget?"),
+                button: _t("Delete widget"),
+                onFinished: (confirmed) => {
+                    if (!confirmed) return;
+                    WidgetUtils.setRoomWidget(roomId, app.id);
+                },
+            });
+            onFinished();
+        };
+
+        deleteButton = <IconizedContextMenuOption
+            onClick={onDeleteClick || onDeleteClickDefault}
+            label={userWidget ? _t("Remove") : _t("Remove for everyone")}
+        />;
+    }
+
+    let isAllowedWidget = SettingsStore.getValue("allowedWidgets", roomId)[app.eventId];
+    if (isAllowedWidget === undefined) {
+        isAllowedWidget = app.creatorUserId === cli.getUserId();
+    }
+
+    const isLocalWidget = WidgetType.JITSI.matches(app.type);
+    let revokeButton;
+    if (!userWidget && !isLocalWidget && isAllowedWidget) {
+        const onRevokeClick = () => {
+            console.info("Revoking permission for widget to load: " + app.eventId);
+            const current = SettingsStore.getValue("allowedWidgets", roomId);
+            current[app.eventId] = false;
+            const level = SettingsStore.firstSupportedLevel("allowedWidgets");
+            SettingsStore.setValue("allowedWidgets", roomId, level, current).catch(err => {
+                console.error(err);
+                // We don't really need to do anything about this - the user will just hit the button again.
+            });
+            onFinished();
+        };
+
+        revokeButton = <IconizedContextMenuOption onClick={onRevokeClick} label={_t("Revoke permissions")} />;
+    }
+
+    const pinnedWidgets = WidgetLayoutStore.instance.getContainerWidgets(room, Container.Top);
+    const widgetIndex = pinnedWidgets.findIndex(widget => widget.id === app.id);
+
+    let moveLeftButton;
+    if (showUnpin && widgetIndex > 0) {
+        const onClick = () => {
+            WidgetLayoutStore.instance.moveWithinContainer(room, Container.Top, app, -1);
+            onFinished();
+        };
+
+        moveLeftButton = <IconizedContextMenuOption onClick={onClick} label={_t("Move left")} />;
+    }
+
+    let moveRightButton;
+    if (showUnpin && widgetIndex < pinnedWidgets.length - 1) {
+        const onClick = () => {
+            WidgetLayoutStore.instance.moveWithinContainer(room, Container.Top, app, 1);
+            onFinished();
+        };
+
+        moveRightButton = <IconizedContextMenuOption onClick={onClick} label={_t("Move right")} />;
+    }
+
+    return <IconizedContextMenu {...props} chevronFace={ChevronFace.None} onFinished={onFinished}>
+        <IconizedContextMenuOptionList>
+            { editButton }
+            { revokeButton }
+            { deleteButton }
+            { snapshotButton }
+            { moveLeftButton }
+            { moveRightButton }
+            { unpinButton }
+        </IconizedContextMenuOptionList>
+    </IconizedContextMenu>;
+};
+
+export default WidgetContextMenu;
+
diff --git a/src/components/views/dialogs/AddExistingToSpaceDialog.tsx b/src/components/views/dialogs/AddExistingToSpaceDialog.tsx
new file mode 100644
index 0000000000..66efaefd9d
--- /dev/null
+++ b/src/components/views/dialogs/AddExistingToSpaceDialog.tsx
@@ -0,0 +1,208 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, {useState} from "react";
+import classNames from "classnames";
+import {Room} from "matrix-js-sdk/src/models/room";
+import {MatrixClient} from "matrix-js-sdk/src/client";
+
+import {_t} from '../../../languageHandler';
+import {IDialogProps} from "./IDialogProps";
+import BaseDialog from "./BaseDialog";
+import FormButton from "../elements/FormButton";
+import Dropdown from "../elements/Dropdown";
+import SearchBox from "../../structures/SearchBox";
+import SpaceStore from "../../../stores/SpaceStore";
+import RoomAvatar from "../avatars/RoomAvatar";
+import {getDisplayAliasForRoom} from "../../../Rooms";
+import AccessibleButton from "../elements/AccessibleButton";
+import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
+import {allSettled} from "../../../utils/promise";
+import DMRoomMap from "../../../utils/DMRoomMap";
+import {calculateRoomVia} from "../../../utils/permalinks/Permalinks";
+import StyledCheckbox from "../elements/StyledCheckbox";
+
+interface IProps extends IDialogProps {
+    matrixClient: MatrixClient;
+    space: Room;
+    onCreateRoomClick(cli: MatrixClient, space: Room): void;
+}
+
+const Entry = ({ room, checked, onChange }) => {
+    return <div className="mx_AddExistingToSpaceDialog_entry">
+        <RoomAvatar room={room} height={32} width={32} />
+        <span className="mx_AddExistingToSpaceDialog_entry_name">{ room.name }</span>
+        <StyledCheckbox onChange={(e) => onChange(e.target.checked)} checked={checked} />
+    </div>;
+};
+
+const AddExistingToSpaceDialog: React.FC<IProps> = ({ matrixClient: cli, space, onCreateRoomClick, onFinished }) => {
+    const [query, setQuery] = useState("");
+    const lcQuery = query.toLowerCase();
+
+    const [selectedSpace, setSelectedSpace] = useState(space);
+    const [selectedToAdd, setSelectedToAdd] = useState(new Set<Room>());
+
+    const existingSubspaces = SpaceStore.instance.getChildSpaces(space.roomId);
+    const existingSubspacesSet = new Set(existingSubspaces);
+    const spaces = SpaceStore.instance.getSpaces().filter(s => {
+        return !existingSubspacesSet.has(s) // not already in space
+            && space !== s // not the top-level space
+            && selectedSpace !== s // not the selected space
+            && s.name.toLowerCase().includes(lcQuery); // contains query
+    });
+
+    const existingRooms = SpaceStore.instance.getChildRooms(space.roomId);
+    const existingRoomsSet = new Set(existingRooms);
+    const rooms = cli.getVisibleRooms().filter(room => {
+        return !existingRoomsSet.has(room) // not already in space
+            && room.name.toLowerCase().includes(lcQuery) // contains query
+            && !DMRoomMap.shared().getUserIdForRoomId(room.roomId); // not a DM
+    });
+
+    const [busy, setBusy] = useState(false);
+    const [error, setError] = useState("");
+
+    let spaceOptionSection;
+    if (existingSubspacesSet.size > 0) {
+        const options = [space, ...existingSubspaces].map((space) => {
+            const classes = classNames("mx_AddExistingToSpaceDialog_dropdownOption", {
+                mx_AddExistingToSpaceDialog_dropdownOptionActive: space === selectedSpace,
+            });
+            return <div key={space.roomId} className={classes}>
+                <RoomAvatar room={space} width={24} height={24} />
+                { space.name || getDisplayAliasForRoom(space) || space.roomId }
+            </div>;
+        });
+
+        spaceOptionSection = (
+            <Dropdown
+                id="mx_SpaceSelectDropdown"
+                onOptionChange={(key: string) => {
+                    setSelectedSpace(existingSubspaces.find(space => space.roomId === key) || space);
+                }}
+                value={selectedSpace.roomId}
+                label={_t("Space selection")}
+            >
+                { options }
+            </Dropdown>
+        );
+    } else {
+        spaceOptionSection = <div className="mx_AddExistingToSpaceDialog_onlySpace">
+            { space.name || getDisplayAliasForRoom(space) || space.roomId }
+        </div>;
+    }
+
+    const title = <React.Fragment>
+        <RoomAvatar room={selectedSpace} height={40} width={40} />
+        <div>
+            <h1>{ _t("Add existing spaces/rooms") }</h1>
+            { spaceOptionSection }
+        </div>
+    </React.Fragment>;
+
+    return <BaseDialog
+        title={title}
+        className="mx_AddExistingToSpaceDialog"
+        contentId="mx_AddExistingToSpaceDialog"
+        onFinished={onFinished}
+        fixedWidth={false}
+    >
+        { error && <div className="mx_AddExistingToSpaceDialog_errorText">{ error }</div> }
+
+        <SearchBox
+            className="mx_textinput_icon mx_textinput_search"
+            placeholder={ _t("Filter your rooms and spaces") }
+            onSearch={setQuery}
+        />
+        <AutoHideScrollbar className="mx_AddExistingToSpaceDialog_content" id="mx_AddExistingToSpaceDialog">
+            { spaces.length > 0 ? (
+                <div className="mx_AddExistingToSpaceDialog_section mx_AddExistingToSpaceDialog_section_spaces">
+                    <h3>{ _t("Spaces") }</h3>
+                    { spaces.map(space => {
+                        return <Entry
+                            key={space.roomId}
+                            room={space}
+                            checked={selectedToAdd.has(space)}
+                            onChange={(checked) => {
+                                if (checked) {
+                                    selectedToAdd.add(space);
+                                } else {
+                                    selectedToAdd.delete(space);
+                                }
+                                setSelectedToAdd(new Set(selectedToAdd));
+                            }}
+                        />;
+                    }) }
+                </div>
+            ) : null }
+
+            { rooms.length > 0 ? (
+                <div className="mx_AddExistingToSpaceDialog_section">
+                    <h3>{ _t("Rooms") }</h3>
+                    { rooms.map(room => {
+                        return <Entry
+                            key={room.roomId}
+                            room={room}
+                            checked={selectedToAdd.has(room)}
+                            onChange={(checked) => {
+                                if (checked) {
+                                    selectedToAdd.add(room);
+                                } else {
+                                    selectedToAdd.delete(room);
+                                }
+                                setSelectedToAdd(new Set(selectedToAdd));
+                            }}
+                        />;
+                    }) }
+                </div>
+            ) : undefined }
+
+            { spaces.length + rooms.length < 1 ? <span className="mx_AddExistingToSpaceDialog_noResults">
+                { _t("No results") }
+            </span> : undefined }
+        </AutoHideScrollbar>
+
+        <div className="mx_AddExistingToSpaceDialog_footer">
+            <span>
+                <div>{ _t("Don't want to add an existing room?") }</div>
+                <AccessibleButton onClick={() => onCreateRoomClick(cli, space)} kind="link">
+                    { _t("Create a new room") }
+                </AccessibleButton>
+            </span>
+
+            <FormButton
+                label={busy ? _t("Applying...") : _t("Apply")}
+                disabled={busy || selectedToAdd.size < 1}
+                onClick={async () => {
+                    setBusy(true);
+                    try {
+                        await allSettled(Array.from(selectedToAdd).map((room) =>
+                            SpaceStore.instance.addRoomToSpace(space, room.roomId, calculateRoomVia(room))));
+                        onFinished(true);
+                    } catch (e) {
+                        console.error("Failed to add rooms to space", e);
+                        setError(_t("Failed to add rooms to space"));
+                    }
+                    setBusy(false);
+                }}
+            />
+        </div>
+    </BaseDialog>;
+};
+
+export default AddExistingToSpaceDialog;
+
diff --git a/src/components/views/dialogs/ConfirmRedactDialog.js b/src/components/views/dialogs/ConfirmRedactDialog.js
index 3106df1d5b..2216f9a93a 100644
--- a/src/components/views/dialogs/ConfirmRedactDialog.js
+++ b/src/components/views/dialogs/ConfirmRedactDialog.js
@@ -23,15 +23,17 @@ import { _t } from '../../../languageHandler';
  */
 export default class ConfirmRedactDialog extends React.Component {
     render() {
-        const QuestionDialog = sdk.getComponent('views.dialogs.QuestionDialog');
+        const TextInputDialog = sdk.getComponent('views.dialogs.TextInputDialog');
         return (
-            <QuestionDialog onFinished={this.props.onFinished}
+            <TextInputDialog onFinished={this.props.onFinished}
                 title={_t("Confirm Removal")}
                 description={
                     _t("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.")}
+                placeholder={_t("Reason (optional)")}
+                focus
                 button={_t("Remove")}>
-            </QuestionDialog>
+            </TextInputDialog>
         );
     }
 }
diff --git a/src/components/views/dialogs/CreateRoomDialog.js b/src/components/views/dialogs/CreateRoomDialog.js
index 2b6bb5e187..0771b0ec45 100644
--- a/src/components/views/dialogs/CreateRoomDialog.js
+++ b/src/components/views/dialogs/CreateRoomDialog.js
@@ -17,6 +17,8 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
+import {Room} from "matrix-js-sdk/src/models/room";
+
 import * as sdk from '../../../index';
 import SdkConfig from '../../../SdkConfig';
 import withValidation from '../elements/Validation';
@@ -30,6 +32,7 @@ export default class CreateRoomDialog extends React.Component {
     static propTypes = {
         onFinished: PropTypes.func.isRequired,
         defaultPublic: PropTypes.bool,
+        parentSpace: PropTypes.instanceOf(Room),
     };
 
     constructor(props) {
@@ -85,6 +88,10 @@ export default class CreateRoomDialog extends React.Component {
             opts.associatedWithCommunity = CommunityPrototypeStore.instance.getSelectedCommunityId();
         }
 
+        if (this.props.parentSpace) {
+            opts.parentSpace = this.props.parentSpace;
+        }
+
         return opts;
     }
 
diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index a0c5375843..814378bb51 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -32,6 +32,12 @@ import {
     PHASE_STARTED,
     PHASE_CANCELLED,
 } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
+import WidgetStore from "../../../stores/WidgetStore";
+import {UPDATE_EVENT} from "../../../stores/AsyncStore";
+import {SETTINGS} from "../../../settings/Settings";
+import SettingsStore, {LEVEL_ORDER} from "../../../settings/SettingsStore";
+import Modal from "../../../Modal";
+import ErrorDialog from "./ErrorDialog";
 
 class GenericEditor extends React.PureComponent {
     // static propTypes = {onBack: PropTypes.func.isRequired};
@@ -701,6 +707,377 @@ class VerificationExplorer extends React.Component {
     }
 }
 
+class WidgetExplorer extends React.Component {
+    static getLabel() {
+        return _t("Active Widgets");
+    }
+
+    constructor(props) {
+        super(props);
+
+        this.state = {
+            query: '',
+            editWidget: null, // set to an IApp when editing
+        };
+    }
+
+    onWidgetStoreUpdate = () => {
+        this.forceUpdate();
+    };
+
+    onQueryChange = (query) => {
+        this.setState({query});
+    };
+
+    onEditWidget = (widget) => {
+        this.setState({editWidget: widget});
+    };
+
+    onBack = () => {
+        const widgets = WidgetStore.instance.getApps(this.props.room.roomId);
+        if (this.state.editWidget && widgets.includes(this.state.editWidget)) {
+            this.setState({editWidget: null});
+        } else {
+            this.props.onBack();
+        }
+    };
+
+    componentDidMount() {
+        WidgetStore.instance.on(UPDATE_EVENT, this.onWidgetStoreUpdate);
+    }
+
+    componentWillUnmount() {
+        WidgetStore.instance.off(UPDATE_EVENT, this.onWidgetStoreUpdate);
+    }
+
+    render() {
+        const room = this.props.room;
+
+        const editWidget = this.state.editWidget;
+        const widgets = WidgetStore.instance.getApps(room.roomId);
+        if (editWidget && widgets.includes(editWidget)) {
+            const allState = Array.from(Array.from(room.currentState.events.values()).map(e => e.values()))
+                .reduce((p, c) => {p.push(...c); return p;}, []);
+            const stateEv = allState.find(ev => ev.getId() === editWidget.eventId);
+            if (!stateEv) { // "should never happen"
+                return <div>
+                    {_t("There was an error finding this widget.")}
+                    <div className="mx_Dialog_buttons">
+                        <button onClick={this.onBack}>{_t("Back")}</button>
+                    </div>
+                </div>;
+            }
+            return <SendCustomEvent
+                onBack={this.onBack}
+                room={room}
+                forceStateEvent={true}
+                inputs={{
+                    eventType: stateEv.getType(),
+                    evContent: JSON.stringify(stateEv.getContent(), null, '\t'),
+                    stateKey: stateEv.getStateKey(),
+                }}
+            />;
+        }
+
+        return (<div>
+            <div className="mx_Dialog_content">
+                <FilteredList query={this.state.query} onChange={this.onQueryChange}>
+                    {widgets.map(w => {
+                        return <button
+                            className='mx_DevTools_RoomStateExplorer_button'
+                            key={w.url + w.eventId}
+                            onClick={() => this.onEditWidget(w)}
+                        >{w.url}</button>;
+                    })}
+                </FilteredList>
+            </div>
+            <div className="mx_Dialog_buttons">
+                <button onClick={this.onBack}>{_t("Back")}</button>
+            </div>
+        </div>);
+    }
+}
+
+class SettingsExplorer extends React.Component {
+    static getLabel() {
+        return _t("Settings Explorer");
+    }
+
+    constructor(props) {
+        super(props);
+
+        this.state = {
+            query: '',
+            editSetting: null, // set to a setting ID when editing
+            viewSetting: null, // set to a setting ID when exploring in detail
+
+            explicitValues: null, // stringified JSON for edit view
+            explicitRoomValues: null, // stringified JSON for edit view
+        };
+    }
+
+    onQueryChange = (ev) => {
+        this.setState({query: ev.target.value});
+    };
+
+    onExplValuesEdit = (ev) => {
+        this.setState({explicitValues: ev.target.value});
+    };
+
+    onExplRoomValuesEdit = (ev) => {
+        this.setState({explicitRoomValues: ev.target.value});
+    };
+
+    onBack = () => {
+        if (this.state.editSetting) {
+            this.setState({editSetting: null});
+        } else if (this.state.viewSetting) {
+            this.setState({viewSetting: null});
+        } else {
+            this.props.onBack();
+        }
+    };
+
+    onViewClick = (ev, settingId) => {
+        ev.preventDefault();
+        this.setState({viewSetting: settingId});
+    };
+
+    onEditClick = (ev, settingId) => {
+        ev.preventDefault();
+        this.setState({
+            editSetting: settingId,
+            explicitValues: this.renderExplicitSettingValues(settingId, null),
+            explicitRoomValues: this.renderExplicitSettingValues(settingId, this.props.room.roomId),
+        });
+    };
+
+    onSaveClick = async () => {
+        try {
+            const settingId = this.state.editSetting;
+            const parsedExplicit = JSON.parse(this.state.explicitValues);
+            const parsedExplicitRoom = JSON.parse(this.state.explicitRoomValues);
+            for (const level of Object.keys(parsedExplicit)) {
+                console.log(`[Devtools] Setting value of ${settingId} at ${level} from user input`);
+                try {
+                    const val = parsedExplicit[level];
+                    await SettingsStore.setValue(settingId, null, level, val);
+                } catch (e) {
+                    console.warn(e);
+                }
+            }
+            const roomId = this.props.room.roomId;
+            for (const level of Object.keys(parsedExplicit)) {
+                console.log(`[Devtools] Setting value of ${settingId} at ${level} in ${roomId} from user input`);
+                try {
+                    const val = parsedExplicitRoom[level];
+                    await SettingsStore.setValue(settingId, roomId, level, val);
+                } catch (e) {
+                    console.warn(e);
+                }
+            }
+            this.setState({
+                viewSetting: settingId,
+                editSetting: null,
+            });
+        } catch (e) {
+            Modal.createTrackedDialog('Devtools - Failed to save settings', '', ErrorDialog, {
+                title: _t("Failed to save settings"),
+                description: e.message,
+            });
+        }
+    };
+
+    renderSettingValue(val) {
+        // Note: we don't .toString() a string because we want JSON.stringify to inject quotes for us
+        const toStringTypes = ['boolean', 'number'];
+        if (toStringTypes.includes(typeof(val))) {
+            return val.toString();
+        } else {
+            return JSON.stringify(val);
+        }
+    }
+
+    renderExplicitSettingValues(setting, roomId) {
+        const vals = {};
+        for (const level of LEVEL_ORDER) {
+            try {
+                vals[level] = SettingsStore.getValueAt(level, setting, roomId, true, true);
+                if (vals[level] === undefined) {
+                    vals[level] = null;
+                }
+            } catch (e) {
+                console.warn(e);
+            }
+        }
+        return JSON.stringify(vals, null, 4);
+    }
+
+    renderCanEditLevel(roomId, level) {
+        const canEdit = SettingsStore.canSetValue(this.state.editSetting, roomId, level);
+        const className = canEdit ? 'mx_DevTools_SettingsExplorer_mutable' : 'mx_DevTools_SettingsExplorer_immutable';
+        return <td className={className}><code>{canEdit.toString()}</code></td>;
+    }
+
+    render() {
+        const room = this.props.room;
+
+        if (!this.state.viewSetting && !this.state.editSetting) {
+            // view all settings
+            const allSettings = Object.keys(SETTINGS)
+                .filter(n => this.state.query ? n.toLowerCase().includes(this.state.query.toLowerCase()) : true);
+            return (
+                <div>
+                    <div className="mx_Dialog_content mx_DevTools_SettingsExplorer">
+                        <Field
+                            label={_t('Filter results')} autoFocus={true} size={64}
+                            type="text" autoComplete="off" value={this.state.query} onChange={this.onQueryChange}
+                            className="mx_TextInputDialog_input mx_DevTools_RoomStateExplorer_query"
+                        />
+                        <table>
+                            <thead>
+                            <tr>
+                                <th>{_t("Setting ID")}</th>
+                                <th>{_t("Value")}</th>
+                                <th>{_t("Value in this room")}</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            {allSettings.map(i => (
+                                <tr key={i}>
+                                    <td>
+                                        <a href="" onClick={(e) => this.onViewClick(e, i)}>
+                                            <code>{i}</code>
+                                        </a>
+                                        <a href="" onClick={(e) => this.onEditClick(e, i)}
+                                           className='mx_DevTools_SettingsExplorer_edit'
+                                        >
+                                            ✏
+                                        </a>
+                                    </td>
+                                    <td>
+                                        <code>{this.renderSettingValue(SettingsStore.getValue(i))}</code>
+                                    </td>
+                                    <td>
+                                        <code>
+                                            {this.renderSettingValue(SettingsStore.getValue(i, room.roomId))}
+                                        </code>
+                                    </td>
+                                </tr>
+                            ))}
+                            </tbody>
+                        </table>
+                    </div>
+                    <div className="mx_Dialog_buttons">
+                        <button onClick={this.onBack}>{_t("Back")}</button>
+                    </div>
+                </div>
+            );
+        } else if (this.state.editSetting) {
+            return (
+                <div>
+                    <div className="mx_Dialog_content mx_DevTools_SettingsExplorer">
+                        <h3>{_t("Setting:")} <code>{this.state.editSetting}</code></h3>
+
+                        <div className='mx_DevTools_SettingsExplorer_warning'>
+                            <b>{_t("Caution:")}</b> {_t(
+                                "This UI does NOT check the types of the values. Use at your own risk.",
+                            )}
+                        </div>
+
+                        <div>
+                            {_t("Setting definition:")}
+                            <pre><code>{JSON.stringify(SETTINGS[this.state.editSetting], null, 4)}</code></pre>
+                        </div>
+
+                        <div>
+                            <table>
+                                <thead>
+                                <tr>
+                                    <th>{_t("Level")}</th>
+                                    <th>{_t("Settable at global")}</th>
+                                    <th>{_t("Settable at room")}</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                    {LEVEL_ORDER.map(lvl => (
+                                        <tr key={lvl}>
+                                            <td><code>{lvl}</code></td>
+                                            {this.renderCanEditLevel(null, lvl)}
+                                            {this.renderCanEditLevel(room.roomId, lvl)}
+                                        </tr>
+                                    ))}
+                                </tbody>
+                            </table>
+                        </div>
+
+                        <div>
+                            <Field
+                                id="valExpl" label={_t("Values at explicit levels")} type="text"
+                                className="mx_DevTools_textarea" element="textarea"
+                                autoComplete="off" value={this.state.explicitValues}
+                                onChange={this.onExplValuesEdit}
+                            />
+                        </div>
+
+                        <div>
+                            <Field
+                                id="valExpl" label={_t("Values at explicit levels in this room")} type="text"
+                                className="mx_DevTools_textarea" element="textarea"
+                                autoComplete="off" value={this.state.explicitRoomValues}
+                                onChange={this.onExplRoomValuesEdit}
+                            />
+                        </div>
+
+                    </div>
+                    <div className="mx_Dialog_buttons">
+                        <button onClick={this.onSaveClick}>{_t("Save setting values")}</button>
+                        <button onClick={this.onBack}>{_t("Back")}</button>
+                    </div>
+                </div>
+            );
+        } else if (this.state.viewSetting) {
+            return (
+                <div>
+                    <div className="mx_Dialog_content mx_DevTools_SettingsExplorer">
+                        <h3>{_t("Setting:")} <code>{this.state.viewSetting}</code></h3>
+
+                        <div>
+                            {_t("Setting definition:")}
+                            <pre><code>{JSON.stringify(SETTINGS[this.state.viewSetting], null, 4)}</code></pre>
+                        </div>
+
+                        <div>
+                            {_t("Value:")}&nbsp;
+                            <code>{this.renderSettingValue(SettingsStore.getValue(this.state.viewSetting))}</code>
+                        </div>
+
+                        <div>
+                            {_t("Value in this room:")}&nbsp;
+                            <code>{this.renderSettingValue(SettingsStore.getValue(this.state.viewSetting, room.roomId))}</code>
+                        </div>
+
+                        <div>
+                            {_t("Values at explicit levels:")}
+                            <pre><code>{this.renderExplicitSettingValues(this.state.viewSetting, null)}</code></pre>
+                        </div>
+
+                        <div>
+                            {_t("Values at explicit levels in this room:")}
+                            <pre><code>{this.renderExplicitSettingValues(this.state.viewSetting, room.roomId)}</code></pre>
+                        </div>
+
+                    </div>
+                    <div className="mx_Dialog_buttons">
+                        <button onClick={(e) => this.onEditClick(e, this.state.viewSetting)}>{_t("Edit Values")}</button>
+                        <button onClick={this.onBack}>{_t("Back")}</button>
+                    </div>
+                </div>
+            );
+        }
+    }
+}
+
 const Entries = [
     SendCustomEvent,
     RoomStateExplorer,
@@ -708,6 +1085,8 @@ const Entries = [
     AccountDataExplorer,
     ServersInRoomList,
     VerificationExplorer,
+    WidgetExplorer,
+    SettingsExplorer,
 ];
 
 export default class DevtoolsDialog extends React.PureComponent {
diff --git a/src/components/views/dialogs/ErrorDialog.js b/src/components/views/dialogs/ErrorDialog.js
index acebdcd854..3bfa635adf 100644
--- a/src/components/views/dialogs/ErrorDialog.js
+++ b/src/components/views/dialogs/ErrorDialog.js
@@ -50,6 +50,10 @@ export default class ErrorDialog extends React.Component {
         button: null,
     };
 
+    onClick = () => {
+        this.props.onFinished(true);
+    };
+
     render() {
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
         return (
@@ -64,7 +68,7 @@ export default class ErrorDialog extends React.Component {
                     { this.props.description || _t('An error has occurred.') }
                 </div>
                 <div className="mx_Dialog_buttons">
-                    <button className="mx_Dialog_primary" onClick={this.props.onFinished} autoFocus={this.props.focus}>
+                    <button className="mx_Dialog_primary" onClick={this.onClick} autoFocus={this.props.focus}>
                         { this.props.button || _t('OK') }
                     </button>
                 </div>
diff --git a/src/components/views/dialogs/FeedbackDialog.js b/src/components/views/dialogs/FeedbackDialog.js
new file mode 100644
index 0000000000..cbe26af6cc
--- /dev/null
+++ b/src/components/views/dialogs/FeedbackDialog.js
@@ -0,0 +1,138 @@
+/*
+Copyright 2018 New Vector 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, {useState} from 'react';
+import QuestionDialog from './QuestionDialog';
+import { _t } from '../../../languageHandler';
+import Field from "../elements/Field";
+import AccessibleButton from "../elements/AccessibleButton";
+import CountlyAnalytics from "../../../CountlyAnalytics";
+import SdkConfig from "../../../SdkConfig";
+import Modal from "../../../Modal";
+import BugReportDialog from "./BugReportDialog";
+import InfoDialog from "./InfoDialog";
+import StyledRadioGroup from "../elements/StyledRadioGroup";
+
+const existingIssuesUrl = "https://github.com/vector-im/element-web/issues" +
+    "?q=is%3Aopen+is%3Aissue+sort%3Areactions-%2B1-desc";
+const newIssueUrl = "https://github.com/vector-im/element-web/issues/new";
+
+
+export default (props) => {
+    const [rating, setRating] = useState("");
+    const [comment, setComment] = useState("");
+
+    const onDebugLogsLinkClick = () => {
+        props.onFinished();
+        Modal.createTrackedDialog('Bug Report Dialog', '', BugReportDialog, {});
+    };
+
+    const hasFeedback = CountlyAnalytics.instance.canEnable();
+    const onFinished = (sendFeedback) => {
+        if (hasFeedback && sendFeedback) {
+            CountlyAnalytics.instance.reportFeedback(parseInt(rating, 10), comment);
+            Modal.createTrackedDialog('Feedback sent', '', InfoDialog, {
+                title: _t('Feedback sent'),
+                description: _t('Thank you!'),
+            });
+        }
+        props.onFinished();
+    };
+
+    const brand = SdkConfig.get().brand;
+
+    let countlyFeedbackSection;
+    if (hasFeedback) {
+        countlyFeedbackSection = <React.Fragment>
+            <hr />
+            <div className="mx_FeedbackDialog_section mx_FeedbackDialog_rateApp">
+                <h3>{_t("Rate %(brand)s", { brand })}</h3>
+
+                <p>{_t("Tell us below how you feel about %(brand)s so far.", { brand })}</p>
+                <p>{_t("Please go into as much detail as you like, so we can track down the problem.")}</p>
+
+                <StyledRadioGroup
+                    name="feedbackRating"
+                    value={rating}
+                    onChange={setRating}
+                    definitions={[
+                        { value: "1", label: "😠" },
+                        { value: "2", label: "😞" },
+                        { value: "3", label: "😑" },
+                        { value: "4", label: "😄" },
+                        { value: "5", label: "😍" },
+                    ]}
+                />
+
+                <Field
+                    id="feedbackComment"
+                    label={_t("Add comment")}
+                    placeholder={_t("Comment")}
+                    type="text"
+                    autoComplete="off"
+                    value={comment}
+                    element="textarea"
+                    onChange={(ev) => {
+                        setComment(ev.target.value);
+                    }}
+                />
+            </div>
+        </React.Fragment>;
+    }
+
+    let subheading;
+    if (hasFeedback) {
+        subheading = (
+            <h2>{_t("There are two ways you can provide feedback and help us improve %(brand)s.", { brand })}</h2>
+        );
+    }
+
+    return (<QuestionDialog
+        className="mx_FeedbackDialog"
+        hasCancelButton={!!hasFeedback}
+        title={_t("Feedback")}
+        description={<React.Fragment>
+            { subheading }
+
+            <div className="mx_FeedbackDialog_section mx_FeedbackDialog_reportBug">
+                <h3>{_t("Report a bug")}</h3>
+                <p>{
+                    _t("Please view <existingIssuesLink>existing bugs on Github</existingIssuesLink> first. " +
+                        "No match? <newIssueLink>Start a new one</newIssueLink>.", {}, {
+                        existingIssuesLink: (sub) => {
+                            return <a target="_blank" rel="noreferrer noopener" href={existingIssuesUrl}>{ sub }</a>;
+                        },
+                        newIssueLink: (sub) => {
+                            return <a target="_blank" rel="noreferrer noopener" href={newIssueUrl}>{ sub }</a>;
+                        },
+                    })
+                }</p>
+                <p>{
+                    _t("PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> " +
+                        "to help us track down the problem.", {}, {
+                        debugLogsLink: sub => (
+                            <AccessibleButton kind="link" onClick={onDebugLogsLinkClick}>{sub}</AccessibleButton>
+                        ),
+                    })
+                }</p>
+            </div>
+            { countlyFeedbackSection }
+        </React.Fragment>}
+        button={hasFeedback ? _t("Send feedback") : _t("Go back")}
+        buttonDisabled={hasFeedback && rating === ""}
+        onFinished={onFinished}
+    />);
+};
diff --git a/src/components/views/dialogs/HostSignupDialog.tsx b/src/components/views/dialogs/HostSignupDialog.tsx
new file mode 100644
index 0000000000..45a03b7cf0
--- /dev/null
+++ b/src/components/views/dialogs/HostSignupDialog.tsx
@@ -0,0 +1,291 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from "react";
+import AccessibleButton from "../elements/AccessibleButton";
+import Modal from "../../../Modal";
+import PersistedElement from "../elements/PersistedElement";
+import QuestionDialog from './QuestionDialog';
+import SdkConfig from "../../../SdkConfig";
+import classNames from "classnames";
+import { _t } from "../../../languageHandler";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
+import { HostSignupStore } from "../../../stores/HostSignupStore";
+import { OwnProfileStore } from "../../../stores/OwnProfileStore";
+import {
+    IHostSignupConfig,
+    IPostmessage,
+    IPostmessageResponseData,
+    PostmessageAction,
+} from "./HostSignupDialogTypes";
+
+const HOST_SIGNUP_KEY = "host_signup";
+
+interface IProps {}
+
+interface IState {
+    completed: boolean;
+    error: string;
+    minimized: boolean;
+}
+
+export default class HostSignupDialog extends React.PureComponent<IProps, IState> {
+    private iframeRef: React.RefObject<HTMLIFrameElement> = React.createRef();
+    private readonly config: IHostSignupConfig;
+
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            completed: false,
+            error: null,
+            minimized: false,
+        };
+
+        this.config = SdkConfig.get().hostSignup;
+    }
+
+    private messageHandler = async (message: IPostmessage) => {
+        if (!this.config.url.startsWith(message.origin)) {
+            return;
+        }
+        switch (message.data.action) {
+            case PostmessageAction.HostSignupAccountDetailsRequest:
+                this.onAccountDetailsRequest();
+                break;
+            case PostmessageAction.Maximize:
+                this.setState({
+                    minimized: false,
+                });
+                break;
+            case PostmessageAction.Minimize:
+                this.setState({
+                    minimized: true,
+                });
+                break;
+            case PostmessageAction.SetupComplete:
+                this.setState({
+                    completed: true,
+                });
+                break;
+            case PostmessageAction.CloseDialog:
+                return this.closeDialog();
+        }
+    }
+
+    private maximizeDialog = () => {
+        this.setState({
+            minimized: false,
+        });
+        // Send this action to the iframe so it can act accordingly
+        this.sendMessage({
+            action: PostmessageAction.Maximize,
+        });
+    }
+
+    private minimizeDialog = () => {
+        this.setState({
+            minimized: true,
+        });
+        // Send this action to the iframe so it can act accordingly
+        this.sendMessage({
+            action: PostmessageAction.Minimize,
+        });
+    }
+
+    private closeDialog = async () => {
+        window.removeEventListener("message", this.messageHandler);
+        // Ensure we destroy the host signup persisted element
+        PersistedElement.destroyElement("host_signup");
+        // Finally clear the flag in
+        return HostSignupStore.instance.setHostSignupActive(false);
+    }
+
+    private onCloseClick = async () => {
+        if (this.state.completed) {
+            // We're done, close
+            return this.closeDialog();
+        } else {
+            Modal.createDialog(
+                QuestionDialog,
+                {
+                    title: _t("Confirm abort of host creation"),
+                    description: _t(
+                        "Are you sure you wish to abort creation of the host? The process cannot be continued.",
+                    ),
+                    button: _t("Abort"),
+                    onFinished: result => {
+                        if (result) {
+                            return this.closeDialog();
+                        }
+                    },
+                },
+            );
+        }
+    }
+
+    private sendMessage = (message: IPostmessageResponseData) => {
+        this.iframeRef.current.contentWindow.postMessage(message, this.config.url);
+    }
+
+    private async sendAccountDetails() {
+        const openIdToken = await MatrixClientPeg.get().getOpenIdToken();
+        if (!openIdToken || !openIdToken.access_token) {
+            console.warn("Failed to connect to homeserver for OpenID token.")
+            this.setState({
+                completed: true,
+                error: _t("Failed to connect to your homeserver. Please close this dialog and try again."),
+            });
+            return;
+        }
+        this.sendMessage({
+            action: PostmessageAction.HostSignupAccountDetails,
+            account: {
+                accessToken: await MatrixClientPeg.get().getAccessToken(),
+                name: OwnProfileStore.instance.displayName,
+                openIdToken: openIdToken.access_token,
+                serverName: await MatrixClientPeg.get().getDomain(),
+                userLocalpart: await MatrixClientPeg.get().getUserIdLocalpart(),
+                termsAccepted: true,
+            },
+        });
+    }
+
+    private onAccountDetailsDialogFinished = async (result) => {
+        if (result) {
+            return this.sendAccountDetails();
+        }
+        return this.closeDialog();
+    }
+
+    private onAccountDetailsRequest = () => {
+        const textComponent = (
+            <>
+                <p>
+                    {_t("Continuing temporarily allows the %(hostSignupBrand)s setup process to access your " +
+                        "account to fetch verified email addresses. This data is not stored.", {
+                        hostSignupBrand: this.config.brand,
+                    })}
+                </p>
+                <p>
+                    {_t("Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.",
+                        {},
+                        {
+                            cookiePolicyLink: () => (
+                                <a href={this.config.cookiePolicyUrl} target="_blank" rel="noreferrer noopener">
+                                    {_t("Cookie Policy")}
+                                </a>
+                            ),
+                            privacyPolicyLink: () => (
+                                <a href={this.config.privacyPolicyUrl} target="_blank" rel="noreferrer noopener">
+                                    {_t("Privacy Policy")}
+                                </a>
+                            ),
+                            termsOfServiceLink: () => (
+                                <a href={this.config.termsOfServiceUrl} target="_blank" rel="noreferrer noopener">
+                                    {_t("Terms of Service")}
+                                </a>
+                            ),
+                        },
+                    )}
+                </p>
+            </>
+        );
+        Modal.createDialog(
+            QuestionDialog,
+            {
+                title: _t("You should know"),
+                description: textComponent,
+                button: _t("Continue"),
+                onFinished: this.onAccountDetailsDialogFinished,
+            },
+        );
+    }
+
+    public componentDidMount() {
+        window.addEventListener("message", this.messageHandler);
+    }
+
+    public componentWillUnmount() {
+        if (HostSignupStore.instance.isHostSignupActive) {
+            // Run the close dialog actions if we're still active, otherwise good to go
+            return this.closeDialog();
+        }
+    }
+
+    public render(): React.ReactNode {
+        return (
+            <div className="mx_HostSignup_persisted">
+                <PersistedElement key={HOST_SIGNUP_KEY} persistKey={HOST_SIGNUP_KEY}>
+                    <div className={classNames({ "mx_Dialog_wrapper": !this.state.minimized })}>
+                        <div
+                            className={classNames("mx_Dialog",
+                                {
+                                    "mx_HostSignupDialog_minimized": this.state.minimized,
+                                    "mx_HostSignupDialog": !this.state.minimized,
+                                },
+                            )}
+                        >
+                            {this.state.minimized &&
+                                <div className="mx_Dialog_header mx_Dialog_headerWithButton">
+                                    <div className="mx_Dialog_title">
+                                        {_t("%(hostSignupBrand)s Setup", {
+                                            hostSignupBrand: this.config.brand,
+                                        })}
+                                    </div>
+                                    <AccessibleButton
+                                        className="mx_HostSignup_maximize_button"
+                                        onClick={this.maximizeDialog}
+                                        aria-label={_t("Maximize dialog")}
+                                        title={_t("Maximize dialog")}
+                                    />
+                                </div>
+                            }
+                            {!this.state.minimized &&
+                                <div className="mx_Dialog_header mx_Dialog_headerWithCancel">
+                                    <AccessibleButton
+                                        onClick={this.minimizeDialog}
+                                        className="mx_HostSignup_minimize_button"
+                                        aria-label={_t("Minimize dialog")}
+                                        title={_t("Minimize dialog")}
+                                    />
+                                    <AccessibleButton
+                                        onClick={this.onCloseClick}
+                                        className="mx_Dialog_cancelButton"
+                                        aria-label={_t("Close dialog")}
+                                        title={_t("Close dialog")}
+                                    />
+                                </div>
+                            }
+                            {this.state.error &&
+                                <div>
+                                    {this.state.error}
+                                </div>
+                            }
+                            {!this.state.error &&
+                                <iframe
+                                    src={this.config.url}
+                                    ref={this.iframeRef}
+                                    sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
+                                />
+                            }
+                        </div>
+                    </div>
+                </PersistedElement>
+            </div>
+        );
+    }
+}
diff --git a/src/components/views/dialogs/HostSignupDialogTypes.ts b/src/components/views/dialogs/HostSignupDialogTypes.ts
new file mode 100644
index 0000000000..9f78592804
--- /dev/null
+++ b/src/components/views/dialogs/HostSignupDialogTypes.ts
@@ -0,0 +1,56 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+export enum PostmessageAction {
+    CloseDialog = "close_dialog",
+    HostSignupAccountDetails = "host_signup_account_details",
+    HostSignupAccountDetailsRequest = "host_signup_account_details_request",
+    Minimize = "host_signup_minimize",
+    Maximize = "host_signup_maximize",
+    SetupComplete = "setup_complete",
+}
+
+interface IAccountData {
+    accessToken: string;
+    name: string;
+    openIdToken: string;
+    serverName: string;
+    userLocalpart: string;
+    termsAccepted: boolean;
+}
+
+export interface IPostmessageRequestData {
+    action: PostmessageAction;
+}
+
+export interface IPostmessageResponseData {
+    action: PostmessageAction;
+    account?: IAccountData;
+}
+
+export interface IPostmessage {
+    data: IPostmessageRequestData;
+    origin: string;
+}
+
+export interface IHostSignupConfig {
+    brand: string;
+    cookiePolicyUrl: string;
+    domains: Array<string>;
+    privacyPolicyUrl: string;
+    termsOfServiceUrl: string;
+    url: string;
+}
diff --git a/src/components/views/dialogs/InfoDialog.js b/src/components/views/dialogs/InfoDialog.js
index 8125bc3edd..6dc9fc01b0 100644
--- a/src/components/views/dialogs/InfoDialog.js
+++ b/src/components/views/dialogs/InfoDialog.js
@@ -27,10 +27,11 @@ export default class InfoDialog extends React.Component {
         className: PropTypes.string,
         title: PropTypes.string,
         description: PropTypes.node,
-        button: PropTypes.string,
+        button: PropTypes.oneOfType(PropTypes.string, PropTypes.bool),
         onFinished: PropTypes.func,
         hasCloseButton: PropTypes.bool,
         onKeyDown: PropTypes.func,
+        fixedWidth: PropTypes.bool,
     };
 
     static defaultProps = {
@@ -54,15 +55,16 @@ export default class InfoDialog extends React.Component {
                 contentId='mx_Dialog_content'
                 hasCancel={this.props.hasCloseButton}
                 onKeyDown={this.props.onKeyDown}
+                fixedWidth={this.props.fixedWidth}
             >
                 <div className={classNames("mx_Dialog_content", this.props.className)} id="mx_Dialog_content">
                     { this.props.description }
                 </div>
-                <DialogButtons primaryButton={this.props.button || _t('OK')}
+                { this.props.button !== false && <DialogButtons primaryButton={this.props.button || _t('OK')}
                     onPrimaryButtonClick={this.onFinished}
                     hasCancel={false}
                 >
-                </DialogButtons>
+                </DialogButtons> }
             </BaseDialog>
         );
     }
diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.tsx
similarity index 76%
rename from src/components/views/dialogs/InviteDialog.js
rename to src/components/views/dialogs/InviteDialog.tsx
index 73101056f3..9bc5b6476f 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.tsx
@@ -15,13 +15,12 @@ limitations under the License.
 */
 
 import React, {createRef} from 'react';
-import PropTypes from 'prop-types';
-import {_t} from "../../../languageHandler";
+import {_t, _td} from "../../../languageHandler";
 import * as sdk from "../../../index";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {makeRoomPermalink, makeUserPermalink} from "../../../utils/permalinks/Permalinks";
 import DMRoomMap from "../../../utils/DMRoomMap";
-import {RoomMember} from "matrix-js-sdk/src/matrix";
+import {RoomMember} from "matrix-js-sdk/src/models/room-member";
 import SdkConfig from "../../../SdkConfig";
 import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
 import * as Email from "../../../email";
@@ -31,7 +30,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";
@@ -40,12 +39,17 @@ import RoomListStore from "../../../stores/room-list/RoomListStore";
 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";
+import { MatrixCall } from 'matrix-js-sdk/src/webrtc/call';
 
 // we have a number of types defined from the Matrix spec which can't reasonably be altered here.
 /* eslint-disable camelcase */
 
 export const KIND_DM = "dm";
 export const KIND_INVITE = "invite";
+export const KIND_SPACE_INVITE = "space_invite";
+export const KIND_CALL_TRANSFER = "call_transfer";
 
 const INITIAL_ROOMS_SHOWN = 3; // Number of rooms to show at first
 const INCREMENT_ROOMS_SHOWN = 5; // Number of rooms to add when 'show more' is clicked
@@ -130,12 +134,12 @@ class ThreepidMember extends Member {
     }
 }
 
-class DMUserTile extends React.PureComponent {
-    static propTypes = {
-        member: PropTypes.object.isRequired, // Should be a Member (see interface above)
-        onRemove: PropTypes.func, // takes 1 argument, the member being removed
-    };
+interface IDMUserTileProps {
+    member: RoomMember;
+    onRemove: (RoomMember) => any;
+}
 
+class DMUserTile extends React.PureComponent<IDMUserTileProps> {
     _onRemove = (e) => {
         // Stop the browser from highlighting text
         e.preventDefault();
@@ -171,7 +175,9 @@ class DMUserTile extends React.PureComponent {
                     className='mx_InviteDialog_userTile_remove'
                     onClick={this._onRemove}
                 >
-                    <img src={require("../../../../res/img/icon-pill-remove.svg")} alt={_t('Remove')} width={8} height={8} />
+                    <img src={require("../../../../res/img/icon-pill-remove.svg")}
+                        alt={_t('Remove')} width={8} height={8}
+                    />
                 </AccessibleButton>
             );
         }
@@ -188,15 +194,15 @@ class DMUserTile extends React.PureComponent {
     }
 }
 
-class DMRoomTile extends React.PureComponent {
-    static propTypes = {
-        member: PropTypes.object.isRequired, // Should be a Member (see interface above)
-        lastActiveTs: PropTypes.number,
-        onToggle: PropTypes.func.isRequired, // takes 1 argument, the member being toggled
-        highlightWord: PropTypes.string,
-        isSelected: PropTypes.bool,
-    };
+interface IDMRoomTileProps {
+    member: RoomMember;
+    lastActiveTs: number;
+    onToggle: (RoomMember) => any;
+    highlightWord: string;
+    isSelected: boolean;
+}
 
+class DMRoomTile extends React.PureComponent<IDMRoomTileProps> {
     _onClick = (e) => {
         // Stop the browser from highlighting text
         e.preventDefault();
@@ -279,42 +285,74 @@ class DMRoomTile extends React.PureComponent {
             </span>
         );
 
+        const caption = this.props.member.isEmail
+            ? _t("Invite by email")
+            : this._highlightName(this.props.member.userId);
+
         return (
             <div className='mx_InviteDialog_roomTile' onClick={this._onClick}>
                 {stackedAvatar}
-                <span className='mx_InviteDialog_roomTile_name'>{this._highlightName(this.props.member.name)}</span>
-                <span className='mx_InviteDialog_roomTile_userId'>{this._highlightName(this.props.member.userId)}</span>
+                <span className="mx_InviteDialog_roomTile_nameStack">
+                    <div className='mx_InviteDialog_roomTile_name'>{this._highlightName(this.props.member.name)}</div>
+                    <div className='mx_InviteDialog_roomTile_userId'>{caption}</div>
+                </span>
                 {timestamp}
             </div>
         );
     }
 }
 
-export default class InviteDialog extends React.PureComponent {
-    static propTypes = {
-        // Takes an array of user IDs/emails to invite.
-        onFinished: PropTypes.func.isRequired,
+interface IInviteDialogProps {
+    // Takes an array of user IDs/emails to invite.
+    onFinished: (toInvite?: string[]) => any;
 
-        // The kind of invite being performed. Assumed to be KIND_DM if
-        // not provided.
-        kind: PropTypes.string,
+    // The kind of invite being performed. Assumed to be KIND_DM if
+    // not provided.
+    kind: string,
 
-        // The room ID this dialog is for. Only required for KIND_INVITE.
-        roomId: PropTypes.string,
-    };
+    // The room ID this dialog is for. Only required for KIND_INVITE and KIND_SPACE_INVITE.
+    roomId: string,
 
+    // The call to transfer. Only required for KIND_CALL_TRANSFER.
+    call: MatrixCall,
+
+    // Initial value to populate the filter with
+    initialText: string,
+}
+
+interface IInviteDialogState {
+    targets: RoomMember[]; // array of Member objects (see interface above)
+    filterText: string;
+    recents: { user: Member, userId: string }[];
+    numRecentsShown: number;
+    suggestions: { user: Member, userId: string }[];
+    numSuggestionsShown: number;
+    serverResultsMixin: { user: Member, userId: string }[];
+    threepidResultsMixin: { user: Member, userId: string}[];
+    canUseIdentityServer: boolean;
+    tryingIdentityServer: boolean;
+
+    // These two flags are used for the 'Go' button to communicate what is going on.
+    busy: boolean,
+    errorText: string,
+}
+
+export default class InviteDialog extends React.PureComponent<IInviteDialogProps, IInviteDialogState> {
     static defaultProps = {
         kind: KIND_DM,
+        initialText: "",
     };
 
-    _debounceTimer: number = null;
+    _debounceTimer: NodeJS.Timeout = null; // actually number because we're in the browser
     _editorRef: any = null;
 
     constructor(props) {
         super(props);
 
-        if (props.kind === KIND_INVITE && !props.roomId) {
-            throw new Error("When using KIND_INVITE a roomId is required for an InviteDialog");
+        if ((props.kind === KIND_INVITE || props.kind === KIND_SPACE_INVITE) && !props.roomId) {
+            throw new Error("When using KIND_INVITE or KIND_SPACE_INVITE a roomId is required for an InviteDialog");
+        } else if (props.kind === KIND_CALL_TRANSFER && !props.call) {
+            throw new Error("When using KIND_CALL_TRANSFER a call is required for an InviteDialog");
         }
 
         const alreadyInvited = new Set([MatrixClientPeg.get().getUserId(), SdkConfig.get()['welcomeUserId']]);
@@ -325,17 +363,19 @@ export default class InviteDialog extends React.PureComponent {
             room.getMembersWithMembership('join').forEach(m => alreadyInvited.add(m.userId));
             // add banned users, so we don't try to invite them
             room.getMembersWithMembership('ban').forEach(m => alreadyInvited.add(m.userId));
+
+            CountlyAnalytics.instance.trackBeginInvite(props.roomId);
         }
 
         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),
             numSuggestionsShown: INITIAL_ROOMS_SHOWN,
-            serverResultsMixin: [], // { user: DirectoryMember, userId: string }[], like recents and suggestions
-            threepidResultsMixin: [], // { user: ThreepidMember, userId: string}[], like recents and suggestions
+            serverResultsMixin: [],
+            threepidResultsMixin: [],
             canUseIdentityServer: !!MatrixClientPeg.get().getIdentityServerUrl(),
             tryingIdentityServer: false,
 
@@ -347,7 +387,13 @@ export default class InviteDialog extends React.PureComponent {
         this._editorRef = createRef();
     }
 
-    static buildRecents(excludedTargetIds: Set<string>): {userId: string, user: RoomMember, lastActive: number} {
+    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
 
         // Also pull in all the rooms tagged as DefaultTagID.DM so we don't miss anything. Sometimes the
@@ -410,7 +456,7 @@ export default class InviteDialog extends React.PureComponent {
         return recents;
     }
 
-    _buildSuggestions(excludedTargetIds: Set<string>): {userId: string, user: RoomMember} {
+    _buildSuggestions(excludedTargetIds: Set<string>): {userId: string, user: RoomMember}[] {
         const maxConsideredMembers = 200;
         const joinedRooms = MatrixClientPeg.get().getRooms()
             .filter(r => r.getMyMembership() === 'join' && r.getJoinedMemberCount() <= maxConsideredMembers);
@@ -450,7 +496,7 @@ export default class InviteDialog extends React.PureComponent {
         }, {});
 
         // Generates { userId: {member, numRooms, score} }
-        const memberScores = Object.values(memberRooms).reduce((scores, entry) => {
+        const memberScores = Object.values(memberRooms).reduce((scores, entry: {member: RoomMember, rooms: Room[]}) => {
             const numMembersTotal = entry.rooms.reduce((c, r) => c + r.getJoinedMemberCount(), 0);
             const maxRange = maxConsideredMembers * entry.rooms.length;
             scores[entry.member.userId] = {
@@ -566,7 +612,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',
@@ -578,7 +629,7 @@ export default class InviteDialog extends React.PureComponent {
             return;
         }
 
-        const createRoomOptions = {inlineErrors: true};
+        const createRoomOptions = {inlineErrors: true} as any; // XXX: Type out `createRoomOptions`
 
         if (privateShouldBeEncrypted()) {
             // Check whether all users have uploaded device keys before.
@@ -595,7 +646,7 @@ export default class InviteDialog extends React.PureComponent {
 
         // Check if it's a traditional DM and create the room if required.
         // TODO: [Canonical DMs] Remove this check and instead just create the multi-person DM
-        let createRoomPromise = Promise.resolve();
+        let createRoomPromise = Promise.resolve(null) as Promise<string | null | boolean>;
         const isSelf = targetIds.length === 1 && targetIds[0] === MatrixClientPeg.get().getUserId();
         if (targetIds.length === 1 && !isSelf) {
             createRoomOptions.dmUserId = targetIds[0];
@@ -627,6 +678,7 @@ export default class InviteDialog extends React.PureComponent {
     };
 
     _inviteUsers = () => {
+        const startTime = CountlyAnalytics.getTimestamp();
         this.setState({busy: true});
         this._convertFilter();
         const targets = this._convertFilter();
@@ -643,6 +695,7 @@ export default class InviteDialog extends React.PureComponent {
         }
 
         inviteMultipleToRoom(this.props.roomId, targetIds).then(result => {
+            CountlyAnalytics.instance.trackSendInvite(startTime, this.props.roomId, targetIds.length);
             if (!this._shouldAbortAfterInviteError(result)) { // handles setting error message too
                 this.props.onFinished();
             }
@@ -657,13 +710,154 @@ export default class InviteDialog extends React.PureComponent {
         });
     };
 
+    _transferCall = async () => {
+        this._convertFilter();
+        const targets = this._convertFilter();
+        const targetIds = targets.map(t => t.userId);
+        if (targetIds.length > 1) {
+            this.setState({
+                errorText: _t("A call can only be transferred to a single user."),
+            });
+        }
+
+        this.setState({busy: true});
+        try {
+            await this.props.call.transfer(targetIds[0]);
+            this.setState({busy: false});
+            this.props.onFinished();
+        } catch (e) {
+            this.setState({
+                busy: false,
+                errorText: _t("Failed to transfer call"),
+            });
+        }
+    };
+
     _onKeyDown = (e) => {
-        // when the field is empty and the user hits backspace remove the right-most target
-        if (!e.target.value && !this.state.busy && this.state.targets.length > 0 && e.key === Key.BACKSPACE &&
-            !e.ctrlKey && !e.shiftKey && !e.metaKey
-        ) {
+        if (this.state.busy) return;
+        const value = e.target.value.trim();
+        const hasModifiers = e.ctrlKey || e.shiftKey || e.metaKey;
+        if (!value && this.state.targets.length > 0 && e.key === Key.BACKSPACE && !hasModifiers) {
+            // when the field is empty and the user hits backspace remove the right-most target
             e.preventDefault();
             this._removeMember(this.state.targets[this.state.targets.length - 1]);
+        } else if (value && e.key === Key.ENTER && !hasModifiers) {
+            // when the user hits enter with something in their field try to convert it
+            e.preventDefault();
+            this._convertFilter();
+        } else if (value && e.key === Key.SPACE && !hasModifiers && value.includes("@") && !value.includes(" ")) {
+            // when the user hits space and their input looks like an e-mail/MXID then try to convert it
+            e.preventDefault();
+            this._convertFilter();
+        }
+    };
+
+    _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
+            }
         }
     };
 
@@ -677,113 +871,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)
     };
 
@@ -806,6 +895,10 @@ export default class InviteDialog extends React.PureComponent {
             filterText = ""; // clear the filter when the user accepts a suggestion
         }
         this.setState({targets, filterText});
+
+        if (this._editorRef && this._editorRef.current) {
+            this._editorRef.current.focus();
+        }
     };
 
     _removeMember = (member: Member) => {
@@ -815,6 +908,10 @@ export default class InviteDialog extends React.PureComponent {
             targets.splice(idx, 1);
             this.setState({targets});
         }
+
+        if (this._editorRef && this._editorRef.current) {
+            this._editorRef.current.focus();
+        }
     };
 
     _onPaste = async (e) => {
@@ -824,7 +921,7 @@ export default class InviteDialog extends React.PureComponent {
             return;
         }
 
-        // Prevent the text being pasted into the textarea
+        // Prevent the text being pasted into the input
         e.preventDefault();
 
         // Process it as a list of addresses to add instead
@@ -930,7 +1027,7 @@ export default class InviteDialog extends React.PureComponent {
             sectionSubname = _t("May include members not in %(communityName)s", {communityName});
         }
 
-        if (this.props.kind === KIND_INVITE) {
+        if (this.props.kind === KIND_INVITE || this.props.kind === KIND_SPACE_INVITE) {
             sectionName = kind === 'recents' ? _t("Recently Direct Messaged") : _t("Suggestions");
         }
 
@@ -942,7 +1039,8 @@ export default class InviteDialog extends React.PureComponent {
         const hasMixins = this.state.serverResultsMixin || this.state.threepidResultsMixin;
         if (this.state.filterText && hasMixins && kind === 'suggestions') {
             // We don't want to duplicate members though, so just exclude anyone we've already seen.
-            const notAlreadyExists = (u: Member): boolean => {
+            // The type of u is a pain to define but members of both mixins have the 'userId' property
+            const notAlreadyExists = (u: any): boolean => {
                 return !sourceMembers.some(m => m.userId === u.userId)
                     && !priorityAdditionalMembers.some(m => m.userId === u.userId)
                     && !otherAdditionalMembers.some(m => m.userId === u.userId);
@@ -1019,8 +1117,8 @@ export default class InviteDialog extends React.PureComponent {
             <DMUserTile member={t} onRemove={!this.state.busy && this._removeMember} key={t.userId} />
         ));
         const input = (
-            <textarea
-                rows={1}
+            <input
+                type="text"
                 onKeyDown={this._onKeyDown}
                 onChange={this._updateFilter}
                 value={this.state.filterText}
@@ -1028,6 +1126,7 @@ export default class InviteDialog extends React.PureComponent {
                 onPaste={this._onPaste}
                 autoFocus={true}
                 disabled={this.state.busy}
+                autoComplete="off"
             />
         );
         return (
@@ -1098,7 +1197,7 @@ export default class InviteDialog extends React.PureComponent {
 
             if (identityServersEnabled) {
                 helpText = _t(
-                    "Start a conversation with someone using their name, username (like <userId/>) or email address.",
+                    "Start a conversation with someone using their name, email address or username (like <userId/>).",
                     {},
                     {userId: () => {
                         return (
@@ -1120,7 +1219,8 @@ export default class InviteDialog extends React.PureComponent {
 
             if (CommunityPrototypeStore.instance.getSelectedCommunityId()) {
                 const communityName = CommunityPrototypeStore.instance.getSelectedCommunityName();
-                const inviteText = _t("This won't invite them to %(communityName)s. " +
+                const inviteText = _t(
+                    "This won't invite them to %(communityName)s. " +
                     "To invite someone to %(communityName)s, click <a>here</a>",
                     {communityName}, {
                         userId: () => {
@@ -1148,36 +1248,43 @@ export default class InviteDialog extends React.PureComponent {
             }
             buttonText = _t("Go");
             goButtonFn = this._startDm;
-        } else { // KIND_INVITE
-            title = _t("Invite to this room");
+        } else if (this.props.kind === KIND_INVITE || this.props.kind === KIND_SPACE_INVITE) {
+            title = this.props.kind === KIND_INVITE ? _t("Invite to this room") : _t("Invite to this space");
 
-            if (identityServersEnabled) {
-                helpText = _t(
-                    "Invite someone using their name, username (like <userId/>), email address or " +
-                        "<a>share this room</a>.",
-                    {},
-                    {
-                        userId: () =>
-                            <a href={makeUserPermalink(userId)} rel="noreferrer noopener" target="_blank">{userId}</a>,
-                        a: (sub) =>
-                            <a href={makeRoomPermalink(this.props.roomId)} rel="noreferrer noopener" target="_blank">{sub}</a>,
-                    },
-                );
-            } else {
-                helpText = _t(
-                    "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.",
-                    {},
-                    {
-                        userId: () =>
-                            <a href={makeUserPermalink(userId)} rel="noreferrer noopener" target="_blank">{userId}</a>,
-                        a: (sub) =>
-                            <a href={makeRoomPermalink(this.props.roomId)} rel="noreferrer noopener" target="_blank">{sub}</a>,
-                    },
-                );
+            let helpTextUntranslated;
+            if (this.props.kind === KIND_INVITE) {
+                if (identityServersEnabled) {
+                    helpTextUntranslated = _td("Invite someone using their name, email address, username " +
+                        "(like <userId/>) or <a>share this room</a>.");
+                } else {
+                    helpTextUntranslated = _td("Invite someone using their name, username " +
+                        "(like <userId/>) or <a>share this room</a>.");
+                }
+            } else { // KIND_SPACE_INVITE
+                if (identityServersEnabled) {
+                    helpTextUntranslated = _td("Invite someone using their name, email address, username " +
+                        "(like <userId/>) or <a>share this space</a>.");
+                } else {
+                    helpTextUntranslated = _td("Invite someone using their name, username " +
+                        "(like <userId/>) or <a>share this space</a>.");
+                }
             }
 
+            helpText = _t(helpTextUntranslated, {}, {
+                userId: () =>
+                    <a href={makeUserPermalink(userId)} rel="noreferrer noopener" target="_blank">{userId}</a>,
+                a: (sub) =>
+                    <a href={makeRoomPermalink(this.props.roomId)} rel="noreferrer noopener" target="_blank">{sub}</a>,
+            });
+
             buttonText = _t("Invite");
             goButtonFn = this._inviteUsers;
+        } else if (this.props.kind === KIND_CALL_TRANSFER) {
+            title = _t("Transfer");
+            buttonText = _t("Transfer");
+            goButtonFn = this._transferCall;
+        } else {
+            console.error("Unknown kind of InviteDialog: " + this.props.kind);
         }
 
         const hasSelection = this.state.targets.length > 0
diff --git a/src/components/views/dialogs/ModalWidgetDialog.tsx b/src/components/views/dialogs/ModalWidgetDialog.tsx
new file mode 100644
index 0000000000..92fb406965
--- /dev/null
+++ b/src/components/views/dialogs/ModalWidgetDialog.tsx
@@ -0,0 +1,203 @@
+/*
+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 * as React from 'react';
+import BaseDialog from './BaseDialog';
+import { _t } from '../../../languageHandler';
+import AccessibleButton from "../elements/AccessibleButton";
+import {
+    ClientWidgetApi,
+    IModalWidgetCloseRequest,
+    IModalWidgetOpenRequestData,
+    IModalWidgetReturnData,
+    ISetModalButtonEnabledActionRequest,
+    IWidgetApiAcknowledgeResponseData,
+    IWidgetApiErrorResponseData,
+    BuiltInModalButtonID,
+    ModalButtonID,
+    ModalButtonKind,
+    Widget,
+    WidgetApiFromWidgetAction,
+    WidgetKind,
+} from "matrix-widget-api";
+import {StopGapWidgetDriver} from "../../../stores/widgets/StopGapWidgetDriver";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
+import {OwnProfileStore} from "../../../stores/OwnProfileStore";
+import { arrayFastClone } from "../../../utils/arrays";
+import { ElementWidget } from "../../../stores/widgets/StopGapWidget";
+
+interface IProps {
+    widgetDefinition: IModalWidgetOpenRequestData;
+    widgetRoomId?: string;
+    sourceWidgetId: string;
+    onFinished(success: boolean, data?: IModalWidgetReturnData): void;
+}
+
+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 = {
+        disabledButtonIds: [],
+    };
+
+    constructor(props) {
+        super(props);
+
+        this.widget = new ElementWidget({
+            ...this.props.widgetDefinition,
+            creatorUserId: MatrixClientPeg.get().getUserId(),
+            id: `modal_${this.props.sourceWidgetId}`,
+        });
+        this.possibleButtons = (this.props.widgetDefinition.buttons || []).map(b => b.id);
+    }
+
+    public componentDidMount() {
+        const driver = new StopGapWidgetDriver( [], this.widget, WidgetKind.Modal);
+        const messaging = new ClientWidgetApi(this.widget, this.appFrame.current, driver);
+        this.setState({messaging});
+    }
+
+    public componentWillUnmount() {
+        this.state.messaging.off("ready", this.onReady);
+        this.state.messaging.off(`action:${WidgetApiFromWidgetAction.CloseModalWidget}`, this.onWidgetClose);
+        this.state.messaging.stop();
+    }
+
+    private onReady = () => {
+        this.state.messaging.sendWidgetConfig(this.props.widgetDefinition);
+    };
+
+    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({
+            widgetRoomId: this.props.widgetRoomId,
+            currentUserId: MatrixClientPeg.get().getUserId(),
+            userDisplayName: OwnProfileStore.instance.displayName,
+            userHttpAvatarUrl: OwnProfileStore.instance.getHttpAvatarUrl(),
+        });
+
+        const parsed = new URL(templated);
+
+        // Add in some legacy support sprinkles (for non-popout widgets)
+        // TODO: Replace these with proper widget params
+        // See https://github.com/matrix-org/matrix-doc/pull/1958/files#r405714833
+        parsed.searchParams.set('widgetId', this.widget.id);
+        parsed.searchParams.set('parentUrl', window.location.href.split('#', 2)[0]);
+
+        // Replace the encoded dollar signs back to dollar signs. They have no special meaning
+        // in HTTP, but URL parsers encode them anyways.
+        const widgetUrl = parsed.toString().replace(/%24/g, '$');
+
+        let buttons;
+        if (this.props.widgetDefinition.buttons) {
+            // show first button rightmost for a more natural specification
+            buttons = this.props.widgetDefinition.buttons.slice(0, MAX_BUTTONS).reverse().map(def => {
+                let kind = "secondary";
+                switch (def.kind) {
+                    case ModalButtonKind.Primary:
+                        kind = "primary";
+                        break;
+                    case ModalButtonKind.Secondary:
+                        kind = "primary_outline";
+                        break
+                    case ModalButtonKind.Danger:
+                        kind = "danger";
+                        break;
+                }
+
+                const onClick = () => {
+                    this.state.messaging.notifyModalWidgetButtonClicked(def.id);
+                };
+
+                const isDisabled = this.state.disabledButtonIds.includes(def.id);
+
+                return <AccessibleButton key={def.id} kind={kind} onClick={onClick} disabled={isDisabled}>
+                    { def.label }
+                </AccessibleButton>;
+            });
+        }
+
+        return <BaseDialog
+            title={this.props.widgetDefinition.name || _t("Modal Widget")}
+            className="mx_ModalWidgetDialog"
+            contentId="mx_Dialog_content"
+            onFinished={this.props.onFinished}
+        >
+            <div className="mx_ModalWidgetDialog_warning">
+                <img
+                    src={require("../../../../res/img/element-icons/warning-badge.svg")}
+                    height="16"
+                    width="16"
+                    alt=""
+                />
+                {_t("Data on this screen is shared with %(widgetDomain)s", {
+                    widgetDomain: parsed.hostname,
+                })}
+            </div>
+            <div>
+                <iframe
+                    ref={this.appFrame}
+                    sandbox="allow-forms allow-scripts allow-same-origin"
+                    src={widgetUrl}
+                    onLoad={this.onLoad}
+                />
+            </div>
+            <div className="mx_ModalWidgetDialog_buttons">
+                { buttons }
+            </div>
+        </BaseDialog>;
+    }
+}
diff --git a/src/components/views/dialogs/NewSessionReviewDialog.js b/src/components/views/dialogs/NewSessionReviewDialog.js
index 2613dcc6e6..e17501da40 100644
--- a/src/components/views/dialogs/NewSessionReviewDialog.js
+++ b/src/components/views/dialogs/NewSessionReviewDialog.js
@@ -47,7 +47,7 @@ export default class NewSessionReviewDialog extends React.PureComponent {
                     <li>{_t("The internet connection either session is using")}</li>
                 </ul>
                 <div>
-                    {_t("We recommend you change your password and recovery key in Settings immediately")}
+                    {_t("We recommend you change your password and Security Key in Settings immediately")}
                 </div>
             </div>,
             onFinished: () => this.props.onFinished(false),
diff --git a/src/components/views/dialogs/QuestionDialog.js b/src/components/views/dialogs/QuestionDialog.js
index d6de60195f..3d90236b08 100644
--- a/src/components/views/dialogs/QuestionDialog.js
+++ b/src/components/views/dialogs/QuestionDialog.js
@@ -17,6 +17,8 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
+import classNames from "classnames";
+
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 
@@ -26,12 +28,14 @@ export default class QuestionDialog extends React.Component {
         description: PropTypes.node,
         extraButtons: PropTypes.node,
         button: PropTypes.string,
+        buttonDisabled: PropTypes.bool,
         danger: PropTypes.bool,
         focus: PropTypes.bool,
         onFinished: PropTypes.func.isRequired,
         headerImage: PropTypes.string,
         quitOnly: PropTypes.bool, // quitOnly doesn't show the cancel button just the quit [x].
         fixedWidth: PropTypes.bool,
+        className: PropTypes.string,
     };
 
     static defaultProps = {
@@ -61,7 +65,7 @@ export default class QuestionDialog extends React.Component {
         }
         return (
             <BaseDialog
-                className="mx_QuestionDialog"
+                className={classNames("mx_QuestionDialog", this.props.className)}
                 onFinished={this.props.onFinished}
                 title={this.props.title}
                 contentId='mx_Dialog_content'
@@ -74,6 +78,7 @@ export default class QuestionDialog extends React.Component {
                 </div>
                 <DialogButtons primaryButton={this.props.button || _t('OK')}
                     primaryButtonClass={primaryButtonClass}
+                    primaryDisabled={this.props.buttonDisabled}
                     cancelButton={this.props.cancelButton}
                     hasCancel={this.props.hasCancelButton && !this.props.quitOnly}
                     onPrimaryButtonClick={this.onOk}
diff --git a/src/components/views/dialogs/RedesignFeedbackDialog.js b/src/components/views/dialogs/RedesignFeedbackDialog.js
deleted file mode 100644
index 51b71ac6cb..0000000000
--- a/src/components/views/dialogs/RedesignFeedbackDialog.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-Copyright 2018 New Vector 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 QuestionDialog from './QuestionDialog';
-import { _t } from '../../../languageHandler';
-
-export default (props) => {
-    const existingIssuesUrl = "https://github.com/vector-im/element-web/issues" +
-        "?q=is%3Aopen+is%3Aissue+sort%3Areactions-%2B1-desc";
-    const newIssueUrl = "https://github.com/vector-im/element-web/issues/new";
-
-    const description1 =
-        _t("If you run into any bugs or have feedback you'd like to share, " +
-           "please let us know on GitHub.");
-    const description2 = _t("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.", {},
-        {
-            existingIssuesLink: (sub) => {
-                return <a target="_blank" rel="noreferrer noopener" href={existingIssuesUrl}>{ sub }</a>;
-            },
-            newIssueLink: (sub) => {
-                return <a target="_blank" rel="noreferrer noopener" href={newIssueUrl}>{ sub }</a>;
-            },
-        });
-
-    return (<QuestionDialog
-        hasCancelButton={false}
-        title={_t("Report bugs & give feedback")}
-        description={<div><p>{description1}</p><p>{description2}</p></div>}
-        button={_t("Go back")}
-        onFinished={props.onFinished}
-    />);
-};
diff --git a/src/components/views/dialogs/RegistrationEmailPromptDialog.tsx b/src/components/views/dialogs/RegistrationEmailPromptDialog.tsx
new file mode 100644
index 0000000000..3f3ad215a5
--- /dev/null
+++ b/src/components/views/dialogs/RegistrationEmailPromptDialog.tsx
@@ -0,0 +1,98 @@
+/*
+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 * as React from "react";
+
+import { _t } from '../../../languageHandler';
+import { IDialogProps } from "./IDialogProps";
+import {useRef, useState} from "react";
+import Field from "../elements/Field";
+import CountlyAnalytics from "../../../CountlyAnalytics";
+import withValidation from "../elements/Validation";
+import * as Email from "../../../email";
+import BaseDialog from "./BaseDialog";
+import DialogButtons from "../elements/DialogButtons";
+
+interface IProps extends IDialogProps {
+    onFinished(continued: boolean, email?: string): void;
+}
+
+const validation = withValidation({
+    rules: [
+        {
+            key: "email",
+            test: ({ value }) => !value || Email.looksValid(value),
+            invalid: () => _t("Doesn't look like a valid email address"),
+        },
+    ],
+});
+
+const RegistrationEmailPromptDialog: React.FC<IProps> = ({onFinished}) => {
+    const [email, setEmail] = useState("");
+    const fieldRef = useRef<Field>();
+
+    const onSubmit = async (e) => {
+        e.preventDefault();
+        if (email) {
+            const valid = await fieldRef.current.validate({ allowEmpty: false });
+
+            if (!valid) {
+                fieldRef.current.focus();
+                fieldRef.current.validate({ allowEmpty: false, focused: true });
+                return;
+            }
+        }
+
+        onFinished(true, email);
+    };
+
+    return <BaseDialog
+        title={_t("Continuing without email")}
+        className="mx_RegistrationEmailPromptDialog"
+        contentId="mx_RegistrationEmailPromptDialog"
+        onFinished={() => onFinished(false)}
+        fixedWidth={false}
+    >
+        <div className="mx_Dialog_content" id="mx_RegistrationEmailPromptDialog">
+            <p>{_t("Just a heads up, if you don't add an email and forget your password, you could " +
+                "<b>permanently lose access to your account</b>.", {}, {
+                b: sub => <b>{sub}</b>,
+            })}</p>
+            <form onSubmit={onSubmit}>
+                <Field
+                    ref={fieldRef}
+                    autoFocus={true}
+                    type="text"
+                    label={_t("Email (optional)")}
+                    value={email}
+                    onChange={ev => {
+                        setEmail(ev.target.value);
+                    }}
+                    onValidate={async fieldState => await validation(fieldState)}
+                    onFocus={() => CountlyAnalytics.instance.track("onboarding_registration_email2_focus")}
+                    onBlur={() => CountlyAnalytics.instance.track("onboarding_registration_email2_blur")}
+                />
+            </form>
+        </div>
+        <DialogButtons
+            primaryButton={_t("Continue")}
+            onPrimaryButtonClick={onSubmit}
+            hasCancel={false}
+        />
+    </BaseDialog>;
+};
+
+export default RegistrationEmailPromptDialog;
diff --git a/src/components/views/dialogs/RoomSettingsDialog.js b/src/components/views/dialogs/RoomSettingsDialog.js
index a43b284c42..9d9313f08f 100644
--- a/src/components/views/dialogs/RoomSettingsDialog.js
+++ b/src/components/views/dialogs/RoomSettingsDialog.js
@@ -53,9 +53,9 @@ export default class RoomSettingsDialog extends React.Component {
     }
 
     _onAction = (payload) => {
-        // When room changes below us, close the room settings
+        // When view changes below us, close the room settings
         // whilst the modal is open this can only be triggered when someone hits Leave Room
-        if (payload.action === 'view_next_room') {
+        if (payload.action === 'view_home_page') {
             this.props.onFinished();
         }
     };
diff --git a/src/components/views/dialogs/ServerPickerDialog.tsx b/src/components/views/dialogs/ServerPickerDialog.tsx
new file mode 100644
index 0000000000..7ca115760e
--- /dev/null
+++ b/src/components/views/dialogs/ServerPickerDialog.tsx
@@ -0,0 +1,235 @@
+/*
+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, {createRef} from "react";
+import {AutoDiscovery} from "matrix-js-sdk/src/autodiscovery";
+
+import AutoDiscoveryUtils, {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
+import BaseDialog from './BaseDialog';
+import { _t } from '../../../languageHandler';
+import AccessibleButton from "../elements/AccessibleButton";
+import SdkConfig from "../../../SdkConfig";
+import Field from "../elements/Field";
+import StyledRadioButton from "../elements/StyledRadioButton";
+import TextWithTooltip from "../elements/TextWithTooltip";
+import withValidation, {IFieldState} from "../elements/Validation";
+
+interface IProps {
+    title?: string;
+    serverConfig: ValidatedServerConfig;
+    onFinished(config?: ValidatedServerConfig): void;
+}
+
+interface IState {
+    defaultChosen: boolean;
+    otherHomeserver: string;
+}
+
+export default class ServerPickerDialog extends React.PureComponent<IProps, IState> {
+    private readonly defaultServer: ValidatedServerConfig;
+    private readonly fieldRef = createRef<Field>();
+    private validatedConf: ValidatedServerConfig;
+
+    constructor(props) {
+        super(props);
+
+        const config = SdkConfig.get();
+        this.defaultServer = config["validated_server_config"] as ValidatedServerConfig;
+        const { serverConfig } = this.props;
+
+        let otherHomeserver = "";
+        if (!serverConfig.isDefault) {
+            if (serverConfig.isNameResolvable && serverConfig.hsName) {
+                otherHomeserver = serverConfig.hsName;
+            } else {
+                otherHomeserver = serverConfig.hsUrl;
+            }
+        }
+
+        this.state = {
+            defaultChosen: serverConfig.isDefault,
+            otherHomeserver,
+        };
+    }
+
+    private onDefaultChosen = () => {
+        this.setState({ defaultChosen: true });
+    };
+
+    private onOtherChosen = () => {
+        this.setState({ defaultChosen: false });
+    };
+
+    private onHomeserverChange = (ev) => {
+        this.setState({ otherHomeserver: ev.target.value });
+    };
+
+    // TODO: Do we want to support .well-known lookups here?
+    // If for some reason someone enters "matrix.org" for a URL, we could do a lookup to
+    // find their homeserver without demanding they use "https://matrix.org"
+    private validate = withValidation<this, { error?: string }>({
+        deriveData: async ({ value }) => {
+            let hsUrl = value.trim(); // trim to account for random whitespace
+
+            // if the URL has no protocol, try validate it as a serverName via well-known
+            if (!hsUrl.includes("://")) {
+                try {
+                    const discoveryResult = await AutoDiscovery.findClientConfig(hsUrl);
+                    this.validatedConf = AutoDiscoveryUtils.buildValidatedConfigFromDiscovery(hsUrl, discoveryResult);
+                    return {}; // we have a validated config, we don't need to try the other paths
+                } catch (e) {
+                    console.error(`Attempted ${hsUrl} as a server_name but it failed`, e);
+                }
+            }
+
+            // if we got to this stage then either the well-known failed or the URL had a protocol specified,
+            // so validate statically only. If the URL has no protocol, default to https.
+            if (!hsUrl.includes("://")) {
+                hsUrl = "https://" + hsUrl;
+            }
+
+            try {
+                this.validatedConf = await AutoDiscoveryUtils.validateServerConfigWithStaticUrls(hsUrl);
+                return {};
+            } catch (e) {
+                console.error(e);
+
+                const stateForError = AutoDiscoveryUtils.authComponentStateForError(e);
+                if (stateForError.isFatalError) {
+                    let error = _t("Unable to validate homeserver");
+                    if (e.translatedMessage) {
+                        error = e.translatedMessage;
+                    }
+                    return { error };
+                }
+
+                // try to carry on anyway
+                try {
+                    this.validatedConf = await AutoDiscoveryUtils.validateServerConfigWithStaticUrls(hsUrl, null, true);
+                    return {};
+                } catch (e) {
+                    console.error(e);
+                    return { error: _t("Invalid URL") };
+                }
+            }
+        },
+        rules: [
+            {
+                key: "required",
+                test: ({ value, allowEmpty }) => allowEmpty || !!value,
+                invalid: () => _t("Specify a homeserver"),
+            }, {
+                key: "valid",
+                test: async function({ value }, { error }) {
+                    if (!value) return true;
+                    return !error;
+                },
+                invalid: function({ error }) {
+                    return error;
+                },
+            },
+        ],
+    });
+
+    private onHomeserverValidate = (fieldState: IFieldState) => this.validate(fieldState);
+
+    private onSubmit = async (ev) => {
+        ev.preventDefault();
+
+        const valid = await this.fieldRef.current.validate({ allowEmpty: false });
+
+        if (!valid && !this.state.defaultChosen) {
+            this.fieldRef.current.focus();
+            this.fieldRef.current.validate({ allowEmpty: false, focused: true });
+            return;
+        }
+
+        this.props.onFinished(this.state.defaultChosen ? this.defaultServer : this.validatedConf);
+    };
+
+    public render() {
+        let text;
+        if (this.defaultServer.hsName === "matrix.org") {
+            text = _t("Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.");
+        }
+
+        let defaultServerName = this.defaultServer.hsName;
+        if (this.defaultServer.hsNameIsDifferent) {
+            defaultServerName = (
+                <TextWithTooltip class="mx_Login_underlinedServerName" tooltip={this.defaultServer.hsUrl}>
+                    {this.defaultServer.hsName}
+                </TextWithTooltip>
+            );
+        }
+
+        return <BaseDialog
+            title={this.props.title || _t("Sign into your homeserver")}
+            className="mx_ServerPickerDialog"
+            contentId="mx_ServerPickerDialog"
+            onFinished={this.props.onFinished}
+            fixedWidth={false}
+            hasCancel={true}
+        >
+            <form className="mx_Dialog_content" id="mx_ServerPickerDialog" onSubmit={this.onSubmit}>
+                <p>
+                    {_t("We call the places where you can host your account ‘homeservers’.")} {text}
+                </p>
+
+                <StyledRadioButton
+                    name="defaultChosen"
+                    value="true"
+                    checked={this.state.defaultChosen}
+                    onChange={this.onDefaultChosen}
+                >
+                    {defaultServerName}
+                </StyledRadioButton>
+
+                <StyledRadioButton
+                    name="defaultChosen"
+                    value="false"
+                    className="mx_ServerPickerDialog_otherHomeserverRadio"
+                    checked={!this.state.defaultChosen}
+                    onChange={this.onOtherChosen}
+                >
+                    <Field
+                        type="text"
+                        className="mx_ServerPickerDialog_otherHomeserver"
+                        label={_t("Other homeserver")}
+                        onChange={this.onHomeserverChange}
+                        onClick={this.onOtherChosen}
+                        ref={this.fieldRef}
+                        onValidate={this.onHomeserverValidate}
+                        value={this.state.otherHomeserver}
+                        validateOnChange={false}
+                        validateOnFocus={false}
+                    />
+                </StyledRadioButton>
+                <p>
+                    {_t("Use your preferred Matrix homeserver if you have one, or host your own.")}
+                </p>
+
+                <AccessibleButton className="mx_ServerPickerDialog_continue" kind="primary" onClick={this.onSubmit}>
+                    {_t("Continue")}
+                </AccessibleButton>
+
+                <h4>{_t("Learn more")}</h4>
+                <a href="https://matrix.org/faq/#what-is-a-homeserver%3F" target="_blank" rel="noreferrer noopener">
+                    {_t("About homeservers")}
+                </a>
+            </form>
+        </BaseDialog>;
+    }
+}
diff --git a/src/components/views/dialogs/ShareDialog.tsx b/src/components/views/dialogs/ShareDialog.tsx
index 1569977d58..5264031cc6 100644
--- a/src/components/views/dialogs/ShareDialog.tsx
+++ b/src/components/views/dialogs/ShareDialog.tsx
@@ -146,7 +146,7 @@ export default class ShareDialog extends React.PureComponent<IProps, IState> {
                 const events = this.props.target.getLiveTimeline().getEvents();
                 matrixToUrl = this.state.permalinkCreator.forEvent(events[events.length - 1].getId());
             } else {
-                matrixToUrl = this.state.permalinkCreator.forRoom();
+                matrixToUrl = this.state.permalinkCreator.forShareableRoom();
             }
         } else if (this.props.target instanceof User || this.props.target instanceof RoomMember) {
             matrixToUrl = makeUserPermalink(this.props.target.userId);
diff --git a/src/components/views/dialogs/SpaceSettingsDialog.tsx b/src/components/views/dialogs/SpaceSettingsDialog.tsx
new file mode 100644
index 0000000000..f6bf5b87e6
--- /dev/null
+++ b/src/components/views/dialogs/SpaceSettingsDialog.tsx
@@ -0,0 +1,162 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, {useState} from 'react';
+import {Room} from "matrix-js-sdk/src/models/room";
+import {MatrixClient} from "matrix-js-sdk/src/client";
+import {EventType} from "matrix-js-sdk/src/@types/event";
+
+import {_t} from '../../../languageHandler';
+import {IDialogProps} from "./IDialogProps";
+import BaseDialog from "./BaseDialog";
+import DevtoolsDialog from "./DevtoolsDialog";
+import SpaceBasicSettings from '../spaces/SpaceBasicSettings';
+import {getTopic} from "../elements/RoomTopic";
+import {avatarUrlForRoom} from "../../../Avatar";
+import ToggleSwitch from "../elements/ToggleSwitch";
+import AccessibleButton from "../elements/AccessibleButton";
+import FormButton from "../elements/FormButton";
+import Modal from "../../../Modal";
+import defaultDispatcher from "../../../dispatcher/dispatcher";
+import {allSettled} from "../../../utils/promise";
+import {useDispatcher} from "../../../hooks/useDispatcher";
+
+interface IProps extends IDialogProps {
+    matrixClient: MatrixClient;
+    space: Room;
+}
+
+const SpaceSettingsDialog: React.FC<IProps> = ({ matrixClient: cli, space, onFinished }) => {
+    useDispatcher(defaultDispatcher, ({action, ...params}) => {
+        if (action === "after_leave_room" && params.room_id === space.roomId) {
+            onFinished(false);
+        }
+    });
+
+    const [busy, setBusy] = useState(false);
+    const [error, setError] = useState("");
+
+    const userId = cli.getUserId();
+
+    const [newAvatar, setNewAvatar] = useState<File>(null); // undefined means to remove avatar
+    const canSetAvatar = space.currentState.maySendStateEvent(EventType.RoomAvatar, userId);
+    const avatarChanged = newAvatar !== null;
+
+    const [name, setName] = useState<string>(space.name);
+    const canSetName = space.currentState.maySendStateEvent(EventType.RoomName, userId);
+    const nameChanged = name !== space.name;
+
+    const currentTopic = getTopic(space);
+    const [topic, setTopic] = useState<string>(currentTopic);
+    const canSetTopic = space.currentState.maySendStateEvent(EventType.RoomTopic, userId);
+    const topicChanged = topic !== currentTopic;
+
+    const currentJoinRule = space.getJoinRule();
+    const [joinRule, setJoinRule] = useState(currentJoinRule);
+    const canSetJoinRule = space.currentState.maySendStateEvent(EventType.RoomJoinRules, userId);
+    const joinRuleChanged = joinRule !== currentJoinRule;
+
+    const onSave = async () => {
+        setBusy(true);
+        const promises = [];
+
+        if (avatarChanged) {
+            promises.push(cli.sendStateEvent(space.roomId, EventType.RoomAvatar, {
+                url: await cli.uploadContent(newAvatar),
+            }, ""));
+        }
+
+        if (nameChanged) {
+            promises.push(cli.setRoomName(space.roomId, name));
+        }
+
+        if (topicChanged) {
+            promises.push(cli.setRoomTopic(space.roomId, topic));
+        }
+
+        if (joinRuleChanged) {
+            promises.push(cli.sendStateEvent(space.roomId, EventType.RoomJoinRules, { join_rule: joinRule }, ""));
+        }
+
+        const results = await allSettled(promises);
+        setBusy(false);
+        const failures = results.filter(r => r.status === "rejected");
+        if (failures.length > 0) {
+            console.error("Failed to save space settings: ", failures);
+            setError(_t("Failed to save space settings."));
+        }
+    };
+
+    return <BaseDialog
+        title={_t("Space settings")}
+        className="mx_SpaceSettingsDialog"
+        contentId="mx_SpaceSettingsDialog"
+        onFinished={onFinished}
+        fixedWidth={false}
+    >
+        <div className="mx_SpaceSettingsDialog_content" id="mx_SpaceSettingsDialog">
+            <div>{ _t("Edit settings relating to your space.") }</div>
+
+            { error && <div className="mx_SpaceRoomView_errorText">{ error }</div> }
+
+            <SpaceBasicSettings
+                avatarUrl={avatarUrlForRoom(space, 80, 80, "crop")}
+                avatarDisabled={!canSetAvatar}
+                setAvatar={setNewAvatar}
+                name={name}
+                nameDisabled={!canSetName}
+                setName={setName}
+                topic={topic}
+                topicDisabled={!canSetTopic}
+                setTopic={setTopic}
+            />
+
+            <div>
+                { _t("Make this space private") }
+                <ToggleSwitch
+                    checked={joinRule === "private"}
+                    onChange={checked => setJoinRule(checked ? "private" : "invite")}
+                    disabled={!canSetJoinRule}
+                    aria-label={_t("Make this space private")}
+                />
+            </div>
+
+            <FormButton
+                kind="danger"
+                label={_t("Leave Space")}
+                onClick={() => {
+                    defaultDispatcher.dispatch({
+                        action: "leave_room",
+                        room_id: space.roomId,
+                    });
+                }}
+            />
+
+            <div className="mx_SpaceSettingsDialog_buttons">
+                <AccessibleButton onClick={() => Modal.createDialog(DevtoolsDialog, {roomId: space.roomId})}>
+                    { _t("View dev tools") }
+                </AccessibleButton>
+                <AccessibleButton onClick={onFinished} disabled={busy} kind="link">
+                    { _t("Cancel") }
+                </AccessibleButton>
+                <FormButton onClick={onSave} disabled={busy} label={busy ? _t("Saving...") : _t("Save Changes")} />
+            </div>
+        </div>
+    </BaseDialog>;
+};
+
+export default SpaceSettingsDialog;
+
diff --git a/src/components/views/dialogs/TextInputDialog.js b/src/components/views/dialogs/TextInputDialog.js
index 571ed7e413..69cc4390be 100644
--- a/src/components/views/dialogs/TextInputDialog.js
+++ b/src/components/views/dialogs/TextInputDialog.js
@@ -18,6 +18,7 @@ import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
 import Field from "../elements/Field";
+import { _t, _td } from '../../../languageHandler';
 
 export default class TextInputDialog extends React.Component {
     static propTypes = {
@@ -29,6 +30,7 @@ export default class TextInputDialog extends React.Component {
         value: PropTypes.string,
         placeholder: PropTypes.string,
         button: PropTypes.string,
+        busyMessage: PropTypes.string, // pass _td string
         focus: PropTypes.bool,
         onFinished: PropTypes.func.isRequired,
         hasCancel: PropTypes.bool,
@@ -40,6 +42,7 @@ export default class TextInputDialog extends React.Component {
         title: "",
         value: "",
         description: "",
+        busyMessage: _td("Loading..."),
         focus: true,
         hasCancel: true,
     };
@@ -51,6 +54,7 @@ export default class TextInputDialog extends React.Component {
 
         this.state = {
             value: this.props.value,
+            busy: false,
             valid: false,
         };
     }
@@ -66,11 +70,13 @@ export default class TextInputDialog extends React.Component {
     onOk = async ev => {
         ev.preventDefault();
         if (this.props.validator) {
+            this.setState({ busy: true });
             await this._field.current.validate({ allowEmpty: false });
 
             if (!this._field.current.state.valid) {
                 this._field.current.focus();
                 this._field.current.validate({ allowEmpty: false, focused: true });
+                this.setState({ busy: false });
                 return;
             }
         }
@@ -125,7 +131,8 @@ export default class TextInputDialog extends React.Component {
                     </div>
                 </form>
                 <DialogButtons
-                    primaryButton={this.props.button}
+                    primaryButton={this.state.busy ? _t(this.props.busyMessage) : this.props.button}
+                    disabled={this.state.busy}
                     onPrimaryButtonClick={this.onOk}
                     onCancel={this.onCancel}
                     hasCancel={this.props.hasCancel}
diff --git a/src/components/views/dialogs/WidgetCapabilitiesPromptDialog.tsx b/src/components/views/dialogs/WidgetCapabilitiesPromptDialog.tsx
new file mode 100644
index 0000000000..535e0b7b8e
--- /dev/null
+++ b/src/components/views/dialogs/WidgetCapabilitiesPromptDialog.tsx
@@ -0,0 +1,147 @@
+/*
+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 BaseDialog from "./BaseDialog";
+import { _t } from "../../../languageHandler";
+import { IDialogProps } from "./IDialogProps";
+import {
+    Capability,
+    Widget,
+    WidgetEventCapability,
+    WidgetKind,
+} from "matrix-widget-api";
+import { objectShallowClone } from "../../../utils/objects";
+import StyledCheckbox from "../elements/StyledCheckbox";
+import DialogButtons from "../elements/DialogButtons";
+import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
+import { CapabilityText } from "../../../widgets/CapabilityText";
+
+export function getRememberedCapabilitiesForWidget(widget: Widget): Capability[] {
+    return JSON.parse(localStorage.getItem(`widget_${widget.id}_approved_caps`) || "[]");
+}
+
+function setRememberedCapabilitiesForWidget(widget: Widget, caps: Capability[]) {
+    localStorage.setItem(`widget_${widget.id}_approved_caps`, JSON.stringify(caps));
+}
+
+interface IProps extends IDialogProps {
+    requestedCapabilities: Set<Capability>;
+    widget: Widget;
+    widgetKind: WidgetKind; // TODO: Refactor into the Widget class
+}
+
+interface IBooleanStates {
+    // @ts-ignore - TS wants a string key, but we know better
+    [capability: Capability]: boolean;
+}
+
+interface IState {
+    booleanStates: IBooleanStates;
+    rememberSelection: boolean;
+}
+
+export default class WidgetCapabilitiesPromptDialog extends React.PureComponent<IProps, IState> {
+    private eventPermissionsMap = new Map<Capability, WidgetEventCapability>();
+
+    constructor(props: IProps) {
+        super(props);
+
+        const parsedEvents = WidgetEventCapability.findEventCapabilities(this.props.requestedCapabilities);
+        parsedEvents.forEach(e => this.eventPermissionsMap.set(e.raw, e));
+
+        const states: IBooleanStates = {};
+        this.props.requestedCapabilities.forEach(c => states[c] = true);
+
+        this.state = {
+            booleanStates: states,
+            rememberSelection: true,
+        };
+    }
+
+    private onToggle = (capability: Capability) => {
+        const newStates = objectShallowClone(this.state.booleanStates);
+        newStates[capability] = !newStates[capability];
+        this.setState({booleanStates: newStates});
+    };
+
+    private onRememberSelectionChange = (newVal: boolean) => {
+        this.setState({rememberSelection: newVal});
+    };
+
+    private onSubmit = async (ev) => {
+        this.closeAndTryRemember(Object.entries(this.state.booleanStates)
+            .filter(([_, isSelected]) => isSelected)
+            .map(([cap]) => cap));
+    };
+
+    private onReject = async (ev) => {
+        this.closeAndTryRemember([]); // nothing was approved
+    };
+
+    private closeAndTryRemember(approved: Capability[]) {
+        if (this.state.rememberSelection) {
+            setRememberedCapabilitiesForWidget(this.props.widget, approved);
+        }
+        this.props.onFinished({approved});
+    }
+
+    public render() {
+        const checkboxRows = Object.entries(this.state.booleanStates).map(([cap, isChecked], i) => {
+            const text = CapabilityText.for(cap, this.props.widgetKind);
+            const byline = text.byline
+                ? <span className="mx_WidgetCapabilitiesPromptDialog_byline">{text.byline}</span>
+                : null;
+
+            return (
+                <div className="mx_WidgetCapabilitiesPromptDialog_cap" key={cap + i}>
+                    <StyledCheckbox
+                        checked={isChecked}
+                        onChange={() => this.onToggle(cap)}
+                    >{text.primary}</StyledCheckbox>
+                    {byline}
+                </div>
+            );
+        });
+
+        return (
+            <BaseDialog
+                className="mx_WidgetCapabilitiesPromptDialog"
+                onFinished={this.props.onFinished}
+                title={_t("Approve widget permissions")}
+            >
+                <form onSubmit={this.onSubmit}>
+                    <div className="mx_Dialog_content">
+                        <div className="text-muted">{_t("This widget would like to:")}</div>
+                        {checkboxRows}
+                        <DialogButtons
+                            primaryButton={_t("Approve")}
+                            cancelButton={_t("Decline All")}
+                            onPrimaryButtonClick={this.onSubmit}
+                            onCancel={this.onReject}
+                            additive={
+                                <LabelledToggleSwitch
+                                    value={this.state.rememberSelection}
+                                    toggleInFront={true}
+                                    onChange={this.onRememberSelectionChange}
+                                    label={_t("Remember my selection for this widget")} />}
+                        />
+                    </div>
+                </form>
+            </BaseDialog>
+        );
+    }
+}
diff --git a/src/components/views/dialogs/WidgetOpenIDPermissionsDialog.js b/src/components/views/dialogs/WidgetOpenIDPermissionsDialog.js
index 42a5304f13..c01d3d39b8 100644
--- a/src/components/views/dialogs/WidgetOpenIDPermissionsDialog.js
+++ b/src/components/views/dialogs/WidgetOpenIDPermissionsDialog.js
@@ -17,18 +17,17 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../languageHandler";
-import SettingsStore from "../../../settings/SettingsStore";
 import * as sdk from "../../../index";
 import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
-import WidgetUtils from "../../../utils/WidgetUtils";
-import {SettingLevel} from "../../../settings/SettingLevel";
+import {Widget} from "matrix-widget-api";
+import {OIDCState, WidgetPermissionStore} from "../../../stores/widgets/WidgetPermissionStore";
 
 export default class WidgetOpenIDPermissionsDialog extends React.Component {
     static propTypes = {
         onFinished: PropTypes.func.isRequired,
-        widgetUrl: PropTypes.string.isRequired,
-        widgetId: PropTypes.string.isRequired,
-        isUserWidget: PropTypes.bool.isRequired,
+        widget: PropTypes.objectOf(Widget).isRequired,
+        widgetKind: PropTypes.string.isRequired, // WidgetKind from widget-api
+        inRoomId: PropTypes.string,
     };
 
     constructor() {
@@ -51,16 +50,10 @@ export default class WidgetOpenIDPermissionsDialog extends React.Component {
         if (this.state.rememberSelection) {
             console.log(`Remembering ${this.props.widgetId} as allowed=${allowed} for OpenID`);
 
-            const currentValues = SettingsStore.getValue("widgetOpenIDPermissions");
-            if (!currentValues.allow) currentValues.allow = [];
-            if (!currentValues.deny) currentValues.deny = [];
-
-            const securityKey = WidgetUtils.getWidgetSecurityKey(
-                this.props.widgetId,
-                this.props.widgetUrl,
-                this.props.isUserWidget);
-            (allowed ? currentValues.allow : currentValues.deny).push(securityKey);
-            SettingsStore.setValue("widgetOpenIDPermissions", null, SettingLevel.DEVICE, currentValues);
+            WidgetPermissionStore.instance.setOIDCState(
+                this.props.widget, this.props.widgetKind, this.props.inRoomId,
+                allowed ? OIDCState.Allowed : OIDCState.Denied,
+            );
         }
 
         this.props.onFinished(allowed);
@@ -77,26 +70,26 @@ export default class WidgetOpenIDPermissionsDialog extends React.Component {
         return (
             <BaseDialog className='mx_WidgetOpenIDPermissionsDialog' hasCancel={true}
                         onFinished={this.props.onFinished}
-                        title={_t("A widget would like to verify your identity")}>
+                        title={_t("Allow this widget to verify your identity")}>
                 <div className='mx_WidgetOpenIDPermissionsDialog_content'>
                     <p>
-                        {_t(
-                            "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.", {
-                                widgetUrl: this.props.widgetUrl,
-                            },
-                        )}
+                        {_t("The widget will verify your user ID, but won't be able to perform actions for you:")}
+                    </p>
+                    <p className="text-muted">
+                        {/* cheap trim to just get the path */}
+                        {this.props.widget.templateUrl.split("?")[0].split("#")[0]}
                     </p>
-                    <LabelledToggleSwitch value={this.state.rememberSelection} toggleInFront={true}
-                                          onChange={this._onRememberSelectionChange}
-                                          label={_t("Remember my selection for this widget")} />
                 </div>
                 <DialogButtons
-                    primaryButton={_t("Allow")}
+                    primaryButton={_t("Continue")}
                     onPrimaryButtonClick={this._onAllow}
-                    cancelButton={_t("Deny")}
                     onCancel={this._onDeny}
+                    additive={
+                        <LabelledToggleSwitch
+                            value={this.state.rememberSelection}
+                            toggleInFront={true}
+                            onChange={this._onRememberSelectionChange}
+                            label={_t("Remember this")} />}
                 />
             </BaseDialog>
         );
diff --git a/src/components/views/dialogs/security/AccessSecretStorageDialog.js b/src/components/views/dialogs/security/AccessSecretStorageDialog.js
index 21655e7fd4..f54a053984 100644
--- a/src/components/views/dialogs/security/AccessSecretStorageDialog.js
+++ b/src/components/views/dialogs/security/AccessSecretStorageDialog.js
@@ -199,11 +199,11 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
         } else if (this.state.recoveryKeyCorrect) {
             return _t("Looks good!");
         } else if (this.state.recoveryKeyValid) {
-            return _t("Wrong Recovery Key");
+            return _t("Wrong Security Key");
         } else if (this.state.recoveryKeyValid === null) {
             return '';
         } else {
-            return _t("Invalid Recovery Key");
+            return _t("Invalid Security Key");
         }
     }
 
@@ -231,7 +231,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
                 keyStatus = <div className="mx_AccessSecretStorageDialog_keyStatus">
                     {"\uD83D\uDC4E "}{_t(
                         "Unable to access secret storage. " +
-                        "Please verify that you entered the correct recovery passphrase.",
+                        "Please verify that you entered the correct Security Phrase.",
                     )}
                 </div>;
             } else {
@@ -298,7 +298,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
                     <div className="mx_AccessSecretStorageDialog_recoveryKeyEntry">
                         <div className="mx_AccessSecretStorageDialog_recoveryKeyEntry_textInput">
                             <Field
-                                type="text"
+                                type="password"
                                 label={_t('Security Key')}
                                 value={this.state.recoveryKey}
                                 onChange={this._onRecoveryKeyChange}
diff --git a/src/components/views/dialogs/security/CreateCrossSigningDialog.js b/src/components/views/dialogs/security/CreateCrossSigningDialog.js
index 226419e759..be546d2616 100644
--- a/src/components/views/dialogs/security/CreateCrossSigningDialog.js
+++ b/src/components/views/dialogs/security/CreateCrossSigningDialog.js
@@ -34,6 +34,7 @@ import InteractiveAuthDialog from '../InteractiveAuthDialog';
 export default class CreateCrossSigningDialog extends React.PureComponent {
     static propTypes = {
         accountPassword: PropTypes.string,
+        tokenLogin: PropTypes.bool,
     };
 
     constructor(props) {
@@ -96,6 +97,9 @@ export default class CreateCrossSigningDialog extends React.PureComponent {
                 user: MatrixClientPeg.get().getUserId(),
                 password: this.state.accountPassword,
             });
+        } else if (this.props.tokenLogin) {
+            // We are hoping the grace period is active
+            await makeRequest({});
         } else {
             const dialogAesthetics = {
                 [SSOAuthEntry.PHASE_PREAUTH]: {
@@ -144,6 +148,12 @@ export default class CreateCrossSigningDialog extends React.PureComponent {
             });
             this.props.onFinished(true);
         } catch (e) {
+            if (this.props.tokenLogin) {
+                // ignore any failures, we are relying on grace period here
+                this.props.onFinished();
+                return;
+            }
+
             this.setState({ error: e });
             console.error("Error bootstrapping cross-signing", e);
         }
diff --git a/src/components/views/dialogs/security/RestoreKeyBackupDialog.js b/src/components/views/dialogs/security/RestoreKeyBackupDialog.js
index 2362133460..ca28ca094c 100644
--- a/src/components/views/dialogs/security/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/security/RestoreKeyBackupDialog.js
@@ -297,19 +297,19 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
         } else if (this.state.restoreError) {
             if (this.state.restoreError.errcode === MatrixClient.RESTORE_BACKUP_ERROR_BAD_KEY) {
                 if (this.state.restoreType === RESTORE_TYPE_RECOVERYKEY) {
-                    title = _t("Recovery key mismatch");
+                    title = _t("Security Key mismatch");
                     content = <div>
                         <p>{_t(
-                            "Backup could not be decrypted with this recovery key: " +
-                            "please verify that you entered the correct recovery key.",
+                            "Backup could not be decrypted with this Security Key: " +
+                            "please verify that you entered the correct Security Key.",
                         )}</p>
                     </div>;
                 } else {
-                    title = _t("Incorrect recovery passphrase");
+                    title = _t("Incorrect Security Phrase");
                     content = <div>
                         <p>{_t(
-                            "Backup could not be decrypted with this recovery passphrase: " +
-                            "please verify that you entered the correct recovery passphrase.",
+                            "Backup could not be decrypted with this Security Phrase: " +
+                            "please verify that you entered the correct Security Phrase.",
                         )}</p>
                     </div>;
                 }
@@ -342,7 +342,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
         } else if (backupHasPassphrase && !this.state.forceRecoveryKey) {
             const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
             const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-            title = _t("Enter recovery passphrase");
+            title = _t("Enter Security Phrase");
             content = <div>
                 <p>{_t(
                     "<b>Warning</b>: you should only set up key backup " +
@@ -351,7 +351,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                 )}</p>
                 <p>{_t(
                     "Access your secure message history and set up secure " +
-                    "messaging by entering your recovery passphrase.",
+                    "messaging by entering your Security Phrase.",
                 )}</p>
 
                 <form className="mx_RestoreKeyBackupDialog_primaryContainer">
@@ -371,8 +371,8 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                     />
                 </form>
                 {_t(
-                    "If you've forgotten your recovery passphrase you can "+
-                    "<button1>use your recovery key</button1> or " +
+                    "If you've forgotten your Security Phrase you can "+
+                    "<button1>use your Security Key</button1> or " +
                     "<button2>set up new recovery options</button2>"
                 , {}, {
                     button1: s => <AccessibleButton className="mx_linkButton"
@@ -390,7 +390,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                 })}
             </div>;
         } else {
-            title = _t("Enter recovery key");
+            title = _t("Enter Security Key");
             const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
             const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
 
@@ -399,11 +399,11 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                 keyStatus = <div className="mx_RestoreKeyBackupDialog_keyStatus"></div>;
             } else if (this.state.recoveryKeyValid) {
                 keyStatus = <div className="mx_RestoreKeyBackupDialog_keyStatus">
-                    {"\uD83D\uDC4D "}{_t("This looks like a valid recovery key!")}
+                    {"\uD83D\uDC4D "}{_t("This looks like a valid Security Key!")}
                 </div>;
             } else {
                 keyStatus = <div className="mx_RestoreKeyBackupDialog_keyStatus">
-                    {"\uD83D\uDC4E "}{_t("Not a valid recovery key")}
+                    {"\uD83D\uDC4E "}{_t("Not a valid Security Key")}
                 </div>;
             }
 
@@ -415,7 +415,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                 )}</p>
                 <p>{_t(
                     "Access your secure message history and set up secure " +
-                    "messaging by entering your recovery key.",
+                    "messaging by entering your Security Key.",
                 )}</p>
 
                 <div className="mx_RestoreKeyBackupDialog_primaryContainer">
@@ -434,7 +434,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
                     />
                 </div>
                 {_t(
-                    "If you've forgotten your recovery key you can "+
+                    "If you've forgotten your Security Key you can "+
                     "<button>set up new recovery options</button>"
                 , {}, {
                     button: s => <AccessibleButton className="mx_linkButton"
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> {
diff --git a/src/components/views/elements/AccessibleTooltipButton.tsx b/src/components/views/elements/AccessibleTooltipButton.tsx
index 29e79dc396..b7c7b78e63 100644
--- a/src/components/views/elements/AccessibleTooltipButton.tsx
+++ b/src/components/views/elements/AccessibleTooltipButton.tsx
@@ -26,6 +26,7 @@ interface ITooltipProps extends React.ComponentProps<typeof AccessibleButton> {
     tooltip?: React.ReactNode;
     tooltipClassName?: string;
     forceHide?: boolean;
+    yOffset?: number;
 }
 
 interface IState {
@@ -63,12 +64,13 @@ export default class AccessibleTooltipButton extends React.PureComponent<IToolti
 
     render() {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const {title, tooltip, children, tooltipClassName, forceHide, ...props} = this.props;
+        const {title, tooltip, children, tooltipClassName, forceHide, yOffset, ...props} = this.props;
 
         const tip = this.state.hover ? <Tooltip
             className="mx_AccessibleTooltipButton_container"
             tooltipClassName={classNames("mx_AccessibleTooltipButton_tooltip", tooltipClassName)}
             label={tooltip || title}
+            yOffset={yOffset}
         /> : <div />;
         return (
             <AccessibleButton
diff --git a/src/components/views/elements/AddressSelector.js b/src/components/views/elements/AddressSelector.js
index 45cdbeced8..2a71622bb8 100644
--- a/src/components/views/elements/AddressSelector.js
+++ b/src/components/views/elements/AddressSelector.js
@@ -46,7 +46,7 @@ export default class AddressSelector extends React.Component {
     }
 
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    UNSAFE_componentWillReceiveProps(props) {
+    UNSAFE_componentWillReceiveProps(props) { // eslint-disable-line camelcase
         // Make sure the selected item isn't outside the list bounds
         const selected = this.state.selected;
         const maxSelected = this._maxSelected(props.addressList);
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index c732d8ec95..213351889f 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -22,56 +22,52 @@ import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import AccessibleButton from './AccessibleButton';
-import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';
-import * as sdk from '../../../index';
 import AppPermission from './AppPermission';
 import AppWarning from './AppWarning';
 import Spinner from './Spinner';
-import WidgetUtils from '../../../utils/WidgetUtils';
 import dis from '../../../dispatcher/dispatcher';
 import ActiveWidgetStore from '../../../stores/ActiveWidgetStore';
 import classNames from 'classnames';
 import SettingsStore from "../../../settings/SettingsStore";
-import {aboveLeftOf, ContextMenu, ContextMenuButton} from "../../structures/ContextMenu";
-import PersistedElement from "./PersistedElement";
+import {aboveLeftOf, ContextMenuButton} from "../../structures/ContextMenu";
+import PersistedElement, {getPersistKey} from "./PersistedElement";
 import {WidgetType} from "../../../widgets/WidgetType";
-import {SettingLevel} from "../../../settings/SettingLevel";
-import WidgetStore from "../../../stores/WidgetStore";
-import {Action} from "../../../dispatcher/actions";
 import {StopGapWidget} from "../../../stores/widgets/StopGapWidget";
 import {ElementWidgetActions} from "../../../stores/widgets/ElementWidgetActions";
 import {MatrixCapabilities} from "matrix-widget-api";
+import RoomWidgetContextMenu from "../context_menus/WidgetContextMenu";
+import WidgetAvatar from "../avatars/WidgetAvatar";
 
 export default class AppTile extends React.Component {
     constructor(props) {
         super(props);
 
         // The key used for PersistedElement
-        this._persistKey = 'widget_' + this.props.app.id;
+        this._persistKey = getPersistKey(this.props.app.id);
         this._sgWidget = new StopGapWidget(this.props);
         this._sgWidget.on("preparing", this._onWidgetPrepared);
         this._sgWidget.on("ready", this._onWidgetReady);
         this.iframe = null; // ref to the iframe (callback style)
 
         this.state = this._getNewState(props);
-
-        this._onAction = this._onAction.bind(this);
-        this._onEditClick = this._onEditClick.bind(this);
-        this._onDeleteClick = this._onDeleteClick.bind(this);
-        this._onRevokeClicked = this._onRevokeClicked.bind(this);
-        this._onSnapshotClick = this._onSnapshotClick.bind(this);
-        this.onClickMenuBar = this.onClickMenuBar.bind(this);
-        this._onMinimiseClick = this._onMinimiseClick.bind(this);
-        this._grantWidgetPermission = this._grantWidgetPermission.bind(this);
-        this._revokeWidgetPermission = this._revokeWidgetPermission.bind(this);
-        this._onPopoutWidgetClick = this._onPopoutWidgetClick.bind(this);
-        this._onReloadWidgetClick = this._onReloadWidgetClick.bind(this);
-
         this._contextMenuButton = createRef();
-        this._menu_bar = createRef();
+
+        this._allowedWidgetsWatchRef = SettingsStore.watchSetting("allowedWidgets", null, this.onAllowedWidgetsChange);
     }
 
+    // This is a function to make the impact of calling SettingsStore slightly less
+    hasPermissionToLoad = (props) => {
+        if (this._usingLocalWidget()) return true;
+        if (!props.room) return true; // user widgets always have permissions
+
+        const currentlyAllowedWidgets = SettingsStore.getValue("allowedWidgets", props.room.roomId);
+        if (currentlyAllowedWidgets[props.app.eventId] === undefined) {
+            return props.userId === props.creatorUserId;
+        }
+        return !!currentlyAllowedWidgets[props.app.eventId];
+    };
+
     /**
      * Set initial component state when the App wUrl (widget URL) is being updated.
      * Component props *must* be passed (rather than relying on this.props).
@@ -79,28 +75,32 @@ export default class AppTile extends React.Component {
      * @return {Object} Updated component state to be set with setState
      */
     _getNewState(newProps) {
-        // This is a function to make the impact of calling SettingsStore slightly less
-        const hasPermissionToLoad = () => {
-            if (this._usingLocalWidget()) return true;
-
-            const currentlyAllowedWidgets = SettingsStore.getValue("allowedWidgets", newProps.room.roomId);
-            return !!currentlyAllowedWidgets[newProps.app.eventId];
-        };
-
         return {
             initialising: true, // True while we are mangling the widget URL
             // True while the iframe content is loading
             loading: this.props.waitForIframeLoad && !PersistedElement.isMounted(this._persistKey),
             // Assume that widget has permission to load if we are the user who
             // added it to the room, or if explicitly granted by the user
-            hasPermissionToLoad: newProps.userId === newProps.creatorUserId || hasPermissionToLoad(),
+            hasPermissionToLoad: this.hasPermissionToLoad(newProps),
             error: null,
-            deleting: false,
             widgetPageTitle: newProps.widgetPageTitle,
             menuDisplayed: false,
         };
     }
 
+    onAllowedWidgetsChange = () => {
+        const hasPermissionToLoad = this.hasPermissionToLoad(this.props);
+
+        if (this.state.hasPermissionToLoad && !hasPermissionToLoad) {
+            // Force the widget to be non-persistent (able to be deleted/forgotten)
+            ActiveWidgetStore.destroyPersistentWidget(this.props.app.id);
+            PersistedElement.destroyElement(this._persistKey);
+            this._sgWidget.stop();
+        }
+
+        this.setState({ hasPermissionToLoad });
+    };
+
     isMixedContent() {
         const parentContentProtocol = window.location.protocol;
         const u = url.parse(this.props.app.url);
@@ -115,7 +115,7 @@ export default class AppTile extends React.Component {
 
     componentDidMount() {
         // Only fetch IM token on mount if we're showing and have permission to load
-        if (this.props.show && this.state.hasPermissionToLoad) {
+        if (this.state.hasPermissionToLoad) {
             this._startWidget();
         }
 
@@ -136,6 +136,8 @@ export default class AppTile extends React.Component {
         if (this._sgWidget) {
             this._sgWidget.stop();
         }
+
+        SettingsStore.unwatchSetting(this._allowedWidgetsWatchRef);
     }
 
     _resetWidget(newProps) {
@@ -167,21 +169,8 @@ export default class AppTile extends React.Component {
     UNSAFE_componentWillReceiveProps(nextProps) { // eslint-disable-line camelcase
         if (nextProps.app.url !== this.props.app.url) {
             this._getNewState(nextProps);
-            if (this.props.show && this.state.hasPermissionToLoad) {
-                this._resetWidget(nextProps);
-            }
-        }
-
-        if (nextProps.show && !this.props.show) {
-            // We assume that persisted widgets are loaded and don't need a spinner.
-            if (this.props.waitForIframeLoad && !PersistedElement.isMounted(this._persistKey)) {
-                this.setState({
-                    loading: true,
-                });
-            }
-            // Start the widget now that we're showing if we already have permission to load
             if (this.state.hasPermissionToLoad) {
-                this._startWidget();
+                this._resetWidget(nextProps);
             }
         }
 
@@ -192,35 +181,6 @@ export default class AppTile extends React.Component {
         }
     }
 
-    _canUserModify() {
-        // User widgets should always be modifiable by their creator
-        if (this.props.userWidget && MatrixClientPeg.get().credentials.userId === this.props.creatorUserId) {
-            return true;
-        }
-        // Check if the current user can modify widgets in the current room
-        return WidgetUtils.canUserModifyWidgets(this.props.room.roomId);
-    }
-
-    _onEditClick() {
-        console.log("Edit widget ID ", this.props.app.id);
-        if (this.props.onEditClick) {
-            this.props.onEditClick();
-        } else {
-            WidgetUtils.editWidget(this.props.room, this.props.app);
-        }
-    }
-
-    _onSnapshotClick() {
-        this._sgWidget.widgetApi.takeScreenshot().then(data => {
-            dis.dispatch({
-                action: 'picture_snapshot',
-                file: data.screenshot,
-            });
-        }).catch(err => {
-            console.error("Failed to take screenshot: ", err);
-        });
-    }
-
     /**
      * Ends all widget interaction, such as cancelling calls and disabling webcams.
      * @private
@@ -250,57 +210,6 @@ export default class AppTile extends React.Component {
         this._sgWidget.stop({forceDestroy: true});
     }
 
-    /* If user has permission to modify widgets, delete the widget,
-     * otherwise revoke access for the widget to load in the user's browser
-    */
-    _onDeleteClick() {
-        if (this.props.onDeleteClick) {
-            this.props.onDeleteClick();
-        } else if (this._canUserModify()) {
-            // Show delete confirmation dialog
-            const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-            Modal.createTrackedDialog('Delete Widget', '', QuestionDialog, {
-                title: _t("Delete Widget"),
-                description: _t(
-                    "Deleting a widget removes it for all users in this room." +
-                    " Are you sure you want to delete this widget?"),
-                button: _t("Delete widget"),
-                onFinished: (confirmed) => {
-                    if (!confirmed) {
-                        return;
-                    }
-                    this.setState({deleting: true});
-
-                    this._endWidgetActions().then(() => {
-                        return WidgetUtils.setRoomWidget(
-                            this.props.room.roomId,
-                            this.props.app.id,
-                        );
-                    }).catch((e) => {
-                        console.error('Failed to delete widget', e);
-                        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-
-                        Modal.createTrackedDialog('Failed to remove widget', '', ErrorDialog, {
-                            title: _t('Failed to remove widget'),
-                            description: _t('An error ocurred whilst trying to remove the widget from the room'),
-                        });
-                    }).finally(() => {
-                        this.setState({deleting: false});
-                    });
-                },
-            });
-        }
-    }
-
-    _onUnpinClicked = () => {
-        WidgetStore.instance.unpinWidget(this.props.app.id);
-    }
-
-    _onRevokeClicked() {
-        console.info("Revoke widget permissions - %s", this.props.app.id);
-        this._revokeWidgetPermission();
-    }
-
     _onWidgetPrepared = () => {
         this.setState({loading: false});
     };
@@ -311,7 +220,7 @@ export default class AppTile extends React.Component {
         }
     };
 
-    _onAction(payload) {
+    _onAction = payload => {
         if (payload.widgetId === this.props.app.id) {
             switch (payload.action) {
                 case 'm.sticker':
@@ -321,24 +230,17 @@ export default class AppTile extends React.Component {
                         console.warn('Ignoring sticker message. Invalid capability');
                     }
                     break;
-
-                case Action.AppTileDelete:
-                    this._onDeleteClick();
-                    break;
-
-                case Action.AppTileRevoke:
-                    this._onRevokeClicked();
-                    break;
             }
         }
-    }
+    };
 
-    _grantWidgetPermission() {
+    _grantWidgetPermission = () => {
         const roomId = this.props.room.roomId;
         console.info("Granting permission for widget to load: " + this.props.app.eventId);
         const current = SettingsStore.getValue("allowedWidgets", roomId);
         current[this.props.app.eventId] = true;
-        SettingsStore.setValue("allowedWidgets", roomId, SettingLevel.ROOM_ACCOUNT, current).then(() => {
+        const level = SettingsStore.firstSupportedLevel("allowedWidgets");
+        SettingsStore.setValue("allowedWidgets", roomId, level, current).then(() => {
             this.setState({hasPermissionToLoad: true});
 
             // Fetch a token for the integration manager, now that we're allowed to
@@ -347,26 +249,7 @@ export default class AppTile extends React.Component {
             console.error(err);
             // We don't really need to do anything about this - the user will just hit the button again.
         });
-    }
-
-    _revokeWidgetPermission() {
-        const roomId = this.props.room.roomId;
-        console.info("Revoking permission for widget to load: " + this.props.app.eventId);
-        const current = SettingsStore.getValue("allowedWidgets", roomId);
-        current[this.props.app.eventId] = false;
-        SettingsStore.setValue("allowedWidgets", roomId, SettingLevel.ROOM_ACCOUNT, current).then(() => {
-            this.setState({hasPermissionToLoad: false});
-
-            // Force the widget to be non-persistent (able to be deleted/forgotten)
-            ActiveWidgetStore.destroyPersistentWidget(this.props.app.id);
-            const PersistedElement = sdk.getComponent("elements.PersistedElement");
-            PersistedElement.destroyElement(this._persistKey);
-            this._sgWidget.stop();
-        }).catch(err => {
-            console.error(err);
-            // We don't really need to do anything about this - the user will just hit the button again.
-        });
-    }
+    };
 
     formatAppTileName() {
         let appTileName = "No name";
@@ -376,32 +259,6 @@ export default class AppTile extends React.Component {
         return appTileName;
     }
 
-    onClickMenuBar(ev) {
-        ev.preventDefault();
-
-        // Ignore clicks on menu bar children
-        if (ev.target !== this._menu_bar.current) {
-            return;
-        }
-
-        // Toggle the view state of the apps drawer
-        if (this.props.userWidget) {
-            this._onMinimiseClick();
-        } else {
-            if (this.props.show) {
-                // if we were being shown, end the widget as we're about to be minimized.
-                this._endWidgetActions();
-            } else {
-                // restart the widget actions
-                this._resetWidget(this.props);
-            }
-            dis.dispatch({
-                action: 'appsDrawer',
-                show: !this.props.show,
-            });
-        }
-    }
-
     /**
      * Whether we're using a local version of the widget rather than loading the
      * actual widget URL
@@ -421,22 +278,18 @@ export default class AppTile extends React.Component {
 
         return (
             <span>
+                <WidgetAvatar app={this.props.app} />
                 <b>{ name }</b>
                 <span>{ title ? titleSpacer : '' }{ title }</span>
             </span>
         );
     }
 
-    _onMinimiseClick(e) {
-        if (this.props.onMinimiseClick) {
-            this.props.onMinimiseClick();
-        }
-    }
-
-    _onPopoutWidgetClick() {
+    // TODO replace with full screen interactions
+    _onPopoutWidgetClick = () => {
         // Ensure Jitsi conferences are closed on pop-out, to not confuse the user to join them
         // twice from the same computer, which Jitsi can have problems with (audio echo/gain-loop).
-        if (WidgetType.JITSI.matches(this.props.app.type) && this.props.show) {
+        if (WidgetType.JITSI.matches(this.props.app.type)) {
             this._endWidgetActions().then(() => {
                 if (this.iframe) {
                     // Reload iframe
@@ -449,13 +302,7 @@ export default class AppTile extends React.Component {
         // window.open(this._getPopoutUrl(), '_blank', 'noopener=yes');
         Object.assign(document.createElement('a'),
             { target: '_blank', href: this._sgWidget.popoutUrl, rel: 'noreferrer noopener'}).click();
-    }
-
-    _onReloadWidgetClick() {
-        // Reload iframe in this way to avoid cross-origin restrictions
-        // eslint-disable-next-line no-self-assign
-        this.iframe.src = this.iframe.src;
-    }
+    };
 
     _onContextMenuClick = () => {
         this.setState({ menuDisplayed: true });
@@ -468,11 +315,6 @@ export default class AppTile extends React.Component {
     render() {
         let appTileBody;
 
-        // Don't render widget if it is in the process of being deleted
-        if (this.state.deleting) {
-            return <div />;
-        }
-
         // Note that there is advice saying allow-scripts shouldn't be used with allow-same-origin
         // because that would allow the iframe to programmatically remove the sandbox attribute, but
         // this would only be for content hosted on the same origin as the element client: anything
@@ -487,71 +329,69 @@ export default class AppTile extends React.Component {
 
         const appTileBodyClass = 'mx_AppTileBody' + (this.props.miniMode ? '_mini  ' : ' ');
 
-        if (this.props.show) {
-            const loadingElement = (
-                <div className="mx_AppLoading_spinner_fadeIn">
-                    <Spinner message={_t("Loading...")} />
+        const loadingElement = (
+            <div className="mx_AppLoading_spinner_fadeIn">
+                <Spinner message={_t("Loading...")} />
+            </div>
+        );
+        if (!this.state.hasPermissionToLoad) {
+            // only possible for room widgets, can assert this.props.room here
+            const isEncrypted = MatrixClientPeg.get().isRoomEncrypted(this.props.room.roomId);
+            appTileBody = (
+                <div className={appTileBodyClass}>
+                    <AppPermission
+                        roomId={this.props.room.roomId}
+                        creatorUserId={this.props.creatorUserId}
+                        url={this._sgWidget.embedUrl}
+                        isRoomEncrypted={isEncrypted}
+                        onPermissionGranted={this._grantWidgetPermission}
+                    />
                 </div>
             );
-            if (!this.state.hasPermissionToLoad) {
-                const isEncrypted = MatrixClientPeg.get().isRoomEncrypted(this.props.room.roomId);
+        } else if (this.state.initialising) {
+            appTileBody = (
+                <div className={appTileBodyClass + (this.state.loading ? 'mx_AppLoading' : '')}>
+                    { loadingElement }
+                </div>
+            );
+        } else {
+            if (this.isMixedContent()) {
                 appTileBody = (
                     <div className={appTileBodyClass}>
-                        <AppPermission
-                            roomId={this.props.room.roomId}
-                            creatorUserId={this.props.creatorUserId}
-                            url={this._sgWidget.embedUrl}
-                            isRoomEncrypted={isEncrypted}
-                            onPermissionGranted={this._grantWidgetPermission}
-                        />
-                    </div>
-                );
-            } else if (this.state.initialising) {
-                appTileBody = (
-                    <div className={appTileBodyClass + (this.state.loading ? 'mx_AppLoading' : '')}>
-                        { loadingElement }
+                        <AppWarning errorMsg="Error - Mixed content" />
                     </div>
                 );
             } else {
-                if (this.isMixedContent()) {
-                    appTileBody = (
-                        <div className={appTileBodyClass}>
-                            <AppWarning errorMsg="Error - Mixed content" />
-                        </div>
-                    );
-                } else {
-                    appTileBody = (
-                        <div className={appTileBodyClass + (this.state.loading ? 'mx_AppLoading' : '')}>
-                            { this.state.loading && loadingElement }
-                            <iframe
-                                allow={iframeFeatures}
-                                ref={this._iframeRefChange}
-                                src={this._sgWidget.embedUrl}
-                                allowFullScreen={true}
-                                sandbox={sandboxFlags}
-                            />
-                        </div>
-                    );
-                    // if the widget would be allowed to remain on screen, we must put it in
-                    // a PersistedElement from the get-go, otherwise the iframe will be
-                    // re-mounted later when we do.
-                    if (this.props.whitelistCapabilities.includes('m.always_on_screen')) {
-                        const PersistedElement = sdk.getComponent("elements.PersistedElement");
-                        // Also wrap the PersistedElement in a div to fix the height, otherwise
-                        // AppTile's border is in the wrong place
-                        appTileBody = <div className="mx_AppTile_persistedWrapper">
-                            <PersistedElement persistKey={this._persistKey}>
-                                {appTileBody}
-                            </PersistedElement>
-                        </div>;
-                    }
+                appTileBody = (
+                    <div className={appTileBodyClass + (this.state.loading ? 'mx_AppLoading' : '')}>
+                        { this.state.loading && loadingElement }
+                        <iframe
+                            allow={iframeFeatures}
+                            ref={this._iframeRefChange}
+                            src={this._sgWidget.embedUrl}
+                            allowFullScreen={true}
+                            sandbox={sandboxFlags}
+                        />
+                    </div>
+                );
+
+                if (!this.props.userWidget) {
+                    // All room widgets can theoretically be allowed to remain on screen, so we
+                    // wrap them all in a PersistedElement from the get-go. If we wait, the iframe
+                    // will be re-mounted later, which means the widget has to start over, which is
+                    // bad.
+
+                    // Also wrap the PersistedElement in a div to fix the height, otherwise
+                    // AppTile's border is in the wrong place
+                    appTileBody = <div className="mx_AppTile_persistedWrapper">
+                        <PersistedElement persistKey={this._persistKey}>
+                            {appTileBody}
+                        </PersistedElement>
+                    </div>;
                 }
             }
         }
 
-        const showMinimiseButton = this.props.showMinimise && this.props.show;
-        const showMaximiseButton = this.props.showMinimise && !this.props.show;
-
         let appTileClasses;
         if (this.props.miniMode) {
             appTileClasses = {mx_AppTile_mini: true};
@@ -560,73 +400,37 @@ export default class AppTile extends React.Component {
         } else {
             appTileClasses = {mx_AppTile: true};
         }
-        appTileClasses.mx_AppTile_minimised = !this.props.show;
         appTileClasses = classNames(appTileClasses);
 
-        const menuBarClasses = classNames({
-            mx_AppTileMenuBar: true,
-            mx_AppTileMenuBar_expanded: this.props.show,
-        });
-
         let contextMenu;
         if (this.state.menuDisplayed) {
-            const elementRect = this._contextMenuButton.current.getBoundingClientRect();
-
-            const canUserModify = this._canUserModify();
-            const showEditButton = Boolean(this._sgWidget.isManagedByManager && canUserModify);
-            const showDeleteButton = (this.props.showDelete === undefined || this.props.showDelete) && canUserModify;
-            const showPictureSnapshotButton = this.props.show && this._sgWidget.widgetApi &&
-                this._sgWidget.widgetApi.hasCapability(MatrixCapabilities.Screenshots);
-
-            const WidgetContextMenu = sdk.getComponent('views.context_menus.WidgetContextMenu');
             contextMenu = (
-                <ContextMenu {...aboveLeftOf(elementRect, null)} onFinished={this._closeContextMenu}>
-                    <WidgetContextMenu
-                        onUnpinClicked={
-                            ActiveWidgetStore.getWidgetPersistence(this.props.app.id) ? null : this._onUnpinClicked
-                        }
-                        onRevokeClicked={this._onRevokeClicked}
-                        onEditClicked={showEditButton ? this._onEditClick : undefined}
-                        onDeleteClicked={showDeleteButton ? this._onDeleteClick : undefined}
-                        onSnapshotClicked={showPictureSnapshotButton ? this._onSnapshotClick : undefined}
-                        onReloadClicked={this.props.showReload ? this._onReloadWidgetClick : undefined}
-                        onFinished={this._closeContextMenu}
-                    />
-                </ContextMenu>
+                <RoomWidgetContextMenu
+                    {...aboveLeftOf(this._contextMenuButton.current.getBoundingClientRect(), null)}
+                    app={this.props.app}
+                    onFinished={this._closeContextMenu}
+                    showUnpin={!this.props.userWidget}
+                    userWidget={this.props.userWidget}
+                />
             );
         }
 
         return <React.Fragment>
             <div className={appTileClasses} id={this.props.app.id}>
                 { this.props.showMenubar &&
-                <div ref={this._menu_bar} className={menuBarClasses} onClick={this.onClickMenuBar}>
+                <div className="mx_AppTileMenuBar">
                     <span className="mx_AppTileMenuBarTitle" style={{pointerEvents: (this.props.handleMinimisePointerEvents ? 'all' : false)}}>
-                        { /* Minimise widget */ }
-                        { showMinimiseButton && <AccessibleButton
-                            className="mx_AppTileMenuBar_iconButton mx_AppTileMenuBar_iconButton_minimise"
-                            title={_t('Minimize widget')}
-                            onClick={this._onMinimiseClick}
-                        /> }
-                        { /* Maximise widget */ }
-                        { showMaximiseButton && <AccessibleButton
-                            className="mx_AppTileMenuBar_iconButton mx_AppTileMenuBar_iconButton_maximise"
-                            title={_t('Maximize widget')}
-                            onClick={this._onMinimiseClick}
-                        /> }
-                        { /* Title */ }
                         { this.props.showTitle && this._getTileTitle() }
                     </span>
                     <span className="mx_AppTileMenuBarWidgets">
-                        { /* Popout widget */ }
                         { this.props.showPopout && <AccessibleButton
                             className="mx_AppTileMenuBar_iconButton mx_AppTileMenuBar_iconButton_popout"
                             title={_t('Popout widget')}
                             onClick={this._onPopoutWidgetClick}
                         /> }
-                        { /* Context menu */ }
                         { <ContextMenuButton
                             className="mx_AppTileMenuBar_iconButton mx_AppTileMenuBar_iconButton_menu"
-                            label={_t('More options')}
+                            label={_t("Options")}
                             isExpanded={this.state.menuDisplayed}
                             inputRef={this._contextMenuButton}
                             onClick={this._onContextMenuClick}
@@ -645,7 +449,9 @@ AppTile.displayName = 'AppTile';
 
 AppTile.propTypes = {
     app: PropTypes.object.isRequired,
-    room: PropTypes.object.isRequired,
+    // If room is not specified then it is an account level widget
+    // which bypasses permission prompts as it was added explicitly by that user
+    room: PropTypes.object,
     // Specifying 'fullWidth' as true will render the app tile to fill the width of the app drawer continer.
     // This should be set to true when there is only one widget in the app drawer, otherwise it should be false.
     fullWidth: PropTypes.bool,
@@ -657,8 +463,6 @@ AppTile.propTypes = {
     creatorUserId: PropTypes.string,
     waitForIframeLoad: PropTypes.bool,
     showMenubar: PropTypes.bool,
-    // Should the AppTile render itself
-    show: PropTypes.bool,
     // Optional onEditClickHandler (overrides default behaviour)
     onEditClick: PropTypes.func,
     // Optional onDeleteClickHandler (overrides default behaviour)
@@ -667,23 +471,10 @@ AppTile.propTypes = {
     onMinimiseClick: PropTypes.func,
     // Optionally hide the tile title
     showTitle: PropTypes.bool,
-    // Optionally hide the tile minimise icon
-    showMinimise: PropTypes.bool,
     // Optionally handle minimise button pointer events (default false)
     handleMinimisePointerEvents: PropTypes.bool,
-    // Optionally hide the delete icon
-    showDelete: PropTypes.bool,
     // Optionally hide the popout widget icon
     showPopout: PropTypes.bool,
-    // Optionally show the reload widget icon
-    // This is not currently intended for use with production widgets. However
-    // it can be useful when developing persistent widgets in order to avoid
-    // having to reload all of Element to get new widget content.
-    showReload: PropTypes.bool,
-    // Widget capabilities to allow by default (without user confirmation)
-    // NOTE -- Use with caution. This is intended to aid better integration / UX
-    // basic widget capabilities, e.g. injecting sticker message events.
-    whitelistCapabilities: PropTypes.array,
     // Is this an instance of a user widget
     userWidget: PropTypes.bool,
 };
@@ -692,12 +483,8 @@ AppTile.defaultProps = {
     waitForIframeLoad: true,
     showMenubar: true,
     showTitle: true,
-    showMinimise: true,
-    showDelete: true,
     showPopout: true,
-    showReload: false,
     handleMinimisePointerEvents: false,
-    whitelistCapabilities: [],
     userWidget: false,
     miniMode: false,
 };
diff --git a/src/components/views/elements/DesktopCapturerSourcePicker.tsx b/src/components/views/elements/DesktopCapturerSourcePicker.tsx
new file mode 100644
index 0000000000..6ae465c362
--- /dev/null
+++ b/src/components/views/elements/DesktopCapturerSourcePicker.tsx
@@ -0,0 +1,173 @@
+/*
+Copyright 2021 Šimon Brandner <simon.bra.ag@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import { _t } from '../../../languageHandler';
+import BaseDialog from "..//dialogs/BaseDialog"
+import AccessibleButton from './AccessibleButton';
+import {getDesktopCapturerSources} from "matrix-js-sdk/src/webrtc/call";
+
+export interface DesktopCapturerSource {
+    id: string;
+    name: string;
+    thumbnailURL;
+}
+
+export enum Tabs {
+    Screens = "screens",
+    Windows = "windows",
+}
+
+export interface DesktopCapturerSourceIProps {
+    source: DesktopCapturerSource;
+    onSelect(source: DesktopCapturerSource): void;
+}
+
+export class ExistingSource extends React.Component<DesktopCapturerSourceIProps> {
+    constructor(props) {
+        super(props);
+    }
+
+    onClick = (ev) => {
+        this.props.onSelect(this.props.source);
+    }
+
+    render() {
+        return (
+            <AccessibleButton
+                className="mx_desktopCapturerSourcePicker_stream_button"
+                title={this.props.source.name}
+                onClick={this.onClick} >
+                <img
+                    className="mx_desktopCapturerSourcePicker_stream_thumbnail"
+                    src={this.props.source.thumbnailURL}
+                />
+                <span className="mx_desktopCapturerSourcePicker_stream_name">{this.props.source.name}</span>
+            </AccessibleButton>
+        );
+    }
+}
+
+export interface DesktopCapturerSourcePickerIState {
+    selectedTab: Tabs;
+    sources: Array<DesktopCapturerSource>;
+}
+export interface DesktopCapturerSourcePickerIProps {
+    onFinished(source: DesktopCapturerSource): void;
+}
+
+export default class DesktopCapturerSourcePicker extends React.Component<
+    DesktopCapturerSourcePickerIProps,
+    DesktopCapturerSourcePickerIState
+    > {
+    interval;
+
+    constructor(props) {
+        super(props);
+
+        this.state = {
+            selectedTab: Tabs.Screens,
+            sources: [],
+        };
+    }
+
+    async componentDidMount() {
+        // setInterval() first waits and then executes, therefore
+        // we call getDesktopCapturerSources() here without any delay.
+        // Otherwise the dialog would be left empty for some time.
+        this.setState({
+            sources: await getDesktopCapturerSources(),
+        });
+
+        // We update the sources every 500ms to get newer thumbnails
+        this.interval = setInterval(async () => {
+            this.setState({
+                sources: await getDesktopCapturerSources(),
+            });
+        }, 500);
+    }
+
+    componentWillUnmount() {
+        clearInterval(this.interval);
+    }
+
+    onSelect = (source) => {
+        this.props.onFinished(source);
+    }
+
+    onScreensClick = (ev) => {
+        this.setState({selectedTab: Tabs.Screens});
+    }
+
+    onWindowsClick = (ev) => {
+        this.setState({selectedTab: Tabs.Windows});
+    }
+
+    onCloseClick = (ev) => {
+        this.props.onFinished(null);
+    }
+
+    render() {
+        let sources;
+        if (this.state.selectedTab === Tabs.Screens) {
+            sources = this.state.sources
+                .filter((source) => {
+                    return source.id.startsWith("screen");
+                })
+                .map((source) => {
+                    return <ExistingSource source={source} onSelect={this.onSelect} key={source.id} />;
+                });
+        } else {
+            sources = this.state.sources
+                .filter((source) => {
+                    return source.id.startsWith("window");
+                })
+                .map((source) => {
+                    return <ExistingSource source={source} onSelect={this.onSelect} key={source.id} />;
+                });
+        }
+
+        const buttonStyle = "mx_desktopCapturerSourcePicker_tabLabel";
+        const screensButtonStyle = buttonStyle + ((this.state.selectedTab === Tabs.Screens) ? "_selected" : "");
+        const windowsButtonStyle = buttonStyle + ((this.state.selectedTab === Tabs.Windows) ? "_selected" : "");
+
+        return (
+            <BaseDialog
+                className="mx_desktopCapturerSourcePicker"
+                onFinished={this.onCloseClick}
+                title={_t("Share your screen")}
+            >
+                <div className="mx_desktopCapturerSourcePicker_tabLabels">
+                    <AccessibleButton
+                        className={screensButtonStyle}
+                        onClick={this.onScreensClick}
+                    >
+                        {_t("Screens")}
+                    </AccessibleButton>
+                    <AccessibleButton
+                        className={windowsButtonStyle}
+                        onClick={this.onWindowsClick}
+                    >
+                        {_t("Windows")}
+                    </AccessibleButton>
+                </div>
+                <div className="mx_desktopCapturerSourcePicker_panel">
+                    { sources }
+                </div>
+            </BaseDialog>
+        );
+    }
+}
diff --git a/src/components/views/elements/DialogButtons.js b/src/components/views/elements/DialogButtons.js
index 001292b6b7..3417485eb8 100644
--- a/src/components/views/elements/DialogButtons.js
+++ b/src/components/views/elements/DialogButtons.js
@@ -54,6 +54,9 @@ export default class DialogButtons extends React.Component {
 
         // disables only the primary button
         primaryDisabled: PropTypes.bool,
+
+        // something to stick next to the buttons, optionally
+        additive: PropTypes.element,
     };
 
     static defaultProps = {
@@ -85,8 +88,14 @@ export default class DialogButtons extends React.Component {
             </button>;
         }
 
+        let additive = null;
+        if (this.props.additive) {
+            additive = <div className="mx_Dialog_buttons_additive">{this.props.additive}</div>;
+        }
+
         return (
             <div className="mx_Dialog_buttons">
+                { additive }
                 { cancelButton }
                 { this.props.children }
                 <button type={this.props.primaryIsSubmit ? 'submit' : 'button'}
diff --git a/src/components/views/elements/DirectorySearchBox.js b/src/components/views/elements/DirectorySearchBox.js
index 5fe2f6dbc8..644b69417b 100644
--- a/src/components/views/elements/DirectorySearchBox.js
+++ b/src/components/views/elements/DirectorySearchBox.js
@@ -16,13 +16,12 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import classnames from 'classnames';
 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);
@@ -32,7 +31,7 @@ export default class DirectorySearchBox extends React.Component {
         this.input = null;
 
         this.state = {
-            value: '',
+            value: this.props.initialText || '',
         };
     }
 
@@ -78,28 +77,33 @@ export default class DirectorySearchBox extends React.Component {
     render() {
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
 
-        const searchbox_classes = {
+        const searchboxClasses = {
             mx_DirectorySearchBox: true,
         };
-        searchbox_classes[this.props.className] = true;
+        searchboxClasses[this.props.className] = true;
 
-        let join_button;
+        let joinButton;
         if (this.props.showJoinButton) {
-            join_button = <AccessibleButton className="mx_DirectorySearchBox_joinButton"
+            joinButton = <AccessibleButton className="mx_DirectorySearchBox_joinButton"
                 onClick={this._onJoinButtonClick}
             >{_t("Join")}</AccessibleButton>;
         }
 
         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
-                />
-                { join_button }
-                <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>;
     }
 }
 
@@ -110,4 +114,5 @@ DirectorySearchBox.propTypes = {
     onJoinClick: PropTypes.func,
     placeholder: PropTypes.string,
     showJoinButton: PropTypes.bool,
+    initialText: PropTypes.string,
 };
diff --git a/src/components/views/elements/EditableItemList.js b/src/components/views/elements/EditableItemList.js
index 34e53906a2..5a07a400d7 100644
--- a/src/components/views/elements/EditableItemList.js
+++ b/src/components/views/elements/EditableItemList.js
@@ -124,7 +124,7 @@ export default class EditableItemList extends React.Component {
                 <Field label={this.props.placeholder} type="text"
                        autoComplete="off" value={this.props.newItem || ""} onChange={this._onNewItemChanged}
                        list={this.props.suggestionsListId} />
-                <AccessibleButton onClick={this._onItemAdded} kind="primary" type="submit">
+                <AccessibleButton onClick={this._onItemAdded} kind="primary" type="submit" disabled={!this.props.newItem}>
                     {_t("Add")}
                 </AccessibleButton>
             </form>
diff --git a/src/components/views/elements/EffectsOverlay.tsx b/src/components/views/elements/EffectsOverlay.tsx
new file mode 100644
index 0000000000..38be8da9a8
--- /dev/null
+++ b/src/components/views/elements/EffectsOverlay.tsx
@@ -0,0 +1,94 @@
+/*
+ Copyright 2020 Nurjin Jafar
+ Copyright 2020 Nordeck IT + Consulting GmbH.
+
+ 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, { FunctionComponent, useEffect, useRef } from 'react';
+import dis from '../../../dispatcher/dispatcher';
+import ICanvasEffect from '../../../effects/ICanvasEffect';
+import {CHAT_EFFECTS} from '../../../effects'
+
+interface IProps {
+    roomWidth: number;
+}
+
+const EffectsOverlay: FunctionComponent<IProps> = ({ roomWidth }) => {
+    const canvasRef = useRef<HTMLCanvasElement>(null);
+    const effectsRef = useRef<Map<string, ICanvasEffect>>(new Map<string, ICanvasEffect>());
+
+    const lazyLoadEffectModule = async (name: string): Promise<ICanvasEffect> => {
+        if (!name) return null;
+        let effect: ICanvasEffect | null = effectsRef.current[name] || null;
+        if (effect === null) {
+            const options = CHAT_EFFECTS.find((e) => e.command === name)?.options
+            try {
+                const { default: Effect } = await import(`../../../effects/${name}`);
+                effect = new Effect(options);
+                effectsRef.current[name] = effect;
+            } catch (err) {
+                console.warn('Unable to load effect module at \'../../../effects/${name}\'.', err);
+            }
+        }
+        return effect;
+    };
+
+    useEffect(() => {
+        const resize = () => {
+            if (canvasRef.current) {
+                canvasRef.current.height = window.innerHeight;
+            }
+        };
+        const onAction = (payload: { action: string }) => {
+            const actionPrefix = 'effects.';
+            if (payload.action.indexOf(actionPrefix) === 0) {
+                const effect = payload.action.substr(actionPrefix.length);
+                lazyLoadEffectModule(effect).then((module) => module?.start(canvasRef.current));
+            }
+        }
+        const dispatcherRef = dis.register(onAction);
+        const canvas = canvasRef.current;
+        canvas.height = window.innerHeight;
+        window.addEventListener('resize', resize, true);
+
+        return () => {
+            dis.unregister(dispatcherRef);
+            window.removeEventListener('resize', resize);
+            // eslint-disable-next-line react-hooks/exhaustive-deps
+            const currentEffects = effectsRef.current; // this is not a react node ref, warning can be safely ignored
+            for (const effect in currentEffects) {
+                const effectModule: ICanvasEffect = currentEffects[effect];
+                if (effectModule && effectModule.isRunning) {
+                    effectModule.stop();
+                }
+            }
+        };
+    }, []);
+
+    return (
+        <canvas
+            ref={canvasRef}
+            width={roomWidth}
+            style={{
+                display: 'block',
+                zIndex: 999999,
+                pointerEvents: 'none',
+                position: 'fixed',
+                top: 0,
+                right: 0,
+            }}
+        />
+    )
+}
+
+export default EffectsOverlay;
diff --git a/src/components/views/elements/EventTilePreview.tsx b/src/components/views/elements/EventTilePreview.tsx
index 20cca35d62..49c97831bc 100644
--- a/src/components/views/elements/EventTilePreview.tsx
+++ b/src/components/views/elements/EventTilePreview.tsx
@@ -22,6 +22,7 @@ import * as Avatar from '../../../Avatar';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import EventTile from '../rooms/EventTile';
 import SettingsStore from "../../../settings/SettingsStore";
+import {Layout} from "../../../settings/Layout";
 import {UIFeature} from "../../../settings/UIFeature";
 
 interface IProps {
@@ -33,7 +34,7 @@ interface IProps {
     /**
      * Whether to use the irc layout or not
      */
-    useIRCLayout: boolean;
+    layout: Layout;
 
     /**
      * classnames to apply to the wrapper of the preview
@@ -121,14 +122,14 @@ export default class EventTilePreview extends React.Component<IProps, IState> {
         const event = this.fakeEvent(this.state);
 
         const className = classnames(this.props.className, {
-            "mx_IRCLayout": this.props.useIRCLayout,
-            "mx_GroupLayout": !this.props.useIRCLayout,
+            "mx_IRCLayout": this.props.layout == Layout.IRC,
+            "mx_GroupLayout": this.props.layout == Layout.Group,
         });
 
         return <div className={className}>
             <EventTile
                 mxEvent={event}
-                useIRCLayout={this.props.useIRCLayout}
+                layout={this.props.layout}
                 enableFlair={SettingsStore.getValue(UIFeature.Flair)}
             />
         </div>;
diff --git a/src/components/views/elements/Field.tsx b/src/components/views/elements/Field.tsx
index 7fd154047d..f5754da9ae 100644
--- a/src/components/views/elements/Field.tsx
+++ b/src/components/views/elements/Field.tsx
@@ -61,10 +61,14 @@ interface IProps {
     tooltipClassName?: string;
     // If specified, an additional class name to apply to the field container
     className?: string;
+    // On what events should validation occur; by default on all
+    validateOnFocus?: boolean;
+    validateOnBlur?: boolean;
+    validateOnChange?: boolean;
     // All other props pass through to the <input>.
 }
 
-interface IInputProps extends IProps, InputHTMLAttributes<HTMLInputElement> {
+export interface IInputProps extends IProps, InputHTMLAttributes<HTMLInputElement> {
     // The element to create. Defaults to "input".
     element?: "input";
     // The input's value. This is a controlled component, so the value is required.
@@ -100,6 +104,9 @@ export default class Field extends React.PureComponent<PropShapes, IState> {
     public static readonly defaultProps = {
         element: "input",
         type: "text",
+        validateOnFocus: true,
+        validateOnBlur: true,
+        validateOnChange: true,
     };
 
     /*
@@ -137,9 +144,11 @@ export default class Field extends React.PureComponent<PropShapes, IState> {
         this.setState({
             focused: true,
         });
-        this.validate({
-            focused: true,
-        });
+        if (this.props.validateOnFocus) {
+            this.validate({
+                focused: true,
+            });
+        }
         // Parent component may have supplied its own `onFocus` as well
         if (this.props.onFocus) {
             this.props.onFocus(ev);
@@ -147,7 +156,9 @@ export default class Field extends React.PureComponent<PropShapes, IState> {
     };
 
     private onChange = (ev) => {
-        this.validateOnChange();
+        if (this.props.validateOnChange) {
+            this.validateOnChange();
+        }
         // Parent component may have supplied its own `onChange` as well
         if (this.props.onChange) {
             this.props.onChange(ev);
@@ -158,16 +169,18 @@ export default class Field extends React.PureComponent<PropShapes, IState> {
         this.setState({
             focused: false,
         });
-        this.validate({
-            focused: false,
-        });
+        if (this.props.validateOnBlur) {
+            this.validate({
+                focused: false,
+            });
+        }
         // Parent component may have supplied its own `onBlur` as well
         if (this.props.onBlur) {
             this.props.onBlur(ev);
         }
     };
 
-    private async validate({ focused, allowEmpty = true }: {focused: boolean, allowEmpty?: boolean}) {
+    public async validate({ focused, allowEmpty = true }: {focused?: boolean, allowEmpty?: boolean}) {
         if (!this.props.onValidate) {
             return;
         }
@@ -196,12 +209,15 @@ export default class Field extends React.PureComponent<PropShapes, IState> {
                 feedbackVisible: false,
             });
         }
+
+        return valid;
     }
 
     public render() {
         /* eslint @typescript-eslint/no-unused-vars: ["error", { "ignoreRestSiblings": true }] */
         const { element, prefixComponent, postfixComponent, className, onValidate, children,
-            tooltipContent, forceValidity, tooltipClassName, list, ...inputProps} = this.props;
+            tooltipContent, forceValidity, tooltipClassName, list, validateOnBlur, validateOnChange, validateOnFocus,
+            ...inputProps} = this.props;
 
         // Set some defaults for the <input> element
         const ref = input => this.input = input;
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);
diff --git a/src/components/views/elements/LanguageDropdown.js b/src/components/views/elements/LanguageDropdown.js
index e37109caff..03ec456af5 100644
--- a/src/components/views/elements/LanguageDropdown.js
+++ b/src/components/views/elements/LanguageDropdown.js
@@ -100,10 +100,10 @@ export default class LanguageDropdown extends React.Component {
         let language = SettingsStore.getValue("language", null, /*excludeDefault:*/true);
         let value = null;
         if (language) {
-          value = this.props.value || language;
+            value = this.props.value || language;
         } else {
-          language = navigator.language || navigator.userLanguage;
-          value = this.props.value || language;
+            language = navigator.language || navigator.userLanguage;
+            value = this.props.value || language;
         }
 
         return <Dropdown
diff --git a/src/components/views/elements/MiniAvatarUploader.tsx b/src/components/views/elements/MiniAvatarUploader.tsx
new file mode 100644
index 0000000000..b2609027d4
--- /dev/null
+++ b/src/components/views/elements/MiniAvatarUploader.tsx
@@ -0,0 +1,102 @@
+/*
+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 {EventType} from 'matrix-js-sdk/src/@types/event';
+import classNames from 'classnames';
+
+import AccessibleButton from "./AccessibleButton";
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import {useTimeout} from "../../../hooks/useTimeout";
+import Analytics from "../../../Analytics";
+import CountlyAnalytics from '../../../CountlyAnalytics';
+import RoomContext from "../../../contexts/RoomContext";
+
+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);
+    }, 3000); // show after 3 seconds
+    useTimeout(() => {
+        setShow(false);
+    }, 13000); // hide after being shown for 10 seconds
+
+    const uploadRef = useRef<HTMLInputElement>();
+
+    const label = (hasAvatar || busy) ? hasAvatarLabel : noAvatarLabel;
+
+    const {room} = useContext(RoomContext);
+    const canSetAvatar = room?.currentState.maySendStateEvent(EventType.RoomAvatar, cli.getUserId());
+    if (!canSetAvatar) return <React.Fragment>{ children }</React.Fragment>;
+
+    const visible = !!label && (hover || show);
+    return <React.Fragment>
+        <input
+            type="file"
+            ref={uploadRef}
+            className="mx_MiniAvatarUploader_input"
+            onChange={async (ev) => {
+                if (!ev.target.files?.length) return;
+                setBusy(true);
+                Analytics.trackEvent("mini_avatar", "upload");
+                CountlyAnalytics.instance.track("mini_avatar_upload");
+                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 }
+
+            <div className={classNames("mx_Tooltip", {
+                "mx_Tooltip_visible": visible,
+                "mx_Tooltip_invisible": !visible,
+            })}>
+                <div className="mx_Tooltip_chevron" />
+                { label }
+            </div>
+        </AccessibleButton>
+    </React.Fragment>;
+};
+
+export default MiniAvatarUploader;
diff --git a/src/components/views/elements/PersistedElement.js b/src/components/views/elements/PersistedElement.js
index 9a64b7c7c4..3732f644b8 100644
--- a/src/components/views/elements/PersistedElement.js
+++ b/src/components/views/elements/PersistedElement.js
@@ -21,6 +21,9 @@ import {throttle} from "lodash";
 import ResizeObserver from 'resize-observer-polyfill';
 
 import dis from '../../../dispatcher/dispatcher';
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
+import {isNullOrUndefined} from "matrix-js-sdk/src/utils";
 
 // Shamelessly ripped off Modal.js.  There's probably a better way
 // of doing reusable widgets like dialog boxes & menus where we go and
@@ -59,6 +62,9 @@ export default class PersistedElement extends React.Component {
         // Any PersistedElements with the same persistKey will use
         // the same DOM container.
         persistKey: PropTypes.string.isRequired,
+
+        // z-index for the element. Defaults to 9.
+        zIndex: PropTypes.number,
     };
 
     constructor() {
@@ -144,9 +150,11 @@ export default class PersistedElement extends React.Component {
     }
 
     renderApp() {
-        const content = <div ref={this.collectChild} style={this.props.style}>
-            {this.props.children}
-        </div>;
+        const content = <MatrixClientContext.Provider value={MatrixClientPeg.get()}>
+            <div ref={this.collectChild} style={this.props.style}>
+                {this.props.children}
+            </div>
+        </MatrixClientContext.Provider>;
 
         ReactDOM.render(content, getOrCreateContainer('mx_persistedElement_'+this.props.persistKey));
     }
@@ -161,6 +169,7 @@ export default class PersistedElement extends React.Component {
 
         const parentRect = parent.getBoundingClientRect();
         Object.assign(child.style, {
+            zIndex: isNullOrUndefined(this.props.zIndex) ? 9 : this.props.zIndex,
             position: 'absolute',
             top: parentRect.top + 'px',
             left: parentRect.left + 'px',
@@ -173,3 +182,5 @@ export default class PersistedElement extends React.Component {
         return <div ref={this.collectChildContainer} />;
     }
 }
+
+export const getPersistKey = (appId: string) => 'widget_' + appId;
diff --git a/src/components/views/elements/PersistentApp.js b/src/components/views/elements/PersistentApp.js
index 8b2aa5c87c..7801076c66 100644
--- a/src/components/views/elements/PersistentApp.js
+++ b/src/components/views/elements/PersistentApp.js
@@ -31,6 +31,7 @@ export default class PersistentApp extends React.Component {
     componentDidMount() {
         this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate);
         ActiveWidgetStore.on('update', this._onActiveWidgetStoreUpdate);
+        MatrixClientPeg.get().on("Room.myMembership", this._onMyMembership);
     }
 
     componentWillUnmount() {
@@ -38,6 +39,9 @@ export default class PersistentApp extends React.Component {
             this._roomStoreToken.remove();
         }
         ActiveWidgetStore.removeListener('update', this._onActiveWidgetStoreUpdate);
+        if (MatrixClientPeg.get()) {
+            MatrixClientPeg.get().removeListener("Room.myMembership", this._onMyMembership);
+        }
     }
 
     _onRoomViewStoreUpdate = payload => {
@@ -53,16 +57,28 @@ export default class PersistentApp extends React.Component {
         });
     };
 
+    _onMyMembership = async (room, membership) => {
+        const persistentWidgetInRoomId = ActiveWidgetStore.getRoomId(this.state.persistentWidgetId);
+        if (membership !== "join") {
+            // we're not in the room anymore - delete
+            if (room.roomId === persistentWidgetInRoomId) {
+                ActiveWidgetStore.destroyPersistentWidget(this.state.persistentWidgetId);
+            }
+        }
+    };
+
     render() {
         if (this.state.persistentWidgetId) {
             const persistentWidgetInRoomId = ActiveWidgetStore.getRoomId(this.state.persistentWidgetId);
-            if (this.state.roomId !== persistentWidgetInRoomId) {
-                const persistentWidgetInRoom = MatrixClientPeg.get().getRoom(persistentWidgetInRoomId);
 
-                // Sanity check the room - the widget may have been destroyed between render cycles, and
-                // thus no room is associated anymore.
-                if (!persistentWidgetInRoom) return null;
+            const persistentWidgetInRoom = MatrixClientPeg.get().getRoom(persistentWidgetInRoomId);
 
+            // Sanity check the room - the widget may have been destroyed between render cycles, and
+            // thus no room is associated anymore.
+            if (!persistentWidgetInRoom) return null;
+
+            const myMembership = persistentWidgetInRoom.getMyMembership();
+            if (this.state.roomId !== persistentWidgetInRoomId && myMembership === "join") {
                 // get the widget data
                 const appEvent = WidgetUtils.getRoomWidgets(persistentWidgetInRoom).find((ev) => {
                     return ev.getStateKey() === ActiveWidgetStore.getPersistentWidgetId();
@@ -71,7 +87,6 @@ export default class PersistentApp extends React.Component {
                     appEvent.getStateKey(), appEvent.getContent(), appEvent.getSender(),
                     persistentWidgetInRoomId, appEvent.getId(),
                 );
-                const capWhitelist = WidgetUtils.getCapWhitelistForAppTypeInRoomId(app.type, persistentWidgetInRoomId);
                 const AppTile = sdk.getComponent('elements.AppTile');
                 return <AppTile
                     key={app.id}
@@ -79,13 +94,9 @@ export default class PersistentApp extends React.Component {
                     fullWidth={true}
                     room={persistentWidgetInRoom}
                     userId={MatrixClientPeg.get().credentials.userId}
-                    show={true}
                     creatorUserId={app.creatorUserId}
                     widgetPageTitle={WidgetUtils.getWidgetDataTitle(app)}
                     waitForIframeLoad={app.waitForIframeLoad}
-                    whitelistCapabilities={capWhitelist}
-                    showDelete={false}
-                    showMinimise={false}
                     miniMode={true}
                     showMenubar={false}
                 />;
diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index 3094f17fb7..daa4cb70e2 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -1,7 +1,7 @@
 /*
 Copyright 2017 Vector Creations Ltd
 Copyright 2018 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2021 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -23,23 +23,11 @@ import { Room, RoomMember } from 'matrix-js-sdk';
 import PropTypes from 'prop-types';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import FlairStore from "../../../stores/FlairStore";
-import {getPrimaryPermalinkEntity} from "../../../utils/permalinks/Permalinks";
+import {getPrimaryPermalinkEntity, parseAppLocalLink} from "../../../utils/permalinks/Permalinks";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {Action} from "../../../dispatcher/actions";
 
-// For URLs of matrix.to links in the timeline which have been reformatted by
-// HttpUtils transformTags to relative links. This excludes event URLs (with `[^\/]*`)
-const REGEX_LOCAL_PERMALINK = /^#\/(?:user|room|group)\/(([#!@+]).*?)(?=\/|\?|$)/;
-
 class Pill extends React.Component {
-    static isPillUrl(url) {
-        return !!getPrimaryPermalinkEntity(url);
-    }
-
-    static isMessagePillUrl(url) {
-        return !!REGEX_LOCAL_PERMALINK.exec(url);
-    }
-
     static roomNotifPos(text) {
         return text.indexOf("@room");
     }
@@ -56,7 +44,7 @@ class Pill extends React.Component {
     static propTypes = {
         // The Type of this Pill. If url is given, this is auto-detected.
         type: PropTypes.string,
-        // The URL to pillify (no validation is done, see isPillUrl and isMessagePillUrl)
+        // The URL to pillify (no validation is done)
         url: PropTypes.string,
         // Whether the pill is in a message
         inMessage: PropTypes.bool,
@@ -90,12 +78,9 @@ class Pill extends React.Component {
 
         if (nextProps.url) {
             if (nextProps.inMessage) {
-                // Default to the empty array if no match for simplicity
-                // resource and prefix will be undefined instead of throwing
-                const matrixToMatch = REGEX_LOCAL_PERMALINK.exec(nextProps.url) || [];
-
-                resourceId = matrixToMatch[1]; // The room/user ID
-                prefix = matrixToMatch[2]; // The first character of prefix
+                const parts = parseAppLocalLink(nextProps.url);
+                resourceId = parts.primaryEntityId; // The room/user ID
+                prefix = parts.sigil; // The first character of prefix
             } else {
                 resourceId = getPrimaryPermalinkEntity(nextProps.url);
                 prefix = resourceId ? resourceId[0] : undefined;
diff --git a/src/components/views/elements/ReplyThread.js b/src/components/views/elements/ReplyThread.js
index 24b49f2b13..27d773b099 100644
--- a/src/components/views/elements/ReplyThread.js
+++ b/src/components/views/elements/ReplyThread.js
@@ -24,6 +24,7 @@ import {wantsDateSeparator} from '../../../DateUtils';
 import {MatrixEvent} from 'matrix-js-sdk';
 import {makeUserPermalink, RoomPermalinkCreator} from "../../../utils/permalinks/Permalinks";
 import SettingsStore from "../../../settings/SettingsStore";
+import {LayoutPropType} from "../../../settings/Layout";
 import escapeHtml from "escape-html";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {Action} from "../../../dispatcher/actions";
@@ -42,7 +43,7 @@ export default class ReplyThread extends React.Component {
         onHeightChanged: PropTypes.func.isRequired,
         permalinkCreator: PropTypes.instanceOf(RoomPermalinkCreator).isRequired,
         // Specifies which layout to use.
-        useIRCLayout: PropTypes.bool,
+        layout: LayoutPropType,
     };
 
     static contextType = MatrixClientContext;
@@ -209,7 +210,7 @@ export default class ReplyThread extends React.Component {
         };
     }
 
-    static makeThread(parentEv, onHeightChanged, permalinkCreator, ref, useIRCLayout) {
+    static makeThread(parentEv, onHeightChanged, permalinkCreator, ref, layout) {
         if (!ReplyThread.getParentEventId(parentEv)) {
             return <div className="mx_ReplyThread_wrapper_empty" />;
         }
@@ -218,7 +219,7 @@ export default class ReplyThread extends React.Component {
             onHeightChanged={onHeightChanged}
             ref={ref}
             permalinkCreator={permalinkCreator}
-            useIRCLayout={useIRCLayout}
+            layout={layout}
         />;
     }
 
@@ -386,7 +387,7 @@ export default class ReplyThread extends React.Component {
                     permalinkCreator={this.props.permalinkCreator}
                     isRedacted={ev.isRedacted()}
                     isTwelveHour={SettingsStore.getValue("showTwelveHourTimestamps")}
-                    useIRCLayout={this.props.useIRCLayout}
+                    layout={this.props.layout}
                     enableFlair={SettingsStore.getValue(UIFeature.Flair)}
                     replacingEventId={ev.replacingEventId()}
                 />
diff --git a/src/components/views/elements/RoomDirectoryButton.js b/src/components/views/elements/RoomDirectoryButton.js
deleted file mode 100644
index e9de6f8d15..0000000000
--- a/src/components/views/elements/RoomDirectoryButton.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-Copyright 2017 Vector Creations 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 * as sdk from '../../../index';
-import PropTypes from 'prop-types';
-import { _t } from '../../../languageHandler';
-import {Action} from "../../../dispatcher/actions";
-
-const RoomDirectoryButton = function(props) {
-    const ActionButton = sdk.getComponent('elements.ActionButton');
-    return (
-        <ActionButton action={Action.ViewRoomDirectory}
-            mouseOverAction={props.callout ? "callout_room_directory" : null}
-            label={_t("Room directory")}
-            iconPath={require("../../../../res/img/icons-directory.svg")}
-            size={props.size}
-            tooltip={props.tooltip}
-        />
-    );
-};
-
-RoomDirectoryButton.propTypes = {
-    size: PropTypes.string,
-    tooltip: PropTypes.bool,
-};
-
-export default RoomDirectoryButton;
diff --git a/src/components/views/elements/RoomName.tsx b/src/components/views/elements/RoomName.tsx
new file mode 100644
index 0000000000..9178155d19
--- /dev/null
+++ b/src/components/views/elements/RoomName.tsx
@@ -0,0 +1,40 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import {useEffect, useState} from "react";
+import {Room} from "matrix-js-sdk/src/models/room";
+
+import {useEventEmitter} from "../../../hooks/useEventEmitter";
+
+interface IProps {
+    room: Room;
+    children?(name: string): JSX.Element;
+}
+
+const RoomName = ({ room, children }: IProps): JSX.Element => {
+    const [name, setName] = useState(room?.name);
+    useEventEmitter(room, "Room.name", () => {
+        setName(room?.name);
+    });
+    useEffect(() => {
+        setName(room?.name);
+    }, [room]);
+
+    if (children) return children(name);
+    return name || "";
+};
+
+export default RoomName;
diff --git a/src/components/views/elements/RoomTopic.tsx b/src/components/views/elements/RoomTopic.tsx
new file mode 100644
index 0000000000..fe8aa5a83d
--- /dev/null
+++ b/src/components/views/elements/RoomTopic.tsx
@@ -0,0 +1,45 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, {useEffect, useState} from "react";
+import {EventType} from "matrix-js-sdk/src/@types/event";
+import {Room} from "matrix-js-sdk/src/models/room";
+
+import {useEventEmitter} from "../../../hooks/useEventEmitter";
+import {linkifyElement} from "../../../HtmlUtils";
+
+interface IProps {
+    room?: Room;
+    children?(topic: string, ref: (element: HTMLElement) => void): JSX.Element;
+}
+
+export const getTopic = room => room?.currentState?.getStateEvents(EventType.RoomTopic, "")?.getContent()?.topic;
+
+const RoomTopic = ({ room, children }: IProps): JSX.Element => {
+    const [topic, setTopic] = useState(getTopic(room));
+    useEventEmitter(room.currentState, "RoomState.events", () => {
+        setTopic(getTopic(room));
+    });
+    useEffect(() => {
+        setTopic(getTopic(room));
+    }, [room]);
+
+    const ref = e => e && linkifyElement(e);
+    if (children) return children(topic, ref);
+    return <span ref={ref}>{ topic }</span>;
+};
+
+export default RoomTopic;
diff --git a/src/components/views/elements/SSOButton.js b/src/components/views/elements/SSOButton.js
deleted file mode 100644
index 1126ae3cd7..0000000000
--- a/src/components/views/elements/SSOButton.js
+++ /dev/null
@@ -1,42 +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 PlatformPeg from "../../../PlatformPeg";
-import AccessibleButton from "./AccessibleButton";
-import {_t} from "../../../languageHandler";
-
-const SSOButton = ({matrixClient, loginType, fragmentAfterLogin, ...props}) => {
-    const onClick = () => {
-        PlatformPeg.get().startSingleSignOn(matrixClient, loginType, fragmentAfterLogin);
-    };
-
-    return (
-        <AccessibleButton {...props} kind="primary" onClick={onClick}>
-            {_t("Sign in with single sign-on")}
-        </AccessibleButton>
-    );
-};
-
-SSOButton.propTypes = {
-    matrixClient: PropTypes.object.isRequired, // does not use context as may use a temporary client
-    loginType: PropTypes.oneOf(["sso", "cas"]), // defaults to "sso" in base-apis
-    fragmentAfterLogin: PropTypes.string,
-};
-
-export default SSOButton;
diff --git a/src/components/views/elements/SSOButtons.tsx b/src/components/views/elements/SSOButtons.tsx
new file mode 100644
index 0000000000..3a03252ebd
--- /dev/null
+++ b/src/components/views/elements/SSOButtons.tsx
@@ -0,0 +1,149 @@
+/*
+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 { chunk } from "lodash";
+import classNames from "classnames";
+import {MatrixClient} from "matrix-js-sdk/src/client";
+
+import PlatformPeg from "../../../PlatformPeg";
+import AccessibleButton from "./AccessibleButton";
+import {_t} from "../../../languageHandler";
+import {IdentityProviderBrand, IIdentityProvider, ISSOFlow} from "../../../Login";
+import AccessibleTooltipButton from "./AccessibleTooltipButton";
+
+interface ISSOButtonProps extends Omit<IProps, "flow"> {
+    idp: IIdentityProvider;
+    mini?: boolean;
+}
+
+const getIcon = (brand: IdentityProviderBrand | string) => {
+    switch (brand) {
+        case IdentityProviderBrand.Apple:
+            return require(`../../../../res/img/element-icons/brands/apple.svg`);
+        case IdentityProviderBrand.Facebook:
+            return require(`../../../../res/img/element-icons/brands/facebook.svg`);
+        case IdentityProviderBrand.Github:
+            return require(`../../../../res/img/element-icons/brands/github.svg`);
+        case IdentityProviderBrand.Gitlab:
+            return require(`../../../../res/img/element-icons/brands/gitlab.svg`);
+        case IdentityProviderBrand.Google:
+            return require(`../../../../res/img/element-icons/brands/google.svg`);
+        case IdentityProviderBrand.Twitter:
+            return require(`../../../../res/img/element-icons/brands/twitter.svg`);
+        default:
+            return null;
+    }
+}
+
+const SSOButton: React.FC<ISSOButtonProps> = ({
+    matrixClient,
+    loginType,
+    fragmentAfterLogin,
+    idp,
+    primary,
+    mini,
+    ...props
+}) => {
+    const label = idp ? _t("Continue with %(provider)s", { provider: idp.name }) : _t("Sign in with single sign-on");
+
+    const onClick = () => {
+        PlatformPeg.get().startSingleSignOn(matrixClient, loginType, fragmentAfterLogin, idp?.id);
+    };
+
+    let icon;
+    let brandClass;
+    const brandIcon = idp ? getIcon(idp.brand) : null;
+    if (brandIcon) {
+        const brandName = idp.brand.split(".").pop();
+        brandClass = `mx_SSOButton_brand_${brandName}`;
+        icon = <img src={brandIcon} height="24" width="24" alt={brandName} />;
+    } else if (typeof idp?.icon === "string" && idp.icon.startsWith("mxc://")) {
+        const src = matrixClient.mxcUrlToHttp(idp.icon, 24, 24, "crop", true);
+        icon = <img src={src} height="24" width="24" alt={idp.name} />;
+    }
+
+    const classes = classNames("mx_SSOButton", {
+        [brandClass]: brandClass,
+        mx_SSOButton_mini: mini,
+        mx_SSOButton_default: !idp,
+        mx_SSOButton_primary: primary,
+    });
+
+    if (mini) {
+        // TODO fallback icon
+        return (
+            <AccessibleTooltipButton {...props} title={label} className={classes} onClick={onClick}>
+                { icon }
+            </AccessibleTooltipButton>
+        );
+    }
+
+    return (
+        <AccessibleButton {...props} className={classes} onClick={onClick}>
+            { icon }
+            { label }
+        </AccessibleButton>
+    );
+};
+
+interface IProps {
+    matrixClient: MatrixClient;
+    flow: ISSOFlow;
+    loginType?: "sso" | "cas";
+    fragmentAfterLogin?: string;
+    primary?: boolean;
+}
+
+const MAX_PER_ROW = 6;
+
+const SSOButtons: React.FC<IProps> = ({matrixClient, flow, loginType, fragmentAfterLogin, primary}) => {
+    const providers = flow["org.matrix.msc2858.identity_providers"] || [];
+    if (providers.length < 2) {
+        return <div className="mx_SSOButtons">
+            <SSOButton
+                matrixClient={matrixClient}
+                loginType={loginType}
+                fragmentAfterLogin={fragmentAfterLogin}
+                idp={providers[0]}
+                primary={primary}
+            />
+        </div>;
+    }
+
+    const rows = Math.ceil(providers.length / MAX_PER_ROW);
+    const size = Math.ceil(providers.length / rows);
+
+    return <div className="mx_SSOButtons">
+        { chunk(providers, size).map(chunk => (
+            <div key={chunk[0].id} className="mx_SSOButtons_row">
+                { chunk.map(idp => (
+                    <SSOButton
+                        key={idp.id}
+                        matrixClient={matrixClient}
+                        loginType={loginType}
+                        fragmentAfterLogin={fragmentAfterLogin}
+                        idp={idp}
+                        mini={true}
+                        primary={primary}
+                    />
+                )) }
+            </div>
+        )) }
+    </div>;
+};
+
+export default SSOButtons;
diff --git a/src/components/views/elements/ServerPicker.tsx b/src/components/views/elements/ServerPicker.tsx
new file mode 100644
index 0000000000..4551a49deb
--- /dev/null
+++ b/src/components/views/elements/ServerPicker.tsx
@@ -0,0 +1,93 @@
+/*
+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 AccessibleButton from "./AccessibleButton";
+import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
+import {_t} from "../../../languageHandler";
+import TextWithTooltip from "./TextWithTooltip";
+import SdkConfig from "../../../SdkConfig";
+import Modal from "../../../Modal";
+import ServerPickerDialog from "../dialogs/ServerPickerDialog";
+import InfoDialog from "../dialogs/InfoDialog";
+
+interface IProps {
+    title?: string;
+    dialogTitle?: string;
+    serverConfig: ValidatedServerConfig;
+    onServerConfigChange?(config: ValidatedServerConfig): void;
+}
+
+const showPickerDialog = (
+    title: string,
+    serverConfig: ValidatedServerConfig,
+    onFinished: (config: ValidatedServerConfig) => void,
+) => {
+    Modal.createTrackedDialog("Server Picker", "", ServerPickerDialog, { title, serverConfig, onFinished });
+};
+
+const onHelpClick = () => {
+    Modal.createTrackedDialog('Custom Server Dialog', '', InfoDialog, {
+        title: _t("Server Options"),
+        description: _t("You can use the custom server options to sign into other Matrix servers by specifying " +
+            "a different homeserver URL. This allows you to use Element with an existing Matrix account on " +
+            "a different homeserver."),
+        button: _t("Dismiss"),
+        hasCloseButton: false,
+        fixedWidth: false,
+    }, "mx_ServerPicker_helpDialog");
+};
+
+const ServerPicker = ({ title, dialogTitle, serverConfig, onServerConfigChange }: IProps) => {
+    let editBtn;
+    if (!SdkConfig.get()["disable_custom_urls"] && onServerConfigChange) {
+        const onClick = () => {
+            showPickerDialog(dialogTitle, serverConfig, (config?: ValidatedServerConfig) => {
+                if (config) {
+                    onServerConfigChange(config);
+                }
+            });
+        };
+        editBtn = <AccessibleButton className="mx_ServerPicker_change" kind="link" onClick={onClick}>
+            {_t("Edit")}
+        </AccessibleButton>;
+    }
+
+    let serverName = serverConfig.isNameResolvable ? serverConfig.hsName : serverConfig.hsUrl;
+    if (serverConfig.hsNameIsDifferent) {
+        serverName = <TextWithTooltip class="mx_Login_underlinedServerName" tooltip={serverConfig.hsUrl}>
+            {serverConfig.hsName}
+        </TextWithTooltip>;
+    }
+
+    let desc;
+    if (serverConfig.hsName === "matrix.org") {
+        desc = <span className="mx_ServerPicker_desc">
+            {_t("Join millions for free on the largest public server")}
+        </span>;
+    }
+
+    return <div className="mx_ServerPicker">
+        <h3>{title || _t("Homeserver")}</h3>
+        <AccessibleButton className="mx_ServerPicker_help" onClick={onHelpClick} />
+        <span className="mx_ServerPicker_server">{serverName}</span>
+        { editBtn }
+        { desc }
+    </div>
+}
+
+export default ServerPicker;
diff --git a/src/components/views/elements/SpellCheckLanguagesDropdown.tsx b/src/components/views/elements/SpellCheckLanguagesDropdown.tsx
new file mode 100644
index 0000000000..c647f6e410
--- /dev/null
+++ b/src/components/views/elements/SpellCheckLanguagesDropdown.tsx
@@ -0,0 +1,126 @@
+/*
+Copyright 2021 Šimon Brandner <simon.bra.ag@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+
+import Dropdown from "../../views/elements/Dropdown"
+import * as sdk from '../../../index';
+import PlatformPeg from "../../../PlatformPeg";
+import SettingsStore from "../../../settings/SettingsStore";
+import { _t } from "../../../languageHandler";
+
+function languageMatchesSearchQuery(query, language) {
+    if (language.label.toUpperCase().includes(query.toUpperCase())) return true;
+    if (language.value.toUpperCase() === query.toUpperCase()) return true;
+    return false;
+}
+
+interface SpellCheckLanguagesDropdownIProps {
+    className: string,
+    value: string,
+    onOptionChange(language: string),
+}
+
+interface SpellCheckLanguagesDropdownIState {
+    searchQuery: string,
+    languages: any,
+}
+
+export default class SpellCheckLanguagesDropdown extends React.Component<SpellCheckLanguagesDropdownIProps,
+                                                                         SpellCheckLanguagesDropdownIState> {
+    constructor(props) {
+        super(props);
+        this._onSearchChange = this._onSearchChange.bind(this);
+
+        this.state = {
+            searchQuery: '',
+            languages: null,
+        };
+    }
+
+    componentDidMount() {
+        const plaf = PlatformPeg.get();
+        if (plaf) {
+            plaf.getAvailableSpellCheckLanguages().then((languages) => {
+                languages.sort(function(a, b) {
+                    if (a < b) return -1;
+                    if (a > b) return 1;
+                    return 0;
+                });
+                const langs = [];
+                languages.forEach((language) => {
+                    langs.push({
+                        label: language,
+                        value: language,
+                    })
+                })
+                this.setState({languages: langs});
+            }).catch((e) => {
+                this.setState({languages: ['en']});
+            });
+        }
+    }
+
+    _onSearchChange(search) {
+        this.setState({
+            searchQuery: search,
+        });
+    }
+
+    render() {
+        if (this.state.languages === null) {
+            const Spinner = sdk.getComponent('elements.Spinner');
+            return <Spinner />;
+        }
+
+        let displayedLanguages;
+        if (this.state.searchQuery) {
+            displayedLanguages = this.state.languages.filter((lang) => {
+                return languageMatchesSearchQuery(this.state.searchQuery, lang);
+            });
+        } else {
+            displayedLanguages = this.state.languages;
+        }
+
+        const options = displayedLanguages.map((language) => {
+            return <div key={language.value}>
+                { language.label }
+            </div>;
+        });
+
+        // default value here too, otherwise we need to handle null / undefined;
+        // values between mounting and the initial value propgating
+        let language = SettingsStore.getValue("language", null, /*excludeDefault:*/true);
+        let value = null;
+        if (language) {
+            value = this.props.value || language;
+        } else {
+            language = navigator.language || navigator.userLanguage;
+            value = this.props.value || language;
+        }
+
+        return <Dropdown
+            id="mx_LanguageDropdown"
+            className={this.props.className}
+            onOptionChange={this.props.onOptionChange}
+            onSearchChange={this._onSearchChange}
+            searchEnabled={true}
+            value={value}
+            label={_t("Language Dropdown")}>
+            { options }
+        </Dropdown>;
+    }
+}
diff --git a/src/components/views/elements/StartChatButton.js b/src/components/views/elements/StartChatButton.js
deleted file mode 100644
index f828f8ae4d..0000000000
--- a/src/components/views/elements/StartChatButton.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2017 Vector Creations 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 * as sdk from '../../../index';
-import PropTypes from 'prop-types';
-import { _t } from '../../../languageHandler';
-
-const StartChatButton = function(props) {
-    const ActionButton = sdk.getComponent('elements.ActionButton');
-    return (
-        <ActionButton action="view_create_chat"
-            mouseOverAction={props.callout ? "callout_start_chat" : null}
-            label={_t("Start chat")}
-            iconPath={require("../../../../res/img/icons-people.svg")}
-            size={props.size}
-            tooltip={props.tooltip}
-        />
-    );
-};
-
-StartChatButton.propTypes = {
-    size: PropTypes.string,
-    tooltip: PropTypes.bool,
-};
-
-export default StartChatButton;
diff --git a/src/components/views/elements/TintableSvgButton.js b/src/components/views/elements/TintableSvgButton.js
deleted file mode 100644
index a3f5b7db5d..0000000000
--- a/src/components/views/elements/TintableSvgButton.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-Copyright 2017 New Vector 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 TintableSvg from './TintableSvg';
-import AccessibleButton from './AccessibleButton';
-
-export default class TintableSvgButton extends React.Component {
-    constructor(props) {
-        super(props);
-    }
-
-    render() {
-        let classes = "mx_TintableSvgButton";
-        if (this.props.className) {
-            classes += " " + this.props.className;
-        }
-        return (
-            <span
-                width={this.props.width}
-                height={this.props.height}
-                className={classes}>
-                <TintableSvg
-                    src={this.props.src}
-                    width={this.props.width}
-                    height={this.props.height}
-                ></TintableSvg>
-                <AccessibleButton
-                    onClick={this.props.onClick}
-                    element='span'
-                    title={this.props.title}
-                />
-            </span>
-        );
-    }
-}
-
-TintableSvgButton.propTypes = {
-    src: PropTypes.string,
-    title: PropTypes.string,
-    className: PropTypes.string,
-    width: PropTypes.string.isRequired,
-    height: PropTypes.string.isRequired,
-    onClick: PropTypes.func,
-};
-
-TintableSvgButton.defaultProps = {
-    onClick: function() {},
-};
diff --git a/src/components/views/elements/Tooltip.tsx b/src/components/views/elements/Tooltip.tsx
index 6b71a1dbf5..03b9eb08d0 100644
--- a/src/components/views/elements/Tooltip.tsx
+++ b/src/components/views/elements/Tooltip.tsx
@@ -36,6 +36,7 @@ interface IProps {
         // the react element to put into the tooltip
         label: React.ReactNode;
         forceOnRight?: boolean;
+        yOffset?: number;
 }
 
 export default class Tooltip extends React.Component<IProps> {
@@ -46,6 +47,7 @@ export default class Tooltip extends React.Component<IProps> {
 
     public static readonly defaultProps = {
         visible: true,
+        yOffset: 0,
     };
 
     // Create a wrapper for the tooltip outside the parent and attach it to the body element
@@ -82,9 +84,9 @@ export default class Tooltip extends React.Component<IProps> {
             offset = Math.floor(parentBox.height - MIN_TOOLTIP_HEIGHT);
         }
 
-        style.top = (parentBox.top - 2) + window.pageYOffset + offset;
+        style.top = (parentBox.top - 2 + this.props.yOffset) + window.pageYOffset + offset;
         if (!this.props.forceOnRight && parentBox.right > window.innerWidth / 2) {
-            style.right = window.innerWidth - parentBox.right - window.pageXOffset - 8;
+            style.right = window.innerWidth - parentBox.right - window.pageXOffset - 16;
         } else {
             style.left = parentBox.right + window.pageXOffset + 6;
         }
diff --git a/src/components/views/elements/Validation.tsx b/src/components/views/elements/Validation.tsx
index 55e5714719..1b0659ab9b 100644
--- a/src/components/views/elements/Validation.tsx
+++ b/src/components/views/elements/Validation.tsx
@@ -32,7 +32,8 @@ interface IRule<T, D = void> {
 
 interface IArgs<T, D = void> {
     rules: IRule<T, D>[];
-    description(this: T, derivedData: D): React.ReactChild;
+    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,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, 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 +161,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);
diff --git a/src/components/views/host_signup/HostSignupContainer.tsx b/src/components/views/host_signup/HostSignupContainer.tsx
new file mode 100644
index 0000000000..6445454994
--- /dev/null
+++ b/src/components/views/host_signup/HostSignupContainer.tsx
@@ -0,0 +1,36 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { useState } from 'react';
+import HostSignupDialog from "../dialogs/HostSignupDialog";
+import { HostSignupStore } from "../../../stores/HostSignupStore";
+import { useEventEmitter } from "../../../hooks/useEventEmitter";
+import { UPDATE_EVENT } from "../../../stores/AsyncStore";
+
+const HostSignupContainer = () => {
+    const [isActive, setIsActive] = useState(HostSignupStore.instance.isHostSignupActive);
+    useEventEmitter(HostSignupStore.instance, UPDATE_EVENT, () => {
+        setIsActive(HostSignupStore.instance.isHostSignupActive);
+    });
+
+    return <div className="mx_HostSignupContainer">
+        {isActive &&
+            <HostSignupDialog />
+        }
+    </div>;
+};
+
+export default HostSignupContainer
diff --git a/src/components/views/messages/EncryptionEvent.js b/src/components/views/messages/EncryptionEvent.js
deleted file mode 100644
index a9ce10d202..0000000000
--- a/src/components/views/messages/EncryptionEvent.js
+++ /dev/null
@@ -1,63 +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';
-
-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>;
-        } 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 (<div className={classes}>
-            {body}
-        </div>);
-    }
-}
-
-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..3af9c463c9
--- /dev/null
+++ b/src/components/views/messages/EncryptionEvent.tsx
@@ -0,0 +1,68 @@
+/*
+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, {forwardRef, 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 = forwardRef<HTMLDivElement, IProps>(({mxEvent}, ref) => {
+    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={subtitle}
+        />;
+    } 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.")}
+        ref={ref}
+    />;
+});
+
+export default EncryptionEvent;
diff --git a/src/components/views/messages/EventTileBubble.tsx b/src/components/views/messages/EventTileBubble.tsx
new file mode 100644
index 0000000000..f797a97a3d
--- /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, {forwardRef, ReactNode} from "react";
+import classNames from "classnames";
+
+interface IProps {
+    className: string;
+    title: string;
+    subtitle?: ReactNode;
+}
+
+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/components/views/messages/MFileBody.js b/src/components/views/messages/MFileBody.js
index cc140a4352..770cd4fff3 100644
--- a/src/components/views/messages/MFileBody.js
+++ b/src/components/views/messages/MFileBody.js
@@ -144,7 +144,7 @@ export default class MFileBody extends React.Component {
      * Extracts a human readable label for the file attachment to use as
      * link text.
      *
-     * @params {Object} content The "content" key of the matrix event.
+     * @param {Object} content The "content" key of the matrix event.
      * @return {string} the human readable link text for the attachment.
      */
     presentableTextForFile(content) {
@@ -288,7 +288,7 @@ export default class MFileBody extends React.Component {
                             <a ref={this._dummyLink} />
                         </div>
                         <iframe
-                            src={`${url}?origin=${encodeURIComponent(window.location.origin)}`}
+                            src={url}
                             onLoad={onIframeLoad}
                             ref={this._iframe}
                             sandbox="allow-scripts allow-downloads allow-downloads-without-user-activation" />
diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index c92ae475bf..a8cdc17abf 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -85,6 +85,7 @@ export default class MImageBody extends React.Component {
     showImage() {
         localStorage.setItem("mx_ShowImage_" + this.props.mxEvent.getId(), "true");
         this.setState({showImage: true});
+        this._downloadImage();
     }
 
     onClick(ev) {
@@ -253,10 +254,7 @@ export default class MImageBody extends React.Component {
         }
     }
 
-    componentDidMount() {
-        this.unmounted = false;
-        this.context.on('sync', this.onClientSync);
-
+    _downloadImage() {
         const content = this.props.mxEvent.getContent();
         if (content.file !== undefined && this.state.decryptedUrl === null) {
             let thumbnailPromise = Promise.resolve(null);
@@ -289,9 +287,18 @@ export default class MImageBody extends React.Component {
                 });
             });
         }
+    }
 
-        // Remember that the user wanted to show this particular image
-        if (!this.state.showImage && localStorage.getItem("mx_ShowImage_" + this.props.mxEvent.getId()) === "true") {
+    componentDidMount() {
+        this.unmounted = false;
+        this.context.on('sync', this.onClientSync);
+
+        const showImage = this.state.showImage ||
+            localStorage.getItem("mx_ShowImage_" + this.props.mxEvent.getId()) === "true";
+
+        if (showImage) {
+            // Don't download anything becaue we don't want to display anything.
+            this._downloadImage();
             this.setState({showImage: true});
         }
 
diff --git a/src/components/views/messages/MJitsiWidgetEvent.tsx b/src/components/views/messages/MJitsiWidgetEvent.tsx
index 3d191209f9..6031ede8fa 100644
--- a/src/components/views/messages/MJitsiWidgetEvent.tsx
+++ b/src/components/views/messages/MJitsiWidgetEvent.tsx
@@ -18,6 +18,9 @@ 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";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
+import { Container, WidgetLayoutStore } from "../../../stores/widgets/WidgetLayoutStore";
 
 interface IProps {
     mxEvent: MatrixEvent;
@@ -32,45 +35,37 @@ export default class MJitsiWidgetEvent extends React.PureComponent<IProps> {
         const url = this.props.mxEvent.getContent()['url'];
         const prevUrl = this.props.mxEvent.getPrevContent()['url'];
         const senderName = this.props.mxEvent.sender?.name || this.props.mxEvent.getSender();
+        const room = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId());
+        const widgetId = this.props.mxEvent.getStateKey();
+        const widget = WidgetStore.instance.getRoom(room.roomId, true).widgets.find(w => w.id === widgetId);
 
         let joinCopy = _t('Join the conference at the top of this room');
-        if (!WidgetStore.instance.isPinned(this.props.mxEvent.getStateKey())) {
+        if (widget && WidgetLayoutStore.instance.isInContainer(room, widget, Container.Right)) {
             joinCopy = _t('Join the conference from the room information card on the right');
+        } else if (!widget) {
+            joinCopy = null;
         }
 
         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/MVideoBody.js b/src/components/views/messages/MVideoBody.tsx
similarity index 58%
rename from src/components/views/messages/MVideoBody.js
rename to src/components/views/messages/MVideoBody.tsx
index 86bf41699b..9628f11809 100644
--- a/src/components/views/messages/MVideoBody.js
+++ b/src/components/views/messages/MVideoBody.tsx
@@ -16,7 +16,6 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 import MFileBody from './MFileBody';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import { decryptFile } from '../../../utils/DecryptFile';
@@ -24,23 +23,36 @@ import { _t } from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
 import InlineSpinner from '../elements/InlineSpinner';
 
-export default class MVideoBody extends React.Component {
-    static propTypes = {
-        /* the MatrixEvent to show */
-        mxEvent: PropTypes.object.isRequired,
+interface IProps {
+    /* the MatrixEvent to show */
+    mxEvent: any;
+    /* called when the video has loaded */
+    onHeightChanged: () => void;
+}
 
-        /* called when the video has loaded */
-        onHeightChanged: PropTypes.func.isRequired,
-    };
+interface IState {
+    decryptedUrl: string|null,
+    decryptedThumbnailUrl: string|null,
+    decryptedBlob: Blob|null,
+    error: any|null,
+    fetchingData: boolean,
+}
 
-    state = {
-        decryptedUrl: null,
-        decryptedThumbnailUrl: null,
-        decryptedBlob: null,
-        error: null,
-    };
+export default class MVideoBody extends React.PureComponent<IProps, IState> {
+    private videoRef = React.createRef<HTMLVideoElement>();
 
-    thumbScale(fullWidth, fullHeight, thumbWidth, thumbHeight) {
+    constructor(props) {
+        super(props);
+        this.state = {
+            fetchingData: false,
+            decryptedUrl: null,
+            decryptedThumbnailUrl: null,
+            decryptedBlob: null,
+            error: null,
+        }
+    }
+
+    thumbScale(fullWidth: number, fullHeight: number, thumbWidth: number, thumbHeight: number) {
         if (!fullWidth || !fullHeight) {
             // Cannot calculate thumbnail height for image: missing w/h in metadata. We can't even
             // log this because it's spammy
@@ -61,7 +73,7 @@ export default class MVideoBody extends React.Component {
         }
     }
 
-    _getContentUrl() {
+    private getContentUrl(): string|null {
         const content = this.props.mxEvent.getContent();
         if (content.file !== undefined) {
             return this.state.decryptedUrl;
@@ -70,7 +82,12 @@ export default class MVideoBody extends React.Component {
         }
     }
 
-    _getThumbUrl() {
+    private hasContentUrl(): boolean {
+        const url = this.getContentUrl();
+        return url && !url.startsWith("data:");
+    }
+
+    private getThumbUrl(): string|null {
         const content = this.props.mxEvent.getContent();
         if (content.file !== undefined) {
             return this.state.decryptedThumbnailUrl;
@@ -81,7 +98,8 @@ export default class MVideoBody extends React.Component {
         }
     }
 
-    componentDidMount() {
+    async componentDidMount() {
+        const autoplay = SettingsStore.getValue("autoplayGifsAndVideos") as boolean;
         const content = this.props.mxEvent.getContent();
         if (content.file !== undefined && this.state.decryptedUrl === null) {
             let thumbnailPromise = Promise.resolve(null);
@@ -92,26 +110,36 @@ export default class MVideoBody extends React.Component {
                     return URL.createObjectURL(blob);
                 });
             }
-            let decryptedBlob;
-            thumbnailPromise.then((thumbnailUrl) => {
-                return decryptFile(content.file).then(function(blob) {
-                    decryptedBlob = blob;
-                    return URL.createObjectURL(blob);
-                }).then((contentUrl) => {
+            try {
+                const thumbnailUrl = await thumbnailPromise;
+                if (autoplay) {
+                    console.log("Preloading video");
+                    const decryptedBlob = await decryptFile(content.file);
+                    const contentUrl = URL.createObjectURL(decryptedBlob);
                     this.setState({
                         decryptedUrl: contentUrl,
                         decryptedThumbnailUrl: thumbnailUrl,
                         decryptedBlob: decryptedBlob,
                     });
                     this.props.onHeightChanged();
-                });
-            }).catch((err) => {
+                } else {
+                    console.log("NOT preloading video");
+                    this.setState({
+                        // For Chrome and Electron, we need to set some non-empty `src` to
+                        // enable the play button. Firefox does not seem to care either
+                        // way, so it's fine to do for all browsers.
+                        decryptedUrl: `data:${content?.info?.mimetype},`,
+                        decryptedThumbnailUrl: thumbnailUrl,
+                        decryptedBlob: null,
+                    });
+                }
+            } catch (err) {
                 console.warn("Unable to decrypt attachment: ", err);
                 // Set a placeholder image when we can't decrypt the image.
                 this.setState({
                     error: err,
                 });
-            });
+            }
         }
     }
 
@@ -124,8 +152,38 @@ export default class MVideoBody extends React.Component {
         }
     }
 
+    private videoOnPlay = async () => {
+        if (this.hasContentUrl() || this.state.fetchingData || this.state.error) {
+            // We have the file, we are fetching the file, or there is an error.
+            return;
+        }
+        this.setState({
+            // To stop subsequent download attempts
+            fetchingData: true,
+        });
+        const content = this.props.mxEvent.getContent();
+        if (!content.file) {
+            this.setState({
+                error: "No file given in content",
+            });
+            return;
+        }
+        const decryptedBlob = await decryptFile(content.file);
+        const contentUrl = URL.createObjectURL(decryptedBlob);
+        this.setState({
+            decryptedUrl: contentUrl,
+            decryptedBlob: decryptedBlob,
+            fetchingData: false,
+        }, () => {
+            if (!this.videoRef.current) return;
+            this.videoRef.current.play();
+        });
+        this.props.onHeightChanged();
+    }
+
     render() {
         const content = this.props.mxEvent.getContent();
+        const autoplay = SettingsStore.getValue("autoplayGifsAndVideos");
 
         if (this.state.error !== null) {
             return (
@@ -136,7 +194,8 @@ export default class MVideoBody extends React.Component {
             );
         }
 
-        if (content.file !== undefined && this.state.decryptedUrl === null) {
+        // Important: If we aren't autoplaying and we haven't decrypred it yet, show a video with a poster.
+        if (content.file !== undefined && this.state.decryptedUrl === null && autoplay) {
             // Need to decrypt the attachment
             // The attachment is decrypted in componentDidMount.
             // For now add an img tag with a spinner.
@@ -149,9 +208,8 @@ export default class MVideoBody extends React.Component {
             );
         }
 
-        const contentUrl = this._getContentUrl();
-        const thumbUrl = this._getThumbUrl();
-        const autoplay = SettingsStore.getValue("autoplayGifsAndVideos");
+        const contentUrl = this.getContentUrl();
+        const thumbUrl = this.getThumbUrl();
         let height = null;
         let width = null;
         let poster = null;
@@ -170,9 +228,20 @@ export default class MVideoBody extends React.Component {
         }
         return (
             <span className="mx_MVideoBody">
-                <video className="mx_MVideoBody" src={contentUrl} alt={content.body}
-                    controls preload={preload} muted={autoplay} autoPlay={autoplay}
-                    height={height} width={width} poster={poster}>
+                <video
+                    className="mx_MVideoBody"
+                    ref={this.videoRef}
+                    src={contentUrl}
+                    title={content.body}
+                    controls
+                    preload={preload}
+                    muted={autoplay}
+                    autoPlay={autoplay}
+                    height={height}
+                    width={width}
+                    poster={poster}
+                    onPlay={this.videoOnPlay}
+                >
                 </video>
                 <MFileBody {...this.props} decryptedBlob={this.state.decryptedBlob} />
             </span>
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/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index 9764b08e5b..04db7bd725 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -81,6 +81,7 @@ export default class TextualBody extends React.Component {
     }
 
     _applyFormatting() {
+        const showLineNumbers = SettingsStore.getValue("showCodeLineNumbers");
         this.activateSpoilers([this._content.current]);
 
         // pillifyLinks BEFORE linkifyElement because plain room/user URLs in the composer
@@ -91,29 +92,150 @@ export default class TextualBody extends React.Component {
         this.calculateUrlPreview();
 
         if (this.props.mxEvent.getContent().format === "org.matrix.custom.html") {
-            const blocks = ReactDOM.findDOMNode(this).getElementsByTagName("code");
-            if (blocks.length > 0) {
+            // Handle expansion and add buttons
+            const pres = ReactDOM.findDOMNode(this).getElementsByTagName("pre");
+            if (pres.length > 0) {
+                for (let i = 0; i < pres.length; i++) {
+                    // If there already is a div wrapping the codeblock we want to skip this.
+                    // This happens after the codeblock was edited.
+                    if (pres[i].parentNode.className == "mx_EventTile_pre_container") continue;
+                    // Add code element if it's missing since we depend on it
+                    if (pres[i].getElementsByTagName("code").length == 0) {
+                        this._addCodeElement(pres[i]);
+                    }
+                    // Wrap a div around <pre> so that the copy button can be correctly positioned
+                    // when the <pre> overflows and is scrolled horizontally.
+                    const div = this._wrapInDiv(pres[i]);
+                    this._handleCodeBlockExpansion(pres[i]);
+                    this._addCodeExpansionButton(div, pres[i]);
+                    this._addCodeCopyButton(div);
+                    if (showLineNumbers) {
+                        this._addLineNumbers(pres[i]);
+                    }
+                }
+            }
+            // Highlight code
+            const codes = ReactDOM.findDOMNode(this).getElementsByTagName("code");
+            if (codes.length > 0) {
                 // Do this asynchronously: parsing code takes time and we don't
                 // need to block the DOM update on it.
                 setTimeout(() => {
                     if (this._unmounted) return;
-                    for (let i = 0; i < blocks.length; i++) {
-                        if (SettingsStore.getValue("enableSyntaxHighlightLanguageDetection")) {
-                            highlight.highlightBlock(blocks[i]);
-                        } else {
-                            // Only syntax highlight if there's a class starting with language-
-                            const classes = blocks[i].className.split(/\s+/).filter(function(cl) {
-                                return cl.startsWith('language-') && !cl.startsWith('language-_');
-                            });
-
-                            if (classes.length != 0) {
-                                highlight.highlightBlock(blocks[i]);
-                            }
-                        }
+                    for (let i = 0; i < codes.length; i++) {
+                        // If the code already has the hljs class we want to skip this.
+                        // This happens after the codeblock was edited.
+                        if (codes[i].className.includes("hljs")) continue;
+                        this._highlightCode(codes[i]);
                     }
                 }, 10);
             }
-            this._addCodeCopyButton();
+        }
+    }
+
+    _addCodeElement(pre) {
+        const code = document.createElement("code");
+        code.append(...pre.childNodes);
+        pre.appendChild(code);
+    }
+
+    _addCodeExpansionButton(div, pre) {
+        // Calculate how many percent does the pre element take up.
+        // If it's less than 30% we don't add the expansion button.
+        const percentageOfViewport = pre.offsetHeight / window.innerHeight * 100;
+        if (percentageOfViewport < 30) return;
+
+        const button = document.createElement("span");
+        button.className = "mx_EventTile_button ";
+        if (pre.className == "mx_EventTile_collapsedCodeBlock") {
+            button.className += "mx_EventTile_expandButton";
+        } else {
+            button.className += "mx_EventTile_collapseButton";
+        }
+
+        button.onclick = async () => {
+            button.className = "mx_EventTile_button ";
+            if (pre.className == "mx_EventTile_collapsedCodeBlock") {
+                pre.className = "";
+                button.className += "mx_EventTile_collapseButton";
+            } else {
+                pre.className = "mx_EventTile_collapsedCodeBlock";
+                button.className += "mx_EventTile_expandButton";
+            }
+
+            // By expanding/collapsing we changed
+            // the height, therefore we call this
+            this.props.onHeightChanged();
+        };
+
+        div.appendChild(button);
+    }
+
+    _addCodeCopyButton(div) {
+        const button = document.createElement("span");
+        button.className = "mx_EventTile_button mx_EventTile_copyButton ";
+
+        // Check if expansion button exists. If so
+        // we put the copy button to the bottom
+        const expansionButtonExists = div.getElementsByClassName("mx_EventTile_button");
+        if (expansionButtonExists.length > 0) button.className += "mx_EventTile_buttonBottom";
+
+        button.onclick = async () => {
+            const copyCode = button.parentNode.getElementsByTagName("code")[0];
+            const successful = await copyPlaintext(copyCode.textContent);
+
+            const buttonRect = button.getBoundingClientRect();
+            const GenericTextContextMenu = sdk.getComponent('context_menus.GenericTextContextMenu');
+            const {close} = ContextMenu.createMenu(GenericTextContextMenu, {
+                ...toRightOf(buttonRect, 2),
+                message: successful ? _t('Copied!') : _t('Failed to copy'),
+            });
+            button.onmouseleave = close;
+        };
+
+        div.appendChild(button);
+    }
+
+    _wrapInDiv(pre) {
+        const div = document.createElement("div");
+        div.className = "mx_EventTile_pre_container";
+
+        // Insert containing div in place of <pre> block
+        pre.parentNode.replaceChild(div, pre);
+        // Append <pre> block and copy button to container
+        div.appendChild(pre);
+
+        return div;
+    }
+
+    _handleCodeBlockExpansion(pre) {
+        if (!SettingsStore.getValue("expandCodeByDefault")) {
+            pre.className = "mx_EventTile_collapsedCodeBlock";
+        }
+    }
+
+    _addLineNumbers(pre) {
+        pre.innerHTML = '<span class="mx_EventTile_lineNumbers"></span>' + pre.innerHTML + '<span></span>';
+        const lineNumbers = pre.getElementsByClassName("mx_EventTile_lineNumbers")[0];
+        // Calculate number of lines in pre
+        const number = pre.innerHTML.split(/\n/).length;
+        // Iterate through lines starting with 1 (number of the first line is 1)
+        for (let i = 1; i < number; i++) {
+            lineNumbers.innerHTML += '<span class="mx_EventTile_lineNumber">' + i + '</span>';
+        }
+    }
+
+    _highlightCode(code) {
+        if (SettingsStore.getValue("enableSyntaxHighlightLanguageDetection")) {
+            highlight.highlightBlock(code);
+        } else {
+            // Only syntax highlight if there's a class starting with language-
+            const classes = code.className.split(/\s+/).filter(function(cl) {
+                return cl.startsWith('language-') && !cl.startsWith('language-_');
+            });
+
+            if (classes.length != 0) {
+                highlight.highlightBlock(code);
+            }
         }
     }
 
@@ -254,38 +376,6 @@ export default class TextualBody extends React.Component {
         }
     }
 
-    _addCodeCopyButton() {
-        // Add 'copy' buttons to pre blocks
-        Array.from(ReactDOM.findDOMNode(this).querySelectorAll('.mx_EventTile_body pre')).forEach((p) => {
-            const button = document.createElement("span");
-            button.className = "mx_EventTile_copyButton";
-            button.onclick = async () => {
-                const copyCode = button.parentNode.getElementsByTagName("pre")[0];
-                const successful = await copyPlaintext(copyCode.textContent);
-
-                const buttonRect = button.getBoundingClientRect();
-                const GenericTextContextMenu = sdk.getComponent('context_menus.GenericTextContextMenu');
-                const {close} = ContextMenu.createMenu(GenericTextContextMenu, {
-                    ...toRightOf(buttonRect, 2),
-                    message: successful ? _t('Copied!') : _t('Failed to copy'),
-                });
-                button.onmouseleave = close;
-            };
-
-            // Wrap a div around <pre> so that the copy button can be correctly positioned
-            // when the <pre> overflows and is scrolled horizontally.
-            const div = document.createElement("div");
-            div.className = "mx_EventTile_pre_container";
-
-            // Insert containing div in place of <pre> block
-            p.parentNode.replaceChild(div, p);
-
-            // Append <pre> block and copy button to container
-            div.appendChild(p);
-            div.appendChild(button);
-        });
-    }
-
     onCancelClick = event => {
         this.setState({ widgetHidden: true });
         // FIXME: persist this somewhere smarter than local storage
@@ -410,13 +500,18 @@ export default class TextualBody extends React.Component {
             ref: this._content,
         });
         if (this.props.replacingEventId) {
-            body = [body, this._renderEditedMarker()];
+            body = <>
+                {body}
+                {this._renderEditedMarker()}
+            </>;
         }
 
         if (this.props.highlightLink) {
             body = <a href={this.props.highlightLink}>{ body }</a>;
         } else if (content.data && typeof content.data["org.matrix.neb.starter_link"] === "string") {
-            body = <a href="#" onClick={this.onStarterLinkClick.bind(this, content.data["org.matrix.neb.starter_link"])}>{ body }</a>;
+            body = <a href="#"
+                onClick={this.onStarterLinkClick.bind(this, content.data["org.matrix.neb.starter_link"])}
+            >{ body }</a>;
         }
 
         let widgets;
diff --git a/src/components/views/right_panel/BaseCard.tsx b/src/components/views/right_panel/BaseCard.tsx
index 5927c7c3cc..09973809de 100644
--- a/src/components/views/right_panel/BaseCard.tsx
+++ b/src/components/views/right_panel/BaseCard.tsx
@@ -33,6 +33,7 @@ interface IProps {
     previousPhase?: RightPanelPhases;
     closeLabel?: string;
     onClose?(): void;
+    refireParams?;
 }
 
 interface IGroupProps {
@@ -56,6 +57,7 @@ const BaseCard: React.FC<IProps> = ({
     withoutScrollContainer,
     previousPhase,
     children,
+    refireParams,
 }) => {
     let backButton;
     if (previousPhase) {
@@ -63,6 +65,7 @@ const BaseCard: React.FC<IProps> = ({
             defaultDispatcher.dispatch<SetRightPanelPhasePayload>({
                 action: Action.SetRightPanelPhase,
                 phase: previousPhase,
+                refireParams: refireParams,
             });
         };
         backButton = <AccessibleButton className="mx_BaseCard_back" onClick={onBackClick} title={_t("Back")} />;
diff --git a/src/components/views/right_panel/RoomSummaryCard.tsx b/src/components/views/right_panel/RoomSummaryCard.tsx
index 95b159deed..bbe61807ae 100644
--- a/src/components/views/right_panel/RoomSummaryCard.tsx
+++ b/src/components/views/right_panel/RoomSummaryCard.tsx
@@ -17,7 +17,6 @@ limitations under the License.
 import React, {useCallback, useState, useEffect, useContext} from "react";
 import classNames from "classnames";
 import {Room} from "matrix-js-sdk/src/models/room";
-import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
 
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import { useIsEncrypted } from '../../../hooks/useIsEncrypted';
@@ -32,17 +31,20 @@ import {SetRightPanelPhasePayload} from "../../../dispatcher/payloads/SetRightPa
 import Modal from "../../../Modal";
 import ShareDialog from '../dialogs/ShareDialog';
 import {useEventEmitter} from "../../../hooks/useEventEmitter";
-import WidgetEchoStore from "../../../stores/WidgetEchoStore";
 import WidgetUtils from "../../../utils/WidgetUtils";
 import {IntegrationManagers} from "../../../integrations/IntegrationManagers";
 import SettingsStore from "../../../settings/SettingsStore";
 import TextWithTooltip from "../elements/TextWithTooltip";
-import BaseAvatar from "../avatars/BaseAvatar";
+import WidgetAvatar from "../avatars/WidgetAvatar";
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
 import WidgetStore, {IApp} from "../../../stores/WidgetStore";
 import { E2EStatus } from "../../../utils/ShieldUtils";
 import RoomContext from "../../../contexts/RoomContext";
 import {UIFeature} from "../../../settings/UIFeature";
+import {ChevronFace, ContextMenuTooltipButton, useContextMenu} from "../../structures/ContextMenu";
+import WidgetContextMenu from "../context_menus/WidgetContextMenu";
+import {useRoomMemberCount} from "../../../hooks/useRoomMembers";
+import { Container, MAX_PINNED, WidgetLayoutStore } from "../../../stores/widgets/WidgetLayoutStore";
 
 interface IProps {
     room: Room;
@@ -68,22 +70,107 @@ const Button: React.FC<IButtonProps> = ({ children, className, onClick }) => {
 };
 
 export const useWidgets = (room: Room) => {
-    const [apps, setApps] = useState<IApp[]>(WidgetStore.instance.getApps(room));
+    const [apps, setApps] = useState<IApp[]>(WidgetStore.instance.getApps(room.roomId));
 
     const updateApps = useCallback(() => {
         // Copy the array so that we always trigger a re-render, as some updates mutate the array of apps/settings
-        setApps([...WidgetStore.instance.getApps(room)]);
+        setApps([...WidgetStore.instance.getApps(room.roomId)]);
     }, [room]);
 
-    useEffect(updateApps, [room]);
-    useEventEmitter(WidgetEchoStore, "update", updateApps);
+    useEffect(updateApps, [room, updateApps]);
     useEventEmitter(WidgetStore.instance, room.roomId, updateApps);
+    useEventEmitter(WidgetLayoutStore.instance, WidgetLayoutStore.emissionForRoom(room), updateApps);
 
     return apps;
 };
 
+interface IAppRowProps {
+    app: IApp;
+    room: Room;
+}
+
+const AppRow: React.FC<IAppRowProps> = ({ app, room }) => {
+    const name = WidgetUtils.getWidgetName(app);
+    const dataTitle = WidgetUtils.getWidgetDataTitle(app);
+    const subtitle = dataTitle && " - " + dataTitle;
+
+    const onOpenWidgetClick = () => {
+        defaultDispatcher.dispatch<SetRightPanelPhasePayload>({
+            action: Action.SetRightPanelPhase,
+            phase: RightPanelPhases.Widget,
+            refireParams: {
+                widgetId: app.id,
+            },
+        });
+    };
+
+    const isPinned = WidgetLayoutStore.instance.isInContainer(room, app, Container.Top);
+    const togglePin = isPinned
+        ? () => { WidgetLayoutStore.instance.moveToContainer(room, app, Container.Right); }
+        : () => { WidgetLayoutStore.instance.moveToContainer(room, app, Container.Top); };
+
+    const [menuDisplayed, handle, openMenu, closeMenu] = useContextMenu<HTMLDivElement>();
+    let contextMenu;
+    if (menuDisplayed) {
+        const rect = handle.current.getBoundingClientRect();
+        contextMenu = <WidgetContextMenu
+            chevronFace={ChevronFace.None}
+            right={window.innerWidth - rect.right}
+            bottom={window.innerHeight - rect.top}
+            onFinished={closeMenu}
+            app={app}
+        />;
+    }
+
+    const cannotPin = !isPinned && !WidgetLayoutStore.instance.canAddToContainer(room, Container.Top);
+
+    let pinTitle: string;
+    if (cannotPin) {
+        pinTitle = _t("You can only pin up to %(count)s widgets", { count: MAX_PINNED });
+    } else {
+        pinTitle = isPinned ? _t("Unpin") : _t("Pin");
+    }
+
+    const classes = classNames("mx_BaseCard_Button mx_RoomSummaryCard_Button", {
+        mx_RoomSummaryCard_Button_pinned: isPinned,
+    });
+
+    return <div className={classes} ref={handle}>
+        <AccessibleTooltipButton
+            className="mx_RoomSummaryCard_icon_app"
+            onClick={onOpenWidgetClick}
+            // only show a tooltip if the widget is pinned
+            title={isPinned ? _t("Unpin a widget to view it in this panel") : ""}
+            forceHide={!isPinned}
+            disabled={isPinned}
+            yOffset={-48}
+        >
+            <WidgetAvatar app={app} />
+            <span>{name}</span>
+            { subtitle }
+        </AccessibleTooltipButton>
+
+        <ContextMenuTooltipButton
+            className="mx_RoomSummaryCard_app_options"
+            isExpanded={menuDisplayed}
+            onClick={openMenu}
+            title={_t("Options")}
+            yOffset={-24}
+        />
+
+        <AccessibleTooltipButton
+            className="mx_RoomSummaryCard_app_pinToggle"
+            onClick={togglePin}
+            title={pinTitle}
+            disabled={cannotPin}
+            yOffset={-24}
+        />
+
+        { contextMenu }
+    </div>;
+};
+
 const AppsSection: React.FC<IAppsSectionProps> = ({ room }) => {
-    const cli = useContext(MatrixClientContext);
     const apps = useWidgets(room);
 
     const onManageIntegrations = () => {
@@ -99,67 +186,18 @@ const AppsSection: React.FC<IAppsSectionProps> = ({ room }) => {
         }
     };
 
+    let copyLayoutBtn = null;
+    if (apps.length > 0 && WidgetLayoutStore.instance.canCopyLayoutToRoom(room)) {
+        copyLayoutBtn = (
+            <AccessibleButton kind="link" onClick={() => WidgetLayoutStore.instance.copyLayoutToRoom(room)}>
+                { _t("Set my room layout for everyone") }
+            </AccessibleButton>
+        );
+    }
+
     return <Group className="mx_RoomSummaryCard_appsGroup" title={_t("Widgets")}>
-        { apps.map(app => {
-            const name = WidgetUtils.getWidgetName(app);
-            const dataTitle = WidgetUtils.getWidgetDataTitle(app);
-            const subtitle = dataTitle && " - " + dataTitle;
-
-            let iconUrls = [require("../../../../res/img/element-icons/room/default_app.svg")];
-            // heuristics for some better icons until Widgets support their own icons
-            if (app.type.includes("meeting") || app.type.includes("calendar")) {
-                iconUrls = [require("../../../../res/img/element-icons/room/default_cal.svg")];
-            } else if (app.type.includes("pad") || app.type.includes("doc") || app.type.includes("calc")) {
-                iconUrls = [require("../../../../res/img/element-icons/room/default_doc.svg")];
-            } else if (app.type.includes("clock")) {
-                iconUrls = [require("../../../../res/img/element-icons/room/default_clock.svg")];
-            }
-
-            if (app.avatar_url) { // MSC2765
-                iconUrls.unshift(getHttpUriForMxc(cli.getHomeserverUrl(), app.avatar_url, 20, 20, "crop"));
-            }
-
-            const isPinned = WidgetStore.instance.isPinned(app.id);
-            const classes = classNames("mx_RoomSummaryCard_icon_app", {
-                mx_RoomSummaryCard_icon_app_pinned: isPinned,
-            });
-
-            if (isPinned) {
-                const onClick = () => {
-                    WidgetStore.instance.unpinWidget(app.id);
-                };
-
-                return <AccessibleTooltipButton
-                    key={app.id}
-                    className={classNames("mx_BaseCard_Button mx_RoomSummaryCard_Button", classes)}
-                    onClick={onClick}
-                    title={_t("Unpin app")}
-                >
-                    <BaseAvatar name={app.id} urls={iconUrls} width={20} height={20} />
-                    <span>{name}</span>
-                    { subtitle }
-                </AccessibleTooltipButton>
-            }
-
-            const onOpenWidgetClick = () => {
-                defaultDispatcher.dispatch<SetRightPanelPhasePayload>({
-                    action: Action.SetRightPanelPhase,
-                    phase: RightPanelPhases.Widget,
-                    refireParams: {
-                        widgetId: app.id,
-                    },
-                });
-            };
-
-            return (
-                <Button key={app.id} className={classes} onClick={onOpenWidgetClick}>
-                    <BaseAvatar name={app.id} urls={iconUrls} width={20} height={20} />
-                    <span>{name}</span>
-                    { subtitle }
-                </Button>
-            );
-        }) }
-
+        { apps.map(app => <AppRow key={app.id} app={app} room={room} />) }
+        { copyLayoutBtn }
         <AccessibleButton kind="link" onClick={onManageIntegrations}>
             { apps.length > 0 ? _t("Edit widgets, bridges & bots") : _t("Add widgets, bridges & bots") }
         </AccessibleButton>
@@ -184,14 +222,6 @@ const onRoomSettingsClick = () => {
     defaultDispatcher.dispatch({ action: "open_room_settings" });
 };
 
-const useMemberCount = (room: Room) => {
-    const [count, setCount] = useState(room.getJoinedMembers().length);
-    useEventEmitter(room.currentState, "RoomState.members", () => {
-        setCount(room.getJoinedMembers().length);
-    });
-    return count;
-};
-
 const RoomSummaryCard: React.FC<IProps> = ({ room, onClose }) => {
     const cli = useContext(MatrixClientContext);
 
@@ -225,7 +255,7 @@ const RoomSummaryCard: React.FC<IProps> = ({ room, onClose }) => {
         </div>
     </React.Fragment>;
 
-    const memberCount = useMemberCount(room);
+    const memberCount = useRoomMemberCount(room);
 
     return <BaseCard header={header} className="mx_RoomSummaryCard" onClose={onClose}>
         <Group title={_t("About")} className="mx_RoomSummaryCard_aboutGroup">
diff --git a/src/components/views/right_panel/UserInfo.tsx b/src/components/views/right_panel/UserInfo.tsx
index dd291b1fa1..eb47a56269 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';
@@ -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";
@@ -60,6 +59,10 @@ import ErrorDialog from "../dialogs/ErrorDialog";
 import QuestionDialog from "../dialogs/QuestionDialog";
 import ConfirmUserActionDialog from "../dialogs/ConfirmUserActionDialog";
 import InfoDialog from "../dialogs/InfoDialog";
+import { EventType } from "matrix-js-sdk/src/@types/event";
+import { SetRightPanelPhasePayload } from "../../../dispatcher/payloads/SetRightPanelPhasePayload";
+import RoomAvatar from "../avatars/RoomAvatar";
+import RoomName from "../elements/RoomName";
 
 interface IDevice {
     deviceId: string;
@@ -105,17 +108,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({
@@ -311,7 +304,8 @@ const UserOptionsSection: React.FC<{
     member: RoomMember;
     isIgnored: boolean;
     canInvite: boolean;
-}> = ({member, isIgnored, canInvite}) => {
+    isSpace?: boolean;
+}> = ({member, isIgnored, canInvite, isSpace}) => {
     const cli = useContext(MatrixClientContext);
 
     let ignoreButton = null;
@@ -351,7 +345,7 @@ const UserOptionsSection: React.FC<{
             </AccessibleButton>
         );
 
-        if (member.roomId) {
+        if (member.roomId && !isSpace) {
             const onReadReceiptButton = function() {
                 const room = cli.getRoom(member.roomId);
                 dis.dispatch({
@@ -443,14 +437,18 @@ const UserOptionsSection: React.FC<{
     );
 };
 
-const warnSelfDemote = async () => {
+const warnSelfDemote = async (isSpace) => {
     const {finished} = Modal.createTrackedDialog('Demoting Self', '', QuestionDialog, {
         title: _t("Demote yourself?"),
         description:
             <div>
-                { _t("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.") }
+                { isSpace
+                    ? _t("You will not be able to undo this change as you are demoting yourself, " +
+                        "if you are the last privileged user in the space it will be impossible " +
+                        "to regain privileges.")
+                    : _t("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.") }
             </div>,
         button: _t("Demote"),
     });
@@ -586,7 +584,10 @@ const RedactMessagesButton: React.FC<IBaseProps> = ({member}) => {
         while (timeline) {
             eventsToRedact = timeline.getEvents().reduce((events, event) => {
                 if (event.getSender() === userId && !event.isRedacted() && !event.isRedaction() &&
-                    event.getType() !== "m.room.create"
+                    event.getType() !== EventType.RoomCreate &&
+                    // Don't redact ACLs because that'll obliterate the room
+                    // See https://github.com/matrix-org/synapse/issues/4042 for details.
+                    event.getType() !== EventType.RoomServerAcl
                 ) {
                     return events.concat(event);
                 } else {
@@ -723,7 +724,7 @@ const MuteToggleButton: React.FC<IBaseRoomProps> = ({member, room, powerLevels,
         // if muting self, warn as it may be irreversible
         if (target === cli.getUserId()) {
             try {
-                if (!(await warnSelfDemote())) return;
+                if (!(await warnSelfDemote(room?.isSpaceRoom()))) return;
             } catch (e) {
                 console.error("Failed to warn about self demotion: ", e);
                 return;
@@ -812,7 +813,7 @@ const RoomAdminToolsContainer: React.FC<IBaseRoomProps> = ({
     if (canAffectUser && me.powerLevel >= kickPowerLevel) {
         kickButton = <RoomKickButton member={member} startUpdating={startUpdating} stopUpdating={stopUpdating} />;
     }
-    if (me.powerLevel >= redactPowerLevel) {
+    if (me.powerLevel >= redactPowerLevel && !room.isSpaceRoom()) {
         redactButton = (
             <RedactMessagesButton member={member} startUpdating={startUpdating} stopUpdating={stopUpdating} />
         );
@@ -1024,24 +1025,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>
         );
     }
@@ -1051,20 +1043,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
@@ -1080,64 +1067,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(room?.isSpaceRoom()))) 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">
@@ -1147,9 +1112,7 @@ const PowerLevelEditor: React.FC<{
                 maxValue={roomPermissions.modifyLevelMax}
                 usersDefault={powerLevelUsersDefault}
                 onChange={onPowerChange}
-                disabled={isUpdating}
             />
-            {buttonOrSpinner}
         </div>
     );
 };
@@ -1339,13 +1302,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
@@ -1355,12 +1322,10 @@ const BasicUserInfo: React.FC<{
     if (!isRoomEncrypted) {
         if (!cryptoEnabled) {
             text = _t("This client does not support end-to-end encryption.");
-        } else if (room) {
+        } else if (room && !room.isSpaceRoom()) {
             text = _t("Messages in this room are not end-to-end encrypted.");
-        } else {
-            // TODO what to render for GroupMember
         }
-    } else {
+    } else if (!room.isSpaceRoom()) {
         text = _t("Messages in this room are end-to-end encrypted.");
     }
 
@@ -1415,18 +1380,15 @@ 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
             canInvite={roomPermissions.canInvite}
             isIgnored={isIgnored}
-            member={member} />
+            member={member}
+            isSpace={room?.isSpaceRoom()}
+        />
 
         { adminToolsContainer }
 
@@ -1543,7 +1505,7 @@ interface IProps {
     user: Member;
     groupId?: string;
     room?: Room;
-    phase: RightPanelPhases.RoomMemberInfo | RightPanelPhases.GroupMemberInfo;
+    phase: RightPanelPhases.RoomMemberInfo | RightPanelPhases.GroupMemberInfo | RightPanelPhases.SpaceMemberInfo;
     onClose(): void;
 }
 
@@ -1580,10 +1542,31 @@ const UserInfo: React.FC<Props> = ({
 
     const classes = ["mx_UserInfo"];
 
+    let refireParams;
+    let previousPhase: RightPanelPhases;
+    // We have no previousPhase for when viewing a UserInfo from a Group or without a Room at this time
+    if (room && phase === RightPanelPhases.EncryptionPanel) {
+        previousPhase = RightPanelPhases.RoomMemberInfo;
+        refireParams = {member: member};
+    } else if (room) {
+        previousPhase = previousPhase = room.isSpaceRoom()
+            ? RightPanelPhases.SpaceMemberList
+            : RightPanelPhases.RoomMemberList;
+    }
+
+    const onEncryptionPanelClose = () => {
+        dis.dispatch<SetRightPanelPhasePayload>({
+            action: Action.SetRightPanelPhase,
+            phase: previousPhase,
+            refireParams: refireParams,
+        });
+    }
+
     let content;
     switch (phase) {
         case RightPanelPhases.RoomMemberInfo:
         case RightPanelPhases.GroupMemberInfo:
+        case RightPanelPhases.SpaceMemberInfo:
             content = (
                 <BasicUserInfo
                     room={room}
@@ -1599,19 +1582,13 @@ const UserInfo: React.FC<Props> = ({
                 <EncryptionPanel
                     {...props as React.ComponentProps<typeof EncryptionPanel>}
                     member={member}
-                    onClose={onClose}
+                    onClose={onEncryptionPanelClose}
                     isRoomEncrypted={isRoomEncrypted}
                 />
             );
             break;
     }
 
-    let previousPhase: RightPanelPhases;
-    // We have no previousPhase for when viewing a UserInfo from a Group or without a Room at this time
-    if (room) {
-        previousPhase = RightPanelPhases.RoomMemberList;
-    }
-
     let closeLabel = undefined;
     if (phase === RightPanelPhases.EncryptionPanel) {
         const verificationRequest = (props as React.ComponentProps<typeof EncryptionPanel>).verificationRequest;
@@ -1620,13 +1597,25 @@ const UserInfo: React.FC<Props> = ({
         }
     }
 
-    const header = <UserInfoHeader member={member} e2eStatus={e2eStatus} />;
+    let scopeHeader;
+    if (room?.isSpaceRoom()) {
+        scopeHeader = <div className="mx_RightPanel_scopeHeader">
+            <RoomAvatar room={room} height={32} width={32} />
+            <RoomName room={room} />
+        </div>;
+    }
+
+    const header = <React.Fragment>
+        { scopeHeader }
+        <UserInfoHeader member={member} e2eStatus={e2eStatus} />
+    </React.Fragment>;
     return <BaseCard
         className={classes.join(" ")}
         header={header}
         onClose={onClose}
         closeLabel={closeLabel}
         previousPhase={previousPhase}
+        refireParams={refireParams}
     >
         { content }
     </BaseCard>;
diff --git a/src/components/views/right_panel/WidgetCard.tsx b/src/components/views/right_panel/WidgetCard.tsx
index 30900b9a4d..56e522e206 100644
--- a/src/components/views/right_panel/WidgetCard.tsx
+++ b/src/components/views/right_panel/WidgetCard.tsx
@@ -14,32 +14,22 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {useContext, useEffect} from "react";
-import {Room} from "matrix-js-sdk/src/models/room";
+import React, { useContext, useEffect } from "react";
+import { Room } from "matrix-js-sdk/src/models/room";
 
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import BaseCard from "./BaseCard";
 import WidgetUtils from "../../../utils/WidgetUtils";
-import AccessibleButton from "../elements/AccessibleButton";
 import AppTile from "../elements/AppTile";
-import {_t} from "../../../languageHandler";
-import {useWidgets} from "./RoomSummaryCard";
-import {RightPanelPhases} from "../../../stores/RightPanelStorePhases";
+import { _t } from "../../../languageHandler";
+import { useWidgets } from "./RoomSummaryCard";
+import { RightPanelPhases } from "../../../stores/RightPanelStorePhases";
 import defaultDispatcher from "../../../dispatcher/dispatcher";
-import {SetRightPanelPhasePayload} from "../../../dispatcher/payloads/SetRightPanelPhasePayload";
-import {Action} from "../../../dispatcher/actions";
-import WidgetStore from "../../../stores/WidgetStore";
-import {ChevronFace, ContextMenuButton, useContextMenu} from "../../structures/ContextMenu";
-import IconizedContextMenu, {
-    IconizedContextMenuOption,
-    IconizedContextMenuOptionList,
-} from "../context_menus/IconizedContextMenu";
-import {AppTileActionPayload} from "../../../dispatcher/payloads/AppTileActionPayload";
-import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
-import classNames from "classnames";
-import dis from "../../../dispatcher/dispatcher";
-import { WidgetMessagingStore } from "../../../stores/widgets/WidgetMessagingStore";
-import { MatrixCapabilities } from "matrix-widget-api";
+import { SetRightPanelPhasePayload } from "../../../dispatcher/payloads/SetRightPanelPhasePayload";
+import { Action } from "../../../dispatcher/actions";
+import { ChevronFace, ContextMenuButton, useContextMenu } from "../../structures/ContextMenu";
+import WidgetContextMenu from "../context_menus/WidgetContextMenu";
+import { Container, WidgetLayoutStore } from "../../../stores/widgets/WidgetLayoutStore";
 
 interface IProps {
     room: Room;
@@ -52,7 +42,7 @@ const WidgetCard: React.FC<IProps> = ({ room, widgetId, onClose }) => {
 
     const apps = useWidgets(room);
     const app = apps.find(a => a.id === widgetId);
-    const isPinned = app && WidgetStore.instance.isPinned(app.id);
+    const isPinned = app && WidgetLayoutStore.instance.isInContainer(room, app, Container.Top);
 
     const [menuDisplayed, handle, openMenu, closeMenu] = useContextMenu();
 
@@ -69,111 +59,22 @@ const WidgetCard: React.FC<IProps> = ({ room, widgetId, onClose }) => {
     // Don't render anything as we are about to transition
     if (!app || isPinned) return null;
 
-    const header = <React.Fragment>
-        <h2>{ WidgetUtils.getWidgetName(app) }</h2>
-    </React.Fragment>;
-
-    const canModify = WidgetUtils.canUserModifyWidgets(room.roomId);
-
     let contextMenu;
     if (menuDisplayed) {
-        let snapshotButton;
-        const widgetMessaging = WidgetMessagingStore.instance.getMessagingForId(app.id);
-        if (widgetMessaging?.hasCapability(MatrixCapabilities.Screenshots)) {
-            const onSnapshotClick = () => {
-                widgetMessaging.takeScreenshot().then(data => {
-                    dis.dispatch({
-                        action: 'picture_snapshot',
-                        file: data.screenshot,
-                    });
-                }).catch(err => {
-                    console.error("Failed to take screenshot: ", err);
-                });
-                closeMenu();
-            };
-
-            snapshotButton = <IconizedContextMenuOption onClick={onSnapshotClick} label={_t("Take a picture")} />;
-        }
-
-        let deleteButton;
-        if (canModify) {
-            const onDeleteClick = () => {
-                defaultDispatcher.dispatch<AppTileActionPayload>({
-                    action: Action.AppTileDelete,
-                    widgetId: app.id,
-                });
-                closeMenu();
-            };
-
-            deleteButton = <IconizedContextMenuOption onClick={onDeleteClick} label={_t("Remove for everyone")} />;
-        }
-
-        const onRevokeClick = () => {
-            defaultDispatcher.dispatch<AppTileActionPayload>({
-                action: Action.AppTileRevoke,
-                widgetId: app.id,
-            });
-            closeMenu();
-        };
-
         const rect = handle.current.getBoundingClientRect();
         contextMenu = (
-            <IconizedContextMenu
+            <WidgetContextMenu
                 chevronFace={ChevronFace.None}
-                right={window.innerWidth - rect.right}
-                bottom={window.innerHeight - rect.top}
+                right={window.innerWidth - rect.right - 12}
+                top={rect.bottom + 12}
                 onFinished={closeMenu}
-            >
-                <IconizedContextMenuOptionList>
-                    { snapshotButton }
-                    { deleteButton }
-                    <IconizedContextMenuOption onClick={onRevokeClick} label={_t("Remove for me")} />
-                </IconizedContextMenuOptionList>
-            </IconizedContextMenu>
+                app={app}
+            />
         );
     }
 
-    const onPinClick = () => {
-        WidgetStore.instance.pinWidget(app.id);
-    };
-
-    const onEditClick = () => {
-        WidgetUtils.editWidget(room, app);
-    };
-
-    let editButton;
-    if (canModify) {
-        editButton = <AccessibleButton kind="secondary" onClick={onEditClick}>
-            { _t("Edit") }
-        </AccessibleButton>;
-    }
-
-    const pinButtonClasses = canModify ? "" : "mx_WidgetCard_widePinButton";
-
-    let pinButton;
-    if (WidgetStore.instance.canPin(app.id)) {
-        pinButton = <AccessibleButton
-            kind="secondary"
-            onClick={onPinClick}
-            className={pinButtonClasses}
-        >
-            { _t("Pin to room") }
-        </AccessibleButton>;
-    } else {
-        pinButton = <AccessibleTooltipButton
-            title={_t("You can only pin 2 widgets at a time")}
-            tooltipClassName="mx_WidgetCard_maxPinnedTooltip"
-            kind="secondary"
-            className={pinButtonClasses}
-            disabled
-        >
-            { _t("Pin to room") }
-        </AccessibleTooltipButton>;
-    }
-
-    const footer = <React.Fragment>
-        { editButton }
-        { pinButton }
+    const header = <React.Fragment>
+        <h2>{ WidgetUtils.getWidgetName(app) }</h2>
         <ContextMenuButton
             kind="secondary"
             className="mx_WidgetCard_optionsButton"
@@ -182,16 +83,12 @@ const WidgetCard: React.FC<IProps> = ({ room, widgetId, onClose }) => {
             isExpanded={menuDisplayed}
             label={_t("Options")}
         />
-
         { contextMenu }
     </React.Fragment>;
 
     return <BaseCard
         header={header}
-        footer={footer}
-        className={classNames("mx_WidgetCard", {
-            mx_WidgetCard_noEdit: !canModify,
-        })}
+        className="mx_WidgetCard"
         onClose={onClose}
         previousPhase={RightPanelPhases.RoomSummary}
         withoutScrollContainer
@@ -206,7 +103,6 @@ const WidgetCard: React.FC<IProps> = ({ room, widgetId, onClose }) => {
             creatorUserId={app.creatorUserId}
             widgetPageTitle={WidgetUtils.getWidgetDataTitle(app)}
             waitForIframeLoad={app.waitForIframeLoad}
-            whitelistCapabilities={WidgetUtils.getCapWhitelistForAppTypeInRoomId(app.type, room.roomId)}
         />
     </BaseCard>;
 };
diff --git a/src/components/views/room_settings/RoomProfileSettings.js b/src/components/views/room_settings/RoomProfileSettings.js
index ca09c3093a..65acc802dc 100644
--- a/src/components/views/room_settings/RoomProfileSettings.js
+++ b/src/components/views/room_settings/RoomProfileSettings.js
@@ -69,19 +69,24 @@ export default class RoomProfileSettings extends React.Component {
         // clear file upload field so same file can be selected
         this._avatarUpload.current.value = "";
         this.setState({
-            avatarUrl: undefined,
-            avatarFile: undefined,
+            avatarUrl: null,
+            avatarFile: null,
             enableProfileSave: true,
         });
     };
 
-    _clearProfile = async (e) => {
+    _cancelProfileChanges = async (e) => {
         e.stopPropagation();
         e.preventDefault();
 
         if (!this.state.enableProfileSave) return;
-        this._removeAvatar();
-        this.setState({enableProfileSave: false, displayName: this.state.originalDisplayName});
+        this.setState({
+            enableProfileSave: false,
+            displayName: this.state.originalDisplayName,
+            topic: this.state.originalTopic,
+            avatarUrl: this.state.originalAvatarUrl,
+            avatarFile: null,
+        });
     };
 
     _saveProfile = async (e) => {
@@ -95,10 +100,11 @@ export default class RoomProfileSettings extends React.Component {
         const newState = {};
 
         // TODO: What do we do about errors?
-
+        const displayName = this.state.displayName.trim();
         if (this.state.originalDisplayName !== this.state.displayName) {
-            await client.setRoomName(this.props.roomId, this.state.displayName);
-            newState.originalDisplayName = this.state.displayName;
+            await client.setRoomName(this.props.roomId, displayName);
+            newState.originalDisplayName = displayName;
+            newState.displayName = displayName;
         }
 
         if (this.state.avatarFile) {
@@ -108,7 +114,7 @@ export default class RoomProfileSettings extends React.Component {
             newState.originalAvatarUrl = newState.avatarUrl;
             newState.avatarFile = null;
         } else if (this.state.originalAvatarUrl !== this.state.avatarUrl) {
-            await client.sendStateEvent(this.props.roomId, 'm.room.avatar', {url: undefined}, '');
+            await client.sendStateEvent(this.props.roomId, 'm.room.avatar', {}, '');
         }
 
         if (this.state.originalTopic !== this.state.topic) {
@@ -120,17 +126,21 @@ export default class RoomProfileSettings extends React.Component {
     };
 
     _onDisplayNameChanged = (e) => {
-        this.setState({
-            displayName: e.target.value,
-            enableProfileSave: true,
-        });
+        this.setState({displayName: e.target.value});
+        if (this.state.originalDisplayName === e.target.value) {
+            this.setState({enableProfileSave: false});
+        } else {
+            this.setState({enableProfileSave: true});
+        }
     };
 
     _onTopicChanged = (e) => {
-        this.setState({
-            topic: e.target.value,
-            enableProfileSave: true,
-        });
+        this.setState({topic: e.target.value});
+        if (this.state.originalTopic === e.target.value) {
+            this.setState({enableProfileSave: false});
+        } else {
+            this.setState({enableProfileSave: true});
+        }
     };
 
     _onAvatarChanged = (e) => {
@@ -158,6 +168,33 @@ export default class RoomProfileSettings extends React.Component {
     render() {
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
         const AvatarSetting = sdk.getComponent('settings.AvatarSetting');
+
+        let profileSettingsButtons;
+        if (
+            this.state.canSetName ||
+            this.state.canSetTopic ||
+            this.state.canSetAvatar
+        ) {
+            profileSettingsButtons = (
+                <div className="mx_ProfileSettings_buttons">
+                    <AccessibleButton
+                        onClick={this._cancelProfileChanges}
+                        kind="link"
+                        disabled={!this.state.enableProfileSave}
+                    >
+                        {_t("Cancel")}
+                    </AccessibleButton>
+                    <AccessibleButton
+                        onClick={this._saveProfile}
+                        kind="primary"
+                        disabled={!this.state.enableProfileSave}
+                    >
+                        {_t("Save")}
+                    </AccessibleButton>
+                </div>
+            );
+        }
+
         return (
             <form
                 onSubmit={this._saveProfile}
@@ -172,7 +209,7 @@ export default class RoomProfileSettings extends React.Component {
                         <Field label={_t("Room Name")}
                                type="text" value={this.state.displayName} autoComplete="off"
                                onChange={this._onDisplayNameChanged} disabled={!this.state.canSetName} />
-                        <Field id="profileTopic" label={_t("Room Topic")} disabled={!this.state.canSetTopic}
+                        <Field className="mx_ProfileSettings_controls_topic" id="profileTopic" label={_t("Room Topic")} disabled={!this.state.canSetTopic}
                                type="text" value={this.state.topic} autoComplete="off"
                                onChange={this._onTopicChanged} element="textarea" />
                     </div>
@@ -183,22 +220,7 @@ export default class RoomProfileSettings extends React.Component {
                         uploadAvatar={this.state.canSetAvatar ? this._uploadAvatar : undefined}
                         removeAvatar={this.state.canSetAvatar ? this._removeAvatar : undefined} />
                 </div>
-                <div className="mx_ProfileSettings_buttons">
-                    <AccessibleButton
-                        onClick={this._clearProfile}
-                        kind="link"
-                        disabled={!this.state.enableProfileSave}
-                    >
-                        {_t("Cancel")}
-                    </AccessibleButton>
-                    <AccessibleButton
-                        onClick={this._saveProfile}
-                        kind="primary"
-                        disabled={!this.state.enableProfileSave}
-                    >
-                        {_t("Save")}
-                    </AccessibleButton>
-                </div>
+                { profileSettingsButtons }
             </form>
         );
     }
diff --git a/src/components/views/rooms/AppsDrawer.js b/src/components/views/rooms/AppsDrawer.js
index a360016ba6..ef30e4a8f5 100644
--- a/src/components/views/rooms/AppsDrawer.js
+++ b/src/components/views/rooms/AppsDrawer.js
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {useState} from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import {Resizable} from "re-resizable";
@@ -24,15 +24,17 @@ import AppTile from '../elements/AppTile';
 import dis from '../../../dispatcher/dispatcher';
 import * as sdk from '../../../index';
 import * as ScalarMessaging from '../../../ScalarMessaging';
-import { _t } from '../../../languageHandler';
 import WidgetUtils from '../../../utils/WidgetUtils';
 import WidgetEchoStore from "../../../stores/WidgetEchoStore";
-import AccessibleButton from '../elements/AccessibleButton';
 import {IntegrationManagers} from "../../../integrations/IntegrationManagers";
 import SettingsStore from "../../../settings/SettingsStore";
-import {useLocalStorageState} from "../../../hooks/useLocalStorageState";
 import ResizeNotifier from "../../../utils/ResizeNotifier";
-import WidgetStore from "../../../stores/WidgetStore";
+import ResizeHandle from "../elements/ResizeHandle";
+import Resizer from "../../../resizer/resizer";
+import PercentageDistributor from "../../../resizer/distributors/percentage";
+import {Container, WidgetLayoutStore} from "../../../stores/widgets/WidgetLayoutStore";
+import {clamp, percentageOf, percentageWithin} from "../../../utils/numbers";
+import {useStateCallback} from "../../../hooks/useStateCallback";
 
 export default class AppsDrawer extends React.Component {
     static propTypes = {
@@ -52,18 +54,27 @@ export default class AppsDrawer extends React.Component {
         this.state = {
             apps: this._getApps(),
         };
+
+        this._resizeContainer = null;
+        this.resizer = this._createResizer();
+
+        this.props.resizeNotifier.on("isResizing", this.onIsResizing);
     }
 
     componentDidMount() {
         ScalarMessaging.startListening();
-        WidgetStore.instance.on(this.props.room.roomId, this._updateApps);
+        WidgetLayoutStore.instance.on(WidgetLayoutStore.emissionForRoom(this.props.room), this._updateApps);
         this.dispatcherRef = dis.register(this.onAction);
     }
 
     componentWillUnmount() {
         ScalarMessaging.stopListening();
-        WidgetStore.instance.off(this.props.room.roomId, this._updateApps);
+        WidgetLayoutStore.instance.off(WidgetLayoutStore.emissionForRoom(this.props.room), this._updateApps);
         if (this.dispatcherRef) dis.unregister(this.dispatcherRef);
+        if (this._resizeContainer) {
+            this.resizer.detach();
+        }
+        this.props.resizeNotifier.off("isResizing", this.onIsResizing);
     }
 
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
@@ -73,6 +84,84 @@ export default class AppsDrawer extends React.Component {
         this._updateApps();
     }
 
+    onIsResizing = (resizing) => {
+        this.setState({ resizing });
+        if (!resizing) {
+            this._relaxResizer();
+        }
+    };
+
+    _createResizer() {
+        const classNames = {
+            handle: "mx_ResizeHandle",
+            vertical: "mx_ResizeHandle_vertical",
+            reverse: "mx_ResizeHandle_reverse",
+        };
+        const collapseConfig = {
+            onResizeStart: () => {
+                this._resizeContainer.classList.add("mx_AppsDrawer_resizing");
+            },
+            onResizeStop: () => {
+                this._resizeContainer.classList.remove("mx_AppsDrawer_resizing");
+                WidgetLayoutStore.instance.setResizerDistributions(
+                    this.props.room, Container.Top,
+                    this.state.apps.slice(1).map((_, i) => this.resizer.forHandleAt(i).size),
+                );
+            },
+        };
+        // pass a truthy container for now, we won't call attach until we update it
+        const resizer = new Resizer({}, PercentageDistributor, collapseConfig);
+        resizer.setClassNames(classNames);
+        return resizer;
+    }
+
+    _collectResizer = (ref) => {
+        if (this._resizeContainer) {
+            this.resizer.detach();
+        }
+
+        if (ref) {
+            this.resizer.container = ref;
+            this.resizer.attach();
+        }
+        this._resizeContainer = ref;
+        this._loadResizerPreferences();
+    };
+
+    _getAppsHash = (apps) => apps.map(app => app.id).join("~");
+
+    componentDidUpdate(prevProps, prevState) {
+        if (this._getAppsHash(this.state.apps) !== this._getAppsHash(prevState.apps)) {
+            this._loadResizerPreferences();
+        }
+    }
+
+    _relaxResizer = () => {
+        const distributors = this.resizer.getDistributors();
+
+        // relax all items if they had any overconstrained flexboxes
+        distributors.forEach(d => d.start());
+        distributors.forEach(d => d.finish());
+    };
+
+    _loadResizerPreferences = () => {
+        const distributions = WidgetLayoutStore.instance.getResizerDistributions(this.props.room, Container.Top);
+        if (this.state.apps && (this.state.apps.length - 1) === distributions.length) {
+            distributions.forEach((size, i) => {
+                const distributor = this.resizer.forHandleAt(i);
+                if (distributor) {
+                    distributor.size = size;
+                    distributor.finish();
+                }
+            });
+        } else if (this.state.apps) {
+            const distributors = this.resizer.getDistributors();
+            distributors.forEach(d => d.item.clearSize());
+            distributors.forEach(d => d.start());
+            distributors.forEach(d => d.finish());
+        }
+    };
+
     onAction = (action) => {
         const hideWidgetKey = this.props.room.roomId + '_hide_widget_drawer';
         switch (action.action) {
@@ -91,7 +180,7 @@ export default class AppsDrawer extends React.Component {
         }
     };
 
-    _getApps = () => WidgetStore.instance.getApps(this.props.room, true);
+    _getApps = () => WidgetLayoutStore.instance.getContainerWidgets(this.props.room, Container.Top);
 
     _updateApps = () => {
         this.setState({
@@ -99,15 +188,6 @@ export default class AppsDrawer extends React.Component {
         });
     };
 
-    _canUserModify() {
-        try {
-            return WidgetUtils.canUserModifyWidgets(this.props.room.roomId);
-        } catch (err) {
-            console.error(err);
-            return false;
-        }
-    }
-
     _launchManageIntegrations() {
         if (SettingsStore.getValue("feature_many_integration_managers")) {
             IntegrationManagers.sharedInstance().openAll();
@@ -116,26 +196,19 @@ export default class AppsDrawer extends React.Component {
         }
     }
 
-    onClickAddWidget = (e) => {
-        e.preventDefault();
-        this._launchManageIntegrations();
-    };
-
     render() {
-        const apps = this.state.apps.map((app, index, arr) => {
-            const capWhitelist = WidgetUtils.getCapWhitelistForAppTypeInRoomId(app.type, this.props.room.roomId);
+        if (!this.props.showApps) return <div />;
 
+        const apps = this.state.apps.map((app, index, arr) => {
             return (<AppTile
                 key={app.id}
                 app={app}
                 fullWidth={arr.length < 2}
                 room={this.props.room}
                 userId={this.props.userId}
-                show={this.props.showApps}
                 creatorUserId={app.creatorUserId}
                 widgetPageTitle={WidgetUtils.getWidgetDataTitle(app)}
                 waitForIframeLoad={app.waitForIframeLoad}
-                whitelistCapabilities={capWhitelist}
             />);
         });
 
@@ -143,21 +216,6 @@ export default class AppsDrawer extends React.Component {
             return <div />;
         }
 
-        let addWidget;
-        if (this.props.showApps &&
-            this._canUserModify()
-        ) {
-            addWidget = <AccessibleButton
-                onClick={this.onClickAddWidget}
-                className={this.state.apps.length<2 ?
-                    'mx_AddWidget_button mx_AddWidget_button_full_width' :
-                    'mx_AddWidget_button'
-                }
-                title={_t('Add a widget')}>
-                [+] { _t('Add a widget') }
-            </AccessibleButton>;
-        }
-
         let spinner;
         if (
             apps.length === 0 && WidgetEchoStore.roomHasPendingWidgets(
@@ -170,32 +228,42 @@ export default class AppsDrawer extends React.Component {
         }
 
         const classes = classNames({
-            "mx_AppsDrawer": true,
-            "mx_AppsDrawer_fullWidth": apps.length < 2,
-            "mx_AppsDrawer_minimised": !this.props.showApps,
+            mx_AppsDrawer: true,
+            mx_AppsDrawer_fullWidth: apps.length < 2,
+            mx_AppsDrawer_resizing: this.state.resizing,
+            mx_AppsDrawer_2apps: apps.length === 2,
+            mx_AppsDrawer_3apps: apps.length === 3,
         });
 
         return (
             <div className={classes}>
                 <PersistentVResizer
-                    id={"apps-drawer_" + this.props.room.roomId}
+                    room={this.props.room}
                     minHeight={100}
                     maxHeight={this.props.maxHeight ? this.props.maxHeight - 50 : undefined}
                     handleClass="mx_AppsContainer_resizerHandle"
-                    className="mx_AppsContainer"
+                    handleWrapperClass="mx_AppsContainer_resizerHandleContainer"
+                    className="mx_AppsContainer_resizer"
                     resizeNotifier={this.props.resizeNotifier}
                 >
-                    { apps }
-                    { spinner }
+                    <div className="mx_AppsContainer" ref={this._collectResizer}>
+                        { apps.map((app, i) => {
+                            if (i < 1) return app;
+                            return <React.Fragment key={app.key}>
+                                <ResizeHandle reverse={i > apps.length / 2} />
+                                { app }
+                            </React.Fragment>;
+                        }) }
+                    </div>
                 </PersistentVResizer>
-                { this._canUserModify() && addWidget }
+                { spinner }
             </div>
         );
     }
 }
 
 const PersistentVResizer = ({
-    id,
+    room,
     minHeight,
     maxHeight,
     className,
@@ -204,15 +272,30 @@ const PersistentVResizer = ({
     resizeNotifier,
     children,
 }) => {
-    const [height, setHeight] = useLocalStorageState("pvr_" + id, 280); // old fixed height was 273px
-    const [resizing, setResizing] = useState(false);
+    let defaultHeight = WidgetLayoutStore.instance.getContainerHeight(room, Container.Top);
+
+    // Arbitrary defaults to avoid NaN problems. 100 px or 3/4 of the visible window.
+    if (!minHeight) minHeight = 100;
+    if (!maxHeight) maxHeight = (window.innerHeight / 4) * 3;
+
+    // Convert from percentage to height. Note that the default height is 280px.
+    if (defaultHeight) {
+        defaultHeight = clamp(defaultHeight, 0, 100);
+        defaultHeight = percentageWithin(defaultHeight / 100, minHeight, maxHeight);
+    } else {
+        defaultHeight = 280;
+    }
+
+    const [height, setHeight] = useStateCallback(defaultHeight, newHeight => {
+        newHeight = percentageOf(newHeight, minHeight, maxHeight) * 100;
+        WidgetLayoutStore.instance.setContainerHeight(room, Container.Top, newHeight);
+    });
 
     return <Resizable
         size={{height: Math.min(height, maxHeight)}}
         minHeight={minHeight}
         maxHeight={maxHeight}
         onResizeStart={() => {
-            if (!resizing) setResizing(true);
             resizeNotifier.startResizing();
         }}
         onResize={() => {
@@ -220,14 +303,11 @@ const PersistentVResizer = ({
         }}
         onResizeStop={(e, dir, ref, d) => {
             setHeight(height + d.height);
-            if (resizing) setResizing(false);
             resizeNotifier.stopResizing();
         }}
         handleWrapperClass={handleWrapperClass}
         handleClasses={{bottom: handleClass}}
-        className={classNames(className, {
-            mx_AppsDrawer_resizing: resizing,
-        })}
+        className={className}
         enable={{bottom: true}}
     >
         { children }
diff --git a/src/components/views/rooms/AuxPanel.js b/src/components/views/rooms/AuxPanel.tsx
similarity index 80%
rename from src/components/views/rooms/AuxPanel.js
rename to src/components/views/rooms/AuxPanel.tsx
index a088418d5e..4ce31be410 100644
--- a/src/components/views/rooms/AuxPanel.js
+++ b/src/components/views/rooms/AuxPanel.tsx
@@ -1,6 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 New Vector Ltd
+Copyright 2015, 2016, 2017, 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.
@@ -16,41 +15,55 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
+import { Room } from 'matrix-js-sdk/src/models/room'
 import * as sdk from '../../../index';
 import dis from "../../../dispatcher/dispatcher";
-import * as ObjectUtils from '../../../ObjectUtils';
 import AppsDrawer from './AppsDrawer';
 import { _t } from '../../../languageHandler';
 import classNames from 'classnames';
 import RateLimitedFunc from '../../../ratelimitedfunc';
 import SettingsStore from "../../../settings/SettingsStore";
 import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
-import CallView from "../voip/CallView";
 import {UIFeature} from "../../../settings/UIFeature";
+import { ResizeNotifier } from "../../../utils/ResizeNotifier";
+import CallViewForRoom from '../voip/CallViewForRoom';
+import {objectHasDiff} from "../../../utils/objects";
 
+interface IProps {
+    // js-sdk room object
+    room: Room,
+    userId: string,
+    showApps: boolean, // Render apps
 
-export default class AuxPanel extends React.Component {
-    static propTypes = {
-        // js-sdk room object
-        room: PropTypes.object.isRequired,
-        userId: PropTypes.string.isRequired,
-        showApps: PropTypes.bool, // Render apps
+    // set to true to show the file drop target
+    draggingFile: boolean,
 
-        // set to true to show the file drop target
-        draggingFile: PropTypes.bool,
+    // maxHeight attribute for the aux panel and the video
+    // therein
+    maxHeight: number,
 
-        // maxHeight attribute for the aux panel and the video
-        // therein
-        maxHeight: PropTypes.number,
+    // a callback which is called when the content of the aux panel changes
+    // content in a way that is likely to make it change size.
+    onResize: () => void,
+    fullHeight: boolean,
 
-        // a callback which is called when the content of the aux panel changes
-        // content in a way that is likely to make it change size.
-        onResize: PropTypes.func,
-        fullHeight: PropTypes.bool,
-    };
+    resizeNotifier: ResizeNotifier,
+}
 
+interface Counter {
+    title: string,
+    value: number,
+    link: string,
+    severity: string,
+    stateKey: string,
+}
+
+interface IState {
+    counters: Counter[],
+}
+
+export default class AuxPanel extends React.Component<IProps, IState> {
     static defaultProps = {
         showApps: true,
     };
@@ -76,8 +89,7 @@ export default class AuxPanel extends React.Component {
     }
 
     shouldComponentUpdate(nextProps, nextState) {
-        return (!ObjectUtils.shallowEqual(this.props, nextProps) ||
-                !ObjectUtils.shallowEqual(this.state, nextState));
+        return objectHasDiff(this.props, nextProps) || objectHasDiff(this.state, nextState);
     }
 
     componentDidUpdate(prevProps, prevState) {
@@ -104,7 +116,7 @@ export default class AuxPanel extends React.Component {
     }, 500);
 
     _computeCounters() {
-        let counters = [];
+        const counters = [];
 
         if (this.props.room && SettingsStore.getValue("feature_state_counters")) {
             const stateEvs = this.props.room.currentState.getStateEvents('re.jki.counter');
@@ -112,7 +124,7 @@ export default class AuxPanel extends React.Component {
                 return a.getStateKey() < b.getStateKey();
             });
 
-            stateEvs.forEach((ev, idx) => {
+            for (const ev of stateEvs) {
                 const title = ev.getContent().title;
                 const value = ev.getContent().value;
                 const link = ev.getContent().link;
@@ -123,14 +135,14 @@ export default class AuxPanel extends React.Component {
                 // zero)
                 if (title && value !== undefined) {
                     counters.push({
-                        "title": title,
-                        "value": value,
-                        "link": link,
-                        "severity": severity,
-                        "stateKey": stateKey
+                        title,
+                        value,
+                        link,
+                        severity,
+                        stateKey,
                     })
                 }
-            });
+            }
         }
 
         return counters;
@@ -143,8 +155,7 @@ export default class AuxPanel extends React.Component {
         if (this.props.draggingFile) {
             fileDropTarget = (
                 <div className="mx_RoomView_fileDropTarget">
-                    <div className="mx_RoomView_fileDropTargetLabel"
-                      title={_t("Drop File Here")}>
+                    <div className="mx_RoomView_fileDropTargetLabel" title={_t("Drop File Here")}>
                         <TintableSvg src={require("../../../../res/img/upload-big.svg")} width="45" height="59" />
                         <br />
                         { _t("Drop file here to upload") }
@@ -154,8 +165,8 @@ export default class AuxPanel extends React.Component {
         }
 
         const callView = (
-            <CallView
-                room={this.props.room}
+            <CallViewForRoom
+                roomId={this.props.room.roomId}
                 onResize={this.props.onResize}
                 maxVideoHeight={this.props.maxHeight}
             />
@@ -208,7 +219,7 @@ export default class AuxPanel extends React.Component {
                     <span
                         className="m_RoomView_auxPanel_stateViews_delim"
                         key={"delim" + idx}
-                    > ─ </span>
+                    > ─ </span>,
                 );
             });
 
@@ -226,7 +237,7 @@ export default class AuxPanel extends React.Component {
             "mx_RoomView_auxPanel": true,
             "mx_RoomView_auxPanel_fullHeight": this.props.fullHeight,
         });
-        const style = {};
+        const style: React.CSSProperties = {};
         if (!this.props.fullHeight) {
             style.maxHeight = this.props.maxHeight;
         }
diff --git a/src/components/views/rooms/BasicMessageComposer.tsx b/src/components/views/rooms/BasicMessageComposer.tsx
index 311a4734fd..017ce77166 100644
--- a/src/components/views/rooms/BasicMessageComposer.tsx
+++ b/src/components/views/rooms/BasicMessageComposer.tsx
@@ -47,6 +47,7 @@ import AutocompleteWrapperModel from "../../../editor/autocomplete";
 import DocumentPosition from "../../../editor/position";
 import {ICompletion} from "../../../autocomplete/Autocompleter";
 
+// matches emoticons which follow the start of a line or whitespace
 const REGEX_EMOTICON_WHITESPACE = new RegExp('(?:^|\\s)(' + EMOTICON_REGEX.source + ')\\s$');
 
 const IS_MAC = navigator.platform.indexOf("Mac") !== -1;
@@ -518,13 +519,13 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
 
     private async tabCompleteName(event: React.KeyboardEvent) {
         try {
-            await new Promise(resolve => this.setState({showVisualBell: false}, resolve));
+            await new Promise<void>(resolve => this.setState({showVisualBell: false}, resolve));
             const {model} = this.props;
             const caret = this.getCaret();
             const position = model.positionForOffset(caret.offset, caret.atNodeEnd);
             const range = model.startRange(position);
             range.expandBackwardsWhile((index, offset, part) => {
-                return part.text[offset] !== " " && (
+                return part.text[offset] !== " " && part.text[offset] !== "+" && (
                     part.type === "plain" ||
                     part.type === "pill-candidate" ||
                     part.type === "command"
diff --git a/src/components/views/rooms/EditMessageComposer.js b/src/components/views/rooms/EditMessageComposer.js
index 78c7de887d..c59b3555b9 100644
--- a/src/components/views/rooms/EditMessageComposer.js
+++ b/src/components/views/rooms/EditMessageComposer.js
@@ -29,9 +29,11 @@ import EditorStateTransfer from '../../../utils/EditorStateTransfer';
 import classNames from 'classnames';
 import {EventStatus} from 'matrix-js-sdk';
 import BasicMessageComposer from "./BasicMessageComposer";
-import {Key} from "../../../Keyboard";
+import {Key, isOnlyCtrlOrCmdKeyEvent} from "../../../Keyboard";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {Action} from "../../../dispatcher/actions";
+import SettingsStore from "../../../settings/SettingsStore";
+import CountlyAnalytics from "../../../CountlyAnalytics";
 
 function _isReply(mxEvent) {
     const relatesTo = mxEvent.getContent()["m.relates_to"];
@@ -135,7 +137,10 @@ export default class EditMessageComposer extends React.Component {
         if (event.metaKey || event.altKey || event.shiftKey) {
             return;
         }
-        if (event.key === Key.ENTER) {
+        const ctrlEnterToSend = !!SettingsStore.getValue('MessageComposerInput.ctrlEnterToSend');
+        const send = ctrlEnterToSend ? event.key === Key.ENTER && isOnlyCtrlOrCmdKeyEvent(event)
+            : event.key === Key.ENTER;
+        if (send) {
             this._sendEdit();
             event.preventDefault();
         } else if (event.key === Key.ESCAPE) {
@@ -182,6 +187,7 @@ export default class EditMessageComposer extends React.Component {
     }
 
     _sendEdit = () => {
+        const startTime = CountlyAnalytics.getTimestamp();
         const editedEvent = this.props.editState.getEvent();
         const editContent = createEditContent(this.model, editedEvent);
         const newContent = editContent["m.new_content"];
@@ -190,8 +196,9 @@ export default class EditMessageComposer extends React.Component {
         if (this._isContentModified(newContent)) {
             const roomId = editedEvent.getRoomId();
             this._cancelPreviousPendingEdit();
-            this.context.sendMessage(roomId, editContent);
+            const prom = this.context.sendMessage(roomId, editContent);
             dis.dispatch({action: "message_sent"});
+            CountlyAnalytics.instance.trackSendMessage(startTime, prom, roomId, true, false, editContent);
         }
 
         // close the event editing and focus composer
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 01646ad567..87fb190678 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -21,21 +21,24 @@ 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";
 import dis from '../../../dispatcher/dispatcher';
 import SettingsStore from "../../../settings/SettingsStore";
+import {Layout, LayoutPropType} from "../../../settings/Layout";
 import {EventStatus} from 'matrix-js-sdk';
 import {formatTime} from "../../../DateUtils";
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import {ALL_RULE_TYPES} from "../../../mjolnir/BanList";
-import * as ObjectUtils from "../../../ObjectUtils";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {E2E_STATE} from "./E2EIcon";
 import {toRem} from "../../../utils/units";
 import {WidgetType} from "../../../widgets/WidgetType";
 import RoomAvatar from "../avatars/RoomAvatar";
+import {WIDGET_LAYOUT_EVENT_TYPE} from "../../../stores/widgets/WidgetLayoutStore";
+import {objectHasDiff} from "../../../utils/objects";
 
 const eventTileTypes = {
     'm.room.message': 'messages.MessageEvent',
@@ -46,6 +49,7 @@ const eventTileTypes = {
     'm.call.invite': 'messages.TextualEvent',
     'm.call.answer': 'messages.TextualEvent',
     'm.call.hangup': 'messages.TextualEvent',
+    'm.call.reject': 'messages.TextualEvent',
 };
 
 const stateEventTileTypes = {
@@ -63,6 +67,7 @@ const stateEventTileTypes = {
     'm.room.server_acl': 'messages.TextualEvent',
     // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
     'im.vector.modular.widgets': 'messages.TextualEvent',
+    [WIDGET_LAYOUT_EVENT_TYPE]: 'messages.TextualEvent',
     'm.room.tombstone': 'messages.TextualEvent',
     'm.room.join_rules': 'messages.TextualEvent',
     'm.room.guest_access': 'messages.TextualEvent',
@@ -223,8 +228,8 @@ export default class EventTile extends React.Component {
         // whether to show reactions for this event
         showReactions: PropTypes.bool,
 
-        // whether to use the irc layout
-        useIRCLayout: PropTypes.bool,
+        // which layout to use
+        layout: LayoutPropType,
 
         // whether or not to show flair at all
         enableFlair: PropTypes.bool,
@@ -289,7 +294,7 @@ export default class EventTile extends React.Component {
     }
 
     shouldComponentUpdate(nextProps, nextState) {
-        if (!ObjectUtils.shallowEqual(this.state, nextState)) {
+        if (objectHasDiff(this.state, nextState)) {
             return true;
         }
 
@@ -645,12 +650,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.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
@@ -729,7 +735,7 @@ export default class EventTile extends React.Component {
             // joins/parts/etc
             avatarSize = 14;
             needsSenderProfile = false;
-        } else if (this.props.useIRCLayout) {
+        } else if (this.props.layout == Layout.IRC) {
             avatarSize = 14;
             needsSenderProfile = true;
         } else if (this.props.continuation && this.props.tileShape !== "file_grid") {
@@ -742,13 +748,22 @@ export default class EventTile extends React.Component {
         }
 
         if (this.props.mxEvent.sender && avatarSize) {
+            let member;
+            // set member to receiver (target) if it is a 3PID invite
+            // so that the correct avatar is shown as the text is
+            // `$target accepted the invitation for $email`
+            if (this.props.mxEvent.getContent().third_party_invite) {
+               member = this.props.mxEvent.target;
+            } else {
+                member = this.props.mxEvent.sender;
+            }
             avatar = (
-                    <div className="mx_EventTile_avatar">
-                        <MemberAvatar member={this.props.mxEvent.sender}
-                            width={avatarSize} height={avatarSize}
-                            viewUserOnClick={true}
-                        />
-                    </div>
+                <div className="mx_EventTile_avatar">
+                    <MemberAvatar member={member}
+                        width={avatarSize} height={avatarSize}
+                        viewUserOnClick={true}
+                    />
+                </div>
             );
         }
 
@@ -831,10 +846,11 @@ export default class EventTile extends React.Component {
                 { timestamp }
             </a>;
 
-        const groupTimestamp = !this.props.useIRCLayout ? linkedTimestamp : null;
-        const ircTimestamp = this.props.useIRCLayout ? linkedTimestamp : null;
-        const groupPadlock = !this.props.useIRCLayout && !isBubbleMessage && this._renderE2EPadlock();
-        const ircPadlock = this.props.useIRCLayout && !isBubbleMessage && this._renderE2EPadlock();
+        const useIRCLayout = this.props.layout == Layout.IRC;
+        const groupTimestamp = !useIRCLayout ? linkedTimestamp : null;
+        const ircTimestamp = useIRCLayout ? linkedTimestamp : null;
+        const groupPadlock = !useIRCLayout && !isBubbleMessage && this._renderE2EPadlock();
+        const ircPadlock = useIRCLayout && !isBubbleMessage && this._renderE2EPadlock();
 
         switch (this.props.tileShape) {
             case 'notif': {
@@ -929,16 +945,13 @@ export default class EventTile extends React.Component {
                     this.props.onHeightChanged,
                     this.props.permalinkCreator,
                     this._replyThread,
-                    this.props.useIRCLayout,
+                    this.props.layout,
                 );
 
                 // tab-index=-1 to allow it to be focusable but do not add tab stop for it, primarily for screen readers
                 return (
                     <div className={classes} tabIndex={-1} aria-live={ariaLive} aria-atomic="true">
                         { ircTimestamp }
-                        <div className="mx_EventTile_msgOption">
-                            { readAvatars }
-                        </div>
                         { sender }
                         { ircPadlock }
                         <div className="mx_EventTile_line">
@@ -957,6 +970,9 @@ export default class EventTile extends React.Component {
                             { reactionsRow }
                             { actionBar }
                         </div>
+                        <div className="mx_EventTile_msgOption">
+                            { readAvatars }
+                        </div>
                         {
                             // The avatar goes after the event tile as it's absolutely positioned to be over the
                             // event tile line, so needs to be later in the DOM so it appears on top (this avoids
diff --git a/src/components/views/rooms/LinkPreviewWidget.js b/src/components/views/rooms/LinkPreviewWidget.js
index a3d59e5137..2a053bf467 100644
--- a/src/components/views/rooms/LinkPreviewWidget.js
+++ b/src/components/views/rooms/LinkPreviewWidget.js
@@ -114,7 +114,10 @@ export default class LinkPreviewWidget extends React.Component {
 
         let thumbHeight = imageMaxHeight;
         if (p["og:image:width"] && p["og:image:height"]) {
-            thumbHeight = ImageUtils.thumbHeight(p["og:image:width"], p["og:image:height"], imageMaxWidth, imageMaxHeight);
+            thumbHeight = ImageUtils.thumbHeight(
+                p["og:image:width"], p["og:image:height"],
+                imageMaxWidth, imageMaxHeight,
+            );
         }
 
         let img;
diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index 9da6e22847..d4d618c821 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -27,6 +27,8 @@ import * as sdk from "../../../index";
 import {CommunityPrototypeStore} from "../../../stores/CommunityPrototypeStore";
 import BaseCard from "../right_panel/BaseCard";
 import {RightPanelPhases} from "../../../stores/RightPanelStorePhases";
+import RoomAvatar from "../avatars/RoomAvatar";
+import RoomName from "../elements/RoomName";
 
 const INITIAL_LOAD_NUM_MEMBERS = 30;
 const INITIAL_LOAD_NUM_INVITED = 5;
@@ -450,22 +452,14 @@ export default class MemberList extends React.Component {
         let inviteButton;
 
         if (room && room.getMyMembership() === 'join') {
-            // assume we can invite until proven false
-            let canInvite = true;
-
-            const plEvent = room.currentState.getStateEvents("m.room.power_levels", "");
-            const me = room.getMember(cli.getUserId());
-            if (plEvent && me) {
-                const content = plEvent.getContent();
-                if (content && content.invite > me.powerLevel) {
-                    canInvite = false;
-                }
-            }
+            const canInvite = room.canInvite(cli.getUserId());
 
             let inviteButtonText = _t("Invite to this room");
             const chat = CommunityPrototypeStore.instance.getSelectedCommunityGeneralChat();
             if (chat && chat.roomId === this.props.roomId) {
                 inviteButtonText = _t("Invite to this community");
+            } else if (room.isSpaceRoom()) {
+                inviteButtonText = _t("Invite to this space");
             }
 
             const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
@@ -493,12 +487,26 @@ export default class MemberList extends React.Component {
                 onSearch={ this.onSearchQueryChanged } />
         );
 
+        let previousPhase = RightPanelPhases.RoomSummary;
+        // We have no previousPhase for when viewing a MemberList from a Space
+        let scopeHeader;
+        if (room?.isSpaceRoom()) {
+            previousPhase = undefined;
+            scopeHeader = <div className="mx_RightPanel_scopeHeader">
+                <RoomAvatar room={room} height={32} width={32} />
+                <RoomName room={room} />
+            </div>;
+        }
+
         return <BaseCard
             className="mx_MemberList"
-            header={inviteButton}
+            header={<React.Fragment>
+                { scopeHeader }
+                { inviteButton }
+            </React.Fragment>}
             footer={footer}
             onClose={this.props.onClose}
-            previousPhase={RightPanelPhases.RoomSummary}
+            previousPhase={previousPhase}
         >
             <div className="mx_MemberList_wrapper">
                 <TruncatedList className="mx_MemberList_section mx_MemberList_joined" truncateAt={this.state.truncateAtJoined}
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index cac746f203..c03178cdf7 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -1,7 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017, 2018 New Vector Ltd
-Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 2015-2018, 2020, 2021 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -19,11 +17,9 @@ import React, {createRef} from 'react';
 import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
-import CallHandler from '../../../CallHandler';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import * as sdk from '../../../index';
 import dis from '../../../dispatcher/dispatcher';
-import RoomViewStore from '../../../stores/RoomViewStore';
 import Stickerpicker from './Stickerpicker';
 import { makeRoomPermalink } from '../../../utils/permalinks/Permalinks';
 import ContentMessages from '../../../ContentMessages';
@@ -34,10 +30,8 @@ import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
 import ReplyPreview from "./ReplyPreview";
 import {UIFeature} from "../../../settings/UIFeature";
 import WidgetStore from "../../../stores/WidgetStore";
-import WidgetUtils from "../../../utils/WidgetUtils";
 import {UPDATE_EVENT} from "../../../stores/AsyncStore";
 import ActiveWidgetStore from "../../../stores/ActiveWidgetStore";
-import { PlaceCallType } from "../../../CallHandler";
 
 function ComposerAvatar(props) {
     const MemberStatusMessageAvatar = sdk.getComponent('avatars.MemberStatusMessageAvatar');
@@ -50,89 +44,18 @@ ComposerAvatar.propTypes = {
     me: PropTypes.object.isRequired,
 };
 
-function CallButton(props) {
-    const onVoiceCallClick = (ev) => {
-        dis.dispatch({
-            action: 'place_call',
-            type: PlaceCallType.Voice,
-            room_id: props.roomId,
-        });
-    };
-
-    return (<AccessibleTooltipButton
-        className="mx_MessageComposer_button mx_MessageComposer_voicecall"
-        onClick={onVoiceCallClick}
-        title={_t('Voice call')}
-    />);
-}
-
-CallButton.propTypes = {
-    roomId: PropTypes.string.isRequired,
-};
-
-function VideoCallButton(props) {
-    const onCallClick = (ev) => {
-        dis.dispatch({
-            action: 'place_call',
-            type: ev.shiftKey ? PlaceCallType.ScreenSharing : PlaceCallType.Video,
-            room_id: props.roomId,
-        });
-    };
-
-    return <AccessibleTooltipButton
-        className="mx_MessageComposer_button mx_MessageComposer_videocall"
-        onClick={onCallClick}
-        title={_t('Video call')}
-    />;
-}
-
-VideoCallButton.propTypes = {
-    roomId: PropTypes.string.isRequired,
-};
-
-function HangupButton(props) {
-    const onHangupClick = () => {
-        if (props.isConference) {
-            dis.dispatch({
-                action: props.canEndConference ? 'end_conference' : 'hangup_conference',
-                room_id: props.roomId,
-            });
-            return;
-        }
-
-        const call = CallHandler.sharedInstance().getCallForRoom(props.roomId);
-        if (!call) {
-            return;
-        }
-        dis.dispatch({
-            action: 'hangup',
-            // hangup the call for this room, which may not be the room in props
-            // (e.g. conferences which will hangup the 1:1 room instead)
-            room_id: call.roomId,
-        });
-    };
-
-    let tooltip = _t("Hangup");
-    if (props.isConference && props.canEndConference) {
-        tooltip = _t("End conference");
-    }
-
-    const canLeaveConference = !props.isConference ? true : props.isInConference;
+function SendButton(props) {
     return (
         <AccessibleTooltipButton
-            className="mx_MessageComposer_button mx_MessageComposer_hangup"
-            onClick={onHangupClick}
-            title={tooltip}
-            disabled={!canLeaveConference}
+            className="mx_MessageComposer_sendMessage"
+            onClick={props.onClick}
+            title={_t('Send message')}
         />
     );
 }
 
-HangupButton.propTypes = {
-    roomId: PropTypes.string.isRequired,
-    isConference: PropTypes.bool.isRequired,
-    canEndConference: PropTypes.bool,
-    isInConference: PropTypes.bool,
+SendButton.propTypes = {
+    onClick: PropTypes.func.isRequired,
 };
 
 const EmojiButton = ({addEmoji}) => {
@@ -250,7 +173,6 @@ export default class MessageComposer extends React.Component {
         super(props);
         this.onInputStateChanged = this.onInputStateChanged.bind(this);
         this._onRoomStateEvents = this._onRoomStateEvents.bind(this);
-        this._onRoomViewStoreUpdate = this._onRoomViewStoreUpdate.bind(this);
         this._onTombstoneClick = this._onTombstoneClick.bind(this);
         this.renderPlaceholderText = this.renderPlaceholderText.bind(this);
         WidgetStore.instance.on(UPDATE_EVENT, this._onWidgetUpdate);
@@ -258,12 +180,11 @@ export default class MessageComposer extends React.Component {
         this._dispatcherRef = null;
 
         this.state = {
-            replyToEvent: RoomViewStore.getQuotingEvent(),
             tombstone: this._getRoomTombstone(),
             canSendMessages: this.props.room.maySendMessage(),
-            showCallButtons: SettingsStore.getValue("showCallButtonsInComposer"),
             hasConference: WidgetStore.instance.doesRoomHaveConference(this.props.room),
             joinedConference: WidgetStore.instance.isJoinedToConferenceIn(this.props.room),
+            isComposerEmpty: true,
         };
     }
 
@@ -290,7 +211,6 @@ export default class MessageComposer extends React.Component {
     componentDidMount() {
         this.dispatcherRef = dis.register(this.onAction);
         MatrixClientPeg.get().on("RoomState.events", this._onRoomStateEvents);
-        this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate);
         this._waitForOwnMember();
     }
 
@@ -314,9 +234,6 @@ export default class MessageComposer extends React.Component {
         if (MatrixClientPeg.get()) {
             MatrixClientPeg.get().removeListener("RoomState.events", this._onRoomStateEvents);
         }
-        if (this._roomStoreToken) {
-            this._roomStoreToken.remove();
-        }
         WidgetStore.instance.removeListener(UPDATE_EVENT, this._onWidgetUpdate);
         ActiveWidgetStore.removeListener('update', this._onActiveWidgetUpdate);
         dis.unregister(this.dispatcherRef);
@@ -337,12 +254,6 @@ export default class MessageComposer extends React.Component {
         return this.props.room.currentState.getStateEvents('m.room.tombstone', '');
     }
 
-    _onRoomViewStoreUpdate() {
-        const replyToEvent = RoomViewStore.getQuotingEvent();
-        if (this.state.replyToEvent === replyToEvent) return;
-        this.setState({ replyToEvent });
-    }
-
     onInputStateChanged(inputState) {
         // Merge the new input state with old to support partial updates
         inputState = Object.assign({}, this.state.inputState, inputState);
@@ -367,6 +278,7 @@ export default class MessageComposer extends React.Component {
             event_id: createEventId,
             room_id: replacementRoomId,
             auto_join: true,
+            _type: "tombstone", // instrumentation
 
             // Try to join via the server that sent the event. This converts @something:example.org
             // into a server domain by splitting on colons and ignoring the first entry ("@something").
@@ -379,7 +291,7 @@ export default class MessageComposer extends React.Component {
     }
 
     renderPlaceholderText() {
-        if (this.state.replyToEvent) {
+        if (this.props.replyToEvent) {
             if (this.props.e2eStatus) {
                 return _t('Send an encrypted reply…');
             } else {
@@ -401,6 +313,16 @@ export default class MessageComposer extends React.Component {
         });
     }
 
+    sendMessage = () => {
+        this.messageComposerInput._sendMessage();
+    }
+
+    onChange = (model) => {
+        this.setState({
+            isComposerEmpty: model.isEmpty,
+        });
+    }
+
     render() {
         const controls = [
             this.state.me ? <ComposerAvatar key="controls_avatar" me={this.state.me} /> : null,
@@ -410,12 +332,7 @@ export default class MessageComposer extends React.Component {
         ];
 
         if (!this.state.tombstone && this.state.canSendMessages) {
-            // This also currently includes the call buttons. Really we should
-            // check separately for whether we can call, but this is slightly
-            // complex because of conference calls.
-
             const SendMessageComposer = sdk.getComponent("rooms.SendMessageComposer");
-            const callInProgress = this.props.callState && this.props.callState !== 'ended';
 
             controls.push(
                 <SendMessageComposer
@@ -425,38 +342,22 @@ export default class MessageComposer extends React.Component {
                     placeholder={this.renderPlaceholderText()}
                     resizeNotifier={this.props.resizeNotifier}
                     permalinkCreator={this.props.permalinkCreator}
-                    replyToEvent={this.state.replyToEvent}
+                    replyToEvent={this.props.replyToEvent}
+                    onChange={this.onChange}
                 />,
                 <UploadButton key="controls_upload" roomId={this.props.room.roomId} />,
                 <EmojiButton key="emoji_button" addEmoji={this.addEmoji} />,
             );
 
-            if (SettingsStore.getValue(UIFeature.Widgets)) {
+            if (SettingsStore.getValue(UIFeature.Widgets) &&
+                SettingsStore.getValue("MessageComposerInput.showStickersButton")) {
                 controls.push(<Stickerpicker key="stickerpicker_controls_button" room={this.props.room} />);
             }
 
-            if (this.state.showCallButtons) {
-                if (this.state.hasConference) {
-                    const canEndConf = WidgetUtils.canUserModifyWidgets(this.props.room.roomId);
-                    controls.push(
-                        <HangupButton
-                            key="controls_hangup"
-                            roomId={this.props.room.roomId}
-                            isConference={true}
-                            canEndConference={canEndConf}
-                            isInConference={this.state.joinedConference}
-                        />,
-                    );
-                } else if (callInProgress) {
-                    controls.push(
-                        <HangupButton key="controls_hangup" roomId={this.props.room.roomId} isConference={false} />,
-                    );
-                } else {
-                    controls.push(
-                        <CallButton key="controls_call" roomId={this.props.room.roomId} />,
-                        <VideoCallButton key="controls_videocall" roomId={this.props.room.roomId} />,
-                    );
-                }
+            if (!this.state.isComposerEmpty) {
+                controls.push(
+                    <SendButton key="controls_send" onClick={this.sendMessage} />,
+                );
             }
         } else if (this.state.tombstone) {
             const replacementRoomId = this.state.tombstone.getContent()['replacement_room'];
diff --git a/src/components/views/rooms/NewRoomIntro.tsx b/src/components/views/rooms/NewRoomIntro.tsx
new file mode 100644
index 0000000000..ce426a64ed
--- /dev/null
+++ b/src/components/views/rooms/NewRoomIntro.tsx
@@ -0,0 +1,141 @@
+/*
+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 inRoom = room && room.getMyMembership() === "join";
+        const topic = room.currentState.getStateEvents(EventType.RoomTopic, "")?.getContent()?.topic;
+        const canAddTopic = inRoom && 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,
+            });
+        }
+
+        let buttons;
+        if (room.canInvite(cli.getUserId())) {
+            const onInviteClick = () => {
+                dis.dispatch({ action: "view_invite", roomId });
+            };
+
+            buttons = <div className="mx_NewRoomIntro_buttons">
+                <AccessibleButton className="mx_NewRoomIntro_inviteButton" kind="primary" onClick={onInviteClick}>
+                    {_t("Invite to this room")}
+                </AccessibleButton>
+            </div>
+        }
+
+        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>
+            { buttons }
+        </React.Fragment>;
+    }
+
+    return <div className="mx_NewRoomIntro">
+        { body }
+    </div>;
+};
+
+export default NewRoomIntro;
diff --git a/src/components/views/rooms/ReadReceiptMarker.js b/src/components/views/rooms/ReadReceiptMarker.js
index c19247ef5a..ba2b3064fd 100644
--- a/src/components/views/rooms/ReadReceiptMarker.js
+++ b/src/components/views/rooms/ReadReceiptMarker.js
@@ -32,7 +32,7 @@ try {
 } catch (e) {
 }
 
-export default class ReadReceiptMarker extends React.Component {
+export default class ReadReceiptMarker extends React.PureComponent {
     static propTypes = {
         // the RoomMember to show the RR for
         member: PropTypes.object,
@@ -155,7 +155,15 @@ export default class ReadReceiptMarker extends React.Component {
 
         // then shift to the rightmost column,
         // and then it will drop down to its resting position
-        startStyles.push({ top: startTopOffset+'px', left: '0px' });
+        //
+        // XXX: We use a fractional left value to trick velocity-animate into actually animating.
+        // This is a very annoying bug where if it thinks there's no change to `left` then it'll
+        // skip applying it, thus making our read receipt at +14px instead of +0px like it
+        // should be. This does cause a tiny amount of drift for read receipts, however with a
+        // value so small it's not perceived by a user.
+        // Note: Any smaller values (or trying to interchange units) might cause read receipts to
+        // fail to fall down or cause gaps.
+        startStyles.push({ top: startTopOffset+'px', left: '0.001px' });
         enterTransitionOpts.push({
             duration: bounce ? Math.min(Math.log(Math.abs(startTopOffset)) * 200, 3000) : 300,
             easing: bounce ? 'easeOutBounce' : 'easeOutCubic',
diff --git a/src/components/views/rooms/RoomBreadcrumbs.tsx b/src/components/views/rooms/RoomBreadcrumbs.tsx
index 7725ce456e..ff60ab7779 100644
--- a/src/components/views/rooms/RoomBreadcrumbs.tsx
+++ b/src/components/views/rooms/RoomBreadcrumbs.tsx
@@ -111,7 +111,7 @@ export default class RoomBreadcrumbs extends React.PureComponent<IProps, IState>
                     appear={true} in={this.state.doAnimation} timeout={640}
                     classNames='mx_RoomBreadcrumbs'
                 >
-                    <Toolbar className='mx_RoomBreadcrumbs'>
+                    <Toolbar className='mx_RoomBreadcrumbs' aria-label={_t("Recently visited rooms")}>
                         {tiles.slice(this.state.skipFirst ? 1 : 0)}
                     </Toolbar>
                 </CSSTransition>
diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index 1a116838ac..6736600bc8 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -15,14 +15,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {createRef} from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { _t } from '../../../languageHandler';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import RateLimitedFunc from '../../../ratelimitedfunc';
 
-import { linkifyElement } from '../../../HtmlUtils';
 import {CancelButton} from './SimpleRoomHeader';
 import SettingsStore from "../../../settings/SettingsStore";
 import RoomHeaderButtons from '../right_panel/RoomHeaderButtons';
@@ -30,6 +29,9 @@ import E2EIcon from './E2EIcon';
 import DecoratedRoomAvatar from "../avatars/DecoratedRoomAvatar";
 import {DefaultTagID} from "../../../stores/room-list/models";
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
+import RoomTopic from "../elements/RoomTopic";
+import RoomName from "../elements/RoomName";
+import {PlaceCallType} from "../../../CallHandler";
 
 export default class RoomHeader extends React.Component {
     static propTypes = {
@@ -42,6 +44,9 @@ export default class RoomHeader extends React.Component {
         onLeaveClick: PropTypes.func,
         onCancelClick: PropTypes.func,
         e2eStatus: PropTypes.string,
+        onAppsClick: PropTypes.func,
+        appsShown: PropTypes.bool,
+        onCallPlaced: PropTypes.func, // (PlaceCallType) => void;
     };
 
     static defaultProps = {
@@ -50,35 +55,13 @@ export default class RoomHeader extends React.Component {
         onCancelClick: null,
     };
 
-    constructor(props) {
-        super(props);
-
-        this._topic = createRef();
-    }
-
     componentDidMount() {
         const cli = MatrixClientPeg.get();
         cli.on("RoomState.events", this._onRoomStateEvents);
         cli.on("Room.accountData", this._onRoomAccountData);
-
-        // When a room name occurs, RoomState.events is fired *before*
-        // room.name is updated. So we have to listen to Room.name as well as
-        // RoomState.events.
-        if (this.props.room) {
-            this.props.room.on("Room.name", this._onRoomNameChange);
-        }
-    }
-
-    componentDidUpdate() {
-        if (this._topic.current) {
-            linkifyElement(this._topic.current);
-        }
     }
 
     componentWillUnmount() {
-        if (this.props.room) {
-            this.props.room.removeListener("Room.name", this._onRoomNameChange);
-        }
         const cli = MatrixClientPeg.get();
         if (cli) {
             cli.removeListener("RoomState.events", this._onRoomStateEvents);
@@ -107,10 +90,6 @@ export default class RoomHeader extends React.Component {
         this.forceUpdate();
     }, 500);
 
-    _onRoomNameChange = (room) => {
-        this.forceUpdate();
-    };
-
     _hasUnreadPins() {
         const currentPinEvent = this.props.room.currentState.getStateEvents("m.room.pinned_events", '');
         if (!currentPinEvent) return false;
@@ -168,29 +147,28 @@ export default class RoomHeader extends React.Component {
             }
         }
 
-        let roomName = _t("Join Room");
+        let oobName = _t("Join Room");
         if (this.props.oobData && this.props.oobData.name) {
-            roomName = this.props.oobData.name;
-        } else if (this.props.room) {
-            roomName = this.props.room.name;
+            oobName = this.props.oobData.name;
         }
 
         const textClasses = classNames('mx_RoomHeader_nametext', { mx_RoomHeader_settingsHint: settingsHint });
         const name =
             <div className="mx_RoomHeader_name" onClick={this.props.onSettingsClick}>
-                <div dir="auto" className={textClasses} title={roomName}>{ roomName }</div>
+                <RoomName room={this.props.room}>
+                    {(name) => {
+                        const roomName = name || oobName;
+                        return <div dir="auto" className={textClasses} title={roomName}>{ roomName }</div>;
+                    }}
+                </RoomName>
                 { searchStatus }
             </div>;
 
-        let topic;
-        if (this.props.room) {
-            const ev = this.props.room.currentState.getStateEvents('m.room.topic', '');
-            if (ev) {
-                topic = ev.getContent().topic;
-            }
-        }
-        const topicElement =
-            <div className="mx_RoomHeader_topic" ref={this._topic} title={topic} dir="auto">{ topic }</div>;
+        const topicElement = <RoomTopic room={this.props.room}>
+            {(topic, ref) => <div className="mx_RoomHeader_topic" ref={ref} title={topic} dir="auto">
+                { topic }
+            </div>}
+        </RoomTopic>;
 
         let roomAvatar;
         if (this.props.room) {
@@ -230,6 +208,17 @@ export default class RoomHeader extends React.Component {
                     title={_t("Forget room")} />;
         }
 
+        let appsButton;
+        if (this.props.onAppsClick) {
+            appsButton =
+                <AccessibleTooltipButton
+                    className={classNames("mx_RoomHeader_button mx_RoomHeader_appsButton", {
+                        mx_RoomHeader_appsButton_highlight: this.props.appsShown,
+                    })}
+                    onClick={this.props.onAppsClick}
+                    title={this.props.appsShown ? _t("Hide Widgets") : _t("Show Widgets")} />;
+        }
+
         let searchButton;
         if (this.props.onSearchClick && this.props.inRoom) {
             searchButton =
@@ -239,10 +228,29 @@ export default class RoomHeader extends React.Component {
                     title={_t("Search")} />;
         }
 
+        let voiceCallButton;
+        let videoCallButton;
+        if (this.props.inRoom && SettingsStore.getValue("showCallButtonsInComposer")) {
+            voiceCallButton =
+                <AccessibleTooltipButton
+                    className="mx_RoomHeader_button mx_RoomHeader_voiceCallButton"
+                    onClick={() => this.props.onCallPlaced(PlaceCallType.Voice)}
+                    title={_t("Voice call")} />;
+            videoCallButton =
+                <AccessibleTooltipButton
+                    className="mx_RoomHeader_button mx_RoomHeader_videoCallButton"
+                    onClick={(ev) => this.props.onCallPlaced(
+                        ev.shiftKey ? PlaceCallType.ScreenSharing : PlaceCallType.Video)}
+                    title={_t("Video call")} />;
+        }
+
         const rightRow =
             <div className="mx_RoomHeader_buttons">
+                { videoCallButton }
+                { voiceCallButton }
                 { pinnedEventsButton }
                 { forgetButton }
+                { appsButton }
                 { searchButton }
             </div>;
 
diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx
index 92bbdfeacb..f7da6571da 100644
--- a/src/components/views/rooms/RoomList.tsx
+++ b/src/components/views/rooms/RoomList.tsx
@@ -46,6 +46,10 @@ import { objectShallowClone, objectWithOnly } from "../../../utils/objects";
 import { IconizedContextMenuOption, IconizedContextMenuOptionList } from "../context_menus/IconizedContextMenu";
 import AccessibleButton from "../elements/AccessibleButton";
 import { CommunityPrototypeStore } from "../../../stores/CommunityPrototypeStore";
+import CallHandler from "../../../CallHandler";
+import SpaceStore from "../../../stores/SpaceStore";
+import { showAddExistingRooms, showCreateNewRoom } from "../../../utils/space";
+import { EventType } from "matrix-js-sdk/src/@types/event";
 
 interface IProps {
     onKeyDown: (ev: React.KeyboardEvent) => void;
@@ -53,12 +57,12 @@ interface IProps {
     onBlur: (ev: React.FocusEvent) => void;
     onResize: () => void;
     resizeNotifier: ResizeNotifier;
-    collapsed: boolean;
     isMinimized: boolean;
 }
 
 interface IState {
     sublists: ITagMap;
+    isNameFiltering: boolean;
 }
 
 const TAG_ORDER: TagID[] = [
@@ -89,10 +93,44 @@ interface ITagAesthetics {
     defaultHidden: boolean;
 }
 
-const TAG_AESTHETICS: {
+interface ITagAestheticsMap {
     // @ts-ignore - TS wants this to be a string but we know better
     [tagId: TagID]: ITagAesthetics;
-} = {
+}
+
+// If we have no dialer support, we just show the create chat dialog
+const dmOnAddRoom = (dispatcher?: Dispatcher<ActionPayload>) => {
+    (dispatcher || defaultDispatcher).dispatch({action: 'view_create_chat'});
+};
+
+// If we have dialer support, show a context menu so the user can pick between
+// the dialer and the create chat dialog
+const dmAddRoomContextMenu = (onFinished: () => void) => {
+    return <IconizedContextMenuOptionList first>
+        <IconizedContextMenuOption
+            label={_t("Start a Conversation")}
+            iconClassName="mx_RoomList_iconPlus"
+            onClick={(e) => {
+                e.preventDefault();
+                e.stopPropagation();
+                onFinished();
+                defaultDispatcher.dispatch({action: "view_create_chat"});
+            }}
+        />
+        <IconizedContextMenuOption
+            label={_t("Open dial pad")}
+            iconClassName="mx_RoomList_iconDialpad"
+            onClick={(e) => {
+                e.preventDefault();
+                e.stopPropagation();
+                onFinished();
+                defaultDispatcher.fire(Action.OpenDialPad);
+            }}
+        />
+    </IconizedContextMenuOptionList>;
+};
+
+const TAG_AESTHETICS: ITagAestheticsMap = {
     [DefaultTagID.Invite]: {
         sectionLabel: _td("Invites"),
         isInvite: true,
@@ -108,9 +146,8 @@ const TAG_AESTHETICS: {
         isInvite: false,
         defaultHidden: false,
         addRoomLabel: _td("Start chat"),
-        onAddRoom: (dispatcher?: Dispatcher<ActionPayload>) => {
-            (dispatcher || defaultDispatcher).dispatch({action: 'view_create_chat'});
-        },
+        // Either onAddRoom or addRoomContextMenu are set depending on whether we
+        // have dialer support.
     },
     [DefaultTagID.Untagged]: {
         sectionLabel: _td("Rooms"),
@@ -118,6 +155,50 @@ const TAG_AESTHETICS: {
         defaultHidden: false,
         addRoomLabel: _td("Add room"),
         addRoomContextMenu: (onFinished: () => void) => {
+            if (SpaceStore.instance.activeSpace) {
+                const canAddRooms = SpaceStore.instance.activeSpace.currentState.maySendStateEvent(EventType.SpaceChild,
+                    MatrixClientPeg.get().getUserId());
+
+                return <IconizedContextMenuOptionList first>
+                    <IconizedContextMenuOption
+                        label={_t("Create new room")}
+                        iconClassName="mx_RoomList_iconPlus"
+                        onClick={(e) => {
+                            e.preventDefault();
+                            e.stopPropagation();
+                            onFinished();
+                            showCreateNewRoom(MatrixClientPeg.get(), SpaceStore.instance.activeSpace);
+                        }}
+                        disabled={!canAddRooms}
+                        tooltip={canAddRooms ? undefined
+                            : _t("You do not have permissions to create new rooms in this space")}
+                    />
+                    <IconizedContextMenuOption
+                        label={_t("Add existing room")}
+                        iconClassName="mx_RoomList_iconHash"
+                        onClick={(e) => {
+                            e.preventDefault();
+                            e.stopPropagation();
+                            onFinished();
+                            showAddExistingRooms(MatrixClientPeg.get(), SpaceStore.instance.activeSpace);
+                        }}
+                        disabled={!canAddRooms}
+                        tooltip={canAddRooms ? undefined
+                            : _t("You do not have permissions to add rooms to this space")}
+                    />
+                    <IconizedContextMenuOption
+                        label={_t("Explore space rooms")}
+                        iconClassName="mx_RoomList_iconExplore"
+                        onClick={(e) => {
+                            e.preventDefault();
+                            e.stopPropagation();
+                            onFinished();
+                            defaultDispatcher.fire(Action.ViewRoomDirectory);
+                        }}
+                    />
+                </IconizedContextMenuOptionList>;
+            }
+
             return <IconizedContextMenuOptionList first>
                 <IconizedContextMenuOption
                     label={_t("Create new room")}
@@ -178,14 +259,20 @@ function customTagAesthetics(tagId: TagID): ITagAesthetics {
 export default class RoomList extends React.PureComponent<IProps, IState> {
     private dispatcherRef;
     private customTagStoreRef;
+    private tagAesthetics: ITagAestheticsMap;
 
     constructor(props: IProps) {
         super(props);
 
         this.state = {
             sublists: {},
+            isNameFiltering: !!RoomListStore.instance.getFirstNameFilterCondition(),
         };
 
+        // shallow-copy from the template as we need to make modifications to it
+        this.tagAesthetics = objectShallowClone(TAG_AESTHETICS);
+        this.updateDmAddRoomAction();
+
         this.dispatcherRef = defaultDispatcher.register(this.onAction);
     }
 
@@ -201,6 +288,17 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
         if (this.customTagStoreRef) this.customTagStoreRef.remove();
     }
 
+    private updateDmAddRoomAction() {
+        const dmTagAesthetics = objectShallowClone(TAG_AESTHETICS[DefaultTagID.DM]);
+        if (CallHandler.sharedInstance().getSupportsPstnProtocol()) {
+            dmTagAesthetics.addRoomContextMenu = dmAddRoomContextMenu;
+        } else {
+            dmTagAesthetics.onAddRoom = dmOnAddRoom;
+        }
+
+        this.tagAesthetics[DefaultTagID.DM] = dmTagAesthetics;
+    }
+
     private onAction = (payload: ActionPayload) => {
         if (payload.action === Action.ViewRoomDelta) {
             const viewRoomDeltaPayload = payload as ViewRoomDeltaPayload;
@@ -213,6 +311,9 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
                     show_room_tile: true, // to make sure the room gets scrolled into view
                 });
             }
+        } else if (payload.action === Action.PstnSupportUpdated) {
+            this.updateDmAddRoomAction();
+            this.updateLists();
         }
     };
 
@@ -254,7 +355,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
@@ -276,14 +378,20 @@ 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();
             });
         }
     };
 
+    private onStartChat = () => {
+        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[] {
@@ -333,6 +441,10 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
             return p;
         }, [] as TagID[]);
 
+        // show a skeleton UI if the user is in no rooms and they are not filtering
+        const showSkeleton = !this.state.isNameFiltering &&
+            Object.values(RoomListStore.instance.unfilteredLists).every(list => !list?.length);
+
         for (const orderedTagId of tagOrder) {
             const orderedRooms = this.state.sublists[orderedTagId] || [];
             const extraTiles = orderedTagId === DefaultTagID.Invite ? this.renderCommunityInvites() : null;
@@ -343,7 +455,7 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
 
             const aesthetics: ITagAesthetics = isCustomTag(orderedTagId)
                 ? customTagAesthetics(orderedTagId)
-                : TAG_AESTHETICS[orderedTagId];
+                : this.tagAesthetics[orderedTagId];
             if (!aesthetics) throw new Error(`Tag ${orderedTagId} does not have aesthetics`);
 
             components.push(<RoomSublist
@@ -357,6 +469,7 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
                 addRoomContextMenu={aesthetics.addRoomContextMenu}
                 isMinimized={this.props.isMinimized}
                 onResize={this.props.onResize}
+                showSkeleton={showSkeleton}
                 extraBadTilesThatShouldntExist={extraTiles}
             />);
         }
@@ -366,13 +479,51 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
 
     public render() {
         let explorePrompt: JSX.Element;
-        if (RoomListStore.instance.getFirstNameFilterCondition()) {
-            explorePrompt = <div className="mx_RoomList_explorePrompt">
-                <div>{_t("Can't see what you’re looking for?")}</div>
-                <AccessibleButton kind="link" onClick={this.onExplore}>
-                    {_t("Explore all public rooms")}
-                </AccessibleButton>
-            </div>;
+        if (!this.props.isMinimized) {
+            if (this.state.isNameFiltering) {
+                explorePrompt = <div className="mx_RoomList_explorePrompt">
+                    <div>{_t("Can't see what you’re looking for?")}</div>
+                    <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>;
+            } else if (Object.values(this.state.sublists).some(list => list.length > 0)) {
+                const unfilteredLists = RoomListStore.instance.unfilteredLists
+                const unfilteredRooms = unfilteredLists[DefaultTagID.Untagged] || [];
+                const unfilteredHistorical = unfilteredLists[DefaultTagID.Archived] || [];
+                const unfilteredFavourite = unfilteredLists[DefaultTagID.Favourite] || [];
+                // show a prompt to join/create rooms if the user is in 0 rooms and no historical
+                if (unfilteredRooms.length < 1 && unfilteredHistorical < 1 && unfilteredFavourite < 1) {
+                    explorePrompt = <div className="mx_RoomList_explorePrompt">
+                        <div>{_t("Use the + to make a new room or explore existing ones below")}</div>
+                        <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>;
+                }
+            }
         }
 
         const sublists = this.renderSublists();
diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index f42e18372a..dc68068157 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -284,7 +284,7 @@ export default class RoomPreviewBar extends React.Component {
                 room_name: this.props.oobData ? this.props.oobData.room_name : null,
                 room_avatar_url: this.props.oobData ? this.props.oobData.avatarUrl : null,
                 inviter_name: this.props.oobData ? this.props.oobData.inviterName : null,
-            }
+            },
         };
     }
 
@@ -337,7 +337,7 @@ export default class RoomPreviewBar extends React.Component {
                 if (this.props.previewLoading) {
                     footer = (
                         <div>
-                            <Spinner w={20} h={20}/>
+                            <Spinner w={20} h={20} />
                             {_t("Loading room preview")}
                         </div>
                     );
diff --git a/src/components/views/rooms/RoomSublist.tsx b/src/components/views/rooms/RoomSublist.tsx
index 4056f2fbd4..a2574bf60c 100644
--- a/src/components/views/rooms/RoomSublist.tsx
+++ b/src/components/views/rooms/RoomSublist.tsx
@@ -71,6 +71,7 @@ interface IProps {
     isMinimized: boolean;
     tagId: TagID;
     onResize: () => void;
+    showSkeleton?: boolean;
 
     // TODO: Don't use this. It's for community invites, and community invites shouldn't be here.
     // You should feel bad if you use this.
@@ -399,6 +400,7 @@ export default class RoomSublist extends React.Component<IProps, IState> {
         const isUnreadFirst = RoomListStore.instance.getListOrder(this.props.tagId) === ListAlgorithm.Importance;
         const newAlgorithm = isUnreadFirst ? ListAlgorithm.Natural : ListAlgorithm.Importance;
         await RoomListStore.instance.setListOrder(this.props.tagId, newAlgorithm);
+        this.forceUpdate(); // because if the sublist doesn't have any changes then we will miss the list order change
     };
 
     private onTagSortChanged = async (sort: SortAlgorithm) => {
@@ -420,7 +422,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;
             });
@@ -876,6 +878,8 @@ export default class RoomSublist extends React.Component<IProps, IState> {
                     </Resizable>
                 </React.Fragment>
             );
+        } else if (this.props.showSkeleton && this.state.isExpanded) {
+            content = <div className="mx_RoomSublist_skeletonUI" />;
         }
 
         return (
diff --git a/src/components/views/rooms/RoomTile.tsx b/src/components/views/rooms/RoomTile.tsx
index a241a13991..835447dc18 100644
--- a/src/components/views/rooms/RoomTile.tsx
+++ b/src/components/views/rooms/RoomTile.tsx
@@ -29,7 +29,7 @@ import ActiveRoomObserver from "../../../ActiveRoomObserver";
 import { _t } from "../../../languageHandler";
 import { ChevronFace, ContextMenuTooltipButton } from "../../structures/ContextMenu";
 import { DefaultTagID, TagID } from "../../../stores/room-list/models";
-import { MessagePreviewStore, ROOM_PREVIEW_CHANGED } from "../../../stores/room-list/MessagePreviewStore";
+import { MessagePreviewStore } from "../../../stores/room-list/MessagePreviewStore";
 import DecoratedRoomAvatar from "../avatars/DecoratedRoomAvatar";
 import { ALL_MESSAGES, ALL_MESSAGES_LOUD, MENTIONS_ONLY, MUTE } from "../../../RoomNotifs";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
@@ -51,7 +51,6 @@ import IconizedContextMenu, {
     IconizedContextMenuRadio,
 } from "../context_menus/IconizedContextMenu";
 import { CommunityPrototypeStore, IRoomProfile } from "../../../stores/CommunityPrototypeStore";
-import { UPDATE_EVENT } from "../../../stores/AsyncStore";
 
 interface IProps {
     room: Room;
@@ -99,12 +98,23 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
 
         ActiveRoomObserver.addListener(this.props.room.roomId, this.onActiveRoomUpdate);
         this.dispatcherRef = defaultDispatcher.register(this.onAction);
-        MessagePreviewStore.instance.on(ROOM_PREVIEW_CHANGED, this.onRoomPreviewChanged);
+        MessagePreviewStore.instance.on(
+            MessagePreviewStore.getPreviewChangedEventName(this.props.room),
+            this.onRoomPreviewChanged,
+        );
         this.notificationState = RoomNotificationStateStore.instance.getRoomState(this.props.room);
         this.notificationState.on(NOTIFICATION_STATE_UPDATE, this.onNotificationUpdate);
         this.roomProps = EchoChamber.forRoom(this.props.room);
         this.roomProps.on(PROPERTY_UPDATED, this.onRoomPropertyUpdate);
-        CommunityPrototypeStore.instance.on(UPDATE_EVENT, this.onCommunityUpdate);
+        CommunityPrototypeStore.instance.on(
+            CommunityPrototypeStore.getUpdateEventName(this.props.room.roomId),
+            this.onCommunityUpdate,
+        );
+        this.props.room.on("Room.name", this.onRoomNameUpdate);
+    }
+
+    private onRoomNameUpdate = (room) => {
+        this.forceUpdate();
     }
 
     private onNotificationUpdate = () => {
@@ -128,6 +138,26 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
         if (prevProps.showMessagePreview !== this.props.showMessagePreview && this.showMessagePreview) {
             this.setState({messagePreview: this.generatePreview()});
         }
+        if (prevProps.room?.roomId !== this.props.room?.roomId) {
+            MessagePreviewStore.instance.off(
+                MessagePreviewStore.getPreviewChangedEventName(prevProps.room),
+                this.onRoomPreviewChanged,
+            );
+            MessagePreviewStore.instance.on(
+                MessagePreviewStore.getPreviewChangedEventName(this.props.room),
+                this.onRoomPreviewChanged,
+            );
+            CommunityPrototypeStore.instance.off(
+                CommunityPrototypeStore.getUpdateEventName(prevProps.room?.roomId),
+                this.onCommunityUpdate,
+            );
+            CommunityPrototypeStore.instance.on(
+                CommunityPrototypeStore.getUpdateEventName(this.props.room?.roomId),
+                this.onCommunityUpdate,
+            );
+            prevProps.room?.off("Room.name", this.onRoomNameUpdate);
+            this.props.room?.on("Room.name", this.onRoomNameUpdate);
+        }
     }
 
     public componentDidMount() {
@@ -140,11 +170,18 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
     public componentWillUnmount() {
         if (this.props.room) {
             ActiveRoomObserver.removeListener(this.props.room.roomId, this.onActiveRoomUpdate);
+            MessagePreviewStore.instance.off(
+                MessagePreviewStore.getPreviewChangedEventName(this.props.room),
+                this.onRoomPreviewChanged,
+            );
+            CommunityPrototypeStore.instance.off(
+                CommunityPrototypeStore.getUpdateEventName(this.props.room.roomId),
+                this.onCommunityUpdate,
+            );
+            this.props.room.off("Room.name", this.onRoomNameUpdate);
         }
         defaultDispatcher.unregister(this.dispatcherRef);
-        MessagePreviewStore.instance.off(ROOM_PREVIEW_CHANGED, this.onRoomPreviewChanged);
         this.notificationState.off(NOTIFICATION_STATE_UPDATE, this.onNotificationUpdate);
-        CommunityPrototypeStore.instance.off(UPDATE_EVENT, this.onCommunityUpdate);
     }
 
     private onAction = (payload: ActionPayload) => {
diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js
index 4828277d8a..673df949f7 100644
--- a/src/components/views/rooms/SendMessageComposer.js
+++ b/src/components/views/rooms/SendMessageComposer.js
@@ -38,10 +38,16 @@ import * as sdk from '../../../index';
 import Modal from '../../../Modal';
 import {_t, _td} from '../../../languageHandler';
 import ContentMessages from '../../../ContentMessages';
-import {Key} from "../../../Keyboard";
+import {Key, isOnlyCtrlOrCmdKeyEvent} from "../../../Keyboard";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import RateLimitedFunc from '../../../ratelimitedfunc';
 import {Action} from "../../../dispatcher/actions";
+import {containsEmoji} from "../../../effects/utils";
+import {CHAT_EFFECTS} from '../../../effects';
+import SettingsStore from "../../../settings/SettingsStore";
+import CountlyAnalytics from "../../../CountlyAnalytics";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
+import EMOJI_REGEX from 'emojibase-regex';
 
 function addReplyToMessageContent(content, repliedToEvent, permalinkCreator) {
     const replyContent = ReplyThread.makeReplyMixIn(repliedToEvent);
@@ -87,12 +93,31 @@ export function createMessageContent(model, permalinkCreator, replyToEvent) {
     return content;
 }
 
+// exported for tests
+export function isQuickReaction(model) {
+    const parts = model.parts;
+    if (parts.length == 0) return false;
+    const text = textSerialize(model);
+    // shortcut takes the form "+:emoji:" or "+ :emoji:""
+    // can be in 1 or 2 parts
+    if (parts.length <= 2) {
+        const hasShortcut = text.startsWith("+") || text.startsWith("+ ");
+        const emojiMatch = text.match(EMOJI_REGEX);
+        if (hasShortcut && emojiMatch && emojiMatch.length == 1) {
+            return emojiMatch[0] === text.substring(1) ||
+                emojiMatch[0] === text.substring(2);
+        }
+    }
+    return false;
+}
+
 export default class SendMessageComposer extends React.Component {
     static propTypes = {
         room: PropTypes.object.isRequired,
         placeholder: PropTypes.string,
         permalinkCreator: PropTypes.object.isRequired,
         replyToEvent: PropTypes.object,
+        onChange: PropTypes.func,
     };
 
     static contextType = MatrixClientContext;
@@ -121,20 +146,25 @@ export default class SendMessageComposer extends React.Component {
             return;
         }
         const hasModifier = event.altKey || event.ctrlKey || event.metaKey || event.shiftKey;
-        if (event.key === Key.ENTER && !hasModifier) {
+        const ctrlEnterToSend = !!SettingsStore.getValue('MessageComposerInput.ctrlEnterToSend');
+        const send = ctrlEnterToSend
+            ? event.key === Key.ENTER && isOnlyCtrlOrCmdKeyEvent(event)
+            : event.key === Key.ENTER && !hasModifier;
+        if (send) {
             this._sendMessage();
             event.preventDefault();
         } else if (event.key === Key.ARROW_UP) {
             this.onVerticalArrow(event, true);
         } else if (event.key === Key.ARROW_DOWN) {
             this.onVerticalArrow(event, false);
-        } else if (this._prepareToEncrypt) {
-            this._prepareToEncrypt();
         } else if (event.key === Key.ESCAPE) {
             dis.dispatch({
                 action: 'reply_to_event',
                 event: null,
             });
+        } else if (this._prepareToEncrypt) {
+            // This needs to be last!
+            this._prepareToEncrypt();
         }
     };
 
@@ -215,6 +245,41 @@ export default class SendMessageComposer extends React.Component {
         return false;
     }
 
+    _sendQuickReaction() {
+        const timeline = this.props.room.getLiveTimeline();
+        const events = timeline.getEvents();
+        const reaction = this.model.parts[1].text;
+        for (let i = events.length - 1; i >= 0; i--) {
+            if (events[i].getType() === "m.room.message") {
+                let shouldReact = true;
+                const lastMessage = events[i];
+                const userId = MatrixClientPeg.get().getUserId();
+                const messageReactions = this.props.room.getUnfilteredTimelineSet()
+                    .getRelationsForEvent(lastMessage.getId(), "m.annotation", "m.reaction");
+
+                // if we have already sent this reaction, don't redact but don't re-send
+                if (messageReactions) {
+                    const myReactionEvents = messageReactions.getAnnotationsBySender()[userId] || [];
+                    const myReactionKeys = [...myReactionEvents]
+                        .filter(event => !event.isRedacted())
+                        .map(event => event.getRelation().key);
+                        shouldReact = !myReactionKeys.includes(reaction);
+                }
+                if (shouldReact) {
+                    MatrixClientPeg.get().sendEvent(lastMessage.getRoomId(), "m.reaction", {
+                        "m.relates_to": {
+                            "rel_type": "m.annotation",
+                            "event_id": lastMessage.getId(),
+                            "key": reaction,
+                        },
+                    });
+                    dis.dispatch({action: "message_sent"});
+                }
+                break;
+            }
+        }
+    }
+
     _getSlashCommand() {
         const commandText = this.model.parts.reduce((text, part) => {
             // use mxid to textify user pills in a command
@@ -302,11 +367,20 @@ export default class SendMessageComposer extends React.Component {
             }
         }
 
+        if (isQuickReaction(this.model)) {
+            shouldSend = false;
+            this._sendQuickReaction();
+        }
+
         const replyToEvent = this.props.replyToEvent;
         if (shouldSend) {
+            const startTime = CountlyAnalytics.getTimestamp();
             const {roomId} = this.props.room;
             const content = createMessageContent(this.model, this.props.permalinkCreator, replyToEvent);
-            this.context.sendMessage(roomId, content);
+            // 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
                 // if the send fails, retry will handle resending.
@@ -316,6 +390,12 @@ export default class SendMessageComposer extends React.Component {
                 });
             }
             dis.dispatch({action: "message_sent"});
+            CHAT_EFFECTS.forEach((effect) => {
+                if (containsEmoji(content, effect.emojis)) {
+                    dis.dispatch({action: `effects.${effect.command}`});
+                }
+            });
+            CountlyAnalytics.instance.trackSendMessage(startTime, prom, roomId, false, !!replyToEvent, content);
         }
 
         this.sendHistoryManager.save(this.model, replyToEvent);
@@ -324,6 +404,9 @@ export default class SendMessageComposer extends React.Component {
         this._editorRef.clearUndoHistory();
         this._editorRef.focus();
         this._clearStoredEditorState();
+        if (SettingsStore.getValue("scrollToBottomOnMessageSent")) {
+            dis.dispatch({action: "scroll_to_bottom"});
+        }
     }
 
     componentWillUnmount() {
@@ -456,10 +539,15 @@ export default class SendMessageComposer extends React.Component {
         }
     }
 
+    onChange = () => {
+        if (this.props.onChange) this.props.onChange(this.model);
+    }
+
     render() {
         return (
             <div className="mx_SendMessageComposer" onClick={this.focusComposer} onKeyDown={this._onKeyDown}>
                 <BasicMessageComposer
+                    onChange={this.onChange}
                     ref={this._setEditorRef}
                     model={this.model}
                     room={this.props.room}
diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index 2faa0fea27..5446d15671 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -264,7 +264,7 @@ export default class Stickerpicker extends React.Component {
                             width: this.popoverWidth,
                         }}
                     >
-                    <PersistedElement persistKey={PERSISTED_ELEMENT_KEY} style={{zIndex: STICKERPICKER_Z_INDEX}}>
+                    <PersistedElement persistKey={PERSISTED_ELEMENT_KEY} zIndex={STICKERPICKER_Z_INDEX}>
                         <AppTile
                             app={stickerApp}
                             room={this.props.room}
@@ -272,18 +272,14 @@ export default class Stickerpicker extends React.Component {
                             userId={MatrixClientPeg.get().credentials.userId}
                             creatorUserId={stickerpickerWidget.sender || MatrixClientPeg.get().credentials.userId}
                             waitForIframeLoad={true}
-                            show={true}
                             showMenubar={true}
                             onEditClick={this._launchManageIntegrations}
                             onDeleteClick={this._removeStickerpickerWidgets}
                             showTitle={false}
-                            showMinimise={true}
-                            showDelete={false}
                             showCancel={false}
                             showPopout={false}
                             onMinimiseClick={this._onHideStickersClick}
                             handleMinimisePointerEvents={true}
-                            whitelistCapabilities={['m.sticker', 'visibility']}
                             userWidget={true}
                         />
                     </PersistedElement>
diff --git a/src/components/views/rooms/ThirdPartyMemberInfo.js b/src/components/views/rooms/ThirdPartyMemberInfo.js
index 3a7042ebd2..73510c2b4f 100644
--- a/src/components/views/rooms/ThirdPartyMemberInfo.js
+++ b/src/components/views/rooms/ThirdPartyMemberInfo.js
@@ -23,6 +23,8 @@ import dis from "../../../dispatcher/dispatcher";
 import * as sdk from "../../../index";
 import Modal from "../../../Modal";
 import {isValid3pidInvite} from "../../../RoomInvite";
+import RoomAvatar from "../avatars/RoomAvatar";
+import RoomName from "../elements/RoomName";
 
 export default class ThirdPartyMemberInfo extends React.Component {
     static propTypes = {
@@ -32,14 +34,14 @@ export default class ThirdPartyMemberInfo extends React.Component {
     constructor(props) {
         super(props);
 
-        const room = MatrixClientPeg.get().getRoom(this.props.event.getRoomId());
-        const me = room.getMember(MatrixClientPeg.get().getUserId());
-        const powerLevels = room.currentState.getStateEvents("m.room.power_levels", "");
+        this.room = MatrixClientPeg.get().getRoom(this.props.event.getRoomId());
+        const me = this.room.getMember(MatrixClientPeg.get().getUserId());
+        const powerLevels = this.room.currentState.getStateEvents("m.room.power_levels", "");
 
         let kickLevel = powerLevels ? powerLevels.getContent().kick : 50;
         if (typeof(kickLevel) !== 'number') kickLevel = 50;
 
-        const sender = room.getMember(this.props.event.getSender());
+        const sender = this.room.getMember(this.props.event.getSender());
 
         this.state = {
             stateKey: this.props.event.getStateKey(),
@@ -119,9 +121,18 @@ export default class ThirdPartyMemberInfo extends React.Component {
             );
         }
 
+        let scopeHeader;
+        if (this.room.isSpaceRoom()) {
+            scopeHeader = <div className="mx_RightPanel_scopeHeader">
+                <RoomAvatar room={this.room} height={32} width={32} />
+                <RoomName room={this.room} />
+            </div>;
+        }
+
         // We shamelessly rip off the MemberInfo styles here.
         return (
             <div className="mx_MemberInfo" role="tabpanel">
+                { scopeHeader }
                 <div className="mx_MemberInfo_name">
                     <AccessibleButton className="mx_MemberInfo_cancel"
                         onClick={this.onCancel}
diff --git a/src/components/views/rooms/WhoIsTypingTile.js b/src/components/views/rooms/WhoIsTypingTile.js
index c796142e78..905cbe6d09 100644
--- a/src/components/views/rooms/WhoIsTypingTile.js
+++ b/src/components/views/rooms/WhoIsTypingTile.js
@@ -81,7 +81,7 @@ export default class WhoIsTypingTile extends React.Component {
     };
 
     onRoomTimeline = (event, room) => {
-        if (room && room.roomId === this.props.room.roomId) {
+        if (room?.roomId === this.props.room?.roomId) {
             const userId = event.getSender();
             // remove user from usersTyping
             const usersTyping = this.state.usersTyping.filter((m) => m.userId !== userId);
diff --git a/src/components/views/settings/AvatarSetting.js b/src/components/views/settings/AvatarSetting.js
index 487c752c38..93b982467a 100644
--- a/src/components/views/settings/AvatarSetting.js
+++ b/src/components/views/settings/AvatarSetting.js
@@ -65,7 +65,7 @@ const AvatarSetting = ({avatarUrl, avatarAltText, avatarName, uploadAvatar, remo
 
     const avatarClasses = classNames({
         "mx_AvatarSetting_avatar": true,
-        "mx_AvatarSetting_avatar_hovering": isHovering,
+        "mx_AvatarSetting_avatar_hovering": isHovering && uploadAvatar,
     });
     return <div className={avatarClasses}>
         {avatarElement}
diff --git a/src/components/views/settings/BridgeTile.js b/src/components/views/settings/BridgeTile.js
deleted file mode 100644
index e9c58518e4..0000000000
--- a/src/components/views/settings/BridgeTile.js
+++ /dev/null
@@ -1,115 +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 {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
-import {_t} from "../../../languageHandler";
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import Pill from "../elements/Pill";
-import {makeUserPermalink} from "../../../utils/permalinks/Permalinks";
-import BaseAvatar from "../avatars/BaseAvatar";
-import AccessibleButton from "../elements/AccessibleButton";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
-import SettingsStore from "../../../settings/SettingsStore";
-
-@replaceableComponent("views.settings.BridgeTile")
-export default class BridgeTile extends React.PureComponent {
-    static propTypes = {
-        ev: PropTypes.object.isRequired,
-        room: PropTypes.object.isRequired,
-    }
-
-    state = {
-        visible: false,
-    }
-
-    _toggleVisible() {
-        this.setState({
-            visible: !this.state.visible,
-        });
-    }
-
-    render() {
-        const content = this.props.ev.getContent();
-        const { channel, network, protocol } = content;
-        const protocolName = protocol.displayname || protocol.id;
-        const channelName = channel.displayname || channel.id;
-        const networkName = network ? network.displayname || network.id : protocolName;
-
-        let creator = null;
-        if (content.creator) {
-            creator = _t("This bridge was provisioned by <user />.", {}, {
-                    user: <Pill
-                        type={Pill.TYPE_USER_MENTION}
-                        room={this.props.room}
-                        url={makeUserPermalink(content.creator)}
-                        shouldShowPillAvatar={SettingsStore.getValue("Pill.shouldShowPillAvatar")}
-                    />,
-            });
-        }
-
-        const bot = _t("This bridge is managed by <user />.", {}, {
-            user: <Pill
-                type={Pill.TYPE_USER_MENTION}
-                room={this.props.room}
-                url={makeUserPermalink(this.props.ev.getSender())}
-                shouldShowPillAvatar={SettingsStore.getValue("Pill.shouldShowPillAvatar")}
-                />,
-        });
-
-        let networkIcon;
-
-        if (protocol.avatar) {
-            const avatarUrl = getHttpUriForMxc(
-                MatrixClientPeg.get().getHomeserverUrl(),
-                protocol.avatar, 64, 64, "crop",
-            );
-
-            networkIcon = <BaseAvatar className="protocol-icon"
-                width={48}
-                height={48}
-                resizeMethod='crop'
-                name={ protocolName }
-                idName={ protocolName }
-                url={ avatarUrl }
-            />;
-        } else {
-            networkIcon = <div class="noProtocolIcon"></div>;
-        }
-
-        const id = this.props.ev.getId();
-        const metadataClassname = "metadata" + (this.state.visible ? " visible" : "");
-        return (<li key={id}>
-            <div className="column-icon">
-                {networkIcon}
-            </div>
-            <div className="column-data">
-                <h3>{protocolName}</h3>
-                <p className="workspace-channel-details">
-                    <span>{_t("Workspace: %(networkName)s", {networkName})}</span>
-                    <span className="channel">{_t("Channel: %(channelName)s", {channelName})}</span>
-                </p>
-                <p className={metadataClassname}>
-                    {creator} {bot}
-                </p>
-                <AccessibleButton className="mx_showMore" kind="secondary" onClick={this._toggleVisible.bind(this)}>
-                    { this.state.visible ? _t("Show less") : _t("Show more") }
-                </AccessibleButton>
-            </div>
-        </li>);
-    }
-}
diff --git a/src/components/views/settings/BridgeTile.tsx b/src/components/views/settings/BridgeTile.tsx
new file mode 100644
index 0000000000..58499ebd25
--- /dev/null
+++ b/src/components/views/settings/BridgeTile.tsx
@@ -0,0 +1,167 @@
+/*
+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 {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
+import {_t} from "../../../languageHandler";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
+import Pill from "../elements/Pill";
+import {makeUserPermalink} from "../../../utils/permalinks/Permalinks";
+import BaseAvatar from "../avatars/BaseAvatar";
+import SettingsStore from "../../../settings/SettingsStore";
+import {MatrixEvent} from "matrix-js-sdk/src/models/event";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { isUrlPermitted } from '../../../HtmlUtils';
+
+interface IProps {
+    ev: MatrixEvent;
+    room: Room;
+}
+
+/**
+ * This should match https://github.com/matrix-org/matrix-doc/blob/hs/msc-bridge-inf/proposals/2346-bridge-info-state-event.md#mbridge
+ */
+interface IBridgeStateEvent {
+    bridgebot: string;
+    creator?: string;
+    protocol: {
+        id: string;
+        displayname?: string;
+        // eslint-disable-next-line camelcase
+        avatar_url?: string;
+        // eslint-disable-next-line camelcase
+        external_url?: string;
+    };
+    network?: {
+        id: string;
+        displayname?: string;
+        // eslint-disable-next-line camelcase
+        avatar_url?: string;
+        // eslint-disable-next-line camelcase
+        external_url?: string;
+    };
+    channel: {
+        id: string;
+        displayname?: string;
+        // eslint-disable-next-line camelcase
+        avatar_url?: string;
+        // eslint-disable-next-line camelcase
+        external_url?: string;
+    };
+}
+
+export default class BridgeTile extends React.PureComponent<IProps> {
+    static propTypes = {
+        ev: PropTypes.object.isRequired,
+        room: PropTypes.object.isRequired,
+    }
+
+    render() {
+        const content: IBridgeStateEvent = this.props.ev.getContent();
+        // Validate
+        if (!content.channel?.id || !content.protocol?.id) {
+            console.warn(`Bridge info event ${this.props.ev.getId()} has missing content. Tile will not render`);
+            return null;
+        }
+        if (!content.bridgebot) {
+            // Bridgebot was not required previously, so in order to not break rooms we are allowing
+            // the sender to be used in place. When the proposal is merged, this should be removed.
+            console.warn(`Bridge info event ${this.props.ev.getId()} does not provide a 'bridgebot' key which`
+             + "is deprecated behaviour. Using sender for now.");
+            content.bridgebot = this.props.ev.getSender();
+        }
+        const { channel, network, protocol } = content;
+        const protocolName = protocol.displayname || protocol.id;
+        const channelName = channel.displayname || channel.id;
+
+        let creator = null;
+        if (content.creator) {
+            creator = <li>{_t("This bridge was provisioned by <user />.", {}, {
+                user: () => <Pill
+                    type={Pill.TYPE_USER_MENTION}
+                    room={this.props.room}
+                    url={makeUserPermalink(content.creator)}
+                    shouldShowPillAvatar={SettingsStore.getValue("Pill.shouldShowPillAvatar")}
+                />,
+            })}</li>;
+        }
+
+        const bot = <li>{_t("This bridge is managed by <user />.", {}, {
+            user: () => <Pill
+                type={Pill.TYPE_USER_MENTION}
+                room={this.props.room}
+                url={makeUserPermalink(content.bridgebot)}
+                shouldShowPillAvatar={SettingsStore.getValue("Pill.shouldShowPillAvatar")}
+            />,
+        })}</li>;
+
+        let networkIcon;
+
+        if (protocol.avatar_url) {
+            const avatarUrl = getHttpUriForMxc(
+                MatrixClientPeg.get().getHomeserverUrl(),
+                protocol.avatar_url, 64, 64, "crop",
+            );
+
+            networkIcon = <BaseAvatar className="protocol-icon"
+                width={48}
+                height={48}
+                resizeMethod='crop'
+                name={ protocolName }
+                idName={ protocolName }
+                url={ avatarUrl }
+            />;
+        } else {
+            networkIcon = <div className="noProtocolIcon"></div>;
+        }
+        let networkItem = null;
+        if (network) {
+            const networkName = network.displayname || network.id;
+            let networkLink = <span>{networkName}</span>;
+            if (typeof network.external_url === "string" && isUrlPermitted(network.external_url)) {
+                networkLink = <a href={network.external_url} target="_blank" rel="noreferrer noopener">{networkName}</a>
+            }
+            networkItem = _t("Workspace: <networkLink/>", {}, {
+                networkLink: () => networkLink,
+            });
+        }
+
+        let channelLink = <span>{channelName}</span>;
+        if (typeof channel.external_url === "string" && isUrlPermitted(channel.external_url)) {
+            channelLink = <a href={channel.external_url} target="_blank" rel="noreferrer noopener">{channelName}</a>
+        }
+
+        const id = this.props.ev.getId();
+        return (<li key={id}>
+            <div className="column-icon">
+                {networkIcon}
+            </div>
+            <div className="column-data">
+                <h3>{protocolName}</h3>
+                <p className="workspace-channel-details">
+                    {networkItem}
+                    <span className="channel">{_t("Channel: <channelLink/>", {}, {
+                        channelLink: () => channelLink,
+                    })}</span>
+                </p>
+                <ul className="metadata">
+                    {creator} {bot}
+                </ul>
+            </div>
+        </li>);
+    }
+}
diff --git a/src/components/views/settings/ChangeAvatar.js b/src/components/views/settings/ChangeAvatar.js
index a6fc60ceb9..7ab2936584 100644
--- a/src/components/views/settings/ChangeAvatar.js
+++ b/src/components/views/settings/ChangeAvatar.js
@@ -19,6 +19,7 @@ import PropTypes from 'prop-types';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
+import Spinner from '../elements/Spinner';
 
 export default class ChangeAvatar extends React.Component {
     static propTypes = {
@@ -58,7 +59,7 @@ export default class ChangeAvatar extends React.Component {
     }
 
     // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    UNSAFE_componentWillReceiveProps(newProps) {
+    UNSAFE_componentWillReceiveProps(newProps) { // eslint-disable-line camelcase
         if (this.avatarSet) {
             // don't clobber what the user has just set
             return;
@@ -143,7 +144,9 @@ export default class ChangeAvatar extends React.Component {
         // time to propagate through to the RoomAvatar.
         if (this.props.room && !this.avatarSet) {
             const RoomAvatar = sdk.getComponent('avatars.RoomAvatar');
-            avatarImg = <RoomAvatar room={this.props.room} width={this.props.width} height={this.props.height} resizeMethod='crop' />;
+            avatarImg = <RoomAvatar
+                room={this.props.room} width={this.props.width} height={this.props.height} resizeMethod='crop'
+            />;
         } else {
             const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
             // XXX: FIXME: once we track in the JS what our own displayname is(!) then use it here rather than ?
@@ -174,9 +177,8 @@ export default class ChangeAvatar extends React.Component {
                     </div>
                 );
             case ChangeAvatar.Phases.Uploading:
-                var Loader = sdk.getComponent("elements.Spinner");
                 return (
-                    <Loader />
+                    <Spinner />
                 );
         }
     }
diff --git a/src/components/views/settings/ChangePassword.js b/src/components/views/settings/ChangePassword.js
index bafbc816b9..22b758b1ca 100644
--- a/src/components/views/settings/ChangePassword.js
+++ b/src/components/views/settings/ChangePassword.js
@@ -21,9 +21,18 @@ import PropTypes from 'prop-types';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import AccessibleButton from '../elements/AccessibleButton';
 import Spinner from '../elements/Spinner';
+import withValidation from '../elements/Validation';
 import { _t } from '../../../languageHandler';
 import * as sdk from "../../../index";
 import Modal from "../../../Modal";
+import PassphraseField from "../auth/PassphraseField";
+import CountlyAnalytics from "../../../CountlyAnalytics";
+
+const FIELD_OLD_PASSWORD = 'field_old_password';
+const FIELD_NEW_PASSWORD = 'field_new_password';
+const FIELD_NEW_PASSWORD_CONFIRM = 'field_new_password_confirm';
+
+const PASSWORD_MIN_SCORE = 3; // safely unguessable: moderate protection from offline slow-hash scenario.
 
 export default class ChangePassword extends React.Component {
     static propTypes = {
@@ -63,6 +72,7 @@ export default class ChangePassword extends React.Component {
     }
 
     state = {
+        fieldValid: {},
         phase: ChangePassword.Phases.Edit,
         oldPassword: "",
         newPassword: "",
@@ -168,26 +178,84 @@ export default class ChangePassword extends React.Component {
         );
     };
 
+    markFieldValid(fieldID, valid) {
+        const { fieldValid } = this.state;
+        fieldValid[fieldID] = valid;
+        this.setState({
+            fieldValid,
+        });
+    }
+
     onChangeOldPassword = (ev) => {
         this.setState({
             oldPassword: ev.target.value,
         });
     };
 
+    onOldPasswordValidate = async fieldState => {
+        const result = await this.validateOldPasswordRules(fieldState);
+        this.markFieldValid(FIELD_OLD_PASSWORD, result.valid);
+        return result;
+    };
+
+    validateOldPasswordRules = withValidation({
+        rules: [
+            {
+                key: "required",
+                test: ({ value, allowEmpty }) => allowEmpty || !!value,
+                invalid: () => _t("Passwords can't be empty"),
+            },
+         ],
+    });
+
     onChangeNewPassword = (ev) => {
         this.setState({
             newPassword: ev.target.value,
         });
     };
 
+    onNewPasswordValidate = result => {
+        this.markFieldValid(FIELD_NEW_PASSWORD, result.valid);
+    };
+
     onChangeNewPasswordConfirm = (ev) => {
         this.setState({
             newPasswordConfirm: ev.target.value,
         });
     };
 
-    onClickChange = (ev) => {
+    onNewPasswordConfirmValidate = async fieldState => {
+        const result = await this.validatePasswordConfirmRules(fieldState);
+        this.markFieldValid(FIELD_NEW_PASSWORD_CONFIRM, result.valid);
+        return result;
+    };
+
+    validatePasswordConfirmRules = withValidation({
+        rules: [
+            {
+                key: "required",
+                test: ({ value, allowEmpty }) => allowEmpty || !!value,
+                invalid: () => _t("Confirm password"),
+            },
+            {
+                key: "match",
+                test({ value }) {
+                    return !value || value === this.state.newPassword;
+                },
+                invalid: () => _t("Passwords don't match"),
+            },
+         ],
+    });
+
+    onClickChange = async (ev) => {
         ev.preventDefault();
+
+        const allFieldsValid = await this.verifyFieldsBeforeSubmit();
+        if (!allFieldsValid) {
+            CountlyAnalytics.instance.track("onboarding_registration_submit_failed");
+            return;
+        }
+
         const oldPassword = this.state.oldPassword;
         const newPassword = this.state.newPassword;
         const confirmPassword = this.state.newPasswordConfirm;
@@ -201,9 +269,75 @@ export default class ChangePassword extends React.Component {
         }
     };
 
-    render() {
-        // TODO: Live validation on `new pw == confirm pw`
+    async verifyFieldsBeforeSubmit() {
+        // Blur the active element if any, so we first run its blur validation,
+        // which is less strict than the pass we're about to do below for all fields.
+        const activeElement = document.activeElement;
+        if (activeElement) {
+            activeElement.blur();
+        }
 
+        const fieldIDsInDisplayOrder = [
+            FIELD_OLD_PASSWORD,
+            FIELD_NEW_PASSWORD,
+            FIELD_NEW_PASSWORD_CONFIRM,
+        ];
+
+        // Run all fields with stricter validation that no longer allows empty
+        // values for required fields.
+        for (const fieldID of fieldIDsInDisplayOrder) {
+            const field = this[fieldID];
+            if (!field) {
+                continue;
+            }
+            // We must wait for these validations to finish before queueing
+            // up the setState below so our setState goes in the queue after
+            // all the setStates from these validate calls (that's how we
+            // know they've finished).
+            await field.validate({ allowEmpty: false });
+        }
+
+        // Validation and state updates are async, so we need to wait for them to complete
+        // first. Queue a `setState` callback and wait for it to resolve.
+        await new Promise(resolve => this.setState({}, resolve));
+
+        if (this.allFieldsValid()) {
+            return true;
+        }
+
+        const invalidField = this.findFirstInvalidField(fieldIDsInDisplayOrder);
+
+        if (!invalidField) {
+            return true;
+        }
+
+        // Focus the first invalid field and show feedback in the stricter mode
+        // that no longer allows empty values for required fields.
+        invalidField.focus();
+        invalidField.validate({ allowEmpty: false, focused: true });
+        return false;
+    }
+
+    allFieldsValid() {
+        const keys = Object.keys(this.state.fieldValid);
+        for (let i = 0; i < keys.length; ++i) {
+            if (!this.state.fieldValid[keys[i]]) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    findFirstInvalidField(fieldIDs) {
+        for (const fieldID of fieldIDs) {
+            if (!this.state.fieldValid[fieldID] && this[fieldID]) {
+                return this[fieldID];
+            }
+        }
+        return null;
+    }
+
+    render() {
         const rowClassName = this.props.rowClassName;
         const buttonClassName = this.props.buttonClassName;
 
@@ -213,28 +347,35 @@ export default class ChangePassword extends React.Component {
                     <form className={this.props.className} onSubmit={this.onClickChange}>
                         <div className={rowClassName}>
                             <Field
+                                ref={field => this[FIELD_OLD_PASSWORD] = field}
                                 type="password"
                                 label={_t('Current password')}
                                 value={this.state.oldPassword}
                                 onChange={this.onChangeOldPassword}
+                                onValidate={this.onOldPasswordValidate}
                             />
                         </div>
                         <div className={rowClassName}>
-                            <Field
+                            <PassphraseField
+                                fieldRef={field => this[FIELD_NEW_PASSWORD] = field}
                                 type="password"
-                                label={_t('New Password')}
+                                label='New Password'
+                                minScore={PASSWORD_MIN_SCORE}
                                 value={this.state.newPassword}
                                 autoFocus={this.props.autoFocusNewPasswordInput}
                                 onChange={this.onChangeNewPassword}
+                                onValidate={this.onNewPasswordValidate}
                                 autoComplete="new-password"
                             />
                         </div>
                         <div className={rowClassName}>
                             <Field
+                                ref={field => this[FIELD_NEW_PASSWORD_CONFIRM] = field}
                                 type="password"
                                 label={_t("Confirm password")}
                                 value={this.state.newPasswordConfirm}
                                 onChange={this.onChangeNewPasswordConfirm}
+                                onValidate={this.onNewPasswordConfirmValidate}
                                 autoComplete="new-password"
                             />
                         </div>
diff --git a/src/components/views/settings/DevicesPanel.js b/src/components/views/settings/DevicesPanel.js
index fe4a4abfdc..dc3ce9e03d 100644
--- a/src/components/views/settings/DevicesPanel.js
+++ b/src/components/views/settings/DevicesPanel.js
@@ -74,7 +74,7 @@ export default class DevicesPanel extends React.Component {
     }
 
 
-    /**
+    /*
      * compare two devices, sorting from most-recently-seen to least-recently-seen
      * (and then, for stability, by device id)
      */
diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js
index 8598a2a966..ec6ccacc9a 100644
--- a/src/components/views/settings/EventIndexPanel.js
+++ b/src/components/views/settings/EventIndexPanel.js
@@ -129,11 +129,16 @@ 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 %(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),
+                            },
+                        )}
                     </div>
                     <div>
                         <AccessibleButton kind="primary" onClick={this._onManage}>
diff --git a/src/components/views/settings/Notifications.js b/src/components/views/settings/Notifications.js
index 6eaf55279b..1337991dc3 100644
--- a/src/components/views/settings/Notifications.js
+++ b/src/components/views/settings/Notifications.js
@@ -31,6 +31,7 @@ import SdkConfig from "../../../SdkConfig";
 import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
 import AccessibleButton from "../elements/AccessibleButton";
 import {SettingLevel} from "../../../settings/SettingLevel";
+import {UIFeature} from "../../../settings/UIFeature";
 
 // TODO: this "view" component still has far too much application logic in it,
 // which should be factored out to other files.
@@ -94,7 +95,9 @@ export default class Notifications extends React.Component {
             phase: Notifications.phases.LOADING,
         });
 
-        MatrixClientPeg.get().setPushRuleEnabled('global', self.state.masterPushRule.kind, self.state.masterPushRule.rule_id, !checked).then(function() {
+        MatrixClientPeg.get().setPushRuleEnabled(
+            'global', self.state.masterPushRule.kind, self.state.masterPushRule.rule_id, !checked,
+        ).then(function() {
            self._refreshFromServer();
         });
     };
@@ -216,8 +219,8 @@ export default class Notifications extends React.Component {
             description: _t('Enter keywords separated by a comma:'),
             button: _t('OK'),
             value: keywords,
-            onFinished: (should_leave, newValue) => {
-                if (should_leave && newValue !== keywords) {
+            onFinished: (shouldLeave, newValue) => {
+                if (shouldLeave && newValue !== keywords) {
                     let newKeywords = newValue.split(',');
                     for (const i in newKeywords) {
                         newKeywords[i] = newKeywords[i].trim();
@@ -403,7 +406,9 @@ export default class Notifications extends React.Component {
                 // when creating the new rule.
                 // Thus, this new rule will join the 'vectorContentRules' set.
                 if (self.state.vectorContentRules.rules.length) {
-                    pushRuleVectorStateKind = PushRuleVectorState.contentRuleVectorStateKind(self.state.vectorContentRules.rules[0]);
+                    pushRuleVectorStateKind = PushRuleVectorState.contentRuleVectorStateKind(
+                        self.state.vectorContentRules.rules[0],
+                    );
                 } else {
                     // ON is default
                     pushRuleVectorStateKind = PushRuleVectorState.ON;
@@ -415,10 +420,9 @@ export default class Notifications extends React.Component {
 
                 if (vectorContentRulesPatterns.indexOf(keyword) < 0) {
                     if (self.state.vectorContentRules.vectorState !== PushRuleVectorState.OFF) {
-                        deferreds.push(cli.addPushRule
-                        ('global', 'content', keyword, {
-                           actions: PushRuleVectorState.actionsFor(pushRuleVectorStateKind),
-                           pattern: keyword,
+                        deferreds.push(cli.addPushRule('global', 'content', keyword, {
+                            actions: PushRuleVectorState.actionsFor(pushRuleVectorStateKind),
+                            pattern: keyword,
                         }));
                     } else {
                         deferreds.push(self._addDisabledPushRule('global', 'content', keyword, {
@@ -482,12 +486,14 @@ export default class Notifications extends React.Component {
 
     _refreshFromServer = () => {
         const self = this;
-        const pushRulesPromise = MatrixClientPeg.get().getPushRules().then(self._portRulesToNewAPI).then(function(rulesets) {
+        const pushRulesPromise = MatrixClientPeg.get().getPushRules().then(
+            self._portRulesToNewAPI,
+        ).then(function(rulesets) {
             /// XXX seriously? wtf is this?
             MatrixClientPeg.get().pushRules = rulesets;
 
             // Get homeserver default rules and triage them by categories
-            const rule_categories = {
+            const ruleCategories = {
                 // The master rule (all notifications disabling)
                 '.m.rule.master': 'master',
 
@@ -514,7 +520,7 @@ export default class Notifications extends React.Component {
             for (const kind in rulesets.global) {
                 for (let i = 0; i < Object.keys(rulesets.global[kind]).length; ++i) {
                     const r = rulesets.global[kind][i];
-                    const cat = rule_categories[r.rule_id];
+                    const cat = ruleCategories[r.rule_id];
                     r.kind = kind;
 
                     if (r.rule_id[0] === '.') {
@@ -750,7 +756,7 @@ export default class Notifications extends React.Component {
         if (this.state.masterPushRule) {
             masterPushRuleDiv = <LabelledToggleSwitch value={!this.state.masterPushRule.enabled}
                                                       onChange={this.onEnableNotificationsChange}
-                                                      label={_t('Enable notifications for this account')}/>;
+                                                      label={_t('Enable notifications for this account')} />;
         }
 
         let clearNotificationsButton;
@@ -778,14 +784,14 @@ export default class Notifications extends React.Component {
 
         const emailThreepids = this.state.threepids.filter((tp) => tp.medium === "email");
         let emailNotificationsRows;
-        if (emailThreepids.length === 0) {
-            emailNotificationsRows = <div>
-                { _t('Add an email address to configure email notifications') }
-            </div>;
-        } else {
+        if (emailThreepids.length > 0) {
             emailNotificationsRows = emailThreepids.map((threePid) => this.emailNotificationsRow(
                 threePid.address, `${_t('Enable email notifications')} (${threePid.address})`,
             ));
+        } else if (SettingsStore.getValue(UIFeature.ThirdPartyID)) {
+            emailNotificationsRows = <div>
+                { _t('Add an email address to configure email notifications') }
+            </div>;
         }
 
         // Build external push rules
@@ -803,7 +809,10 @@ export default class Notifications extends React.Component {
         }
         if (externalKeywords.length) {
             externalKeywords = externalKeywords.join(", ");
-            externalRules.push(<li>{ _t('Notifications on the following keywords follow rules which can’t be displayed here:') } { externalKeywords }</li>);
+            externalRules.push(<li>
+                {_t('Notifications on the following keywords follow rules which can’t be displayed here:') }
+                { externalKeywords }
+            </li>);
         }
 
         let devicesSection;
diff --git a/src/components/views/settings/ProfileSettings.js b/src/components/views/settings/ProfileSettings.js
index 92851ccaa0..89d7cf6c2b 100644
--- a/src/components/views/settings/ProfileSettings.js
+++ b/src/components/views/settings/ProfileSettings.js
@@ -52,19 +52,23 @@ export default class ProfileSettings extends React.Component {
         // clear file upload field so same file can be selected
         this._avatarUpload.current.value = "";
         this.setState({
-            avatarUrl: undefined,
-            avatarFile: undefined,
+            avatarUrl: null,
+            avatarFile: null,
             enableProfileSave: true,
         });
     };
 
-    _clearProfile = async (e) => {
+    _cancelProfileChanges = async (e) => {
         e.stopPropagation();
         e.preventDefault();
 
         if (!this.state.enableProfileSave) return;
-        this._removeAvatar();
-        this.setState({enableProfileSave: false, displayName: this.state.originalDisplayName});
+        this.setState({
+            enableProfileSave: false,
+            displayName: this.state.originalDisplayName,
+            avatarUrl: this.state.originalAvatarUrl,
+            avatarFile: null,
+        });
     };
 
     _saveProfile = async (e) => {
@@ -77,13 +81,18 @@ export default class ProfileSettings extends React.Component {
         const client = MatrixClientPeg.get();
         const newState = {};
 
+        const displayName = this.state.displayName.trim();
         try {
             if (this.state.originalDisplayName !== this.state.displayName) {
-                await client.setDisplayName(this.state.displayName);
-                newState.originalDisplayName = this.state.displayName;
+                await client.setDisplayName(displayName);
+                newState.originalDisplayName = displayName;
+                newState.displayName = displayName;
             }
 
             if (this.state.avatarFile) {
+                console.log(
+                    `Uploading new avatar, ${this.state.avatarFile.name} of type ${this.state.avatarFile.type},` +
+                    ` (${this.state.avatarFile.size}) bytes`);
                 const uri = await client.uploadContent(this.state.avatarFile);
                 await client.setAvatarUrl(uri);
                 newState.avatarUrl = client.mxcUrlToHttp(uri, 96, 96, 'crop', false);
@@ -93,6 +102,7 @@ export default class ProfileSettings extends React.Component {
                 await client.setAvatarUrl(""); // use empty string as Synapse 500s on undefined
             }
         } catch (err) {
+            console.log("Failed to save profile", err);
             Modal.createTrackedDialog('Failed to save profile', '', ErrorDialog, {
                 title: _t("Failed to save your profile"),
                 description: ((err && err.message) ? err.message : _t("The operation could not be completed")),
@@ -182,7 +192,7 @@ export default class ProfileSettings extends React.Component {
                 </div>
                 <div className="mx_ProfileSettings_buttons">
                     <AccessibleButton
-                        onClick={this._clearProfile}
+                        onClick={this._cancelProfileChanges}
                         kind="link"
                         disabled={!this.state.enableProfileSave}
                     >
diff --git a/src/components/views/settings/SecureBackupPanel.js b/src/components/views/settings/SecureBackupPanel.js
index 3547efc3f2..080d83b2cf 100644
--- a/src/components/views/settings/SecureBackupPanel.js
+++ b/src/components/views/settings/SecureBackupPanel.js
@@ -424,7 +424,7 @@ export default class SecureBackupPanel extends React.PureComponent {
                 <p>{_t(
                     "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.",
+                    "unique Security Key.",
                 )}</p>
                 {statusDescription}
                 <details>
diff --git a/src/components/views/settings/SpellCheckSettings.tsx b/src/components/views/settings/SpellCheckSettings.tsx
new file mode 100644
index 0000000000..d08f263b5f
--- /dev/null
+++ b/src/components/views/settings/SpellCheckSettings.tsx
@@ -0,0 +1,111 @@
+/*
+Copyright 2021 Šimon Brandner <simon.bra.ag@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import SpellCheckLanguagesDropdown from "../../../components/views/elements/SpellCheckLanguagesDropdown";
+import AccessibleButton from "../../../components/views/elements/AccessibleButton";
+import {_t} from "../../../languageHandler";
+
+interface ExistingSpellCheckLanguageIProps {
+    language: string,
+    onRemoved(language: string),
+}
+
+interface SpellCheckLanguagesIProps {
+    languages: Array<string>,
+    onLanguagesChange(languages: Array<string>),
+}
+
+interface SpellCheckLanguagesIState {
+    newLanguage: string,
+}
+
+export class ExistingSpellCheckLanguage extends React.Component<ExistingSpellCheckLanguageIProps> {
+    _onRemove = (e) => {
+        e.stopPropagation();
+        e.preventDefault();
+
+        return this.props.onRemoved(this.props.language);
+    };
+
+    render() {
+        return (
+            <div className="mx_ExistingSpellCheckLanguage">
+                <span className="mx_ExistingSpellCheckLanguage_language">{this.props.language}</span>
+                <AccessibleButton onClick={this._onRemove} kind="danger_sm">
+                    {_t("Remove")}
+                </AccessibleButton>
+            </div>
+        );
+    }
+}
+
+export default class SpellCheckLanguages extends React.Component<SpellCheckLanguagesIProps, SpellCheckLanguagesIState> {
+    constructor(props) {
+        super(props);
+        this.state = {
+            newLanguage: "",
+        }
+    }
+
+    _onRemoved = (language) => {
+        const languages = this.props.languages.filter((e) => e !== language);
+        this.props.onLanguagesChange(languages);
+    };
+
+    _onAddClick = (e) => {
+        e.stopPropagation();
+        e.preventDefault();
+
+        const language = this.state.newLanguage;
+
+        if (!language) return;
+        if (this.props.languages.includes(language)) return;
+
+        this.props.languages.push(language)
+        this.props.onLanguagesChange(this.props.languages);
+    };
+
+    _onNewLanguageChange = (language: string) => {
+        if (this.state.newLanguage === language) return;
+        this.setState({newLanguage: language});
+    };
+
+    render() {
+        const existingSpellCheckLanguages = this.props.languages.map((e) => {
+            return <ExistingSpellCheckLanguage language={e} onRemoved={this._onRemoved} key={e} />;
+        });
+
+        const addButton = (
+            <AccessibleButton onClick={this._onAddClick} kind="primary">
+                {_t("Add")}
+            </AccessibleButton>
+        );
+
+        return (
+            <div className="mx_SpellCheckLanguages">
+                {existingSpellCheckLanguages}
+                <form onSubmit={this._onAddClick} noValidate={true}>
+                    <SpellCheckLanguagesDropdown
+                        className="mx_GeneralUserSettingsTab_spellCheckLanguageInput"
+                        value={this.state.newLanguage}
+                        onOptionChange={this._onNewLanguageChange} />
+                    {addButton}
+                </form>
+            </div>
+        );
+    }
+}
diff --git a/src/components/views/settings/account/EmailAddresses.js b/src/components/views/settings/account/EmailAddresses.js
index ca66d5df65..a8de7693a9 100644
--- a/src/components/views/settings/account/EmailAddresses.js
+++ b/src/components/views/settings/account/EmailAddresses.js
@@ -178,19 +178,23 @@ export default class EmailAddresses extends React.Component {
         e.preventDefault();
 
         this.setState({continueDisabled: true});
-        this.state.addTask.checkEmailLinkClicked().then(() => {
-            const email = this.state.newEmailAddress;
+        this.state.addTask.checkEmailLinkClicked().then(([finished]) => {
+            let newEmailAddress = this.state.newEmailAddress;
+            if (finished) {
+                const email = this.state.newEmailAddress;
+                const emails = [
+                    ...this.props.emails,
+                    { address: email, medium: "email" },
+                ];
+                this.props.onEmailsChange(emails);
+                newEmailAddress = "";
+            }
             this.setState({
                 addTask: null,
                 continueDisabled: false,
                 verifying: false,
-                newEmailAddress: "",
+                newEmailAddress,
             });
-            const emails = [
-                ...this.props.emails,
-                { address: email, medium: "email" },
-            ];
-            this.props.onEmailsChange(emails);
         }).catch((err) => {
             this.setState({continueDisabled: false});
             const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
diff --git a/src/components/views/settings/account/PhoneNumbers.js b/src/components/views/settings/account/PhoneNumbers.js
index 02e995ac45..df54b5ca1f 100644
--- a/src/components/views/settings/account/PhoneNumbers.js
+++ b/src/components/views/settings/account/PhoneNumbers.js
@@ -177,21 +177,25 @@ export default class PhoneNumbers extends React.Component {
         this.setState({continueDisabled: true});
         const token = this.state.newPhoneNumberCode;
         const address = this.state.verifyMsisdn;
-        this.state.addTask.haveMsisdnToken(token).then(() => {
+        this.state.addTask.haveMsisdnToken(token).then(([finished]) => {
+            let newPhoneNumber = this.state.newPhoneNumber;
+            if (finished) {
+                const msisdns = [
+                    ...this.props.msisdns,
+                    { address, medium: "msisdn" },
+                ];
+                this.props.onMsisdnsChange(msisdns);
+                newPhoneNumber = "";
+            }
             this.setState({
                 addTask: null,
                 continueDisabled: false,
                 verifying: false,
                 verifyMsisdn: "",
                 verifyError: null,
-                newPhoneNumber: "",
+                newPhoneNumber,
                 newPhoneNumberCode: "",
             });
-            const msisdns = [
-                ...this.props.msisdns,
-                { address, medium: "msisdn" },
-            ];
-            this.props.onMsisdnsChange(msisdns);
         }).catch((err) => {
             this.setState({continueDisabled: false});
             if (err.errcode !== 'M_THREEPID_AUTH_FAILED') {
diff --git a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js
index 0a0c693158..f72e78fa3f 100644
--- a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js
@@ -25,6 +25,7 @@ import QuestionDialog from "../../../dialogs/QuestionDialog";
 import StyledRadioGroup from '../../../elements/StyledRadioGroup';
 import {SettingLevel} from "../../../../../settings/SettingLevel";
 import SettingsStore from "../../../../../settings/SettingsStore";
+import {UIFeature} from "../../../../../settings/UIFeature";
 
 export default class SecurityRoomSettingsTab extends React.Component {
     static propTypes = {
@@ -350,6 +351,16 @@ export default class SecurityRoomSettingsTab extends React.Component {
             />;
         }
 
+        let historySection = (<>
+            <span className='mx_SettingsTab_subheading'>{_t("Who can read history?")}</span>
+            <div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
+                {this._renderHistory()}
+            </div>
+        </>);
+        if (!SettingsStore.getValue(UIFeature.RoomHistorySettings)) {
+            historySection = null;
+        }
+
         return (
             <div className="mx_SettingsTab mx_SecurityRoomSettingsTab">
                 <div className="mx_SettingsTab_heading">{_t("Security & Privacy")}</div>
@@ -371,10 +382,7 @@ export default class SecurityRoomSettingsTab extends React.Component {
                     {this._renderRoomAccess()}
                 </div>
 
-                <span className='mx_SettingsTab_subheading'>{_t("Who can read history?")}</span>
-                <div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
-                    {this._renderHistory()}
-                </div>
+                {historySection}
             </div>
         );
     }
diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
index 9f9acd8e3c..80a20d8afa 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
@@ -28,15 +28,14 @@ import { FontWatcher } from "../../../../../settings/watchers/FontWatcher";
 import { RecheckThemePayload } from '../../../../../dispatcher/payloads/RecheckThemePayload';
 import { Action } from '../../../../../dispatcher/actions';
 import { IValidationResult, IFieldState } from '../../../elements/Validation';
-import StyledRadioButton from '../../../elements/StyledRadioButton';
 import StyledCheckbox from '../../../elements/StyledCheckbox';
 import SettingsFlag from '../../../elements/SettingsFlag';
 import Field from '../../../elements/Field';
 import EventTilePreview from '../../../elements/EventTilePreview';
 import StyledRadioGroup from "../../../elements/StyledRadioGroup";
-import classNames from 'classnames';
 import { SettingLevel } from "../../../../../settings/SettingLevel";
 import {UIFeature} from "../../../../../settings/UIFeature";
+import {Layout} from "../../../../../settings/Layout";
 
 interface IProps {
 }
@@ -62,7 +61,7 @@ interface IState extends IThemeState {
     useSystemFont: boolean;
     systemFont: string;
     showAdvanced: boolean;
-    useIRCLayout: boolean;
+    layout: Layout;
 }
 
 
@@ -83,7 +82,7 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
             useSystemFont: SettingsStore.getValue("useSystemFont"),
             systemFont: SettingsStore.getValue("systemFont"),
             showAdvanced: false,
-            useIRCLayout: SettingsStore.getValue("useIRCLayout"),
+            layout: SettingsStore.getValue("layout"),
         };
     }
 
@@ -213,15 +212,15 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
         this.setState({customThemeUrl: e.target.value});
     };
 
-    private onLayoutChange = (e: React.ChangeEvent<HTMLInputElement>): void => {
-        const val = e.target.value === "true";
-
-        this.setState({
-            useIRCLayout: val,
-        });
-
-        SettingsStore.setValue("useIRCLayout", null, SettingLevel.DEVICE, val);
-    };
+    private onIRCLayoutChange = (enabled: boolean) => {
+        if (enabled) {
+            this.setState({layout: Layout.IRC});
+            SettingsStore.setValue("layout", null, SettingLevel.DEVICE, Layout.IRC);
+        } else {
+            this.setState({layout: Layout.Group});
+            SettingsStore.setValue("layout", null, SettingLevel.DEVICE, Layout.Group);
+        }
+    }
 
     private renderThemeSection() {
         const themeWatcher = new ThemeWatcher();
@@ -306,7 +305,7 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
             <EventTilePreview
                 className="mx_AppearanceUserSettingsTab_fontSlider_preview"
                 message={this.MESSAGE_PREVIEW_TEXT}
-                useIRCLayout={this.state.useIRCLayout}
+                layout={this.state.layout}
             />
             <div className="mx_AppearanceUserSettingsTab_fontSlider">
                 <div className="mx_AppearanceUserSettingsTab_fontSlider_smallText">Aa</div>
@@ -342,50 +341,6 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
         </div>;
     }
 
-    private renderLayoutSection = () => {
-        return <div className="mx_SettingsTab_section mx_AppearanceUserSettingsTab_Layout">
-            <span className="mx_SettingsTab_subheading">{_t("Message layout")}</span>
-
-            <div className="mx_AppearanceUserSettingsTab_Layout_RadioButtons">
-                <div className={classNames("mx_AppearanceUserSettingsTab_Layout_RadioButton", {
-                    mx_AppearanceUserSettingsTab_Layout_RadioButton_selected: this.state.useIRCLayout,
-                })}>
-                    <EventTilePreview
-                        className="mx_AppearanceUserSettingsTab_Layout_RadioButton_preview"
-                        message={this.MESSAGE_PREVIEW_TEXT}
-                        useIRCLayout={true}
-                    />
-                    <StyledRadioButton
-                        name="layout"
-                        value="true"
-                        checked={this.state.useIRCLayout}
-                        onChange={this.onLayoutChange}
-                    >
-                        {_t("Compact")}
-                    </StyledRadioButton>
-                </div>
-                <div className="mx_AppearanceUserSettingsTab_spacer" />
-                <div className={classNames("mx_AppearanceUserSettingsTab_Layout_RadioButton", {
-                    mx_AppearanceUserSettingsTab_Layout_RadioButton_selected: !this.state.useIRCLayout,
-                })}>
-                    <EventTilePreview
-                        className="mx_AppearanceUserSettingsTab_Layout_RadioButton_preview"
-                        message={this.MESSAGE_PREVIEW_TEXT}
-                        useIRCLayout={false}
-                    />
-                    <StyledRadioButton
-                        name="layout"
-                        value="false"
-                        checked={!this.state.useIRCLayout}
-                        onChange={this.onLayoutChange}
-                    >
-                        {_t("Modern")}
-                    </StyledRadioButton>
-                </div>
-            </div>
-        </div>;
-    };
-
     private renderAdvancedSection() {
         if (!SettingsStore.getValue(UIFeature.AdvancedSettings)) return null;
 
@@ -394,7 +349,7 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
             className="mx_AppearanceUserSettingsTab_AdvancedToggle"
             onClick={() => this.setState({showAdvanced: !this.state.showAdvanced})}
         >
-            {this.state.showAdvanced ? "Hide advanced" : "Show advanced"}
+            {this.state.showAdvanced ? _t("Hide advanced") : _t("Show advanced")}
         </div>;
 
         let advanced: React.ReactNode;
@@ -409,14 +364,15 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
                     name="useCompactLayout"
                     level={SettingLevel.DEVICE}
                     useCheckbox={true}
-                    disabled={this.state.useIRCLayout}
-                />
-                <SettingsFlag
-                    name="useIRCLayout"
-                    level={SettingLevel.DEVICE}
-                    useCheckbox={true}
-                    onChange={(checked) => this.setState({useIRCLayout: checked})}
+                    disabled={this.state.layout == Layout.IRC}
                 />
+                <StyledCheckbox
+                    checked={this.state.layout == Layout.IRC}
+                    onChange={(ev) => this.onIRCLayoutChange(ev.target.checked)}
+                >
+                    {_t("Enable experimental, compact IRC style layout")}
+                </StyledCheckbox>
+
                 <SettingsFlag
                     name="useSystemFont"
                     level={SettingLevel.DEVICE}
diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index 35285351ab..b17ab18c39 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -22,6 +22,7 @@ import ProfileSettings from "../../ProfileSettings";
 import * as languageHandler from "../../../../../languageHandler";
 import SettingsStore from "../../../../../settings/SettingsStore";
 import LanguageDropdown from "../../../elements/LanguageDropdown";
+import SpellCheckSettings from "../../SpellCheckSettings";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import DeactivateAccountDialog from "../../../dialogs/DeactivateAccountDialog";
 import PropTypes from "prop-types";
@@ -49,6 +50,7 @@ export default class GeneralUserSettingsTab extends React.Component {
 
         this.state = {
             language: languageHandler.getCurrentLanguage(),
+            spellCheckLanguages: [],
             haveIdServer: Boolean(MatrixClientPeg.get().getIdentityServerUrl()),
             serverSupportsSeparateAddAndBind: null,
             idServerHasUnsignedTerms: false,
@@ -85,6 +87,15 @@ export default class GeneralUserSettingsTab extends React.Component {
         this._getThreepidState();
     }
 
+    async componentDidMount() {
+        const plaf = PlatformPeg.get();
+        if (plaf) {
+            this.setState({
+                spellCheckLanguages: await plaf.getSpellCheckLanguages(),
+            });
+        }
+    }
+
     componentWillUnmount() {
         dis.unregister(this.dispatcherRef);
     }
@@ -182,6 +193,15 @@ export default class GeneralUserSettingsTab extends React.Component {
         PlatformPeg.get().reload();
     };
 
+    _onSpellCheckLanguagesChange = (languages) => {
+        this.setState({spellCheckLanguages: languages});
+
+        const plaf = PlatformPeg.get();
+        if (plaf) {
+            plaf.setSpellCheckLanguages(languages);
+        }
+    };
+
     _onPasswordChangeError = (err) => {
         // TODO: Figure out a design that doesn't involve replacing the current dialog
         let errMsg = err.error || "";
@@ -303,6 +323,16 @@ export default class GeneralUserSettingsTab extends React.Component {
         );
     }
 
+    _renderSpellCheckSection() {
+        return (
+            <div className="mx_SettingsTab_section">
+                <span className="mx_SettingsTab_subheading">{_t("Spell check dictionaries")}</span>
+                <SpellCheckSettings languages={this.state.spellCheckLanguages}
+                                    onLanguagesChange={this._onSpellCheckLanguagesChange} />
+            </div>
+        );
+    }
+
     _renderDiscoverySection() {
         const SetIdServer = sdk.getComponent("views.settings.SetIdServer");
 
@@ -381,6 +411,9 @@ export default class GeneralUserSettingsTab extends React.Component {
     }
 
     render() {
+        const plaf = PlatformPeg.get();
+        const supportsMultiLanguageSpellCheck = plaf.supportsMultiLanguageSpellCheck();
+
         const discoWarning = this.state.requiredPolicyInfo.hasTerms
             ? <img className='mx_GeneralUserSettingsTab_warningIcon'
                 src={require("../../../../../../res/img/feather-customised/warning-triangle.svg")}
@@ -409,6 +442,7 @@ export default class GeneralUserSettingsTab extends React.Component {
                 {this._renderProfileSection()}
                 {this._renderAccountSection()}
                 {this._renderLanguageSection()}
+                {supportsMultiLanguageSpellCheck ? this._renderSpellCheckSection() : null}
                 { discoverySection }
                 {this._renderIntegrationManagerSection() /* Has its own title */}
                 { accountManagementSection }
diff --git a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
index eba5c6586d..91bc9abcad 100644
--- a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
@@ -67,7 +67,6 @@ export default class LabsUserSettingsTab extends React.Component {
                     <SettingsFlag name={"enableWidgetScreenshots"} level={SettingLevel.ACCOUNT} />
                     <SettingsFlag name={"showHiddenEventsInTimeline"} level={SettingLevel.DEVICE} />
                     <SettingsFlag name={"lowBandwidth"} level={SettingLevel.DEVICE} />
-                    <SettingsFlag name={"sendReadReceipts"} level={SettingLevel.ACCOUNT} />
                     <SettingsFlag name={"advancedRoomListLogging"} level={SettingLevel.DEVICE} />
                 </div>
             </div>
diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
index bba337ee85..ae9cad4cfa 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
@@ -33,6 +33,8 @@ export default class PreferencesUserSettingsTab extends React.Component {
         'MessageComposerInput.autoReplaceEmoji',
         'MessageComposerInput.suggestEmoji',
         'sendTypingNotifications',
+        'MessageComposerInput.ctrlEnterToSend',
+        'MessageComposerInput.showStickersButton',
     ];
 
     static TIMELINE_SETTINGS = [
@@ -45,11 +47,16 @@ export default class PreferencesUserSettingsTab extends React.Component {
         'alwaysShowTimestamps',
         'showRedactions',
         'enableSyntaxHighlightLanguageDetection',
+        'expandCodeByDefault',
+        'scrollToBottomOnMessageSent',
+        'showCodeLineNumbers',
         'showJoinLeaves',
         'showAvatarChanges',
         'showDisplaynameChanges',
         'showImages',
+        'showChatEffects',
         'Pill.shouldShowPillAvatar',
+        'ctrlFForSearch',
     ];
 
     static GENERAL_SETTINGS = [
diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
index 61402e8881..a0d9016ce2 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@@ -33,6 +33,7 @@ import SecureBackupPanel from "../../SecureBackupPanel";
 import SettingsStore from "../../../../../settings/SettingsStore";
 import {UIFeature} from "../../../../../settings/UIFeature";
 import {isE2eAdvancedPanelPossible} from "../../E2eAdvancedPanel";
+import CountlyAnalytics from "../../../../../CountlyAnalytics";
 
 export class IgnoredUser extends React.Component {
     static propTypes = {
@@ -102,6 +103,7 @@ export default class SecurityUserSettingsTab extends React.Component {
 
     _updateAnalytics = (checked) => {
         checked ? Analytics.enable() : Analytics.disable();
+        CountlyAnalytics.instance.enable(/* anonymous = */ !checked);
     };
 
     _onExportE2eKeysClicked = () => {
@@ -339,7 +341,7 @@ export default class SecurityUserSettingsTab extends React.Component {
         }
 
         let privacySection;
-        if (Analytics.canEnable()) {
+        if (Analytics.canEnable() || CountlyAnalytics.instance.canEnable()) {
             privacySection = <React.Fragment>
                 <div className="mx_SettingsTab_heading">{_t("Privacy")}</div>
                 <div className="mx_SettingsTab_section">
diff --git a/src/components/views/spaces/SpaceBasicSettings.tsx b/src/components/views/spaces/SpaceBasicSettings.tsx
new file mode 100644
index 0000000000..bc378ab956
--- /dev/null
+++ b/src/components/views/spaces/SpaceBasicSettings.tsx
@@ -0,0 +1,120 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, {useRef, useState} from "react";
+
+import {_t} from "../../../languageHandler";
+import AccessibleButton from "../elements/AccessibleButton";
+import Field from "../elements/Field";
+
+interface IProps {
+    avatarUrl?: string;
+    avatarDisabled?: boolean;
+    name?: string,
+    nameDisabled?: boolean;
+    topic?: string;
+    topicDisabled?: boolean;
+    setAvatar(avatar: File): void;
+    setName(name: string): void;
+    setTopic(topic: string): void;
+}
+
+const SpaceBasicSettings = ({
+    avatarUrl,
+    avatarDisabled = false,
+    setAvatar,
+    name = "",
+    nameDisabled = false,
+    setName,
+    topic = "",
+    topicDisabled = false,
+    setTopic,
+}: IProps) => {
+    const avatarUploadRef = useRef<HTMLInputElement>();
+    const [avatar, setAvatarDataUrl] = useState(avatarUrl); // avatar data url cache
+
+    let avatarSection;
+    if (avatarDisabled) {
+        if (avatar) {
+            avatarSection = <img className="mx_SpaceBasicSettings_avatar" src={avatar} alt="" />;
+        } else {
+            avatarSection = <div className="mx_SpaceBasicSettings_avatar" />;
+        }
+    } else {
+        if (avatar) {
+            avatarSection = <React.Fragment>
+                <AccessibleButton
+                    className="mx_SpaceBasicSettings_avatar"
+                    onClick={() => avatarUploadRef.current?.click()}
+                    element="img"
+                    src={avatar}
+                    alt=""
+                />
+                <AccessibleButton onClick={() => {
+                    avatarUploadRef.current.value = "";
+                    setAvatarDataUrl(undefined);
+                    setAvatar(undefined);
+                }} kind="link" className="mx_SpaceBasicSettings_avatar_remove">
+                    { _t("Delete") }
+                </AccessibleButton>
+            </React.Fragment>;
+        } else {
+            avatarSection = <React.Fragment>
+                <div className="mx_SpaceBasicSettings_avatar" onClick={() => avatarUploadRef.current?.click()} />
+                <AccessibleButton onClick={() => avatarUploadRef.current?.click()} kind="link">
+                    { _t("Upload") }
+                </AccessibleButton>
+            </React.Fragment>;
+        }
+    }
+
+    return <div className="mx_SpaceBasicSettings">
+        <div className="mx_SpaceBasicSettings_avatarContainer">
+            { avatarSection }
+            <input type="file" ref={avatarUploadRef} onChange={(e) => {
+                if (!e.target.files?.length) return;
+                const file = e.target.files[0];
+                setAvatar(file);
+                const reader = new FileReader();
+                reader.onload = (ev) => {
+                    setAvatarDataUrl(ev.target.result as string);
+                };
+                reader.readAsDataURL(file);
+            }} accept="image/*" />
+        </div>
+
+        <Field
+            name="spaceName"
+            label={_t("Name")}
+            autoFocus={true}
+            value={name}
+            onChange={ev => setName(ev.target.value)}
+            disabled={nameDisabled}
+        />
+
+        <Field
+            name="spaceTopic"
+            element="textarea"
+            label={_t("Description")}
+            value={topic}
+            onChange={ev => setTopic(ev.target.value)}
+            rows={3}
+            disabled={topicDisabled}
+        />
+    </div>;
+};
+
+export default SpaceBasicSettings;
diff --git a/src/components/views/spaces/SpaceCreateMenu.tsx b/src/components/views/spaces/SpaceCreateMenu.tsx
new file mode 100644
index 0000000000..9d0543a6c5
--- /dev/null
+++ b/src/components/views/spaces/SpaceCreateMenu.tsx
@@ -0,0 +1,175 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, {useContext, useState} from "react";
+import classNames from "classnames";
+import {EventType, RoomType, RoomCreateTypeField} from "matrix-js-sdk/src/@types/event";
+
+import {_t} from "../../../languageHandler";
+import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
+import {ChevronFace, ContextMenu} from "../../structures/ContextMenu";
+import FormButton from "../elements/FormButton";
+import createRoom, {IStateEvent, Preset} from "../../../createRoom";
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import SpaceBasicSettings from "./SpaceBasicSettings";
+import AccessibleButton from "../elements/AccessibleButton";
+import FocusLock from "react-focus-lock";
+
+const SpaceCreateMenuType = ({ title, description, className, onClick }) => {
+    return (
+        <AccessibleButton className={classNames("mx_SpaceCreateMenuType", className)} onClick={onClick}>
+            <h3>{ title }</h3>
+            <span>{ description }</span>
+        </AccessibleButton>
+    );
+};
+
+enum Visibility {
+    Public,
+    Private,
+}
+
+const SpaceCreateMenu = ({ onFinished }) => {
+    const cli = useContext(MatrixClientContext);
+    const [visibility, setVisibility] = useState<Visibility>(null);
+    const [name, setName] = useState("");
+    const [avatar, setAvatar] = useState<File>(null);
+    const [topic, setTopic] = useState<string>("");
+    const [busy, setBusy] = useState<boolean>(false);
+
+    const onSpaceCreateClick = async () => {
+        if (busy) return;
+        setBusy(true);
+        const initialState: IStateEvent[] = [
+            {
+                type: EventType.RoomHistoryVisibility,
+                content: {
+                    "history_visibility": visibility === Visibility.Public ? "world_readable" : "invited",
+                },
+            },
+        ];
+        if (avatar) {
+            const url = await cli.uploadContent(avatar);
+
+            initialState.push({
+                type: EventType.RoomAvatar,
+                content: { url },
+            });
+        }
+        if (topic) {
+            initialState.push({
+                type: EventType.RoomTopic,
+                content: { topic },
+            });
+        }
+
+        try {
+            await createRoom({
+                createOpts: {
+                    preset: visibility === Visibility.Public ? Preset.PublicChat : Preset.PrivateChat,
+                    name,
+                    creation_content: {
+                        // Based on MSC1840
+                        [RoomCreateTypeField]: RoomType.Space,
+                    },
+                    initial_state: initialState,
+                    power_level_content_override: {
+                        // Only allow Admins to write to the timeline to prevent hidden sync spam
+                        events_default: 100,
+                    },
+                },
+                spinner: false,
+                encryption: false,
+                andView: true,
+                inlineErrors: true,
+            });
+
+            onFinished();
+        } catch (e) {
+            console.error(e);
+        }
+    };
+
+    let body;
+    if (visibility === null) {
+        body = <React.Fragment>
+            <h2>{ _t("Create a space") }</h2>
+            <p>{ _t("Organise rooms into spaces, for just you or anyone") }</p>
+
+            <SpaceCreateMenuType
+                title={_t("Public")}
+                description={_t("Open space for anyone, best for communities")}
+                className="mx_SpaceCreateMenuType_public"
+                onClick={() => setVisibility(Visibility.Public)}
+            />
+            <SpaceCreateMenuType
+                title={_t("Private")}
+                description={_t("Invite only space, best for yourself or teams")}
+                className="mx_SpaceCreateMenuType_private"
+                onClick={() => setVisibility(Visibility.Private)}
+            />
+
+            {/*<p>{ _t("Looking to join an existing space?") }</p>*/}
+        </React.Fragment>;
+    } else {
+        body = <React.Fragment>
+            <AccessibleTooltipButton
+                className="mx_SpaceCreateMenu_back"
+                onClick={() => setVisibility(null)}
+                title={_t("Go back")}
+            />
+
+            <h2>
+                {
+                    visibility === Visibility.Public
+                        ? _t("Personalise your public space")
+                        : _t("Personalise your private space")
+                }
+            </h2>
+            <p>
+                {
+                    _t("Give it a photo, name and description to help you identify it.")
+                } {
+                    _t("You can change these at any point.")
+                }
+            </p>
+
+            <SpaceBasicSettings setAvatar={setAvatar} name={name} setName={setName} topic={topic} setTopic={setTopic} />
+
+            <FormButton
+                label={busy ? _t("Creating...") : _t("Create")}
+                onClick={onSpaceCreateClick}
+                disabled={!name && !busy}
+            />
+        </React.Fragment>;
+    }
+
+    return <ContextMenu
+        left={72}
+        top={62}
+        chevronOffset={0}
+        chevronFace={ChevronFace.None}
+        onFinished={onFinished}
+        wrapperClassName="mx_SpaceCreateMenu_wrapper"
+        managed={false}
+    >
+        <FocusLock returnFocus={true}>
+            { body }
+        </FocusLock>
+    </ContextMenu>;
+}
+
+export default SpaceCreateMenu;
diff --git a/src/components/views/spaces/SpacePanel.tsx b/src/components/views/spaces/SpacePanel.tsx
new file mode 100644
index 0000000000..48e2c86b2c
--- /dev/null
+++ b/src/components/views/spaces/SpacePanel.tsx
@@ -0,0 +1,238 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, {useState} from "react";
+import classNames from "classnames";
+import {Room} from "matrix-js-sdk/src/models/room";
+
+import {_t} from "../../../languageHandler";
+import RoomAvatar from "../avatars/RoomAvatar";
+import {useContextMenu} from "../../structures/ContextMenu";
+import SpaceCreateMenu from "./SpaceCreateMenu";
+import {SpaceItem} from "./SpaceTreeLevel";
+import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
+import {useEventEmitter} from "../../../hooks/useEventEmitter";
+import SpaceStore, {HOME_SPACE, UPDATE_SELECTED_SPACE, UPDATE_TOP_LEVEL_SPACES} from "../../../stores/SpaceStore";
+import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
+import {SpaceNotificationState} from "../../../stores/notifications/SpaceNotificationState";
+import NotificationBadge from "../rooms/NotificationBadge";
+import {
+    RovingAccessibleButton,
+    RovingAccessibleTooltipButton,
+    RovingTabIndexProvider,
+} from "../../../accessibility/RovingTabIndex";
+import {Key} from "../../../Keyboard";
+
+interface IButtonProps {
+    space?: Room;
+    className?: string;
+    selected?: boolean;
+    tooltip?: string;
+    notificationState?: SpaceNotificationState;
+    isNarrow?: boolean;
+    onClick(): void;
+}
+
+const SpaceButton: React.FC<IButtonProps> = ({
+    space,
+    className,
+    selected,
+    onClick,
+    tooltip,
+    notificationState,
+    isNarrow,
+    children,
+}) => {
+    const classes = classNames("mx_SpaceButton", className, {
+        mx_SpaceButton_active: selected,
+        mx_SpaceButton_narrow: isNarrow,
+    });
+
+    let avatar = <div className="mx_SpaceButton_avatarPlaceholder"><div className="mx_SpaceButton_icon" /></div>;
+    if (space) {
+        avatar = <RoomAvatar width={32} height={32} room={space} />;
+    }
+
+    let notifBadge;
+    if (notificationState) {
+        notifBadge = <div className="mx_SpacePanel_badgeContainer">
+            <NotificationBadge forceCount={false} notification={notificationState} />
+        </div>;
+    }
+
+    let button;
+    if (isNarrow) {
+        button = (
+            <RovingAccessibleTooltipButton className={classes} title={tooltip} onClick={onClick} role="treeitem">
+                <div className="mx_SpaceButton_selectionWrapper">
+                    { avatar }
+                    { notifBadge }
+                    { children }
+                </div>
+            </RovingAccessibleTooltipButton>
+        );
+    } else {
+        button = (
+            <RovingAccessibleButton className={classes} onClick={onClick} role="treeitem">
+                <div className="mx_SpaceButton_selectionWrapper">
+                    { avatar }
+                    <span className="mx_SpaceButton_name">{ tooltip }</span>
+                    { notifBadge }
+                    { children }
+                </div>
+            </RovingAccessibleButton>
+        );
+    }
+
+    return <li className={classNames({
+        "mx_SpaceItem": true,
+        "collapsed": isNarrow,
+    })}>
+        { button }
+    </li>;
+}
+
+const useSpaces = (): [Room[], Room | null] => {
+    const [spaces, setSpaces] = useState<Room[]>(SpaceStore.instance.spacePanelSpaces);
+    useEventEmitter(SpaceStore.instance, UPDATE_TOP_LEVEL_SPACES, setSpaces);
+    const [activeSpace, setActiveSpace] = useState<Room>(SpaceStore.instance.activeSpace);
+    useEventEmitter(SpaceStore.instance, UPDATE_SELECTED_SPACE, setActiveSpace);
+    return [spaces, activeSpace];
+};
+
+const SpacePanel = () => {
+    // We don't need the handle as we position the menu in a constant location
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const [menuDisplayed, handle, openMenu, closeMenu] = useContextMenu<void>();
+    const [spaces, activeSpace] = useSpaces();
+    const [isPanelCollapsed, setPanelCollapsed] = useState(true);
+
+    const newClasses = classNames("mx_SpaceButton_new", {
+        mx_SpaceButton_newCancel: menuDisplayed,
+    });
+
+    let contextMenu = null;
+    if (menuDisplayed) {
+        contextMenu = <SpaceCreateMenu onFinished={closeMenu} />;
+    }
+
+    const onKeyDown = (ev: React.KeyboardEvent) => {
+        let handled = true;
+
+        switch (ev.key) {
+            case Key.ARROW_UP:
+                onMoveFocus(ev.target as Element, true);
+                break;
+            case Key.ARROW_DOWN:
+                onMoveFocus(ev.target as Element, false);
+                break;
+            default:
+                handled = false;
+        }
+
+        if (handled) {
+            // consume all other keys in context menu
+            ev.stopPropagation();
+            ev.preventDefault();
+        }
+    };
+
+    const onMoveFocus = (element: Element, up: boolean) => {
+        let descending = false; // are we currently descending or ascending through the DOM tree?
+        let classes: DOMTokenList;
+
+        do {
+            const child = up ? element.lastElementChild : element.firstElementChild;
+            const sibling = up ? element.previousElementSibling : element.nextElementSibling;
+
+            if (descending) {
+                if (child) {
+                    element = child;
+                } else if (sibling) {
+                    element = sibling;
+                } else {
+                    descending = false;
+                    element = element.parentElement;
+                }
+            } else {
+                if (sibling) {
+                    element = sibling;
+                    descending = true;
+                } else {
+                    element = element.parentElement;
+                }
+            }
+
+            if (element) {
+                if (element.classList.contains("mx_ContextualMenu")) { // we hit the top
+                    element = up ? element.lastElementChild : element.firstElementChild;
+                    descending = true;
+                }
+                classes = element.classList;
+            }
+        } while (element && !classes.contains("mx_SpaceButton"));
+
+        if (element) {
+            (element as HTMLElement).focus();
+        }
+    };
+
+    const activeSpaces = activeSpace ? [activeSpace] : [];
+    const expandCollapseButtonTitle = isPanelCollapsed ? _t("Expand space panel") : _t("Collapse space panel");
+    // TODO drag and drop for re-arranging order
+    return <RovingTabIndexProvider handleHomeEnd={true} onKeyDown={onKeyDown}>
+        {({onKeyDownHandler}) => (
+            <ul
+                className={classNames("mx_SpacePanel", { collapsed: isPanelCollapsed })}
+                onKeyDown={onKeyDownHandler}
+            >
+                <AutoHideScrollbar className="mx_SpacePanel_spaceTreeWrapper">
+                    <div className="mx_SpaceTreeLevel">
+                        <SpaceButton
+                            className="mx_SpaceButton_home"
+                            onClick={() => SpaceStore.instance.setActiveSpace(null)}
+                            selected={!activeSpace}
+                            tooltip={_t("Home")}
+                            notificationState={SpaceStore.instance.getNotificationState(HOME_SPACE)}
+                            isNarrow={isPanelCollapsed}
+                        />
+                        { spaces.map(s => <SpaceItem
+                            key={s.roomId}
+                            space={s}
+                            activeSpaces={activeSpaces}
+                            isPanelCollapsed={isPanelCollapsed}
+                            onExpand={() => setPanelCollapsed(false)}
+                        />) }
+                    </div>
+                    <SpaceButton
+                        className={newClasses}
+                        tooltip={menuDisplayed ? _t("Cancel") : _t("Create a space")}
+                        onClick={menuDisplayed ? closeMenu : openMenu}
+                        isNarrow={isPanelCollapsed}
+                    />
+                </AutoHideScrollbar>
+                <AccessibleTooltipButton
+                    className={classNames("mx_SpacePanel_toggleCollapse", {expanded: !isPanelCollapsed})}
+                    onClick={evt => setPanelCollapsed(!isPanelCollapsed)}
+                    title={expandCollapseButtonTitle}
+                />
+                { contextMenu }
+            </ul>
+        )}
+    </RovingTabIndexProvider>
+};
+
+export default SpacePanel;
diff --git a/src/components/views/spaces/SpacePublicShare.tsx b/src/components/views/spaces/SpacePublicShare.tsx
new file mode 100644
index 0000000000..3930c1db16
--- /dev/null
+++ b/src/components/views/spaces/SpacePublicShare.tsx
@@ -0,0 +1,65 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, {useState} from "react";
+import {Room} from "matrix-js-sdk/src/models/room";
+
+import {_t} from "../../../languageHandler";
+import AccessibleButton from "../elements/AccessibleButton";
+import {copyPlaintext} from "../../../utils/strings";
+import {sleep} from "../../../utils/promise";
+import {RoomPermalinkCreator} from "../../../utils/permalinks/Permalinks";
+import {showRoomInviteDialog} from "../../../RoomInvite";
+
+interface IProps {
+    space: Room;
+    onFinished(): void;
+}
+
+const SpacePublicShare = ({ space, onFinished }: IProps) => {
+    const [copiedText, setCopiedText] = useState(_t("Click to copy"));
+
+    return <div className="mx_SpacePublicShare">
+        <AccessibleButton
+            className="mx_SpacePublicShare_shareButton"
+            onClick={async () => {
+                const permalinkCreator = new RoomPermalinkCreator(space);
+                permalinkCreator.load();
+                const success = await copyPlaintext(permalinkCreator.forRoom());
+                const text = success ? _t("Copied!") : _t("Failed to copy");
+                setCopiedText(text);
+                await sleep(10);
+                if (copiedText === text) { // if the text hasn't changed by another click then clear it after some time
+                    setCopiedText(_t("Click to copy"));
+                }
+            }}
+        >
+            { _t("Share invite link") }
+            <span>{ copiedText }</span>
+        </AccessibleButton>
+        <AccessibleButton
+            className="mx_SpacePublicShare_inviteButton"
+            onClick={() => {
+                showRoomInviteDialog(space.roomId);
+                onFinished();
+            }}
+        >
+            { _t("Invite by email or username") }
+        </AccessibleButton>
+    </div>;
+};
+
+export default SpacePublicShare;
diff --git a/src/components/views/spaces/SpaceTreeLevel.tsx b/src/components/views/spaces/SpaceTreeLevel.tsx
new file mode 100644
index 0000000000..04d6c02208
--- /dev/null
+++ b/src/components/views/spaces/SpaceTreeLevel.tsx
@@ -0,0 +1,405 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from "react";
+import classNames from "classnames";
+import {Room} from "matrix-js-sdk/src/models/room";
+
+import RoomAvatar from "../avatars/RoomAvatar";
+import SpaceStore from "../../../stores/SpaceStore";
+import NotificationBadge from "../rooms/NotificationBadge";
+import {RovingAccessibleButton} from "../../../accessibility/roving/RovingAccessibleButton";
+import {RovingAccessibleTooltipButton} from "../../../accessibility/roving/RovingAccessibleTooltipButton";
+import IconizedContextMenu, {
+    IconizedContextMenuOption,
+    IconizedContextMenuOptionList,
+} from "../context_menus/IconizedContextMenu";
+import {_t} from "../../../languageHandler";
+import {ContextMenuTooltipButton} from "../../../accessibility/context_menu/ContextMenuTooltipButton";
+import {toRightOf} from "../../structures/ContextMenu";
+import {shouldShowSpaceSettings, showCreateNewRoom, showSpaceSettings} from "../../../utils/space";
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import {ButtonEvent} from "../elements/AccessibleButton";
+import defaultDispatcher from "../../../dispatcher/dispatcher";
+import Modal from "../../../Modal";
+import SpacePublicShare from "./SpacePublicShare";
+import {Action} from "../../../dispatcher/actions";
+import RoomViewStore from "../../../stores/RoomViewStore";
+import {SetRightPanelPhasePayload} from "../../../dispatcher/payloads/SetRightPanelPhasePayload";
+import {RightPanelPhases} from "../../../stores/RightPanelStorePhases";
+import {showRoomInviteDialog} from "../../../RoomInvite";
+import InfoDialog from "../dialogs/InfoDialog";
+import {EventType} from "matrix-js-sdk/src/@types/event";
+import SpaceRoomDirectory from "../../structures/SpaceRoomDirectory";
+
+interface IItemProps {
+    space?: Room;
+    activeSpaces: Room[];
+    isNested?: boolean;
+    isPanelCollapsed?: boolean;
+    onExpand?: Function;
+}
+
+interface IItemState {
+    collapsed: boolean;
+    contextMenuPosition: Pick<DOMRect, "right" | "top" | "height">;
+}
+
+export class SpaceItem extends React.PureComponent<IItemProps, IItemState> {
+    static contextType = MatrixClientContext;
+
+    constructor(props) {
+        super(props);
+
+        this.state = {
+            collapsed: !props.isNested,   // default to collapsed for root items
+            contextMenuPosition: null,
+        };
+    }
+
+    private toggleCollapse(evt) {
+        if (this.props.onExpand && this.state.collapsed) {
+            this.props.onExpand();
+        }
+        this.setState({collapsed: !this.state.collapsed});
+        // don't bubble up so encapsulating button for space
+        // doesn't get triggered
+        evt.stopPropagation();
+    }
+
+    private onContextMenu = (ev: React.MouseEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+        this.setState({
+            contextMenuPosition: {
+                right: ev.clientX,
+                top: ev.clientY,
+                height: 0,
+            },
+        });
+    }
+
+    private onClick = (ev: React.MouseEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+        SpaceStore.instance.setActiveSpace(this.props.space);
+    };
+
+    private onMenuOpenClick = (ev: React.MouseEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+        const target = ev.target as HTMLButtonElement;
+        this.setState({contextMenuPosition: target.getBoundingClientRect()});
+    };
+
+    private onMenuClose = () => {
+        this.setState({contextMenuPosition: null});
+    };
+
+    private onHomeClick = (ev: ButtonEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        defaultDispatcher.dispatch({
+            action: "view_room",
+            room_id: this.props.space.roomId,
+        });
+        this.setState({contextMenuPosition: null}); // also close the menu
+    };
+
+    private onInviteClick = (ev: ButtonEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        if (this.props.space.getJoinRule() === "public") {
+            const modal = Modal.createTrackedDialog("Space Invite", "User Menu", InfoDialog, {
+                title: _t("Invite members"),
+                description: <React.Fragment>
+                    <span>{ _t("Share your public space") }</span>
+                    <SpacePublicShare space={this.props.space} onFinished={() => modal.close()} />
+                </React.Fragment>,
+                fixedWidth: false,
+                button: false,
+                className: "mx_SpacePanel_sharePublicSpace",
+                hasCloseButton: true,
+            });
+        } else {
+            showRoomInviteDialog(this.props.space.roomId);
+        }
+        this.setState({contextMenuPosition: null}); // also close the menu
+    };
+
+    private onSettingsClick = (ev: ButtonEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        showSpaceSettings(this.context, this.props.space);
+        this.setState({contextMenuPosition: null}); // also close the menu
+    };
+
+    private onLeaveClick = (ev: ButtonEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        defaultDispatcher.dispatch({
+            action: "leave_room",
+            room_id: this.props.space.roomId,
+        });
+        this.setState({contextMenuPosition: null}); // also close the menu
+    };
+
+    private onNewRoomClick = (ev: ButtonEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        showCreateNewRoom(this.context, this.props.space);
+        this.setState({contextMenuPosition: null}); // also close the menu
+    };
+
+    private onMembersClick = (ev: ButtonEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        if (!RoomViewStore.getRoomId()) {
+            defaultDispatcher.dispatch({
+                action: "view_room",
+                room_id: this.props.space.roomId,
+            }, true);
+        }
+
+        defaultDispatcher.dispatch<SetRightPanelPhasePayload>({
+            action: Action.SetRightPanelPhase,
+            phase: RightPanelPhases.SpaceMemberList,
+            refireParams: { space: this.props.space },
+        });
+        this.setState({contextMenuPosition: null}); // also close the menu
+    };
+
+    private onExploreRoomsClick = (ev: ButtonEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        Modal.createTrackedDialog("Space room directory", "Space panel", SpaceRoomDirectory, {
+            space: this.props.space,
+        }, "mx_SpaceRoomDirectory_dialogWrapper", false, true);
+        this.setState({contextMenuPosition: null}); // also close the menu
+    };
+
+    private renderContextMenu(): React.ReactElement {
+        let contextMenu = null;
+        if (this.state.contextMenuPosition) {
+            const userId = this.context.getUserId();
+
+            let inviteOption;
+            if (this.props.space.canInvite(userId)) {
+                inviteOption = (
+                    <IconizedContextMenuOption
+                        className="mx_SpacePanel_contextMenu_inviteButton"
+                        iconClassName="mx_SpacePanel_iconInvite"
+                        label={_t("Invite people")}
+                        onClick={this.onInviteClick}
+                    />
+                );
+            }
+
+            let settingsOption;
+            let leaveSection;
+            if (shouldShowSpaceSettings(this.context, this.props.space)) {
+                settingsOption = (
+                    <IconizedContextMenuOption
+                        iconClassName="mx_SpacePanel_iconSettings"
+                        label={_t("Settings")}
+                        onClick={this.onSettingsClick}
+                    />
+                );
+            } else {
+                leaveSection = <IconizedContextMenuOptionList red first>
+                    <IconizedContextMenuOption
+                        iconClassName="mx_SpacePanel_iconLeave"
+                        label={_t("Leave space")}
+                        onClick={this.onLeaveClick}
+                    />
+                </IconizedContextMenuOptionList>;
+            }
+
+            let newRoomOption;
+            if (this.props.space.currentState.maySendStateEvent(EventType.SpaceChild, userId)) {
+                newRoomOption = (
+                    <IconizedContextMenuOption
+                        iconClassName="mx_SpacePanel_iconPlus"
+                        label={_t("New room")}
+                        onClick={this.onNewRoomClick}
+                    />
+                );
+            }
+
+            contextMenu = <IconizedContextMenu
+                {...toRightOf(this.state.contextMenuPosition, 0)}
+                onFinished={this.onMenuClose}
+                className="mx_SpacePanel_contextMenu"
+                compact
+            >
+                <div className="mx_SpacePanel_contextMenu_header">
+                    { this.props.space.name }
+                </div>
+                <IconizedContextMenuOptionList first>
+                    { inviteOption }
+                    <IconizedContextMenuOption
+                        iconClassName="mx_SpacePanel_iconHome"
+                        label={_t("Space Home")}
+                        onClick={this.onHomeClick}
+                    />
+                    <IconizedContextMenuOption
+                        iconClassName="mx_SpacePanel_iconMembers"
+                        label={_t("Members")}
+                        onClick={this.onMembersClick}
+                    />
+                    { settingsOption }
+                    <IconizedContextMenuOption
+                        iconClassName="mx_SpacePanel_iconExplore"
+                        label={_t("Explore rooms")}
+                        onClick={this.onExploreRoomsClick}
+                    />
+                    { newRoomOption }
+                </IconizedContextMenuOptionList>
+                { leaveSection }
+            </IconizedContextMenu>;
+        }
+
+        return (
+            <React.Fragment>
+                <ContextMenuTooltipButton
+                    className="mx_SpaceButton_menuButton"
+                    onClick={this.onMenuOpenClick}
+                    title={_t("Space options")}
+                    isExpanded={!!this.state.contextMenuPosition}
+                />
+                { contextMenu }
+            </React.Fragment>
+        );
+    }
+
+    render() {
+        const {space, activeSpaces, isNested} = this.props;
+
+        const forceCollapsed = this.props.isPanelCollapsed;
+        const isNarrow = this.props.isPanelCollapsed;
+        const collapsed = this.state.collapsed || forceCollapsed;
+
+        const childSpaces = SpaceStore.instance.getChildSpaces(space.roomId);
+        const isActive = activeSpaces.includes(space);
+        const itemClasses = classNames({
+            "mx_SpaceItem": true,
+            "collapsed": collapsed,
+            "hasSubSpaces": childSpaces && childSpaces.length,
+        });
+        const classes = classNames("mx_SpaceButton", {
+            mx_SpaceButton_active: isActive,
+            mx_SpaceButton_hasMenuOpen: !!this.state.contextMenuPosition,
+            mx_SpaceButton_narrow: isNarrow,
+        });
+        const notificationState = SpaceStore.instance.getNotificationState(space.roomId);
+        const childItems = childSpaces && !collapsed ? <SpaceTreeLevel
+            spaces={childSpaces}
+            activeSpaces={activeSpaces}
+            isNested={true}
+        /> : null;
+        let notifBadge;
+        if (notificationState) {
+            notifBadge = <div className="mx_SpacePanel_badgeContainer">
+                <NotificationBadge forceCount={false} notification={notificationState} />
+            </div>;
+        }
+
+        const avatarSize = isNested ? 24 : 32;
+
+        const toggleCollapseButton = childSpaces && childSpaces.length ?
+            <button
+                className="mx_SpaceButton_toggleCollapse"
+                onClick={evt => this.toggleCollapse(evt)}
+            /> : null;
+
+        let button;
+        if (isNarrow) {
+            button = (
+                <RovingAccessibleTooltipButton
+                    className={classes}
+                    title={space.name}
+                    onClick={this.onClick}
+                    onContextMenu={this.onContextMenu}
+                    forceHide={!!this.state.contextMenuPosition}
+                    role="treeitem"
+                >
+                    { toggleCollapseButton }
+                    <div className="mx_SpaceButton_selectionWrapper">
+                        <RoomAvatar width={avatarSize} height={avatarSize} room={space} />
+                        { notifBadge }
+                        { this.renderContextMenu() }
+                    </div>
+                </RovingAccessibleTooltipButton>
+            );
+        } else {
+            button = (
+                <RovingAccessibleButton
+                    className={classes}
+                    onClick={this.onClick}
+                    onContextMenu={this.onContextMenu}
+                    role="treeitem"
+                >
+                    { toggleCollapseButton }
+                    <div className="mx_SpaceButton_selectionWrapper">
+                        <RoomAvatar width={avatarSize} height={avatarSize} room={space} />
+                        <span className="mx_SpaceButton_name">{ space.name }</span>
+                        { notifBadge }
+                        { this.renderContextMenu() }
+                    </div>
+                </RovingAccessibleButton>
+            );
+        }
+
+        return (
+            <li className={itemClasses}>
+                { button }
+                { childItems }
+            </li>
+        );
+    }
+}
+
+interface ITreeLevelProps {
+    spaces: Room[];
+    activeSpaces: Room[];
+    isNested?: boolean;
+}
+
+const SpaceTreeLevel: React.FC<ITreeLevelProps> = ({
+    spaces,
+    activeSpaces,
+    isNested,
+}) => {
+    return <ul className="mx_SpaceTreeLevel">
+        {spaces.map(s => {
+            return (<SpaceItem
+                key={s.roomId}
+                activeSpaces={activeSpaces}
+                space={s}
+                isNested={isNested}
+            />);
+        })}
+    </ul>;
+}
+
+export default SpaceTreeLevel;
diff --git a/src/components/views/voip/CallPreview.tsx b/src/components/views/voip/CallPreview.tsx
index ca2b510f20..c08e52181b 100644
--- a/src/components/views/voip/CallPreview.tsx
+++ b/src/components/views/voip/CallPreview.tsx
@@ -24,16 +24,67 @@ 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 { CallEvent, CallState, MatrixCall } from 'matrix-js-sdk/src/webrtc/call';
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
+
+const SHOW_CALL_IN_STATES = [
+    CallState.Connected,
+    CallState.InviteSent,
+    CallState.Connecting,
+    CallState.CreateAnswer,
+    CallState.CreateOffer,
+    CallState.WaitLocalMedia,
+];
 
 interface IProps {
 }
 
 interface IState {
     roomId: string;
-    activeCall: MatrixCall;
+
+    // The main call that we are displaying (ie. not including the call in the room being viewed, if any)
+    primaryCall: MatrixCall;
+
+    // Any other call we're displaying: only if the user is on two calls and not viewing either of the rooms
+    // they belong to
+    secondaryCall: MatrixCall;
 }
 
+// Splits a list of calls into one 'primary' one and a list
+// (which should be a single element) of other calls.
+// The primary will be the one not on hold, or an arbitrary one
+// if they're all on hold)
+function getPrimarySecondaryCalls(calls: MatrixCall[]): [MatrixCall, MatrixCall[]] {
+    let primary: MatrixCall = null;
+    let secondaries: MatrixCall[] = [];
+
+    for (const call of calls) {
+        if (!SHOW_CALL_IN_STATES.includes(call.state)) continue;
+
+        if (!call.isRemoteOnHold() && primary === null) {
+            primary = call;
+        } else {
+            secondaries.push(call);
+        }
+    }
+
+    if (primary === null && secondaries.length > 0) {
+        primary = secondaries[0];
+        secondaries = secondaries.slice(1);
+    }
+
+    if (secondaries.length > 1) {
+        // We should never be in more than two calls so this shouldn't happen
+        console.log("Found more than 1 secondary call! Other calls will not be shown.");
+    }
+
+    return [primary, secondaries];
+}
+
+/**
+ * CallPreview shows a small version of CallView hovering over the UI in 'picture-in-picture'
+ * (PiP mode). It displays the call(s) which is *not* in the room the user is currently viewing.
+ */
 export default class CallPreview extends React.Component<IProps, IState> {
     private roomStoreToken: any;
     private dispatcherRef: string;
@@ -42,18 +93,27 @@ export default class CallPreview extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);
 
+        const roomId = RoomViewStore.getRoomId();
+
+        const [primaryCall, secondaryCalls] = getPrimarySecondaryCalls(
+            CallHandler.sharedInstance().getAllActiveCallsNotInRoom(roomId),
+        );
+
         this.state = {
-            roomId: RoomViewStore.getRoomId(),
-            activeCall: CallHandler.sharedInstance().getAnyActiveCall(),
+            roomId,
+            primaryCall: primaryCall,
+            secondaryCall: secondaryCalls[0],
         };
     }
 
     public componentDidMount() {
         this.roomStoreToken = RoomViewStore.addListener(this.onRoomViewStoreUpdate);
         this.dispatcherRef = dis.register(this.onAction);
+        MatrixClientPeg.get().on(CallEvent.RemoteHoldUnhold, this.onCallRemoteHold);
     }
 
     public componentWillUnmount() {
+        MatrixClientPeg.get().removeListener(CallEvent.RemoteHoldUnhold, this.onCallRemoteHold);
         if (this.roomStoreToken) {
             this.roomStoreToken.remove();
         }
@@ -63,8 +123,16 @@ export default class CallPreview extends React.Component<IProps, IState> {
 
     private onRoomViewStoreUpdate = (payload) => {
         if (RoomViewStore.getRoomId() === this.state.roomId) return;
+
+        const roomId = RoomViewStore.getRoomId();
+        const [primaryCall, secondaryCalls] = getPrimarySecondaryCalls(
+            CallHandler.sharedInstance().getAllActiveCallsNotInRoom(roomId),
+        );
+
         this.setState({
-            roomId: RoomViewStore.getRoomId(),
+            roomId,
+            primaryCall: primaryCall,
+            secondaryCall: secondaryCalls[0],
         });
     };
 
@@ -72,39 +140,35 @@ export default class CallPreview extends React.Component<IProps, IState> {
         switch (payload.action) {
             // listen for call state changes to prod the render method, which
             // may hide the global CallView if the call it is tracking is dead
-            case 'call_state':
+            case 'call_state': {
+                const [primaryCall, secondaryCalls] = getPrimarySecondaryCalls(
+                    CallHandler.sharedInstance().getAllActiveCallsNotInRoom(this.state.roomId),
+                );
+
                 this.setState({
-                    activeCall: CallHandler.sharedInstance().getAnyActiveCall(),
+                    primaryCall: primaryCall,
+                    secondaryCall: secondaryCalls[0],
                 });
                 break;
+            }
         }
     };
 
-    private onCallViewClick = () => {
-        const call = CallHandler.sharedInstance().getAnyActiveCall();
-        if (call) {
-            dis.dispatch({
-                action: 'view_room',
-                room_id: call.roomId,
-            });
-        }
-    };
-
-    public render() {
-        const callForRoom = CallHandler.sharedInstance().getCallForRoom(this.state.roomId);
-        const showCall = (
-            this.state.activeCall &&
-            this.state.activeCall.state === CallState.Connected &&
-            !callForRoom
+    private onCallRemoteHold = () => {
+        const [primaryCall, secondaryCalls] = getPrimarySecondaryCalls(
+            CallHandler.sharedInstance().getAllActiveCallsNotInRoom(this.state.roomId),
         );
 
-        if (showCall) {
+        this.setState({
+            primaryCall: primaryCall,
+            secondaryCall: secondaryCalls[0],
+        });
+    }
+
+    public render() {
+        if (this.state.primaryCall) {
             return (
-                <CallView
-                    className="mx_CallPreview"
-                    onClick={this.onCallViewClick}
-                    showHangup={true}
-                />
+                <CallView call={this.state.primaryCall} secondaryCall={this.state.secondaryCall} pipMode={true} />
             );
         }
 
diff --git a/src/components/views/voip/CallView.tsx b/src/components/views/voip/CallView.tsx
index 3e1833a903..7cac682794 100644
--- a/src/components/views/voip/CallView.tsx
+++ b/src/components/views/voip/CallView.tsx
@@ -15,175 +15,612 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {createRef} from 'react';
-import Room from 'matrix-js-sdk/src/models/room';
+import React, { createRef, CSSProperties } from 'react';
 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 { _t, _td } from '../../../languageHandler';
+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';
+import classNames from 'classnames';
+import AccessibleButton from '../elements/AccessibleButton';
+import {isOnlyCtrlOrCmdKeyEvent, Key} from '../../../Keyboard';
+import {alwaysAboveLeftOf, alwaysAboveRightOf, ChevronFace, ContextMenuButton} from '../../structures/ContextMenu';
+import CallContextMenu from '../context_menus/CallContextMenu';
+import { avatarUrlForMember } from '../../../Avatar';
+import DialpadContextMenu from '../context_menus/DialpadContextMenu';
 
 interface IProps {
-        // js-sdk room object. If set, we will only show calls for the given
-        // room; if not, we will show any active call.
-        room?: Room;
+        // The call for us to display
+        call: MatrixCall,
+
+        // Another ongoing call to display information about
+        secondaryCall?: MatrixCall,
 
         // maxHeight style attribute for the video panel
         maxVideoHeight?: number;
 
-        // a callback which is called when the user clicks on the video div
-        onClick?: React.MouseEventHandler;
-
         // a callback which is called when the content in the callview changes
         // in a way that is likely to cause a resize.
         onResize?: any;
 
-        // classname applied to view,
-        className?: string;
-
-        // Whether to show the hang up icon:W
-        showHangup?: boolean;
+        // Whether this call view is for picture-in-pictue mode
+        // otherwise, it's the larger call view when viewing the room the call is in.
+        // This is sort of a proxy for a number of things but we currently have no
+        // need to control those things separately, so this is simpler.
+        pipMode?: boolean;
 }
 
 interface IState {
-    call: any;
+    isLocalOnHold: boolean,
+    isRemoteOnHold: boolean,
+    micMuted: boolean,
+    vidMuted: boolean,
+    callState: CallState,
+    controlsVisible: boolean,
+    showMoreMenu: boolean,
+    showDialpad: 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);
+}
+
+const CONTROLS_HIDE_DELAY = 1000;
+// Height of the header duplicated from CSS because we need to subtract it from our max
+// height to get the max height of the video
+const HEADER_HEIGHT = 44;
+const BOTTOM_PADDING = 10;
+const BOTTOM_MARGIN_TOP_BOTTOM = 10; // top margin plus bottom margin
+const CONTEXT_MENU_VPADDING = 8; // How far the context menu sits above the button (px)
+
 export default class CallView extends React.Component<IProps, IState> {
-    private videoref: React.RefObject<any>;
     private dispatcherRef: string;
-    public call: any;
+    private contentRef = createRef<HTMLDivElement>();
+    private controlsHideTimer: number = null;
+    private dialpadButton = createRef<HTMLDivElement>();
+    private contextMenuButton = createRef<HTMLDivElement>();
 
     constructor(props: IProps) {
         super(props);
 
         this.state = {
-            // the call this view is displaying (if any)
-            call: null,
-        };
+            isLocalOnHold: this.props.call.isLocalOnHold(),
+            isRemoteOnHold: this.props.call.isRemoteOnHold(),
+            micMuted: this.props.call.isMicrophoneMuted(),
+            vidMuted: this.props.call.isLocalVideoMuted(),
+            callState: this.props.call.state,
+            controlsVisible: true,
+            showMoreMenu: false,
+            showDialpad: false,
+        }
 
-        this.videoref = createRef();
+        this.updateCallListeners(null, this.props.call);
     }
 
     public componentDidMount() {
         this.dispatcherRef = dis.register(this.onAction);
-        this.showCall();
+        document.addEventListener('keydown', this.onNativeKeyDown);
     }
 
     public componentWillUnmount() {
+        if (getFullScreenElement()) {
+            exitFullscreen();
+        }
+
+        document.removeEventListener("keydown", this.onNativeKeyDown);
+        this.updateCallListeners(this.props.call, null);
         dis.unregister(this.dispatcherRef);
     }
 
+    public componentDidUpdate(prevProps) {
+        if (this.props.call === prevProps.call) return;
+
+        this.setState({
+            isLocalOnHold: this.props.call.isLocalOnHold(),
+            isRemoteOnHold: this.props.call.isRemoteOnHold(),
+            micMuted: this.props.call.isMicrophoneMuted(),
+            vidMuted: this.props.call.isLocalVideoMuted(),
+            callState: this.props.call.state,
+        });
+
+        this.updateCallListeners(null, this.props.call);
+    }
+
     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.contentRef.current) {
+                    return;
+                }
+                if (payload.fullscreen) {
+                    requestFullscreen(this.contentRef.current);
+                } else if (getFullScreenElement()) {
+                    exitFullscreen();
+                }
+                break;
+            }
         }
-        this.showCall();
     };
 
-    private showCall() {
-        let call: MatrixCall;
+    private updateCallListeners(oldCall: MatrixCall, newCall: MatrixCall) {
+        if (oldCall === newCall) return;
 
-        if (this.props.room) {
-            const roomId = this.props.room.roomId;
-            call = CallHandler.sharedInstance().getCallForRoom(roomId);
-
-            if (this.call) {
-                this.setState({ call: call });
-            }
-        } else {
-            call = CallHandler.sharedInstance().getAnyActiveCall();
-            // Ignore calls if we can't get the room associated with them.
-            // I think the underlying problem is that the js-sdk sends events
-            // for calls before it has made the rooms available in the store,
-            // although this isn't confirmed.
-            if (MatrixClientPeg.get().getRoom(call.roomId) === null) {
-                call = null;
-            }
-            this.setState({ call: call });
+        if (oldCall) {
+            oldCall.removeListener(CallEvent.State, this.onCallState);
+            oldCall.removeListener(CallEvent.LocalHoldUnhold, this.onCallLocalHoldUnhold);
+            oldCall.removeListener(CallEvent.RemoteHoldUnhold, this.onCallRemoteHoldUnhold);
         }
-
-        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 (newCall) {
+            newCall.on(CallEvent.State, this.onCallState);
+            newCall.on(CallEvent.LocalHoldUnhold, this.onCallLocalHoldUnhold);
+            newCall.on(CallEvent.RemoteHoldUnhold, this.onCallRemoteHoldUnhold);
         }
     }
 
-    private getVideoView() {
-        return this.videoref.current;
+    private onCallState = (state) => {
+        this.setState({
+            callState: state,
+        });
+    };
+
+    private onCallLocalHoldUnhold = () => {
+        this.setState({
+            isLocalOnHold: this.props.call.isLocalOnHold(),
+        });
+    };
+
+    private onCallRemoteHoldUnhold = () => {
+        this.setState({
+            isRemoteOnHold: this.props.call.isRemoteOnHold(),
+            // update both here because isLocalOnHold changes when we hold the call too
+            isLocalOnHold: this.props.call.isLocalOnHold(),
+        });
+    };
+
+    private onFullscreenClick = () => {
+        dis.dispatch({
+            action: 'video_fullscreen',
+            fullscreen: true,
+        });
+    };
+
+    private onExpandClick = () => {
+        const userFacingRoomId = CallHandler.roomIdForCall(this.props.call);
+        dis.dispatch({
+            action: 'view_room',
+            room_id: userFacingRoomId,
+        });
+    };
+
+    private onControlsHideTimer = () => {
+        this.controlsHideTimer = null;
+        this.setState({
+            controlsVisible: false,
+        });
+    }
+
+    private onMouseMove = () => {
+        this.showControls();
+    }
+
+    private showControls() {
+        if (this.state.showMoreMenu || this.state.showDialpad) return;
+
+        if (!this.state.controlsVisible) {
+            this.setState({
+                controlsVisible: true,
+            });
+        }
+        if (this.controlsHideTimer !== null) {
+            clearTimeout(this.controlsHideTimer);
+        }
+        this.controlsHideTimer = window.setTimeout(this.onControlsHideTimer, CONTROLS_HIDE_DELAY);
+    }
+
+    private onDialpadClick = () => {
+        if (!this.state.showDialpad) {
+            if (this.controlsHideTimer) {
+                clearTimeout(this.controlsHideTimer);
+                this.controlsHideTimer = null;
+            }
+
+            this.setState({
+                showDialpad: true,
+                controlsVisible: true,
+            });
+        } else {
+            if (this.controlsHideTimer !== null) {
+                clearTimeout(this.controlsHideTimer);
+            }
+            this.controlsHideTimer = window.setTimeout(this.onControlsHideTimer, CONTROLS_HIDE_DELAY);
+
+            this.setState({
+                showDialpad: false,
+            });
+        }
+    }
+
+    private onMicMuteClick = () => {
+        const newVal = !this.state.micMuted;
+
+        this.props.call.setMicrophoneMuted(newVal);
+        this.setState({micMuted: newVal});
+    }
+
+    private onVidMuteClick = () => {
+        const newVal = !this.state.vidMuted;
+
+        this.props.call.setLocalVideoMuted(newVal);
+        this.setState({vidMuted: newVal});
+    }
+
+    private onMoreClick = () => {
+        if (this.controlsHideTimer) {
+            clearTimeout(this.controlsHideTimer);
+            this.controlsHideTimer = null;
+        }
+
+        this.setState({
+            showMoreMenu: true,
+            controlsVisible: true,
+        });
+    }
+
+    private closeDialpad = () => {
+        this.setState({
+            showDialpad: false,
+        });
+        this.controlsHideTimer = window.setTimeout(this.onControlsHideTimer, CONTROLS_HIDE_DELAY);
+    }
+
+    private closeContextMenu = () => {
+        this.setState({
+            showMoreMenu: false,
+        });
+        this.controlsHideTimer = window.setTimeout(this.onControlsHideTimer, CONTROLS_HIDE_DELAY);
+    }
+
+    // we register global shortcuts here, they *must not conflict* with local shortcuts elsewhere or both will fire
+    // Note that this assumes we always have a callview on screen at any given time
+    // CallHandler would probably be a better place for this
+    private onNativeKeyDown = ev => {
+        let handled = false;
+        const ctrlCmdOnly = isOnlyCtrlOrCmdKeyEvent(ev);
+
+        switch (ev.key) {
+            case Key.D:
+                if (ctrlCmdOnly) {
+                    this.onMicMuteClick();
+                    // show the controls to give feedback
+                    this.showControls();
+                    handled = true;
+                }
+                break;
+
+            case Key.E:
+                if (ctrlCmdOnly) {
+                    this.onVidMuteClick();
+                    // show the controls to give feedback
+                    this.showControls();
+                    handled = true;
+                }
+                break;
+        }
+
+        if (handled) {
+            ev.stopPropagation();
+            ev.preventDefault();
+        }
+    };
+
+    private onRoomAvatarClick = () => {
+        const userFacingRoomId = CallHandler.roomIdForCall(this.props.call);
+        dis.dispatch({
+            action: 'view_room',
+            room_id: userFacingRoomId,
+        });
+    }
+
+    private onSecondaryRoomAvatarClick = () => {
+        const userFacingRoomId = CallHandler.roomIdForCall(this.props.secondaryCall);
+
+        dis.dispatch({
+            action: 'view_room',
+            room_id: userFacingRoomId,
+        });
+    }
+
+    private onCallResumeClick = () => {
+        const userFacingRoomId = CallHandler.roomIdForCall(this.props.call);
+        CallHandler.sharedInstance().setActiveCallRoomId(userFacingRoomId);
     }
 
     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);
+        const client = MatrixClientPeg.get();
+        const callRoomId = CallHandler.roomIdForCall(this.props.call);
+        const secondaryCallRoomId = CallHandler.roomIdForCall(this.props.secondaryCall);
+        const callRoom = client.getRoom(callRoomId);
+        const secCallRoom = this.props.secondaryCall ? client.getRoom(secondaryCallRoomId) : null;
 
-            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>{ _t("Active call") }</p>
-                </div>
-            </AccessibleButton>;
-        } else {
-            view = <VideoView
-                ref={this.videoref}
-                onClick={this.props.onClick}
-                onResize={this.props.onResize}
-                maxHeight={this.props.maxVideoHeight}
+        let dialPad;
+        let contextMenu;
+
+        if (this.state.showDialpad) {
+            dialPad = <DialpadContextMenu
+                {...alwaysAboveRightOf(
+                    this.dialpadButton.current.getBoundingClientRect(),
+                    ChevronFace.None,
+                    CONTEXT_MENU_VPADDING,
+                )}
+                onFinished={this.closeDialpad}
+                call={this.props.call}
             />;
         }
 
-        let hangup: React.ReactNode;
-        if (this.props.showHangup) {
-            hangup = <div
-                className="mx_CallView_hangup"
+        if (this.state.showMoreMenu) {
+            contextMenu = <CallContextMenu
+                {...alwaysAboveLeftOf(
+                    this.contextMenuButton.current.getBoundingClientRect(),
+                    ChevronFace.None,
+                    CONTEXT_MENU_VPADDING,
+                )}
+                onFinished={this.closeContextMenu}
+                call={this.props.call}
+            />;
+        }
+
+        const micClasses = classNames({
+            mx_CallView_callControls_button: true,
+            mx_CallView_callControls_button_micOn: !this.state.micMuted,
+            mx_CallView_callControls_button_micOff: this.state.micMuted,
+        });
+
+        const vidClasses = classNames({
+            mx_CallView_callControls_button: true,
+            mx_CallView_callControls_button_vidOn: !this.state.vidMuted,
+            mx_CallView_callControls_button_vidOff: this.state.vidMuted,
+        });
+
+        // Put the other states of the mic/video icons in the document to make sure they're cached
+        // (otherwise the icon disappears briefly when toggled)
+        const micCacheClasses = classNames({
+            mx_CallView_callControls_button: true,
+            mx_CallView_callControls_button_micOn: this.state.micMuted,
+            mx_CallView_callControls_button_micOff: !this.state.micMuted,
+            mx_CallView_callControls_button_invisible: true,
+        });
+
+        const vidCacheClasses = classNames({
+            mx_CallView_callControls_button: true,
+            mx_CallView_callControls_button_vidOn: this.state.micMuted,
+            mx_CallView_callControls_button_vidOff: !this.state.micMuted,
+            mx_CallView_callControls_button_invisible: true,
+        });
+
+        const callControlsClasses = classNames({
+            mx_CallView_callControls: true,
+            mx_CallView_callControls_hidden: !this.state.controlsVisible,
+        });
+
+        const vidMuteButton = this.props.call.type === CallType.Video ? <AccessibleButton
+            className={vidClasses}
+            onClick={this.onVidMuteClick}
+        /> : null;
+
+        // The dial pad & 'more' button actions are only relevant in a connected call
+        // When not connected, we have to put something there to make the flexbox alignment correct
+        const dialpadButton = this.state.callState === CallState.Connected ? <ContextMenuButton
+            className="mx_CallView_callControls_button mx_CallView_callControls_dialpad"
+            inputRef={this.dialpadButton}
+            onClick={this.onDialpadClick}
+            isExpanded={this.state.showDialpad}
+        /> : <div className="mx_CallView_callControls_button mx_CallView_callControls_button_dialpad_hidden" />;
+
+        const contextMenuButton = this.state.callState === CallState.Connected ? <ContextMenuButton
+            className="mx_CallView_callControls_button mx_CallView_callControls_button_more"
+            onClick={this.onMoreClick}
+            inputRef={this.contextMenuButton}
+            isExpanded={this.state.showMoreMenu}
+        /> : <div className="mx_CallView_callControls_button mx_CallView_callControls_button_more_hidden" />;
+
+        // in the near future, the dial pad button will go on the left. For now, it's the nothing button
+        // because something needs to have margin-right: auto to make the alignment correct.
+        const callControls = <div className={callControlsClasses}>
+            {dialpadButton}
+            <AccessibleButton
+                className={micClasses}
+                onClick={this.onMicMuteClick}
+            />
+            <AccessibleButton
+                className="mx_CallView_callControls_button mx_CallView_callControls_button_hangup"
                 onClick={() => {
                     dis.dispatch({
                         action: 'hangup',
-                        room_id: this.state.call.roomId,
+                        room_id: callRoomId,
                     });
                 }}
+            />
+            {vidMuteButton}
+            <div className={micCacheClasses} />
+            <div className={vidCacheClasses} />
+            {contextMenuButton}
+        </div>;
+
+        // The 'content' for the call, ie. the videos for a video call and profile picture
+        // for voice calls (fills the bg)
+        let contentView: React.ReactNode;
+
+        const isOnHold = this.state.isLocalOnHold || this.state.isRemoteOnHold;
+        let onHoldText = null;
+        if (this.state.isRemoteOnHold) {
+            const holdString = CallHandler.sharedInstance().hasAnyUnheldCall() ?
+                _td("You held the call <a>Switch</a>") : _td("You held the call <a>Resume</a>");
+            onHoldText = _t(holdString, {}, {
+                a: sub => <AccessibleButton kind="link" onClick={this.onCallResumeClick}>
+                    {sub}
+                </AccessibleButton>,
+            });
+        } else if (this.state.isLocalOnHold) {
+            onHoldText = _t("%(peerName)s held the call", {
+                peerName: this.props.call.getOpponentMember().name,
+            });
+        }
+
+        if (this.props.call.type === CallType.Video) {
+            let localVideoFeed = null;
+            let onHoldContent = null;
+            let onHoldBackground = null;
+            const backgroundStyle: CSSProperties = {};
+            const containerClasses = classNames({
+                mx_CallView_video: true,
+                mx_CallView_video_hold: isOnHold,
+            });
+            if (isOnHold) {
+                onHoldContent = <div className="mx_CallView_video_holdContent">
+                    {onHoldText}
+                </div>;
+                const backgroundAvatarUrl = avatarUrlForMember(
+                    // is it worth getting the size of the div to pass here?
+                    this.props.call.getOpponentMember(), 1024, 1024, 'crop',
+                );
+                backgroundStyle.backgroundImage = 'url(' + backgroundAvatarUrl + ')';
+                onHoldBackground = <div className="mx_CallView_video_holdBackground" style={backgroundStyle} />;
+            }
+            if (!this.state.vidMuted) {
+                localVideoFeed = <VideoFeed type={VideoFeedType.Local} call={this.props.call} />;
+            }
+
+            // if we're fullscreen, we don't want to set a maxHeight on the video element.
+            const maxVideoHeight = getFullScreenElement() || !this.props.maxVideoHeight ? null : (
+                this.props.maxVideoHeight - (HEADER_HEIGHT + BOTTOM_PADDING + BOTTOM_MARGIN_TOP_BOTTOM)
+            );
+            contentView = <div className={containerClasses}
+                ref={this.contentRef} onMouseMove={this.onMouseMove}
+                // Put the max height on here too because this div is ended up 4px larger than the content
+                // and is causing it to scroll, and I am genuinely baffled as to why.
+                style={{maxHeight: maxVideoHeight}}
+            >
+                {onHoldBackground}
+                <VideoFeed type={VideoFeedType.Remote} call={this.props.call} onResize={this.props.onResize}
+                    maxHeight={maxVideoHeight}
+                />
+                {localVideoFeed}
+                {onHoldContent}
+                {callControls}
+            </div>;
+        } else {
+            const avatarSize = this.props.pipMode ? 76 : 160;
+            const classes = classNames({
+                mx_CallView_voice: true,
+                mx_CallView_voice_hold: isOnHold,
+            });
+
+            contentView = <div className={classes} onMouseMove={this.onMouseMove}>
+                <div className="mx_CallView_voice_avatarsContainer">
+                    <div className="mx_CallView_voice_avatarContainer" style={{width: avatarSize, height: avatarSize}}>
+                        <RoomAvatar
+                            room={callRoom}
+                            height={avatarSize}
+                            width={avatarSize}
+                        />
+                    </div>
+                </div>
+                <div className="mx_CallView_voice_holdText">{onHoldText}</div>
+                {callControls}
+            </div>;
+        }
+
+        const callTypeText = this.props.call.type === CallType.Video ? _t("Video Call") : _t("Voice Call");
+        let myClassName;
+
+        let fullScreenButton;
+        if (this.props.call.type === CallType.Video && !this.props.pipMode) {
+            fullScreenButton = <div className="mx_CallView_header_button mx_CallView_header_button_fullscreen"
+                onClick={this.onFullscreenClick} title={_t("Fill Screen")}
             />;
         }
 
-        return <div className={this.props.className}>
-            {view}
-            {hangup}
+        let expandButton;
+        if (this.props.pipMode) {
+            expandButton = <div className="mx_CallView_header_button mx_CallView_header_button_expand"
+                onClick={this.onExpandClick} title={_t("Return to call")}
+            />;
+        }
+
+        const headerControls = <div className="mx_CallView_header_controls">
+            {fullScreenButton}
+            {expandButton}
+        </div>;
+
+        let header: React.ReactNode;
+        if (!this.props.pipMode) {
+            header = <div className="mx_CallView_header">
+                <div className="mx_CallView_header_phoneIcon"></div>
+                <span className="mx_CallView_header_callType">{callTypeText}</span>
+                {headerControls}
+            </div>;
+            myClassName = 'mx_CallView_large';
+        } else {
+            let secondaryCallInfo;
+            if (this.props.secondaryCall) {
+                secondaryCallInfo = <span className="mx_CallView_header_secondaryCallInfo">
+                    <AccessibleButton element='span' onClick={this.onSecondaryRoomAvatarClick}>
+                        <RoomAvatar room={secCallRoom} height={16} width={16} />
+                        <span className="mx_CallView_secondaryCall_roomName">
+                            {_t("%(name)s on hold", { name: secCallRoom.name })}
+                        </span>
+                    </AccessibleButton>
+                </span>;
+            }
+
+            header = <div className="mx_CallView_header">
+                <AccessibleButton onClick={this.onRoomAvatarClick}>
+                    <RoomAvatar room={callRoom} height={32} width={32} />
+                </AccessibleButton>
+                <div className="mx_CallView_header_callInfo">
+                    <div className="mx_CallView_header_roomName">{callRoom.name}</div>
+                    <div className="mx_CallView_header_callTypeSmall">
+                        {callTypeText}
+                        {secondaryCallInfo}
+                    </div>
+                </div>
+                {headerControls}
+            </div>;
+            myClassName = 'mx_CallView_pip';
+        }
+
+        return <div className={"mx_CallView " + myClassName}>
+            {header}
+            {contentView}
+            {dialPad}
+            {contextMenu}
         </div>;
     }
 }
-
diff --git a/src/components/views/voip/CallViewForRoom.tsx b/src/components/views/voip/CallViewForRoom.tsx
new file mode 100644
index 0000000000..4cb4e66fbe
--- /dev/null
+++ b/src/components/views/voip/CallViewForRoom.tsx
@@ -0,0 +1,87 @@
+/*
+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 { CallState, MatrixCall } from 'matrix-js-sdk/src/webrtc/call';
+import React from 'react';
+import CallHandler from '../../../CallHandler';
+import CallView from './CallView';
+import dis from '../../../dispatcher/dispatcher';
+
+interface IProps {
+    // What room we should display the call for
+    roomId: string,
+
+    // maxHeight style attribute for the video panel
+    maxVideoHeight?: number;
+
+    // a callback which is called when the content in the callview changes
+    // in a way that is likely to cause a resize.
+    onResize?: any;
+}
+
+interface IState {
+    call: MatrixCall,
+}
+
+/*
+ * Wrapper for CallView that always display the call in a given room,
+ * or nothing if there is no call in that room.
+ */
+export default class CallViewForRoom extends React.Component<IProps, IState> {
+    private dispatcherRef: string;
+
+    constructor(props: IProps) {
+        super(props);
+        this.state = {
+            call: this.getCall(),
+        };
+    }
+
+    public componentDidMount() {
+        this.dispatcherRef = dis.register(this.onAction);
+    }
+
+    public componentWillUnmount() {
+        dis.unregister(this.dispatcherRef);
+    }
+
+    private onAction = (payload) => {
+        switch (payload.action) {
+            case 'call_state': {
+                const newCall = this.getCall();
+                if (newCall !== this.state.call) {
+                    this.setState({call: newCall});
+                }
+                break;
+            }
+        }
+    };
+
+    private getCall(): MatrixCall {
+        const call = CallHandler.sharedInstance().getCallForRoom(this.props.roomId);
+
+        if (call && [CallState.Ended, CallState.Ringing].includes(call.state)) return null;
+        return call;
+    }
+
+    public render() {
+        if (!this.state.call) return null;
+
+        return <CallView call={this.state.call} pipMode={false}
+            onResize={this.props.onResize} maxVideoHeight={this.props.maxVideoHeight}
+        />;
+    }
+}
diff --git a/src/components/views/voip/DialPad.tsx b/src/components/views/voip/DialPad.tsx
new file mode 100644
index 0000000000..da88f49adf
--- /dev/null
+++ b/src/components/views/voip/DialPad.tsx
@@ -0,0 +1,85 @@
+/*
+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 * as React from "react";
+import AccessibleButton from "../elements/AccessibleButton";
+
+const BUTTONS = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '*', '0', '#'];
+
+enum DialPadButtonKind {
+    Digit,
+    Delete,
+    Dial,
+}
+
+interface IButtonProps {
+    kind: DialPadButtonKind;
+    digit?: string;
+    onButtonPress: (string) => void;
+}
+
+class DialPadButton extends React.PureComponent<IButtonProps> {
+    onClick = () => {
+        this.props.onButtonPress(this.props.digit);
+    }
+
+    render() {
+        switch (this.props.kind) {
+            case DialPadButtonKind.Digit:
+                return <AccessibleButton className="mx_DialPad_button" onClick={this.onClick}>
+                    {this.props.digit}
+                </AccessibleButton>;
+            case DialPadButtonKind.Delete:
+                return <AccessibleButton className="mx_DialPad_button mx_DialPad_deleteButton"
+                    onClick={this.onClick}
+                />;
+            case DialPadButtonKind.Dial:
+                return <AccessibleButton className="mx_DialPad_button mx_DialPad_dialButton" onClick={this.onClick} />;
+        }
+    }
+}
+
+interface IProps {
+    onDigitPress: (string) => void;
+    hasDialAndDelete: boolean;
+    onDeletePress?: (string) => void;
+    onDialPress?: (string) => void;
+}
+
+export default class Dialpad extends React.PureComponent<IProps> {
+    render() {
+        const buttonNodes = [];
+
+        for (const button of BUTTONS) {
+            buttonNodes.push(<DialPadButton key={button} kind={DialPadButtonKind.Digit}
+                digit={button} onButtonPress={this.props.onDigitPress}
+            />);
+        }
+
+        if (this.props.hasDialAndDelete) {
+            buttonNodes.push(<DialPadButton key="del" kind={DialPadButtonKind.Delete}
+                onButtonPress={this.props.onDeletePress}
+            />);
+            buttonNodes.push(<DialPadButton key="dial" kind={DialPadButtonKind.Dial}
+                onButtonPress={this.props.onDialPress}
+            />);
+        }
+
+        return <div className="mx_DialPad">
+            {buttonNodes}
+        </div>;
+    }
+}
diff --git a/src/components/views/voip/DialPadModal.tsx b/src/components/views/voip/DialPadModal.tsx
new file mode 100644
index 0000000000..9f031a48a3
--- /dev/null
+++ b/src/components/views/voip/DialPadModal.tsx
@@ -0,0 +1,111 @@
+/*
+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 * as React from "react";
+import { ensureDMExists } from "../../../createRoom";
+import { _t } from "../../../languageHandler";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
+import AccessibleButton from "../elements/AccessibleButton";
+import Field from "../elements/Field";
+import DialPad from './DialPad';
+import dis from '../../../dispatcher/dispatcher';
+import Modal from "../../../Modal";
+import ErrorDialog from "../../views/dialogs/ErrorDialog";
+import CallHandler from "../../../CallHandler";
+
+interface IProps {
+    onFinished: (boolean) => void;
+}
+
+interface IState {
+    value: string;
+}
+
+export default class DialpadModal extends React.PureComponent<IProps, IState> {
+    constructor(props) {
+        super(props);
+        this.state = {
+            value: '',
+        }
+    }
+
+    onCancelClick = () => {
+        this.props.onFinished(false);
+    }
+
+    onChange = (ev) => {
+        this.setState({value: ev.target.value});
+    }
+
+    onFormSubmit = (ev) => {
+        ev.preventDefault();
+        this.onDialPress();
+    }
+
+    onDigitPress = (digit) => {
+        this.setState({value: this.state.value + digit});
+    }
+
+    onDeletePress = () => {
+        if (this.state.value.length === 0) return;
+        this.setState({value: this.state.value.slice(0, -1)});
+    }
+
+    onDialPress = async () => {
+        const results = await CallHandler.sharedInstance().pstnLookup(this.state.value);
+        if (!results || results.length === 0 || !results[0].userid) {
+            Modal.createTrackedDialog('', '', ErrorDialog, {
+                title: _t("Unable to look up phone number"),
+                description: _t("There was an error looking up the phone number"),
+            });
+        }
+        const userId = results[0].userid;
+
+        const roomId = await ensureDMExists(MatrixClientPeg.get(), userId);
+
+        dis.dispatch({
+            action: 'view_room',
+            room_id: roomId,
+        });
+
+        this.props.onFinished(true);
+    }
+
+    render() {
+        return <div className="mx_DialPadModal">
+            <div className="mx_DialPadModal_header">
+                <div>
+                    <span className="mx_DialPadModal_title">{_t("Dial pad")}</span>
+                    <AccessibleButton className="mx_DialPadModal_cancel" onClick={this.onCancelClick} />
+                </div>
+                <form onSubmit={this.onFormSubmit}>
+                    <Field className="mx_DialPadModal_field" id="dialpad_number"
+                        value={this.state.value} autoFocus={true}
+                        onChange={this.onChange}
+                    />
+                </form>
+            </div>
+            <div className="mx_DialPadModal_horizSep" />
+            <div className="mx_DialPadModal_dialPad">
+                <DialPad hasDialAndDelete={true}
+                    onDigitPress={this.onDigitPress}
+                    onDeletePress={this.onDeletePress}
+                    onDialPress={this.onDialPress}
+                />
+            </div>
+        </div>;
+    }
+}
diff --git a/src/components/views/voip/IncomingCallBox.tsx b/src/components/views/voip/IncomingCallBox.tsx
index 560a034f47..a495093d85 100644
--- a/src/components/views/voip/IncomingCallBox.tsx
+++ b/src/components/views/voip/IncomingCallBox.tsx
@@ -22,10 +22,9 @@ import dis from '../../../dispatcher/dispatcher';
 import { _t } from '../../../languageHandler';
 import { ActionPayload } from '../../../dispatcher/payloads';
 import CallHandler from '../../../CallHandler';
-import PulsedAvatar from '../avatars/PulsedAvatar';
 import RoomAvatar from '../avatars/RoomAvatar';
 import FormButton from '../elements/FormButton';
-import { CallState } from 'matrix-js-sdk/lib/webrtc/call';
+import { CallState } from 'matrix-js-sdk/src/webrtc/call';
 
 interface IProps {
 }
@@ -71,15 +70,15 @@ export default class IncomingCallBox extends React.Component<IProps, IState> {
         e.stopPropagation();
         dis.dispatch({
             action: 'answer',
-            room_id: this.state.incomingCall.roomId,
+            room_id: CallHandler.roomIdForCall(this.state.incomingCall),
         });
     };
 
     private onRejectClick: React.MouseEventHandler = (e) => {
         e.stopPropagation();
         dis.dispatch({
-            action: 'hangup',
-            room_id: this.state.incomingCall.roomId,
+            action: 'reject',
+            room_id: CallHandler.roomIdForCall(this.state.incomingCall),
         });
     };
 
@@ -90,7 +89,7 @@ export default class IncomingCallBox extends React.Component<IProps, IState> {
 
         let room = null;
         if (this.state.incomingCall) {
-            room = MatrixClientPeg.get().getRoom(this.state.incomingCall.roomId);
+            room = MatrixClientPeg.get().getRoom(CallHandler.roomIdForCall(this.state.incomingCall));
         }
 
         const caller = room ? room.name : _t("Unknown caller");
@@ -108,13 +107,11 @@ export default class IncomingCallBox extends React.Component<IProps, IState> {
 
         return <div className="mx_IncomingCallBox">
             <div className="mx_IncomingCallBox_CallerInfo">
-                <PulsedAvatar>
-                    <RoomAvatar
-                        room={room}
-                        height={32}
-                        width={32}
-                    />
-                </PulsedAvatar>
+                <RoomAvatar
+                    room={room}
+                    height={32}
+                    width={32}
+                />
                 <div>
                     <h1>{caller}</h1>
                     <p>{incomingCallText}</p>
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..5210f28eb1
--- /dev/null
+++ b/src/components/views/voip/VideoFeed.tsx
@@ -0,0 +1,88 @@
+/*
+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.
+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);
+        this.setVideoElement();
+    }
+
+    componentDidUpdate(prevProps) {
+        if (this.props.call !== prevProps.call) {
+            this.setVideoElement();
+        }
+    }
+
+    componentWillUnmount() {
+        this.vid.current.removeEventListener('resize', this.onResize);
+    }
+
+    private setVideoElement() {
+        if (this.props.type === VideoFeedType.Local) {
+            this.props.call.setLocalVideoElement(this.vid.current);
+        } else {
+            this.props.call.setRemoteVideoElement(this.vid.current);
+        }
+    }
+
+    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 <video className={classnames(videoClasses)} ref={this.vid} style={videoStyle} />;
+    }
+}
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/contexts/RoomContext.ts b/src/contexts/RoomContext.ts
index e8eb0c23b4..b00dc148e4 100644
--- a/src/contexts/RoomContext.ts
+++ b/src/contexts/RoomContext.ts
@@ -17,6 +17,7 @@ limitations under the License.
 import { createContext } from "react";
 
 import {IState} from "../components/structures/RoomView";
+import {Layout} from "../settings/Layout";
 
 const RoomContext = createContext<IState>({
     roomLoading: true,
@@ -29,7 +30,6 @@ const RoomContext = createContext<IState>({
     guestsCanJoin: false,
     canPeek: false,
     showApps: false,
-    isAlone: false,
     isPeeking: false,
     showingPinned: false,
     showReadReceipts: true,
@@ -41,7 +41,7 @@ const RoomContext = createContext<IState>({
     statusBarVisible: false,
     canReact: false,
     canReply: false,
-    useIRCLayout: false,
+    layout: Layout.Group,
     matrixClientIsReady: false,
 });
 RoomContext.displayName = "RoomContext";
diff --git a/src/createRoom.ts b/src/createRoom.ts
index 34eb65df4e..a5343076ac 100644
--- a/src/createRoom.ts
+++ b/src/createRoom.ts
@@ -15,19 +15,25 @@ 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 { EventType } from "matrix-js-sdk/src/@types/event";
 
-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";
+import { VIRTUAL_ROOM_EVENT_TYPE } from "./CallHandler";
+import SpaceStore from "./stores/SpaceStore";
+import { makeSpaceParentEvent } from "./utils/space";
 
 // we define a number of interfaces which take their names from the js-sdk
 /* eslint-disable camelcase */
@@ -38,7 +44,7 @@ enum Visibility {
     Private = "private",
 }
 
-enum Preset {
+export enum Preset {
     PrivateChat = "private_chat",
     TrustedPrivateChat = "trusted_private_chat",
     PublicChat = "public_chat",
@@ -51,7 +57,7 @@ interface Invite3PID {
     address: string;
 }
 
-interface IStateEvent {
+export interface IStateEvent {
     type: string;
     state_key?: string; // defaults to an empty string
     content: object;
@@ -72,7 +78,7 @@ interface ICreateOpts {
     power_level_content_override?: object;
 }
 
-interface IOpts {
+export interface IOpts {
     dmUserId?: string;
     createOpts?: ICreateOpts;
     spinner?: boolean;
@@ -81,6 +87,7 @@ interface IOpts {
     inlineErrors?: boolean;
     andView?: boolean;
     associatedWithCommunity?: string;
+    parentSpace?: Room;
 }
 
 /**
@@ -108,6 +115,8 @@ export default function createRoom(opts: IOpts): Promise<string | null> {
     if (opts.guestAccess === undefined) opts.guestAccess = true;
     if (opts.encryption === undefined) opts.encryption = false;
 
+    const startTime = CountlyAnalytics.getTimestamp();
+
     const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
     const Loader = sdk.getComponent("elements.Spinner");
 
@@ -170,6 +179,16 @@ export default function createRoom(opts: IOpts): Promise<string | null> {
         });
     }
 
+    if (opts.parentSpace) {
+        opts.createOpts.initial_state.push(makeSpaceParentEvent(opts.parentSpace, true));
+        opts.createOpts.initial_state.push({
+            type: EventType.RoomHistoryVisibility,
+            content: {
+                "history_visibility": opts.createOpts.preset === Preset.PublicChat ? "world_readable" : "invited",
+            },
+        });
+    }
+
     let modal;
     if (opts.spinner) modal = Modal.createDialog(Loader, null, 'mx_Dialog_spinner');
 
@@ -184,6 +203,9 @@ export default function createRoom(opts: IOpts): Promise<string | null> {
             return Promise.resolve();
         }
     }).then(() => {
+        if (opts.parentSpace) {
+            return SpaceStore.instance.addRoomToSpace(opts.parentSpace, roomId, [client.getDomain()], true);
+        }
         if (opts.associatedWithCommunity) {
             return GroupStore.addRoomToGroup(opts.associatedWithCommunity, roomId, false);
         }
@@ -192,6 +214,9 @@ export default function createRoom(opts: IOpts): Promise<string | null> {
         // room has been created, so we race here with the client knowing that
         // the room exists, causing things like
         // https://github.com/vector-im/vector-web/issues/1813
+        // Even if we were to block on the echo, servers tend to split the room
+        // state over multiple syncs so we can't atomically know when we have the
+        // entire thing.
         if (opts.andView) {
             dis.dispatch({
                 action: 'view_room',
@@ -201,8 +226,10 @@ export default function createRoom(opts: IOpts): Promise<string | null> {
                 // so we are expecting the room to come down the sync
                 // stream, if it hasn't already.
                 joining: true,
+                justCreatedOpts: opts,
             });
         }
+        CountlyAnalytics.instance.trackRoomCreate(startTime, roomId);
         return roomId;
     }, function(err) {
         // Raise the error if the caller requested that we do so.
@@ -232,9 +259,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) => {
@@ -288,6 +322,34 @@ export async function canEncryptToAllUsers(client: MatrixClient, userIds: string
     }
 }
 
+// Similar to ensureDMExists but also adds creation content
+// without polluting ensureDMExists with unrelated stuff (also
+// they're never encrypted).
+export async function ensureVirtualRoomExists(
+    client: MatrixClient, userId: string, nativeRoomId: string,
+): Promise<string> {
+    const existingDMRoom = findDMForUser(client, userId);
+    let roomId;
+    if (existingDMRoom) {
+        roomId = existingDMRoom.roomId;
+    } else {
+        roomId = await createRoom({
+            dmUserId: userId,
+            spinner: false,
+            andView: false,
+            createOpts: {
+                creation_content: {
+                    // This allows us to recognise that the room is a virtual room
+                    // when it comes down our sync stream (we also put the ID of the
+                    // respective native room in there because why not?)
+                    [VIRTUAL_ROOM_EVENT_TYPE]: nativeRoomId,
+                },
+            },
+        });
+    }
+    return roomId;
+}
+
 export async function ensureDMExists(client: MatrixClient, userId: string): Promise<string> {
     const existingDMRoom = findDMForUser(client, userId);
     let roomId;
@@ -298,6 +360,7 @@ export async function ensureDMExists(client: MatrixClient, userId: string): Prom
         if (privateShouldBeEncrypted()) {
             encryption = await canEncryptToAllUsers(client, [userId]);
         }
+
         roomId = await createRoom({encryption, dmUserId: userId, spinner: false, andView: false});
         await _waitForMember(client, roomId, userId);
     }
diff --git a/src/customisations/Lifecycle.ts b/src/customisations/Lifecycle.ts
new file mode 100644
index 0000000000..eba2af715a
--- /dev/null
+++ b/src/customisations/Lifecycle.ts
@@ -0,0 +1,30 @@
+/*
+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.
+*/
+
+function onLoggedOutAndStorageCleared(): void {
+    // E.g. redirect user or call other APIs after logout
+}
+
+// This interface summarises all available customisation points and also marks
+// them all as optional. This allows customisers to only define and export the
+// customisations they need while still maintaining type safety.
+export interface ILifecycleCustomisations {
+    onLoggedOutAndStorageCleared?: typeof onLoggedOutAndStorageCleared;
+}
+
+// A real customisation module will define and export one or more of the
+// customisation points that make up `ILifecycleCustomisations`.
+export default {} as ILifecycleCustomisations;
diff --git a/src/customisations/RoomList.ts b/src/customisations/RoomList.ts
new file mode 100644
index 0000000000..758b212aa2
--- /dev/null
+++ b/src/customisations/RoomList.ts
@@ -0,0 +1,45 @@
+/*
+ * 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 { Room } from "matrix-js-sdk/src/models/room";
+
+// Populate this file with the details of your customisations when copying it.
+
+/**
+ * Determines if a room is visible in the room list or not. By default,
+ * all rooms are visible. Where special handling is performed by Element,
+ * those rooms will not be able to override their visibility in the room
+ * list - Element will make the decision without calling this function.
+ *
+ * This function should be as fast as possible to avoid slowing down the
+ * client.
+ * @param {Room} room The room to check the visibility of.
+ * @returns {boolean} True if the room should be visible, false otherwise.
+ */
+function isRoomVisible(room: Room): boolean {
+    return true;
+}
+
+// This interface summarises all available customisation points and also marks
+// them all as optional. This allows customisers to only define and export the
+// customisations they need while still maintaining type safety.
+export interface IRoomListCustomisations {
+    isRoomVisible?: typeof isRoomVisible;
+}
+
+// A real customisation module will define and export one or more of the
+// customisation points that make up the interface above.
+export const RoomListCustomisations: IRoomListCustomisations = {};
diff --git a/src/customisations/Security.ts b/src/customisations/Security.ts
index 8fb0978375..96b5b62cdb 100644
--- a/src/customisations/Security.ts
+++ b/src/customisations/Security.ts
@@ -16,6 +16,7 @@ limitations under the License.
 
 import { IMatrixClientCreds } from "../MatrixClientPeg";
 import { Kind as SetupEncryptionKind } from "../toasts/SetupEncryptionToast";
+import { ISecretStorageKeyInfo } from 'matrix-js-sdk/src/matrix';
 
 /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
 function examineLoginResponse(
@@ -44,6 +45,13 @@ function getSecretStorageKey(): Uint8Array {
     return null;
 }
 
+/* eslint-disable-next-line @typescript-eslint/no-unused-vars */
+function getDehydrationKey(
+    keyInfo: ISecretStorageKeyInfo,
+): Promise<Uint8Array> {
+    return Promise.resolve(null);
+}
+
 /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
 function catchAccessSecretStorageError(e: Error): void {
     // E.g. notify the user in some way
@@ -59,21 +67,13 @@ function setupEncryptionNeeded(kind: SetupEncryptionKind): boolean {
 // them all as optional. This allows customisers to only define and export the
 // customisations they need while still maintaining type safety.
 export interface ISecurityCustomisations {
-    examineLoginResponse?: (
-        response: any,
-        credentials: IMatrixClientCreds,
-    ) => void;
-    persistCredentials?: (
-        credentials: IMatrixClientCreds,
-    ) => void;
-    createSecretStorageKey?: () => Uint8Array,
-    getSecretStorageKey?: () => Uint8Array,
-    catchAccessSecretStorageError?: (
-        e: Error,
-    ) => void,
-    setupEncryptionNeeded?: (
-        kind: SetupEncryptionKind,
-    ) => boolean,
+    examineLoginResponse?: typeof examineLoginResponse;
+    persistCredentials?: typeof persistCredentials;
+    createSecretStorageKey?: typeof createSecretStorageKey,
+    getSecretStorageKey?: typeof getSecretStorageKey,
+    catchAccessSecretStorageError?: typeof catchAccessSecretStorageError,
+    setupEncryptionNeeded?: typeof setupEncryptionNeeded,
+    getDehydrationKey?: typeof getDehydrationKey,
 }
 
 // A real customisation module will define and export one or more of the
diff --git a/src/customisations/WidgetPermissions.ts b/src/customisations/WidgetPermissions.ts
new file mode 100644
index 0000000000..9a78171194
--- /dev/null
+++ b/src/customisations/WidgetPermissions.ts
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+
+// Populate this class with the details of your customisations when copying it.
+import { Capability, Widget } from "matrix-widget-api";
+
+/**
+ * Approves the widget for capabilities that it requested, if any can be
+ * approved. Typically this will be used to give certain widgets capabilities
+ * without having to prompt the user to approve them. This cannot reject
+ * capabilities that Element will be automatically granting, such as the
+ * ability for Jitsi widgets to stay on screen - those will be approved
+ * regardless.
+ * @param {Widget} widget The widget to approve capabilities for.
+ * @param {Set<Capability>} requestedCapabilities The capabilities the widget requested.
+ * @returns {Set<Capability>} Resolves to the capabilities that are approved for use
+ * by the widget. If none are approved, this should return an empty Set.
+ */
+async function preapproveCapabilities(
+    widget: Widget,
+    requestedCapabilities: Set<Capability>,
+): Promise<Set<Capability>> {
+    return new Set(); // no additional capabilities approved
+}
+
+// This interface summarises all available customisation points and also marks
+// them all as optional. This allows customisers to only define and export the
+// customisations they need while still maintaining type safety.
+export interface IWidgetPermissionCustomisations {
+    preapproveCapabilities?: typeof preapproveCapabilities;
+}
+
+// A real customisation module will define and export one or more of the
+// customisation points that make up the interface above.
+export const WidgetPermissionCustomisations: IWidgetPermissionCustomisations = {};
diff --git a/src/dispatcher/actions.ts b/src/dispatcher/actions.ts
index 26d585b76e..12bf4c57a3 100644
--- a/src/dispatcher/actions.ts
+++ b/src/dispatcher/actions.ts
@@ -96,12 +96,21 @@ export enum Action {
     AfterRightPanelPhaseChange = "after_right_panel_phase_change",
 
     /**
-     * Requests that the AppTile deletes the widget. Should be used with the AppTileActionPayload.
+     * Opens the modal dial pad
      */
-    AppTileDelete = "appTile_delete",
+    OpenDialPad = "open_dial_pad",
 
     /**
-     * Requests that the AppTile revokes the widget. Should be used with the AppTileActionPayload.
+     * Fired when CallHandler has checked for PSTN protocol support
+     * payload: none
+     * XXX: Is an action the right thing for this?
      */
-    AppTileRevoke = "appTile_revoke",
+    PstnSupportUpdated = "pstn_support_updated",
+
+    /**
+     * Similar to PstnSupportUpdated, fired when CallHandler has checked for virtual room support
+     * payload: none
+     * XXX: Ditto
+     */
+    VirtualRoomSupportUpdated = "virtual_room_support_updated",
 }
diff --git a/src/dispatcher/payloads/SetRightPanelPhasePayload.ts b/src/dispatcher/payloads/SetRightPanelPhasePayload.ts
index 4126e8a669..430fad6145 100644
--- a/src/dispatcher/payloads/SetRightPanelPhasePayload.ts
+++ b/src/dispatcher/payloads/SetRightPanelPhasePayload.ts
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import { VerificationRequest } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
+import { Room } from "matrix-js-sdk/src/models/room";
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 import { RightPanelPhases } from "../../stores/RightPanelStorePhases";
 import { ActionPayload } from "../payloads";
@@ -35,4 +36,5 @@ export interface SetRightPanelPhaseRefireParams {
     // XXX: The type for event should 'view_3pid_invite' action's payload
     event?: any;
     widgetId?: string;
+    space?: Room;
 }
diff --git a/src/editor/deserialize.ts b/src/editor/deserialize.ts
index ec697b193c..bc1dd74c7d 100644
--- a/src/editor/deserialize.ts
+++ b/src/editor/deserialize.ts
@@ -21,6 +21,7 @@ import { walkDOMDepthFirst } from "./dom";
 import { checkBlockNode } from "../HtmlUtils";
 import { getPrimaryPermalinkEntity } from "../utils/permalinks/Permalinks";
 import { PartCreator } from "./parts";
+import SdkConfig from "../SdkConfig";
 
 function parseAtRoomMentions(text: string, partCreator: PartCreator) {
     const ATROOM = "@room";
@@ -59,6 +60,11 @@ function parseLink(a: HTMLAnchorElement, partCreator: PartCreator) {
     }
 }
 
+function parseImage(img: HTMLImageElement, partCreator: PartCreator) {
+    const { src } = img;
+    return partCreator.plain(`![${img.alt.replace(/[[\\\]]/g, c => "\\" + c)}](${src})`);
+}
+
 function parseCodeBlock(n: HTMLElement, partCreator: PartCreator) {
     const parts = [];
     let language = "";
@@ -101,6 +107,8 @@ function parseElement(n: HTMLElement, partCreator: PartCreator, lastNode: HTMLEl
             return parseHeader(n, partCreator);
         case "A":
             return parseLink(<HTMLAnchorElement>n, partCreator);
+        case "IMG":
+            return parseImage(<HTMLImageElement>n, partCreator);
         case "BR":
             return partCreator.newline();
         case "EM":
@@ -130,6 +138,23 @@ function parseElement(n: HTMLElement, partCreator: PartCreator, lastNode: HTMLEl
             }
             break;
         }
+        case "DIV":
+        case "SPAN": {
+            // math nodes are translated back into delimited latex strings
+            if (n.hasAttribute("data-mx-maths")) {
+                const delimLeft = (n.nodeName == "SPAN") ?
+                    (SdkConfig.get()['latex_maths_delims'] || {})['inline_left'] || "$" :
+                    (SdkConfig.get()['latex_maths_delims'] || {})['display_left'] || "$$";
+                const delimRight = (n.nodeName == "SPAN") ?
+                    (SdkConfig.get()['latex_maths_delims'] || {})['inline_right'] || "$" :
+                    (SdkConfig.get()['latex_maths_delims'] || {})['display_right'] || "$$";
+                const tex = n.getAttribute("data-mx-maths");
+                return partCreator.plain(delimLeft + tex + delimRight);
+            } else if (!checkDescendInto(n)) {
+                return partCreator.plain(n.textContent);
+            }
+            break;
+        }
         case "OL":
             state.listIndex.push((<HTMLOListElement>n).start || 1);
             /* falls through */
diff --git a/src/editor/parts.ts b/src/editor/parts.ts
index 5ed0c0529f..8a7ccfcb7b 100644
--- a/src/editor/parts.ts
+++ b/src/editor/parts.ts
@@ -190,7 +190,9 @@ abstract class PlainBasePart extends BasePart {
                 return true;
             }
             // only split if the previous character is a space
-            return this._text[offset - 1] !== " ";
+            // or if it is a + and this is a :
+            return this._text[offset - 1] !== " " &&
+                (this._text[offset - 1] !== "+" || chr !== ":");
         }
         return true;
     }
diff --git a/src/editor/serialize.ts b/src/editor/serialize.ts
index c550f54291..c1f4da306b 100644
--- a/src/editor/serialize.ts
+++ b/src/editor/serialize.ts
@@ -18,6 +18,10 @@ limitations under the License.
 import Markdown from '../Markdown';
 import {makeGenericPermalink} from "../utils/permalinks/Permalinks";
 import EditorModel from "./model";
+import { AllHtmlEntities } from 'html-entities';
+import SettingsStore from '../settings/SettingsStore';
+import SdkConfig from '../SdkConfig';
+import cheerio from 'cheerio';
 
 export function mdSerialize(model: EditorModel) {
     return model.parts.reduce((html, part) => {
@@ -38,10 +42,43 @@ export function mdSerialize(model: EditorModel) {
 }
 
 export function htmlSerializeIfNeeded(model: EditorModel, {forceHTML = false} = {}) {
-    const md = mdSerialize(model);
+    let md = mdSerialize(model);
+
+    if (SettingsStore.getValue("feature_latex_maths")) {
+        const displayPattern = (SdkConfig.get()['latex_maths_delims'] || {})['display_pattern'] ||
+            "\\$\\$(([^$]|\\\\\\$)*)\\$\\$";
+        const inlinePattern = (SdkConfig.get()['latex_maths_delims'] || {})['inline_pattern'] ||
+            "\\$(([^$]|\\\\\\$)*)\\$";
+
+        md = md.replace(RegExp(displayPattern, "gm"), function(m, p1) {
+            const p1e = AllHtmlEntities.encode(p1);
+            return `<div data-mx-maths="${p1e}">\n\n</div>\n\n`;
+        });
+
+        md = md.replace(RegExp(inlinePattern, "gm"), function(m, p1) {
+            const p1e = AllHtmlEntities.encode(p1);
+            return `<span data-mx-maths="${p1e}"></span>`;
+        });
+
+        // make sure div tags always start on a new line, otherwise it will confuse
+        // the markdown parser
+        md = md.replace(/(.)<div/g, function(m, p1) { return `${p1}\n<div`; });
+    }
+
     const parser = new Markdown(md);
     if (!parser.isPlainText() || forceHTML) {
-        return parser.toHTML();
+        // feed Markdown output to HTML parser
+        const phtml = cheerio.load(parser.toHTML(),
+            { _useHtmlParser2: true, decodeEntities: false })
+
+        // add fallback output for latex math, which should not be interpreted as markdown
+        phtml('div, span').each(function(i, e) {
+            const tex = phtml(e).attr('data-mx-maths')
+            if (tex) {
+                phtml(e).html(`<code>${tex}</code>`)
+            }
+        });
+        return phtml.html();
     }
     // ensure removal of escape backslashes in non-Markdown messages
     if (md.indexOf("\\") > -1) {
diff --git a/src/effects/ICanvasEffect.ts b/src/effects/ICanvasEffect.ts
new file mode 100644
index 0000000000..9bf3e9293d
--- /dev/null
+++ b/src/effects/ICanvasEffect.ts
@@ -0,0 +1,47 @@
+/*
+ Copyright 2020 Nurjin Jafar
+ Copyright 2020 Nordeck IT + Consulting GmbH.
+
+ 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.
+ */
+/**
+ * Defines the constructor of a canvas based room effect
+ */
+export interface ICanvasEffectConstructable {
+    /**
+     * @param {{[key:string]:any}} options? Optional animation options
+     * @returns ICanvasEffect Returns a new instance of the canvas effect
+     */
+    new(options?: { [key: string]: any }): ICanvasEffect;
+}
+
+/**
+ * Defines the interface of a canvas based room effect
+ */
+export default interface ICanvasEffect {
+    /**
+     * @param {HTMLCanvasElement} canvas The canvas instance as the render target of the animation
+     * @param {number} timeout? A timeout that defines the runtime of the animation (defaults to false)
+     */
+    start: (canvas: HTMLCanvasElement, timeout?: number) => Promise<void>;
+
+    /**
+     * Stops the current animation
+     */
+    stop: () => Promise<void>;
+
+    /**
+     * Returns a value that defines if the animation is currently running
+     */
+    isRunning: boolean;
+}
diff --git a/src/effects/confetti/index.ts b/src/effects/confetti/index.ts
new file mode 100644
index 0000000000..8c4b2d2616
--- /dev/null
+++ b/src/effects/confetti/index.ts
@@ -0,0 +1,191 @@
+/*
+ Copyright 2020 Nurjin Jafar
+ Copyright 2020 Nordeck IT + Consulting GmbH.
+
+ 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 ICanvasEffect from '../ICanvasEffect';
+
+export type ConfettiOptions = {
+    /**
+     * max confetti count
+     */
+    maxCount: number,
+    /**
+     * particle animation speed
+     */
+    speed: number,
+    /**
+     * the confetti animation frame interval in milliseconds
+     */
+    frameInterval: number,
+    /**
+     * the alpha opacity of the confetti (between 0 and 1, where 1 is opaque and 0 is invisible)
+     */
+    alpha: number,
+    /**
+     * use gradient instead of solid particle color
+     */
+    gradient: boolean,
+}
+
+type ConfettiParticle = {
+    color: string,
+    color2: string,
+    x: number,
+    y: number,
+    diameter: number,
+    tilt: number,
+    tiltAngleIncrement: number,
+    tiltAngle: number,
+}
+
+export const DefaultOptions: ConfettiOptions = {
+    maxCount: 150,
+    speed: 3,
+    frameInterval: 15,
+    alpha: 1.0,
+    gradient: false,
+};
+
+export default class Confetti implements ICanvasEffect {
+    private readonly options: ConfettiOptions;
+
+    constructor(options: { [key: string]: any }) {
+        this.options = {...DefaultOptions, ...options};
+    }
+
+    private context: CanvasRenderingContext2D | null = null;
+    private supportsAnimationFrame = window.requestAnimationFrame;
+    private colors = ['rgba(30,144,255,', 'rgba(107,142,35,', 'rgba(255,215,0,',
+        'rgba(255,192,203,', 'rgba(106,90,205,', 'rgba(173,216,230,',
+        'rgba(238,130,238,', 'rgba(152,251,152,', 'rgba(70,130,180,',
+        'rgba(244,164,96,', 'rgba(210,105,30,', 'rgba(220,20,60,'];
+
+    private lastFrameTime = Date.now();
+    private particles: Array<ConfettiParticle> = [];
+    private waveAngle = 0;
+
+    public isRunning: boolean;
+
+    public start = async (canvas: HTMLCanvasElement, timeout = 3000) => {
+        if (!canvas) {
+            return;
+        }
+        this.context = canvas.getContext('2d');
+        this.particles = [];
+        const count = this.options.maxCount;
+        while (this.particles.length < count) {
+            this.particles.push(this.resetParticle({} as ConfettiParticle, canvas.width, canvas.height));
+        }
+        this.isRunning = true;
+        this.runAnimation();
+        if (timeout) {
+            window.setTimeout(this.stop, timeout);
+        }
+    }
+
+    public stop = async () => {
+        this.isRunning = false;
+    }
+
+    private resetParticle = (particle: ConfettiParticle, width: number, height: number): ConfettiParticle => {
+        particle.color = this.colors[(Math.random() * this.colors.length) | 0] + (this.options.alpha + ')');
+        if (this.options.gradient) {
+            particle.color2 = this.colors[(Math.random() * this.colors.length) | 0] + (this.options.alpha + ')');
+        } else {
+            particle.color2 = particle.color;
+        }
+        particle.x = Math.random() * width;
+        particle.y = Math.random() * -height;
+        particle.diameter = Math.random() * 10 + 5;
+        particle.tilt = Math.random() * -10;
+        particle.tiltAngleIncrement = Math.random() * 0.07 + 0.05;
+        particle.tiltAngle = Math.random() * Math.PI;
+        return particle;
+    }
+
+    private runAnimation = (): void => {
+        if (!this.context || !this.context.canvas) {
+            return;
+        }
+        if (this.particles.length === 0) {
+            this.context.clearRect(0, 0, this.context.canvas.width, this.context.canvas.height);
+        } else {
+            const now = Date.now();
+            const delta = now - this.lastFrameTime;
+            if (!this.supportsAnimationFrame || delta > this.options.frameInterval) {
+                this.context.clearRect(0, 0, this.context.canvas.width, this.context.canvas.height);
+                this.updateParticles();
+                this.drawParticles(this.context);
+                this.lastFrameTime = now - (delta % this.options.frameInterval);
+            }
+            requestAnimationFrame(this.runAnimation);
+        }
+    }
+
+
+    private drawParticles = (context: CanvasRenderingContext2D): void => {
+        if (!this.context || !this.context.canvas) {
+            return;
+        }
+        let x; let x2; let y2;
+        for (const particle of this.particles) {
+            this.context.beginPath();
+            context.lineWidth = particle.diameter;
+            x2 = particle.x + particle.tilt;
+            x = x2 + particle.diameter / 2;
+            y2 = particle.y + particle.tilt + particle.diameter / 2;
+            if (this.options.gradient) {
+                const gradient = context.createLinearGradient(x, particle.y, x2, y2);
+                gradient.addColorStop(0, particle.color);
+                gradient.addColorStop(1.0, particle.color2);
+                context.strokeStyle = gradient;
+            } else {
+                context.strokeStyle = particle.color;
+            }
+            context.moveTo(x, particle.y);
+            context.lineTo(x2, y2);
+            context.stroke();
+        }
+    }
+
+    private updateParticles = () => {
+        if (!this.context || !this.context.canvas) {
+            return;
+        }
+        const width = this.context.canvas.width;
+        const height = this.context.canvas.height;
+        let particle: ConfettiParticle;
+        this.waveAngle += 0.01;
+        for (let i = 0; i < this.particles.length; i++) {
+            particle = this.particles[i];
+            if (!this.isRunning && particle.y < -15) {
+                particle.y = height + 100;
+            } else {
+                particle.tiltAngle += particle.tiltAngleIncrement;
+                particle.x += Math.sin(this.waveAngle) - 0.5;
+                particle.y += (Math.cos(this.waveAngle) + particle.diameter + this.options.speed) * 0.5;
+                particle.tilt = Math.sin(particle.tiltAngle) * 15;
+            }
+            if (particle.x > width + 20 || particle.x < -20 || particle.y > height) {
+                if (this.isRunning && this.particles.length <= this.options.maxCount) {
+                    this.resetParticle(particle, width, height);
+                } else {
+                    this.particles.splice(i, 1);
+                    i--;
+                }
+            }
+        }
+    }
+}
diff --git a/src/effects/fireworks/index.ts b/src/effects/fireworks/index.ts
new file mode 100644
index 0000000000..96a27531af
--- /dev/null
+++ b/src/effects/fireworks/index.ts
@@ -0,0 +1,174 @@
+/*
+ Copyright 2020 Nurjin Jafar
+ Copyright 2020 Nordeck IT + Consulting GmbH.
+
+ 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 ICanvasEffect from '../ICanvasEffect';
+
+export type FireworksOptions = {
+    /**
+     * max fireworks count
+     */
+    maxCount: number;
+    /**
+     * gravity value that firework adds to shift from it's start position
+     */
+    gravity: number;
+}
+
+type FireworksParticle = {
+    /**
+     * color
+     */
+    color: string;
+    /**
+     * x,y are the point where the particle starts to position on canvas
+     */
+    x: number;
+    y: number;
+    /**
+     * vx,vy shift values from x and y
+     */
+    vx: number;
+    vy: number;
+    /**
+     * the alpha opacity of the firework particle (between 0 and 1, where 1 is opaque and 0 is invisible)
+     */
+    alpha: number;
+    /**
+     * w,h width and height
+     */
+    w: number;
+    h: number;
+}
+
+export const DefaultOptions: FireworksOptions = {
+    maxCount: 500,
+    gravity: 0.05,
+};
+
+export default class Fireworks implements ICanvasEffect {
+    private readonly options: FireworksOptions;
+
+    constructor(options: { [key: string]: any }) {
+        this.options = {...DefaultOptions, ...options};
+    }
+
+    private context: CanvasRenderingContext2D | null = null;
+    private supportsAnimationFrame = window.requestAnimationFrame;
+    private particles: Array<FireworksParticle> = [];
+    public isRunning: boolean;
+
+    public start = async (canvas: HTMLCanvasElement, timeout = 3000) => {
+        if (!canvas) {
+            return;
+        }
+        this.isRunning = true;
+        this.context = canvas.getContext('2d');
+        this.supportsAnimationFrame.call(window, this.updateWorld);
+        if (timeout) {
+            window.setTimeout(this.stop, timeout);
+        }
+    }
+
+    private updateWorld = () => {
+        if (!this.isRunning && this.particles.length === 0) return;
+        this.update();
+        this.paint();
+        this.supportsAnimationFrame.call(window, this.updateWorld);
+    }
+
+    private update = () => {
+        if (this.particles.length < this.options.maxCount && this.isRunning) {
+            this.createFirework();
+        }
+        const alive = [];
+        for (let i=0; i<this.particles.length; i++) {
+            if (this.move(this.particles[i])) {
+                alive.push(this.particles[i]);
+            }
+        }
+        this.particles = alive;
+    }
+
+    private paint = () => {
+        if (!this.context || !this.context.canvas) return;
+        this.context.globalCompositeOperation = 'destination-out';
+        this.context.fillStyle = "rgba(0,0,0,0.5)";
+        this.context.fillRect(0, 0, this.context.canvas.width, this.context.canvas.height);
+        this.context.globalCompositeOperation = 'lighter';
+        for (let i=0; i<this.particles.length; i++) {
+            this.drawParticle(this.particles[i]);
+        }
+    }
+
+    private createFirework = () => {
+        if (!this.context || !this.context.canvas) return;
+        const width = this.context.canvas.width;
+        const height = this.context.canvas.height;
+        const xPoint = Math.random() * (width - 200) + 100;
+        const yPoint = Math.random() * (height - 200) + 100;
+        const nFire = Math.random() * 50 + 100;
+        const color = "rgb("+(~~(Math.random()*200+55))+","
+            +(~~(Math.random()*200+55))+","+(~~(Math.random()*200+55))+")";
+        for (let i=0; i<nFire; i++) {
+            const particle = <FireworksParticle>{};
+            particle.color = color;
+            particle.w = particle.h = Math.random() * 4 + 1;
+            particle.x = xPoint - particle.w / 2;
+            particle.y = yPoint - particle.h / 2;
+            particle.vx = (Math.random()-0.5)*10;
+            particle.vy = (Math.random()-0.5)*10;
+            particle.alpha = Math.random()*.5+.5;
+            const vy = Math.sqrt(25 - particle.vx * particle.vx);
+            if (Math.abs(particle.vy) > vy) {
+                particle.vy = particle.vy > 0 ? vy: -vy;
+            }
+            this.particles.push(particle);
+        }
+    }
+
+    public stop = async () => {
+        this.isRunning = false;
+    }
+
+    private drawParticle = (particle: FireworksParticle): void => {
+        if (!this.context || !this.context.canvas) {
+            return;
+        }
+        this.context.save();
+        this.context.beginPath();
+
+        this.context.translate(particle.x + particle.w / 2, particle.y + particle.h / 2);
+        this.context.arc(0, 0, particle.w, 0, Math.PI * 2);
+        this.context.fillStyle = particle.color;
+        this.context.globalAlpha = particle.alpha;
+
+        this.context.closePath();
+        this.context.fill();
+        this.context.restore();
+    }
+
+
+    private move = (particle: FireworksParticle) => {
+        particle.x += particle.vx;
+        particle.vy += this.options.gravity;
+        particle.y += particle.vy;
+        particle.alpha -= 0.01;
+        return !(particle.x <= -particle.w || particle.x >= screen.width ||
+            particle.y >= screen.height ||
+            particle.alpha <= 0);
+    }
+}
diff --git a/src/effects/index.ts b/src/effects/index.ts
new file mode 100644
index 0000000000..a22948ebcf
--- /dev/null
+++ b/src/effects/index.ts
@@ -0,0 +1,136 @@
+/*
+ Copyright 2020 Nurjin Jafar
+ Copyright 2020 Nordeck IT + Consulting GmbH.
+
+ 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 { _t, _td } from "../languageHandler";
+
+export type Effect<TOptions extends { [key: string]: any }> = {
+    /**
+     * one or more emojis that will trigger this effect
+     */
+    emojis: Array<string>;
+    /**
+     * the matrix message type that will trigger this effect
+     */
+    msgType: string;
+    /**
+     * the room command to trigger this effect
+     */
+    command: string;
+    /**
+     * a function that returns the translated description of the effect
+     */
+    description: () => string;
+    /**
+     * a function that returns the translated fallback message. this message will be shown if the user did not provide a custom message
+     */
+    fallbackMessage: () => string;
+    /**
+     * animation options
+     */
+    options: TOptions;
+}
+
+type ConfettiOptions = {
+    /**
+     * max confetti count
+     */
+    maxCount: number;
+    /**
+     * particle animation speed
+     */
+    speed: number;
+    /**
+     * the confetti animation frame interval in milliseconds
+     */
+    frameInterval: number;
+    /**
+     * the alpha opacity of the confetti (between 0 and 1, where 1 is opaque and 0 is invisible)
+     */
+    alpha: number;
+    /**
+     * use gradient instead of solid particle color
+     */
+    gradient: boolean;
+};
+type FireworksOptions = {
+    /**
+     * max fireworks count
+     */
+    maxCount: number;
+    /**
+     * gravity value that firework adds to shift from it's start position
+     */
+    gravity: number;
+}
+type SnowfallOptions = {
+    /**
+     * The maximum number of snowflakes to render at a given time
+     */
+    maxCount: number;
+    /**
+     * The amount of gravity to apply to the snowflakes
+     */
+    gravity: number;
+    /**
+     * The amount of drift (horizontal sway) to apply to the snowflakes. Each snowflake varies.
+     */
+    maxDrift: number;
+}
+
+/**
+ * This configuration defines room effects that can be triggered by custom message types and emojis
+ */
+export const CHAT_EFFECTS: Array<Effect<{ [key: string]: any }>> = [
+    {
+        emojis: ['🎊', '🎉'],
+        msgType: 'nic.custom.confetti',
+        command: 'confetti',
+        description: () => _td("Sends the given message with confetti"),
+        fallbackMessage: () => _t("sends confetti") + " 🎉",
+        options: {
+            maxCount: 150,
+            speed: 3,
+            frameInterval: 15,
+            alpha: 1.0,
+            gradient: false,
+        },
+    } as Effect<ConfettiOptions>,
+    {
+        emojis: ['🎆'],
+        msgType: 'nic.custom.fireworks',
+        command: 'fireworks',
+        description: () => _td("Sends the given message with fireworks"),
+        fallbackMessage: () => _t("sends fireworks") + " 🎆",
+        options: {
+            maxCount: 500,
+            gravity: 0.05,
+        },
+    } as Effect<FireworksOptions>,
+    {
+        emojis: ['❄', '🌨'],
+        msgType: 'io.element.effect.snowfall',
+        command: 'snowfall',
+        description: () => _td("Sends the given message with snowfall"),
+        fallbackMessage: () => _t("sends snowfall") + " ❄",
+        options: {
+            maxCount: 200,
+            gravity: 0.05,
+            maxDrift: 5,
+        },
+    } as Effect<SnowfallOptions>,
+];
+
+
diff --git a/src/effects/snowfall/index.ts b/src/effects/snowfall/index.ts
new file mode 100644
index 0000000000..2affb50405
--- /dev/null
+++ b/src/effects/snowfall/index.ts
@@ -0,0 +1,148 @@
+/*
+ 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 ICanvasEffect from '../ICanvasEffect';
+import { arrayFastClone } from "../../utils/arrays";
+
+export type SnowfallOptions = {
+    /**
+     * The maximum number of snowflakes to render at a given time
+     */
+    maxCount: number;
+    /**
+     * The amount of gravity to apply to the snowflakes
+     */
+    gravity: number;
+    /**
+     * The amount of drift (horizontal sway) to apply to the snowflakes. Each snowflake varies.
+     */
+    maxDrift: number;
+}
+
+type Snowflake = {
+    x: number;
+    y: number;
+    xCol: number;
+    diameter: number;
+    maximumDrift: number;
+    gravity: number;
+}
+
+export const DefaultOptions: SnowfallOptions = {
+    maxCount: 200,
+    gravity: 0.05,
+    maxDrift: 5,
+};
+
+const KEY_FRAME_INTERVAL = 15; // 15ms, roughly
+
+export default class Snowfall implements ICanvasEffect {
+    private readonly options: SnowfallOptions;
+
+    constructor(options: { [key: string]: any }) {
+        this.options = {...DefaultOptions, ...options};
+    }
+
+    private context: CanvasRenderingContext2D | null = null;
+    private particles: Array<Snowflake> = [];
+    private lastAnimationTime: number;
+
+    public isRunning: boolean;
+
+    public start = async (canvas: HTMLCanvasElement, timeout = 3000) => {
+        if (!canvas) {
+            return;
+        }
+        this.context = canvas.getContext('2d');
+        this.particles = [];
+        const count = this.options.maxCount;
+        while (this.particles.length < count) {
+            this.particles.push(this.resetParticle({} as Snowflake, canvas.width, canvas.height));
+        }
+        this.isRunning = true;
+        requestAnimationFrame(this.renderLoop);
+        if (timeout) {
+            window.setTimeout(this.stop, timeout);
+        }
+    }
+
+    public stop = async () => {
+        this.isRunning = false;
+    }
+
+    private resetParticle = (particle: Snowflake, width: number, height: number): Snowflake => {
+        particle.x = Math.random() * width;
+        particle.y = Math.random() * -height;
+        particle.xCol = particle.x;
+        particle.diameter = (Math.random() * 7) + 4;
+        particle.maximumDrift = (Math.random() * this.options.maxDrift) + 3.5;
+        particle.gravity = this.options.gravity + (Math.random() * 6) + 4;
+        return particle;
+    }
+
+    private renderLoop = (): void => {
+        if (!this.context || !this.context.canvas) {
+            return;
+        }
+        if (this.particles.length === 0) {
+            this.context.clearRect(0, 0, this.context.canvas.width, this.context.canvas.height);
+        } else {
+            const timeDelta = Date.now() - this.lastAnimationTime;
+            if (timeDelta >= KEY_FRAME_INTERVAL || !this.lastAnimationTime) {
+                // Clear the screen first
+                this.context.clearRect(0, 0, this.context.canvas.width, this.context.canvas.height);
+
+                this.lastAnimationTime = Date.now();
+                this.animateAndRenderSnowflakes();
+            }
+            requestAnimationFrame(this.renderLoop);
+        }
+    };
+
+    private animateAndRenderSnowflakes() {
+        if (!this.context || !this.context.canvas) {
+            return;
+        }
+        const height = this.context.canvas.height;
+        for (const particle of arrayFastClone(this.particles)) {
+            particle.y += particle.gravity;
+
+            // We treat the drift as a sine function to have a more fluid-like movement instead
+            // of a pong-like movement off walls of the X column. This means that for
+            // $x=A\sin(\frac{2\pi}{P}y)$ we use the `maximumDrift` as the amplitude (A) and a
+            // large multiplier to create a very long waveform through P.
+            const peakDistance = 75 * particle.maximumDrift;
+            const PI2 = Math.PI * 2;
+            particle.x = particle.maximumDrift * Math.sin((PI2 / peakDistance) * particle.y);
+            particle.x += particle.xCol; // bring the particle to the right place
+
+            const radius = particle.diameter / 2;
+            this.context.save();
+            this.context.beginPath();
+            this.context.ellipse(particle.x, particle.y, radius, radius, 0, 0, 360);
+            this.context.fillStyle = '#eaeaea'; // grey so it shows up on the light theme
+            this.context.fill();
+            this.context.closePath();
+            this.context.restore();
+
+            // Remove any dead snowflakes
+            const maxBounds = radius * 4; // make sure it's *really* off screen
+            if (particle.y > (height + maxBounds)) {
+                const idx = this.particles.indexOf(particle);
+                this.particles.splice(idx, 1);
+            }
+        }
+    }
+}
diff --git a/src/effects/utils.ts b/src/effects/utils.ts
new file mode 100644
index 0000000000..c2b499b154
--- /dev/null
+++ b/src/effects/utils.ts
@@ -0,0 +1,24 @@
+/*
+ Copyright 2020 Nurjin Jafar
+ Copyright 2020 Nordeck IT + Consulting GmbH.
+
+ 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.
+ */
+/**
+ * Checks a message if it contains one of the provided emojis
+ * @param  {Object} content The message
+ * @param  {Array<string>} emojis The list of emojis to check for
+ */
+export const containsEmoji = (content: { msgtype: string, body: string }, emojis: Array<string>): boolean => {
+    return emojis.some((emoji) => content.body && content.body.includes(emoji));
+}
diff --git a/src/hooks/useLocalStorageState.ts b/src/hooks/useLocalStorageState.ts
index ce3b574f86..943db9ab4e 100644
--- a/src/hooks/useLocalStorageState.ts
+++ b/src/hooks/useLocalStorageState.ts
@@ -26,7 +26,7 @@ const getValue = <T>(key: string, initialValue: T): T => {
 };
 
 // Hook behaving like useState but persisting the value to localStorage. Returns same as useState
-export const useLocalStorageState = <T>(key: string, initialValue: T) => {
+export const useLocalStorageState = <T>(key: string, initialValue: T): [T, Dispatch<SetStateAction<T>>] => {
     const lsKey = "mx_" + key;
 
     const [value, setValue] = useState<T>(getValue(lsKey, initialValue));
diff --git a/src/hooks/useRoomMembers.ts b/src/hooks/useRoomMembers.ts
new file mode 100644
index 0000000000..e25436045e
--- /dev/null
+++ b/src/hooks/useRoomMembers.ts
@@ -0,0 +1,40 @@
+/*
+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 {useState} from "react";
+import {Room} from "matrix-js-sdk/src/models/room";
+import {RoomMember} from "matrix-js-sdk/src/models/room-member";
+
+import {useEventEmitter} from "./useEventEmitter";
+import {throttle} from "lodash";
+
+// Hook to simplify watching Matrix Room joined members
+export const useRoomMembers = (room: Room, throttleWait = 250) => {
+    const [members, setMembers] = useState<RoomMember[]>(room.getJoinedMembers());
+    useEventEmitter(room.currentState, "RoomState.members", throttle(() => {
+        setMembers(room.getJoinedMembers());
+    }, throttleWait, {leading: true, trailing: true}));
+    return members;
+};
+
+// Hook to simplify watching Matrix Room joined member count
+export const useRoomMemberCount = (room: Room, throttleWait = 250) => {
+    const [count, setCount] = useState<number>(room.getJoinedMemberCount());
+    useEventEmitter(room.currentState, "RoomState.members", throttle(() => {
+        setCount(room.getJoinedMemberCount());
+    }, throttleWait, {leading: true, trailing: true}));
+    return count;
+};
diff --git a/src/hooks/useSettings.ts b/src/hooks/useSettings.ts
index 9534fccc4c..3aa38c44f4 100644
--- a/src/hooks/useSettings.ts
+++ b/src/hooks/useSettings.ts
@@ -18,12 +18,12 @@ import {useEffect, useState} from "react";
 import SettingsStore from '../settings/SettingsStore';
 
 // Hook to fetch the value of a setting and dynamically update when it changes
-export const useSettingValue = (settingName: string, roomId: string = null, excludeDefault = false) => {
-    const [value, setValue] = useState(SettingsStore.getValue(settingName, roomId, excludeDefault));
+export const useSettingValue = <T>(settingName: string, roomId: string = null, excludeDefault = false) => {
+    const [value, setValue] = useState(SettingsStore.getValue<T>(settingName, roomId, excludeDefault));
 
     useEffect(() => {
         const ref = SettingsStore.watchSetting(settingName, roomId, () => {
-            setValue(SettingsStore.getValue(settingName, roomId, excludeDefault));
+            setValue(SettingsStore.getValue<T>(settingName, roomId, excludeDefault));
         });
         // clean-up
         return () => {
diff --git a/src/hooks/useStateArray.ts b/src/hooks/useStateArray.ts
new file mode 100644
index 0000000000..e8ff6efff0
--- /dev/null
+++ b/src/hooks/useStateArray.ts
@@ -0,0 +1,29 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import {useState} from "react";
+
+// Hook to simplify managing state of arrays of a common type
+export const useStateArray = <T>(initialSize: number, initialState: T | T[]): [T[], (i: number, v: T) => void] => {
+    const [data, setData] = useState<T[]>(() => {
+        return Array.isArray(initialState) ? initialState : new Array(initialSize).fill(initialState);
+    });
+    return [data, (index: number, value: T) => setData(data => {
+        const copy = [...data];
+        copy[index] = value;
+        return copy;
+    })]
+};
diff --git a/src/hooks/useStateCallback.ts b/src/hooks/useStateCallback.ts
new file mode 100644
index 0000000000..f3993c1d32
--- /dev/null
+++ b/src/hooks/useStateCallback.ts
@@ -0,0 +1,28 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import {Dispatch, SetStateAction, useState} from "react";
+
+// Hook to simplify interactions with a store-backed state values
+// Returns value and method to change the state value
+export const useStateCallback = <T>(initialValue: T, callback: (v: T) => void): [T, Dispatch<SetStateAction<T>>] => {
+    const [value, setValue] = useState(initialValue);
+    const interceptSetValue = (newVal: T) => {
+        setValue(newVal);
+        callback(newVal);
+    };
+    return [value, interceptSetValue];
+};
diff --git a/src/i18n/strings/ar.json b/src/i18n/strings/ar.json
index 718edd4c26..5da09afd23 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,1128 @@
     "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": "رُفض الاتصال",
+    "See videos posted to your active room": "أظهر الفيديوهات المرسلة إلى هذه غرفتك النشطة",
+    "See videos posted to this room": "أظهر الفيديوهات المرسلة إلى هذه الغرفة",
+    "Send videos as you in your active room": "أرسل الفيديوهات بهويتك في غرفتك النشطة",
+    "Send videos as you in this room": "أرسل الفيديوهات بهويتك في هذه الغرفة",
+    "See messages posted to this room": "أرسل الرسائل المرسلة إلى هذه الغرفة",
+    "See images posted to your active room": "أظهر الصور المرسلة إلى غرفتك النشطة",
+    "See images posted to this room": "أظهر الصور المرسلة إلى هذه الغرفة",
+    "Send images as you in your active room": "أرسل الصور بهويتك في غرفتك النشطة",
+    "Send images as you in this room": "أرسل الصور بهويتك في هذه الغرفة",
+    "See emotes posted to your active room": "أظهر الرموز التعبيرية المرسلة لغرفتك النشطة",
+    "See emotes posted to this room": "أظهر الرموز التعبيرية المرسلة إلى هذه الغرفة",
+    "Send emotes as you in your active room": "أظهر الرموز التعبيرية بهويتك في غرفتك النشطة",
+    "Send emotes as you in this room": "أرسل الرموز التعبيرية بهويتك",
+    "See text messages posted to your active room": "أظهر الرسائل النصية المرسلة إلى غرفتك النشطة",
+    "See text messages posted to this room": "أظهر الرسائل النصية المرسلة إلى هذه الغرفة",
+    "Send text messages as you in your active room": "أرسل الرسائل النصية بهويتك في غرفتك النشطة",
+    "Send text messages as you in this room": "أرسل الرسائل النصية بهويتك في هذه الغرفة",
+    "See messages posted to your active room": "أظهر الرسائل المرسلة إلى غرفتك النشطة",
+    "Send messages as you in your active room": "أرسل رسائل بهويتك في غرفتك النشطة",
+    "Send messages as you in this room": "أرسل رسائل بهويتك في هذه الغرفة",
+    "The <b>%(capability)s</b> capability": "القدرة <b>%(capability)s</b>",
+    "See <b>%(eventType)s</b> events posted to your active room": "أظهر أحداث <b>%(eventType)s</b> المنشورة بغرفة النشطة",
+    "Send <b>%(eventType)s</b> events as you in your active room": "أرسل أحداث <b>%(eventType)s</b> بهويتك في غرفتك النشطة",
+    "See <b>%(eventType)s</b> events posted to this room": "أظهر أحداث <b>%(eventType)s</b> المنشورة في هذه الغرفة",
+    "Send <b>%(eventType)s</b> events as you in this room": "أرسل أحداث <b>%(eventType)s</b> بهويتك في هذه الغرفة",
+    "with state key %(stateKey)s": "مع مفتاح الحالة %(stateKey)s",
+    "with an empty state key": "بمفتاح حالة فارغ",
+    "See when anyone posts a sticker to your active room": "أظهر وضع أي أحد للملصقات لغرفتك النشطة",
+    "Send stickers to your active room as you": "أرسل ملصقات لغرفتك النشطة بهويتك",
+    "See when a sticker is posted in this room": "أظهر وضع الملصقات في هذه الغرفة",
+    "Send stickers to this room as you": "أرسل ملصقات لهذه الغرفة بهويتك",
+    "See when the avatar changes in your active room": "أظهر تغييرات صورة غرفتك النشطة",
+    "Change the avatar of your active room": "غير صورة غرفتك النشطة",
+    "See when the avatar changes in this room": "أظهر تغييرات الصورة في هذه الغرفة",
+    "Change the avatar of this room": "غير صورة هذه الغرفة",
+    "See when the name changes in your active room": "أظهر تغييرات الاسم في غرفتك النشطة",
+    "Change the name of your active room": "غير اسم غرفتك النشطة",
+    "See when the name changes in this room": "أظهر تغييرات الاسم في هذه الغرفة",
+    "Change the name of this room": "غير اسم هذه الغرفة",
+    "See when the topic changes in your active room": "أظهر تغيير موضوع غرفتك النشطة",
+    "Change the topic of your active room": "غير موضوع غرفتك النشطة",
+    "See when the topic changes in this room": "أظهر تغير موضوع هذه الغرفة",
+    "Change the topic of this room": "تغيير موضوع هذه الغرفة",
+    "Change which room you're viewing": "تغيير الغرفة التي تشاهدها",
+    "Send stickers into your active room": "أرسل ملصقات إلى غرفتك النشطة",
+    "Send stickers into this room": "أرسل ملصقات إلى هذه الغرفة",
+    "Remain on your screen while running": "ابقَ على شاشتك أثناء إجراء",
+    "Remain on your screen when viewing another room, when running": "ابقَ على شاشتك عند مشاهدة غرفة أخرى أثناء إجراء",
+    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s حدَّث قاعدة حظر المستخدمين المطابقة %(glob)s بسبب %(reason)s",
+    "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s حدَّث قاعدة حظر الخوادم المطابقة %(glob)s بسبب %(reason)s",
+    "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s حدَّث قاعدة حظر الغرفة المطابقة %(glob)s بسبب %(reason)s",
+    "%(senderName)s declined the call.": "%(senderName)s رفض المكالمة.",
+    "(an error occurred)": "(حدث خطأ)",
+    "(their device couldn't start the camera / microphone)": "(تعذر على جهازهم بدء تشغيل الكاميرا / الميكروفون)",
+    "(connection failed)": "(فشل الاتصال)",
+    "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 جميع الخوادم ممنوعة من المشاركة! لم يعد من الممكن استخدام هذه الغرفة.",
+    "Takes the call in the current room off hold": "يوقف المكالمة في الغرفة الحالية",
+    "Places the call in the current room on hold": "يضع المكالمة في الغرفة الحالية قيد الانتظار",
+    "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "يلصق (͡ ° ͜ʖ ͡ °) أوَّل رسالة نصية عادية",
+    "No other application is using the webcam": "لا يوجد تطبيق آخر يستخدم كاميرا الويب",
+    "Permission is granted to use the webcam": "منح الإذن باستخدام كاميرا الويب",
+    "A microphone and webcam are plugged in and set up correctly": "الميكروفون وكاميرا ويب موصولان ومعدان بشكل صحيح",
+    "Call failed because no webcam or microphone could not be accessed. Check that:": "فشلت المكالمة نظرًا لتعذر الوصول إلى كاميرا الويب أو الميكروفون. تحقق مما يلي:",
+    "Unable to access webcam / microphone": "تعذر الوصول إلى كاميرا الويب / الميكروفون",
+    "Call failed because no microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "فشلت المكالمة لأنه لا يمكن الوصول إلى ميكروفون. تحقق من توصيل الميكروفون وإعداده بشكل صحيح.",
+    "Unable to access microphone": "تعذر الوصول إلى الميكروفون"
 }
diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 32652669af..8c6ea60a8d 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -851,7 +851,7 @@
     "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.": "Съобщението Ви не бе изпратено, защото този сървър е някой от лимитите си. Моля, <a>свържете се с администратора на услугата</a> за да продължите да я използвате.",
     "Please <a>contact your service administrator</a> to continue using this service.": "Моля, <a>свържете се с администратора на услугата</a> за да продължите да я използвате.",
     "Sorry, your homeserver is too old to participate in this room.": "Съжаляваме, вашият сървър е прекалено стар за да участва в тази стая.",
-    "Please contact your homeserver administrator.": "Моля, свържете се се със сървърния администратор.",
+    "Please contact your homeserver administrator.": "Моля, свържете се със сървърния администратор.",
     "Legal": "Юридически",
     "Unable to connect to Homeserver. Retrying...": "Неуспешно свързване със сървъра. Опитване отново...",
     "This room has been replaced and is no longer active.": "Тази стая е била заменена и вече не е активна.",
@@ -1612,11 +1612,11 @@
     "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s премахна правилото блокиращо достъпа до стаи отговарящи на %(glob)s",
     "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s премахна правилото блокиращо достъпа до сървъри отговарящи на %(glob)s",
     "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s премахна правилото блокиращо достъпа неща отговарящи на %(glob)s",
-    "%(senderName)s updated an invalid ban rule": "%(senderName)s обнови невалидно правило за блокиране",
-    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s премахна правилото блокиращо достъпа на потребители отговарящи на %(glob)s поради %(reason)s",
-    "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s премахна правилото блокиращо достъпа до стаи отговарящи на %(glob)s поради %(reason)s",
-    "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s премахна правилото блокиращо достъпа до сървъри отговарящи на %(glob)s поради %(reason)s",
-    "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s премахна правилото блокиращо достъпа неща отговарящи на %(glob)s поради %(reason)s",
+    "%(senderName)s updated an invalid ban rule": "%(senderName)s промени невалидно правило за блокиране",
+    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s промени правилото блокиращо достъпа на потребители отговарящи на %(glob)s поради %(reason)s",
+    "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s промени правилото блокиращо достъпа до стаи отговарящи на %(glob)s поради %(reason)s",
+    "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s промени правилото блокиращо достъпа до сървъри отговарящи на %(glob)s поради %(reason)s",
+    "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s промени правило блокиращо достъпа неща отговарящи на %(glob)s поради %(reason)s",
     "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s създаде правило блокиращо достъпа на потребители отговарящи на %(glob)s поради %(reason)s",
     "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s създаде правило блокиращо достъпа до стаи отговарящи на %(glob)s поради %(reason)s",
     "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s създаде правило блокиращо достъпа до сървъри отговарящи на %(glob)s поради %(reason)s",
@@ -1949,7 +1949,7 @@
     "Accepting…": "Приемане…",
     "Start Verification": "Започни верификация",
     "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Съобщенията ви са защитени и само вие и получателят имате уникалните ключове за да ги отключите.",
-    "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "В шифровани стаи,  съобщенията ви са защитени и само вие и получателят имате уникалните ключове за да ги отключите.",
+    "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "В шифровани стаи, съобщенията ви са защитени и само вие и получателят имате уникалните ключове за да ги отключите.",
     "Verify User": "Потвърди потребителя",
     "For extra security, verify this user by checking a one-time code on both of your devices.": "За допълнителна сигурност, потвърдете този потребител като проверите еднократен код на устройствата ви.",
     "Your messages are not secure": "Съобщенията ви не са защитени",
@@ -2305,5 +2305,531 @@
     "You were uninvited": "Поканата към вас беше премахната",
     "%(targetName)s was uninvited": "Поканата към %(targetName)s беше премахната",
     "You were banned (%(reason)s)": "Бяхте блокирани (%(reason)s)",
-    "%(targetName)s was banned (%(reason)s)": "%(targetName)s беше блокиран(а) (%(reason)s)"
+    "%(targetName)s was banned (%(reason)s)": "%(targetName)s беше блокиран(а) (%(reason)s)",
+    "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
+    "* %(senderName)s %(emote)s": "%(senderName)s%(emote)s",
+    "The person who invited you already left the room, or their server is offline.": "Участникът който ви е поканил вече е напуснал стаята или техният сървър не е на линия.",
+    "The person who invited you already left the room.": "Участникът който ви покани вече напусна стаята.",
+    "Safeguard against losing access to encrypted messages & data": "Защитете се срещу загуба на достъп до криптирани съобшения и информация",
+    "Set up Secure Backup": "Конфигуриране на Защитен Архив",
+    "Unknown App": "Неизвестно приложение",
+    "Error leaving room": "Грешка при напускане на стаята",
+    "%(senderName)s declined the call.": "%(senderName)s отказа разговора.",
+    "(their device couldn't start the camera / microphone)": "(тяхното устройство не може да стартира камерата / микрофонът)",
+    "(connection failed)": "(връзката се разпадна)",
+    "Are you sure you want to cancel entering passphrase?": "Сигурни ли сте че желате да прекратите въвеждането на паролата?",
+    "This will end the conference for everyone. Continue?": "Това ще прекрати конферентният разговор за всички. Продължи?",
+    "End conference": "Прекрати конфетентният разговор",
+    "Call Declined": "Обаждането е отказано",
+    "The call could not be established": "Обаждането не може да бъде осъществено",
+    "The other party declined the call.": "Другата страна отказа обаждането.",
+    "Answered Elsewhere": "Отговорено на друго място",
+    "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s зададе ACLs на сървър за тази стая.",
+    "Incoming call": "Входящ разговор",
+    "Incoming video call": "Входящ видео разговор",
+    "Incoming voice call": "Входящ гласов разговор",
+    "Unknown caller": "Непознат абонат",
+    "Downloading logs": "Изтегляне на логове",
+    "Uploading logs": "Качване на логове",
+    "Enable experimental, compact IRC style layout": "Включи експериментално, компактно IRC оформление",
+    "Use a more compact ‘Modern’ layout": "Използвай по-компактно 'Модерно' оформление",
+    "Enable advanced debugging for the room list": "Включи разрешен debugging за списъка със стаите",
+    "Offline encrypted messaging using dehydrated devices": "Офлайн шифровани съобщения чрез използването на дехидратирани устройства",
+    "Show message previews for reactions in all rooms": "Показвай преглед на реакциите за всички стаи",
+    "Show message previews for reactions in DMs": "Показвай преглед на реакциите за директни съобщения",
+    "New spinner design": "Нов дизайн на индикатора за активност",
+    "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Протипи за Общности v2. Изисква сървър съвместим с това. Много експериментално - използвайте с повишено внимание.",
+    "Change notification settings": "Промяна на настройките за уведомление",
+    "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
+    "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
+    "Unexpected server error trying to leave the room": "Възникна неочаквана сървърна грешка при опит за напускане на стаята",
+    "(an error occurred)": "(възникна грешка)",
+    "🎉 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.": "На обаждането беше отговорено от друго устройство.",
+    "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": "Не пропускайте отговор",
+    "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.": "Предпазете се от загуба на достъп до шифрованите съобщения и данни като направите резервно копие на ключовете за шифроване върху сървъра.",
+    "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 профил съществуващ на друг сървър.",
+    "Forgot password?": "Забравена парола?",
+    "Search (must be enabled)": "Търсене (трябва да е включено)",
+    "Go to Home View": "Отиване на начален изглед",
+    "%(creator)s created this DM.": "%(creator)s създаде този директен чат.",
+    "You have no visible notifications.": "Нямате видими уведомления.",
+    "Filter rooms and people": "Филтриране на стаи и хора",
+    "Got an account? <a>Sign in</a>": "Имате профил? <a>Влезте от тук</a>",
+    "New here? <a>Create an account</a>": "Вие сте нов тук? <a>Създайте профил</a>",
+    "There was a problem communicating with the homeserver, please try again later.": "Възникна проблем при комуникацията със Home сървъра, моля опитайте отново по-късно.",
+    "New? <a>Create account</a>": "Вие сте нов? <a>Създайте профил</a>",
+    "That username already exists, please try another.": "Това потребителско име е вече заето, моля опитайте с друго.",
+    "Continue with %(ssoButtons)s": "Продължаване с %(ssoButtons)s",
+    "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s Или %(usernamePassword)s",
+    "Already have an account? <a>Sign in here</a>": "Вече имате профил? <a>Влезте от тук</a>",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "Ние ще запазим шифровано копие на вашите ключове на нашият сървър. Защитете вашето резервно копие с фраза за сигурност.",
+    "Your Security Key has been <b>copied to your clipboard</b>, paste it to:": "Ключа за сигурност беше <b>копиран в клиборда</b>, поставете го в:",
+    "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "Тази сесия откри, че вашата фраза за сигурност и ключ за защитени съобщения бяха премахнати.",
+    "A new Security Phrase and key for Secure Messages have been detected.": "Новa фраза за сигурност и ключ за защитени съобщения бяха открити.",
+    "Use Security Key or Phrase": "Използване на ключ или фраза за сигурност",
+    "Use Security Key": "Използване на ключ за сигурност",
+    "Great! This Security Phrase looks strong enough.": "Чудесно! Тази фраза за сигурност изглежда достатъчно силна.",
+    "Set up with a Security Key": "Настройка със ключ за сигурност",
+    "Please enter your Security Phrase a second time to confirm.": "Моля въведете фразата си за сигурност повторно за да потвърдите.",
+    "Repeat your Security Phrase...": "Повторете фразата си за сигурност...",
+    "Your Security Key is in your <b>Downloads</b> folder.": "Ключа за сигурност е във вашата папка <b>Изтегляния</b>.",
+    "Your Security Key": "Вашият ключ за сигурност",
+    "Secure your backup with a Security Phrase": "Защитете вашето резервно копие с фраза за сигурност",
+    "Make a copy of your Security Key": "Направете копие на вашият ключ за сигурност",
+    "Confirm your Security Phrase": "Потвърдете вашата фраза за сигурност",
+    "Converts the DM to a room": "Превръща директния чат в стая",
+    "Converts the room to a DM": "Превръща стаята в директен чат",
+    "Takes the call in the current room off hold": "Възстановява повикването в текущата стая",
+    "Places the call in the current room on hold": "Задържа повикването в текущата стая",
+    "Permission is granted to use the webcam": "Разрешение за използване на уеб камерата е дадено",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "Неуспешно повикване поради неуспешен достъп до уеб камера или микрофон. Проверете дали:",
+    "A microphone and webcam are plugged in and set up correctly": "Микрофон и уеб камера са включени и настроени правилно",
+    "We couldn't log you in": "Не можахме да ви впишем",
+    "You've reached the maximum number of simultaneous calls.": "Достигнахте максималният брой едновременни повиквания.",
+    "No other application is using the webcam": "Никое друго приложение не използва уеб камерата",
+    "Unable to access webcam / microphone": "Неуспешен достъп до уеб камера / микрофон",
+    "Unable to access microphone": "Неуспешен достъп до микрофон",
+    "Failed to connect to your homeserver. Please close this dialog and try again.": "Неуспешно свързване към вашият Home сървър. Моля затворете този прозорец и опитайте отново.",
+    "Abort": "Прекрати",
+    "%(hostSignupBrand)s Setup": "Настройка на %(hostSignupBrand)s",
+    "Maximize dialog": "Максимизирай прозореца",
+    "Minimize dialog": "Минимизирай прозореца",
+    "Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.": "Научете повече в нашите <privacyPolicyLink />, <termsOfServiceLink /> и <cookiePolicyLink />.",
+    "Cookie Policy": "Политика за бисквитките",
+    "Privacy Policy": "Политика за поверителност",
+    "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "Добавя ┬──┬ ノ( ゜-゜ノ) в началото на съобщението",
+    "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "Добавя (╯°□°）╯︵ ┻━┻ в началото на съобщението",
+    "Effects": "Ефекти",
+    "Anguilla": "Ангила",
+    "British Indian Ocean Territory": "Британска територия в Индийския океан",
+    "Pitcairn Islands": "острови Питкерн",
+    "Heard & McDonald Islands": "острови Хърд и Макдоналд",
+    "Cook Islands": "острови Кук",
+    "Christmas Island": "остров Рождество",
+    "Brunei": "Бруней Даруссалам",
+    "Bouvet Island": "остров Буве",
+    "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": "Тонга",
+    "Timor-Leste": "Източен Тимор",
+    "Tokelau": "Токелау",
+    "Togo": "Того",
+    "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": "Полша",
+    "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": "Хондурас",
+    "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": "Коста Рика",
+    "Congo - Kinshasa": "Конго (Киншаса)",
+    "Congo - Brazzaville": "Конго (Бразавил)",
+    "Comoros": "Коморски острови",
+    "Colombia": "Колумбия",
+    "Cocos (Keeling) Islands": "Кокосови острови",
+    "China": "Китай",
+    "Chile": "Чили",
+    "Chad": "Чад",
+    "Central African Republic": "Централноафриканска република",
+    "Cayman Islands": "Кайманови острови",
+    "Caribbean Netherlands": "Карибска Нидерландия",
+    "Cape Verde": "Кабо Верде",
+    "Canada": "Канада",
+    "Cameroon": "Камерун",
+    "Cambodia": "Камбоджа",
+    "Burundi": "Бурунди",
+    "Burkina Faso": "Буркина Фасо",
+    "Bulgaria": "България",
+    "British Virgin Islands": "Британски Вирджински острови",
+    "Brazil": "Бразилия",
+    "Botswana": "Ботсвана",
+    "Bosnia": "Босна и Херцеговина",
+    "Bolivia": "Боливия",
+    "Bhutan": "Бутан",
+    "Bermuda": "Бермудски острови",
+    "Benin": "Бенин",
+    "Belize": "Белиз",
+    "Belgium": "Белгия",
+    "Belarus": "Беларус",
+    "Barbados": "Барбадос",
+    "Bangladesh": "Бангладеш",
+    "Bahrain": "Бахрейн",
+    "Bahamas": "Бахамски острови",
+    "Azerbaijan": "Азербайджан",
+    "Austria": "Австрия",
+    "Australia": "Австралия",
+    "Aruba": "Аруба",
+    "Armenia": "Армения",
+    "Argentina": "Аржентина",
+    "Antigua & Barbuda": "Антигуа и Барбуда",
+    "Antarctica": "Антарктика",
+    "Angola": "Ангола",
+    "Andorra": "Андора",
+    "American Samoa": "Американска Самоа",
+    "Algeria": "Алжир",
+    "Albania": "Албания",
+    "Åland Islands": "Оландски острови",
+    "Afghanistan": "Афганистан",
+    "United States": "Съединените щати",
+    "United Kingdom": "Обединеното кралство"
 }
diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index 6b954da9f2..7db987b8af 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",
@@ -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",
@@ -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ò, heu de poder convidar a altres 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 un comandament",
-    "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.",
+    "/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-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ó",
@@ -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.",
@@ -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 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.": "%(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": "Deixeu anar un 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",
-    "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.",
+    "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 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",
@@ -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 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": "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)",
@@ -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,30 +313,30 @@
     "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",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s ha canviat el seu avatar per a la sala %(roomName)s",
+    "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 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ó",
     "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",
@@ -349,17 +349,17 @@
     "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",
     "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",
@@ -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,12 +426,12 @@
     "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.",
     "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,13 +450,13 @@
     "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.",
     "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",
@@ -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,15 +499,15 @@
     "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:",
     "%(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?",
-    "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!",
+    "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 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",
@@ -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.",
@@ -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",
@@ -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",
@@ -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!": "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!",
     "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,144 @@
     "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.",
+    "Unable to access webcam / microphone": "No s'ha pogut accedir a la càmera web / micròfon",
+    "Unable to access microphone": "No s'ha pogut accedir al micròfon"
 }
diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 4d9d27363f..3ee9c73399 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -55,7 +55,7 @@
     "Custom Server Options": "Vlastní nastavení serveru",
     "Add a widget": "Přidat widget",
     "Accept": "Přijmout",
-    "%(targetName)s accepted an invitation.": "Uživatel %(targetName)s přijal pozvání.",
+    "%(targetName)s accepted an invitation.": "%(targetName)s přijal(a) pozvání.",
     "Account": "Účet",
     "Access Token:": "Přístupový token:",
     "Add": "Přidat",
@@ -86,10 +86,10 @@
     "Bans user with given id": "Vykáže uživatele s daným id",
     "Cannot add any more widgets": "Nelze přidat žádné další widgety",
     "Change Password": "Změnit heslo",
-    "%(senderName)s changed their profile picture.": "Uživatel %(senderName)s změnil svůj profilový obrázek.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "Uživatel %(senderDisplayName)s změnil název místnosti na %(roomName)s.",
-    "%(senderDisplayName)s removed the room name.": "Uživatel %(senderDisplayName)s odstranil název místnosti.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "Uživatel %(senderDisplayName)s změnil téma na „%(topic)s“.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s změnil(a) svůj profilový obrázek.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s změnil(a) název místnosti na %(roomName)s.",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s odstranil(a) název místnosti.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s změnil(a) téma na „%(topic)s“.",
     "Changes your display nickname": "Změní vaši zobrazovanou přezdívku",
     "Command error": "Chyba příkazu",
     "Commands": "Příkazy",
@@ -113,13 +113,13 @@
     "Email address": "E-mailová adresa",
     "Emoji": "Emoji",
     "Enable automatic language detection for syntax highlighting": "Zapnout automatické rozpoznávání jazyků pro zvýrazňování syntaxe",
-    "%(senderName)s ended the call.": "Uživatel %(senderName)s ukončil hovor.",
-    "Enter passphrase": "Zadejte heslo",
+    "%(senderName)s ended the call.": "%(senderName)s ukončil(a) hovor.",
+    "Enter passphrase": "Zadejte přístupovou frázi",
     "Error decrypting attachment": "Chyba při dešifrování přílohy",
     "Error: Problem communicating with the given homeserver.": "Chyba: problém v komunikaci s daným domovským serverem.",
     "Existing Call": "Probíhající hovor",
     "Export": "Exportovat",
-    "Export E2E room keys": "Exportovat end-to-end klíče místnosti",
+    "Export E2E room keys": "Exportovat end-to-end klíče místností",
     "Failed to ban user": "Nepodařilo se vykázat uživatele",
     "Failed to join room": "Vstup do místnosti se nezdařil",
     "Failed to kick": "Vykopnutí se nezdařilo",
@@ -131,23 +131,23 @@
     "Failed to send request.": "Odeslání žádosti se nezdařilo.",
     "Failed to set display name": "Nepodařilo se nastavit zobrazované jméno",
     "Failed to unban": "Přijetí zpět se nezdařilo",
-    "Failed to upload profile picture!": "Nahrání profilového obrázku se nezdařilo",
+    "Failed to upload profile picture!": "Nahrání profilového obrázku se nezdařilo!",
     "Failure to create room": "Vytvoření místnosti se nezdařilo",
     "Forget room": "Zapomenout místnost",
     "For security, this session has been signed out. Please sign in again.": "Z bezpečnostních důvodů bylo toto přihlášení ukončeno. Přihlašte se prosím znovu.",
     "and %(count)s others...|other": "a %(count)s další...",
-    "%(widgetName)s widget modified by %(senderName)s": "Uživatel %(senderName)s upravil widget %(widgetName)s",
-    "%(widgetName)s widget removed by %(senderName)s": "Uživatel %(senderName)s odstranil widget %(widgetName)s",
-    "%(widgetName)s widget added by %(senderName)s": "Uživatel  %(senderName)s přidal widget %(widgetName)s",
+    "%(widgetName)s widget modified by %(senderName)s": "%(senderName)s upravil(a) widget %(widgetName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s odstranil(a) widget %(widgetName)s",
+    "%(widgetName)s widget added by %(senderName)s": "%(senderName)s přidal(a) widget %(widgetName)s",
     "Automatically replace plain text Emoji": "Automaticky nahrazovat textové emoji",
     "Failed to upload image": "Obrázek se nepodařilo nahrát",
-    "%(senderName)s answered the call.": "Uživatel %(senderName)s přijal hovor.",
+    "%(senderName)s answered the call.": "%(senderName)s přijal(a) hovor.",
     "Click to mute audio": "Klepněte pro vypnutí zvuku",
     "Failed to verify email address: make sure you clicked the link in the email": "E-mailovou adresu se nepodařilo ověřit. Přesvědčte se, že jste klepli na odkaz v e-mailové zprávě",
     "Guests cannot join this room even if explicitly invited.": "Hosté nemohou vstoupit do této místnosti, i když jsou přímo pozváni.",
     "Homeserver is": "Domovský server je",
     "Identity Server is": "Server identity je",
-    "I have verified my email address": "Ověřil/a jsem svou e-mailovou adresu",
+    "I have verified my email address": "Ověřil(a) jsem svou e-mailovou adresu",
     "Import": "Importovat",
     "Import E2E room keys": "Importovat end-to-end klíče místností",
     "Incoming call from %(name)s": "Příchozí hovor od %(name)s",
@@ -156,12 +156,12 @@
     "Incorrect username and/or password.": "Nesprávné uživatelské jméno nebo heslo.",
     "Incorrect verification code": "Nesprávný ověřovací kód",
     "Invalid Email Address": "Neplatná e-mailová adresa",
-    "%(senderName)s invited %(targetName)s.": "Uživatel %(senderName)s pozval uživatele %(targetName)s.",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s pozval(a) uživatele %(targetName)s.",
     "Invites": "Pozvánky",
     "Invites user with given id to current room": "Pozve do aktuální místnosti uživatele s daným id",
     "Join Room": "Vstoupit do místnosti",
-    "%(targetName)s joined the room.": "Uživatel %(targetName)s vstoupil do místnosti.",
-    "%(senderName)s kicked %(targetName)s.": "Uživatel %(senderName)s vykopl uživatele %(targetName)s.",
+    "%(targetName)s joined the room.": "%(targetName)s vstoupil(a) do místnosti.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s vykopl(a) uživatele %(targetName)s.",
     "Kick": "Vykopnout",
     "Kicks user with given id": "Vykopne uživatele s daným id",
     "Last seen": "Naposledy aktivní",
@@ -184,7 +184,7 @@
     "Passwords can't be empty": "Hesla nemohou být prázdná",
     "Permissions": "Oprávnění",
     "Phone": "Telefon",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "Uživatel %(senderName)s změnil úroveň oprávnění o %(powerLevelDiffText)s.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s změnil(a) úroveň oprávnění o %(powerLevelDiffText)s.",
     "Define the power level of a user": "Stanovte úroveň oprávnění uživatele",
     "Failed to change power level": "Nepodařilo se změnit úroveň oprávnění",
     "Power level must be positive integer.": "Úroveň oprávnění musí být kladné celé číslo.",
@@ -201,15 +201,15 @@
     "%(roomName)s is not accessible at this time.": "Místnost %(roomName)s není v tuto chvíli dostupná.",
     "Save": "Uložit",
     "Send Reset Email": "Poslat resetovací e-mail",
-    "%(senderDisplayName)s sent an image.": "Uživatel %(senderDisplayName)s poslal obrázek.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "Uživatel %(senderName)s pozval uživatele %(targetDisplayName)s ke vstupu do místnosti.",
+    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s poslal(a) obrázek.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s pozval(a) uživatele %(targetDisplayName)s ke vstupu do místnosti.",
     "Server error": "Chyba serveru",
     "Server may be unavailable, overloaded, or search timed out :(": "Server může být nedostupný, přetížený nebo vyhledávání vypršelo :(",
     "Server may be unavailable, overloaded, or you hit a bug.": "Server může být nedostupný, přetížený nebo jste narazili na chybu.",
     "Server unavailable, overloaded, or something else went wrong.": "Server je nedostupný, přetížený nebo se něco pokazilo.",
     "Session ID": "ID sezení",
-    "%(senderName)s set a profile picture.": "Uživatel %(senderName)s si nastavil profilový obrázek.",
-    "%(senderName)s set their display name to %(displayName)s.": "Uživatel %(senderName)s si změnil zobrazované jméno na %(displayName)s.",
+    "%(senderName)s set a profile picture.": "%(senderName)s si nastavil(a) profilový obrázek.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s si změnil(a) zobrazované jméno na %(displayName)s.",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Zobrazovat čas v 12hodinovém formátu (např. 2:30 odp.)",
     "Sign in": "Přihlásit",
     "Sign out": "Odhlásit",
@@ -219,7 +219,7 @@
     "Submit": "Odeslat",
     "Success": "Úspěch",
     "The phone number entered looks invalid": "Zadané telefonní číslo se zdá být neplatné",
-    "This email address is already in use": "Tato e-mailová adresa je již požívána",
+    "This email address is already in use": "Tato e-mailová adresa je již používána",
     "This email address was not found": "Tato e-mailová adresa nebyla nalezena",
     "This room has no local addresses": "Tato místnost nemá žádné místní adresy",
     "This room is not recognised.": "Tato místnost nebyla rozpoznána.",
@@ -235,13 +235,13 @@
     "Online": "Online",
     "Offline": "Offline",
     "Check for update": "Zkontrolovat aktualizace",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "Uživatel %(targetName)s přijal pozvání pro %(displayName)s.",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s přijal(a) pozvání pro %(displayName)s.",
     "Active call (%(roomName)s)": "Probíhající hovor (%(roomName)s)",
-    "%(senderName)s banned %(targetName)s.": "Uživatel %(senderName)s vykázal uživatele %(targetName)s.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s vykázal(a) uživatele %(targetName)s.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Nelze se připojit k domovskému serveru přes HTTP, pokud je v adresním řádku HTTPS. Buď použijte HTTPS, nebo <a>povolte nezabezpečené skripty</a>.",
     "Click here to fix": "Pro opravu klepněte zde",
     "Click to mute video": "Klepněte pro zakázání videa",
-    "click to reveal": "pro odhlení klepněte",
+    "click to reveal": "klepněte pro odhalení",
     "Click to unmute video": "Klepněte pro povolení videa",
     "Click to unmute audio": "Klepněte pro povolení zvuku",
     "Displays action": "Zobrazí akci",
@@ -258,7 +258,7 @@
     "Unable to remove contact information": "Nepodařilo se smazat kontaktní údaje",
     "Unable to verify email address.": "Nepodařilo se ověřit e-mailovou adresu.",
     "Unban": "Přijmout zpět",
-    "%(senderName)s unbanned %(targetName)s.": "Uživatel %(senderName)s přijal zpět uživatele %(targetName)s.",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s přijal(a) zpět uživatele %(targetName)s.",
     "Unable to capture screen": "Nepodařilo se zachytit obrazovku",
     "Unable to enable Notifications": "Nepodařilo se povolit oznámení",
     "unknown caller": "neznámý volající",
@@ -305,11 +305,11 @@
     "Reason": "Důvod",
     "VoIP conference started.": "VoIP konference započata.",
     "VoIP conference finished.": "VoIP konference ukončena.",
-    "%(targetName)s left the room.": "Uživatel %(targetName)s opustil místnost.",
+    "%(targetName)s left the room.": "%(targetName)s opustil(a) místnost.",
     "You are already in a call.": "Již máte probíhající hovor.",
     "%(senderName)s requested a VoIP conference.": "Uživatel %(senderName)s požádal o VoIP konferenci.",
-    "%(senderName)s removed their profile picture.": "Uživatel %(senderName)s odstranil svůj profilový obrázek.",
-    "%(targetName)s rejected the invitation.": "Uživatel %(targetName)s odmítl pozvání.",
+    "%(senderName)s removed their profile picture.": "%(senderName)s odstranil(a) svůj profilový obrázek.",
+    "%(targetName)s rejected the invitation.": "%(targetName)s odmítl(a) pozvání.",
     "Communities": "Skupiny",
     "Message Pinning": "Připíchnutí zprávy",
     "Your browser does not support the required cryptography extensions": "Váš prohlížeč nepodporuje požadovaná kryptografická rozšíření",
@@ -320,20 +320,20 @@
     "Admin Tools": "Nástroje pro správce",
     "No pinned messages.": "Žádné připíchnuté zprávy.",
     "Pinned Messages": "Připíchnuté zprávy",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "Uživatel %(senderName)s odstranil své zobrazované jméno (%(oldDisplayName)s).",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "Uživatel %(senderName)s zrušil pozvání pro uživatele %(targetName)s.",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "Uživatel %(senderName)s nastavil viditelnost budoucích zpráv v této místnosti pro všechny její členy, a to od chvíle jejich pozvání.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "Uživatel %(senderName)s nastavil viditelnost budoucích zpráv v této místnosti pro všechny její členy, a to od chvíle jejich vstupu.",
-    "%(senderName)s made future room history visible to all room members.": "Uživatel %(senderName)s nastavil viditelnost budoucích zpráv v této místnosti pro všechny její členy.",
-    "%(senderName)s made future room history visible to anyone.": "Uživatel %(senderName)s nastavil viditelnost budoucích zpráv pro kohokoliv.",
-    "%(senderName)s changed the pinned messages for the room.": "Uživatel %(senderName)s změnil připíchnuté zprávy této místnosti.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s odstranil(a) své zobrazované jméno (%(oldDisplayName)s).",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s zrušil(a) pozvání pro uživatele %(targetName)s.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s nastavil(a) viditelnost budoucích zpráv v této místnosti pro všechny její členy, a to od chvíle jejich pozvání.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s nastavil(a) viditelnost budoucích zpráv v této místnosti pro všechny její členy, a to od chvíle jejich vstupu.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s nastavil(a) viditelnost budoucích zpráv v této místnosti pro všechny její členy.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s nastavil(a) viditelnost budoucích zpráv pro kohokoliv.",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s změnil(a) připíchnuté zprávy této místnosti.",
     "Authentication check failed: incorrect password?": "Kontrola ověření selhala: špatné heslo?",
     "You need to be able to invite users to do that.": "Pro tuto akci musíte mít právo zvát uživatele.",
     "Delete Widget": "Smazat widget",
     "Error decrypting image": "Chyba při dešifrování obrázku",
     "Error decrypting video": "Chyba při dešifrování videa",
-    "%(senderDisplayName)s removed the room avatar.": "Uživatel %(senderDisplayName)s odstranil avatar místnosti.",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "Uživatel %(senderDisplayName)s změnil avatar místnosti na <img/>",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s odstranil(a) avatar místnosti.",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s změnil(a) avatar místnosti na <img/>",
     "Copied!": "Zkopírováno!",
     "Failed to copy": "Nepodařilo se zkopírovat",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Smazáním widgetu ho odstraníte všem uživatelům v této místnosti. Opravdu chcete tento widget smazat?",
@@ -384,9 +384,9 @@
     "Invalid community ID": "Neplatné ID skupiny",
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s' není platné ID skupiny",
     "New community ID (e.g. +foo:%(localDomain)s)": "Nové ID skupiny (např. +neco:%(localDomain)s)",
-    "%(senderName)s sent an image": "Uživatel %(senderName)s poslal obrázek",
-    "%(senderName)s sent a video": "Uživatel %(senderName)s poslal video",
-    "%(senderName)s uploaded a file": "Uživatel %(senderName)s nahrál soubor",
+    "%(senderName)s sent an image": "%(senderName)s poslal(a) obrázek",
+    "%(senderName)s sent a video": "%(senderName)s poslal(a) video",
+    "%(senderName)s uploaded a file": "%(senderName)s nahrál(a) soubor",
     "Disinvite this user?": "Odvolat pozvání tohoto uživatele?",
     "Kick this user?": "Vykopnout tohoto uživatele?",
     "Unban this user?": "Přijmout zpět tohoto uživatele?",
@@ -398,16 +398,16 @@
     "You have <a>disabled</a> URL previews by default.": "<a>Vypnuli</a> jste automatické náhledy webových adres.",
     "You have <a>enabled</a> URL previews by default.": "<a>Zapnuli</a> jste automatické náhledy webových adres.",
     "URL Previews": "Náhledy webových adres",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "Uživatel %(senderDisplayName)s změnil avatar místnosti %(roomName)s",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s změnil(a) avatar místnosti %(roomName)s",
     "Add an Integration": "Přidat začlenění",
     "An email has been sent to %(emailAddress)s": "Na adresu %(emailAddress)s jsme poslali e-mail",
     "File to import": "Soubor k importu",
-    "Passphrases must match": "Hesla se musí shodovat",
-    "Passphrase must not be empty": "Heslo nesmí být prázdné",
+    "Passphrases must match": "Přístupové fráze se musí shodovat",
+    "Passphrase must not be empty": "Přístupová fráze nesmí být prázdná",
     "Export room keys": "Exportovat klíče místnosti",
     "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.": "Tento proces vám umožňuje exportovat do souboru klíče ke zprávám, které jste dostali v šifrovaných místnostech. Když pak tento soubor importujete do jiného Matrix klienta, všechny tyto zprávy bude možné opět dešifrovat.",
-    "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.": "Kdokoliv, kdo získá přístup k exportovanému souboru, bude moci dešifrovat všechny vaše přijaté zprávy, a proto je třeba dbát zvýšenou pozornost jeho zabezpečení. Z toho důvodu byste měli do kolonky níže zadat heslo, se kterým exportovaná data zašifrujeme. Import pak bude možný pouze se znalostí zadaného hesla.",
-    "Confirm passphrase": "Potvrďte heslo",
+    "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.": "Kdokoliv, kdo získá přístup k exportovanému souboru, bude moci dešifrovat všechny vaše přijaté zprávy, a proto je třeba dbát zvýšenou pozornost jeho zabezpečení. Z toho důvodu byste měli do kolonky níže zadat přístupovou frázi, se kterým exportovaná data zašifrujeme. Import pak bude možný pouze se znalostí zadané přístupové fráze.",
+    "Confirm passphrase": "Potvrďte přístupovou frázi",
     "Import room keys": "Importovat klíče místnosti",
     "Call Timeout": "Časový limit hovoru",
     "Show these rooms to non-members on the community page and room list?": "Zobrazovat tyto místnosti na domovské stránce skupiny a v seznamu místností i pro nečleny?",
@@ -438,7 +438,7 @@
     "URL previews are enabled by default for participants in this room.": "Ve výchozím nastavení jsou náhledy URL adres povolené pro členy této místnosti.",
     "URL previews are disabled by default for participants in this room.": "Ve výchozím nastavení jsou náhledy URL adres zakázané pro členy této místnosti.",
     "Invalid file%(extra)s": "Neplatný soubor%(extra)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?": "Budete přesměrováni na stránku třetí strany k ověření svého účtu pro používání s  %(integrationsUrl)s. Chcete pokračovat?",
+    "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?": "Budete přesměrováni na stránku třetí strany k ověření svého účtu pro používání s %(integrationsUrl)s. Chcete pokračovat?",
     "Please check your email to continue registration.": "Pro pokračování v registraci prosím zkontrolujte své e-maily.",
     "Token incorrect": "Neplatný token",
     "A text message has been sent to %(msisdn)s": "Na číslo %(msisdn)s byla odeslána textová zpráva",
@@ -466,18 +466,18 @@
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s%(count)s krát vstoupili",
     "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)svstoupili",
-    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)svstoupil",
+    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)svstoupil(a)",
     "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s %(count)s krát opustili",
     "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)sopustili",
     "%(oneUser)sleft %(count)s times|other": "%(oneUser)s %(count)s krát opustil",
     "%(oneUser)sleft %(count)s times|one": "%(oneUser)sopustil",
     "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s %(count)s krát vstoupili a opustili",
     "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)svstoupili a opustili",
-    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s %(count)s krát vstoupil a opustil",
-    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)svstoupil a opustil",
+    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s %(count)s krát vstoupil(a) a opustil(a)",
+    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)svstoupil(a) a opustil(a)",
     "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s %(count)s krát opustili a znovu vstoupili",
     "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)sopustili a znovu vstoupili",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s %(count)s krát opustil a znovu vstoupil",
+    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s %(count)s krát opustil(a) a znovu vstoupil(a)",
     "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)sopustil a znovu vstoupil",
     "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s %(count)s krát odmítli pozvání",
     "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)sodmítli pozvání",
@@ -487,10 +487,10 @@
     "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)smeli stažené pozvání",
     "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)směl %(count)s krát stažené pozvání",
     "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)směl stažené pozvání",
-    "were invited %(count)s times|other": "byli %(count)s krát pozvaní",
-    "were invited %(count)s times|one": "byli pozvaní",
-    "was invited %(count)s times|other": "byl %(count)s krát pozvaný",
-    "was invited %(count)s times|one": "byl pozvaný",
+    "were invited %(count)s times|other": "byli %(count)s krát pozváni",
+    "were invited %(count)s times|one": "byli pozváni",
+    "was invited %(count)s times|other": "byl %(count)s krát pozván",
+    "was invited %(count)s times|one": "byl pozván",
     "were banned %(count)s times|other": "mělid %(count)s krát zakázaný vstup",
     "were banned %(count)s times|one": "měli zakázaný vstup",
     "was banned %(count)s times|other": "měl %(count)s krát zakázaný vstup",
@@ -503,14 +503,14 @@
     "were kicked %(count)s times|one": "byli vyhozeni",
     "was kicked %(count)s times|other": "byl %(count)s krát vyhozen",
     "was kicked %(count)s times|one": "byl vyhozen",
-    "%(severalUsers)schanged their name %(count)s times|other": "Uživatelé %(severalUsers)s si %(count)s krát změnili jméno",
-    "%(severalUsers)schanged their name %(count)s times|one": "Uživatelé %(severalUsers)s si změnili jméno",
-    "%(oneUser)schanged their name %(count)s times|other": "Uživatel %(oneUser)s si %(count)s krát změnil jméno",
-    "%(oneUser)schanged their name %(count)s times|one": "Uživatel %(oneUser)s si změnil jméno",
+    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s si %(count)s krát změnili jméno",
+    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s si změnili jméno",
+    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s si %(count)s krát změnil(a) jméno",
+    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s si změnil(a) jméno",
     "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)ssi %(count)s krát změnili avatary",
     "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)ssi změnili avatary",
-    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)ssi %(count)s krát změnil avatar",
-    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)ssi změnil avatar",
+    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)s si %(count)s krát změnil(a) avatar",
+    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s si změnil(a) avatar",
     "%(items)s and %(count)s others|other": "%(items)s a %(count)s další",
     "%(items)s and %(count)s others|one": "%(items)s a jeden další",
     "%(items)s and %(lastItem)s": "%(items)s a také %(lastItem)s",
@@ -539,7 +539,7 @@
     "To get started, please pick a username!": "Začněte tím, že si zvolíte uživatelské jméno!",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Toto bude název vašeho účtu na domovském serveru <span></span>, anebo si můžete zvolit <a>jiný server</a>.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Pokud už účet v síti Matrix máte, můžete se ihned <a>Přihlásit</a>.",
-    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s %(count)s krát vstoupil",
+    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s %(count)s krát vstoupil(a)",
     "Private Chat": "Soukromá konverzace",
     "Public Chat": "Veřejná konverzace",
     "You must <a>register</a> to use this functionality": "Pro využívání této funkce se <a>zaregistrujte</a>",
@@ -557,14 +557,14 @@
     "Failed to add the following users to the summary of %(groupId)s:": "Do souhrnného seznamu skupiny %(groupId)s se nepodařilo přidat následující uživatele:",
     "Add a User": "Přidat uživatele",
     "Failed to remove a user from the summary of %(groupId)s": "Ze souhrnného seznamu skupiny %(groupId)s se nepodařilo odstranit uživatele",
-    "The user '%(displayName)s' could not be removed from the summary.": "Nelze odstranit uživatele '%(displayName)s'  ze souhrnného seznamu.",
+    "The user '%(displayName)s' could not be removed from the summary.": "Nelze odstranit uživatele '%(displayName)s' ze souhrnného seznamu.",
     "Unable to accept invite": "Nelze přijmout pozvání",
     "Unable to reject invite": "Nelze odmítnout pozvání",
     "Community Settings": "Nastavení skupiny",
     "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Tyto místnosti se zobrazují všem členům na stránce skupiny. Členové skupiny mohou vstoupit do místnosti klepnutím.",
     "Featured Rooms:": "Hlavní místnosti:",
     "Featured Users:": "Významní uživatelé:",
-    "%(inviter)s has invited you to join this community": "Uživatel %(inviter)s vás pozval do této skupiny",
+    "%(inviter)s has invited you to join this community": "%(inviter)s vás pozval(a) do této skupiny",
     "You are an administrator of this community": "Jste správcem této skupiny",
     "You are a member of this community": "Jste členem této skupiny",
     "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!": "Vaše skupina nemá vyplněný dlouhý popis, který je součástí HTML stránky skupiny a která se zobrazuje jejím členům.<br />Klepnutím zde otevřete nastavení, kde ho můžete doplnit!",
@@ -606,7 +606,7 @@
     "Notify the whole room": "Oznámení pro celou místnost",
     "Room Notification": "Oznámení místnosti",
     "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.": "Tento proces vás provede importem šifrovacích klíčů, které jste si stáhli z jiného Matrix klienta. Po úspěšném naimportování budete v tomto klientovi moci dešifrovat všechny zprávy, které jste mohli dešifrovat v původním klientovi.",
-    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Stažený soubor je chráněn heslem. Soubor můžete naimportovat pouze pokud zadáte odpovídající heslo.",
+    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Stažený soubor je chráněn přístupovou frází. Soubor můžete naimportovat pouze pokud zadáte odpovídající přístupovou frázi.",
     "Call Failed": "Hovor selhal",
     "Send": "Odeslat",
     "collapse": "sbalit",
@@ -753,7 +753,7 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
     "Missing roomId.": "Chybějící ID místnosti.",
     "Opens the Developer Tools dialog": "Otevře dialog nástrojů pro vývojáře",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s si změnil zobrazované jméno na %(displayName)s.",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s si změnil(a) zobrazované jméno na %(displayName)s.",
     "Always show encryption icons": "Vždy zobrazovat ikonu stavu šifrovaní",
     "Send analytics data": "Odesílat analytická data",
     "Enable widget screenshots on supported widgets": "Povolit screenshot widgetu pro podporované widgety",
@@ -764,14 +764,14 @@
     "Demote": "Degradovat",
     "Share Link to User": "Sdílet odkaz na uživatele",
     "Send an encrypted reply…": "Odeslat šifrovanou odpověď …",
-    "Send an encrypted message…": "Odeslat šifrovanou zprávu …",
+    "Send an encrypted message…": "Odeslat šifrovanou zprávu…",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "%(displayName)s (%(userName)s) viděl %(dateTime)s",
     "Replying": "Odpovídá",
     "Share room": "Sdílet místnost",
     "System Alerts": "Systémová varování",
     "Muted Users": "Umlčení uživatelé",
     "Only room administrators will see this warning": "Toto varování uvidí jen správci místnosti",
-    "You don't currently have any stickerpacks enabled": "Momentálně nemáte aktívní žádné balíčky s nálepkami",
+    "You don't currently have any stickerpacks enabled": "Momentálně nemáte aktivní žádné balíčky s nálepkami",
     "Stickerpack": "Balíček s nálepkami",
     "Hide Stickers": "Skrýt nálepky",
     "Show Stickers": "Zobrazit nálepky",
@@ -860,7 +860,7 @@
     "Security & Privacy": "Zabezpečení",
     "Encryption": "Šifrování",
     "Once enabled, encryption cannot be disabled.": "Po zapnutí, už nepůjde šifrování vypnout.",
-    "Encrypted": "Šifrování",
+    "Encrypted": "Šifrováno",
     "General": "Obecné",
     "General failure": "Nějaká chyba",
     "This homeserver does not support login using email address.": "Tento domovský serveru neumožňuje přihlášení pomocí e-mailu.",
@@ -943,14 +943,14 @@
     "Upgrades a room to a new version": "Upgraduje místnost na novou verzi",
     "This room has no topic.": "Tato místnost nemá žádné specifické téma.",
     "Sets the room name": "Nastaví název místnosti",
-    "%(senderDisplayName)s upgraded this room.": "Uživatel %(senderDisplayName)s upgradoval místnost.",
-    "%(senderDisplayName)s made the room public to whoever knows the link.": "Uživatel %(senderDisplayName)s zveřejnil místnost pro všechny s odkazem.",
-    "%(senderDisplayName)s made the room invite only.": "Uživatel %(senderDisplayName)s zpřístupnil místnost pouze na pozvání.",
-    "%(senderDisplayName)s changed the join rule to %(rule)s": "Uživatel %(senderDisplayName)s změnil pravidlo k připojení na %(rule)s",
-    "%(senderDisplayName)s has allowed guests to join the room.": "Uživatel %(senderDisplayName)s povolil přístup hostům.",
-    "%(senderDisplayName)s has prevented guests from joining the room.": "Uživatel %(senderDisplayName)s zakázal přístup hostům.",
-    "%(senderDisplayName)s changed guest access to %(rule)s": "Uživatel %(senderDisplayName)s změnil pravidlo pro přístup hostů na %(rule)s",
-    "%(senderName)s set the main address for this room to %(address)s.": "Uživatel %(senderName)s hlavní adresu této místnosti na %(address)s.",
+    "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s upgradoval(a) místnost.",
+    "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s zveřejnil(a) místnost pro všechny s odkazem.",
+    "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s zpřístupnil(a) místnost pouze na pozvání.",
+    "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s změnil(a) pravidlo k připojení na %(rule)s",
+    "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s povolil(a) přístup hostům.",
+    "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s zakázal(a) přístup hostům.",
+    "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s změnil(a) pravidlo pro přístup hostů na %(rule)s",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s nastavil(a) hlavní adresu této místnosti na %(address)s.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s zrušil hlavní adresu této místnosti.",
     "%(displayName)s is typing …": "%(displayName)s píše …",
     "%(names)s and %(count)s others are typing …|other": "%(names)s a %(count)s dalších píše …",
@@ -1136,7 +1136,7 @@
     "Render simple counters in room header": "Zobrazovat stavová počítadla v hlavičce místnosti",
     "Enable Community Filter Panel": "Povolit panel Filtr skupiny",
     "Show developer tools": "Zobrazit nástroje pro vývojáře",
-    "Encrypted messages in group chats": "Šifrované zprávy ve skupinových konverzacích",
+    "Encrypted messages in group chats": "Šifrované zprávy ve skupinách",
     "Open Devtools": "Otevřít nástroje pro vývojáře",
     "Credits": "Poděkování",
     "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.": "Na adrese %(host)s už jste použili %(brand)s se zapnutou volbou načítání členů místností až při prvním zobrazení. V této verzi je načítání členů až při prvním zobrazení vypnuté. Protože je s tímto nastavením lokální vyrovnávací paměť nekompatibilní, %(brand)s potřebuje znovu synchronizovat údaje z vašeho účtu.",
@@ -1231,10 +1231,10 @@
     "You cannot modify widgets in this room.": "V této místnosti nemůžete manipulovat s widgety.",
     "Sends the given message coloured as a rainbow": "Pošle zprávu v barvách duhy",
     "Sends the given emote coloured as a rainbow": "Pošle reakci v barvách duhy",
-    "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "Uživatel %(senderDisplayName)s přidal této místnosti příslušnost ke skupině %(groups)s.",
-    "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "Uživatel %(senderDisplayName)s odebral této místnosti příslušnost ke skupině %(groups)s.",
-    "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "Uživatel %(senderDisplayName)s přidal této místnosti příslušnost ke skupině %(newGroups)s a odebral k %(oldGroups)s.",
-    "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s zrušil pozvání do této místnosti pro uživatele %(targetDisplayName)s.",
+    "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s přidal(a) této místnosti příslušnost ke skupině %(groups)s.",
+    "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s odebral(a) této místnosti příslušnost ke skupině %(groups)s.",
+    "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s přidal(a) této místnosti příslušnost ke skupině %(newGroups)s a odebral(a) k %(oldGroups)s.",
+    "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s zrušil(a) pozvání do této místnosti pro uživatele %(targetDisplayName)s.",
     "No homeserver URL provided": "Nebyla zadána URL adresa domovského server",
     "Unexpected error resolving homeserver configuration": "Chyba při zjišťování konfigurace domovského serveru",
     "The user's homeserver does not support the version of the room.": "Uživatelův domovský server nepodporuje verzi této místnosti.",
@@ -1253,19 +1253,19 @@
     "Join the conversation with an account": "Připojte se ke konverzaci s účtem",
     "Sign Up": "Zaregistrovat se",
     "Sign In": "Přihlásit se",
-    "You were kicked from %(roomName)s by %(memberName)s": "Uživatel %(memberName)s vás vykopl z místnosti %(roomName)s",
+    "You were kicked from %(roomName)s by %(memberName)s": "%(memberName)s vás vykopl(a) z místnosti %(roomName)s",
     "Reason: %(reason)s": "Důvod: %(reason)s",
     "Forget this room": "Zapomenout na tuto místnost",
     "Re-join": "Znovu vstoupit",
-    "You were banned from %(roomName)s by %(memberName)s": "Uživatel %(memberName)s vás vykázal z místnosti %(roomName)s",
+    "You were banned from %(roomName)s by %(memberName)s": "%(memberName)s vás vykázal(a) z místnosti %(roomName)s",
     "Something went wrong with your invite to %(roomName)s": "S vaší pozvánkou do místnosti %(roomName)s se něco pokazilo",
     "You can only join it with a working invite.": "Vstoupit můžete jen s funkční pozvánkou.",
     "You can still join it because this is a public room.": "I přesto můžete vstoupit, protože tato místnost je veřejná.",
     "Join the discussion": "Zapojit se do diskuze",
     "Try to join anyway": "Stejně se pokusit vstoupit",
-    "Do you want to chat with %(user)s?": "Chcete si povídat s uživatelem %(user)s?",
+    "Do you want to chat with %(user)s?": "Chcete si povídat s %(user)s?",
     "Do you want to join %(roomName)s?": "Chcete vstoupit do místnosti %(roomName)s?",
-    "<userName/> invited you": "Uživatel <userName/> vás pozval",
+    "<userName/> invited you": "<userName/> vás pozval(a)",
     "You're previewing %(roomName)s. Want to join it?": "Nahlížíte do místnosti %(roomName)s. Chcete do ní vstoupit?",
     "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s si nelze jen tak prohlížet. Chcete do ní vstoupit?",
     "This room doesn't exist. Are you sure you're at the right place?": "Tato místnost neexistuje. Jste si jistí, že jste na správném místě?",
@@ -1280,7 +1280,7 @@
     "Invited by %(sender)s": "Pozván od uživatele %(sender)s",
     "Error updating flair": "Nepovedlo se změnit příslušnost ke skupině",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Pro tuto místnost se nepovedlo změnit příslušnost ke skupině. Možná to server neumožňuje, nebo došlo k dočasné chybě.",
-    "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "Uživatel <reactors/><reactedWith>reagoval s %(shortName)s</reactedWith>",
+    "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith> reagoval(a) s %(shortName)s</reactedWith>",
     "edited": "upraveno",
     "Maximize apps": "Maximalizovat aplikace",
     "Rotate Left": "Otočit doleva",
@@ -1332,7 +1332,7 @@
     "The homeserver may be unavailable or overloaded.": "Domovský server je nedostupný nebo přetížený.",
     "Add room": "Přidat místnost",
     "You have %(count)s unread notifications in a prior version of this room.|other": "Máte %(count)s nepřečtených oznámení v předchozí verzi této místnosti.",
-    "You have %(count)s unread notifications in a prior version of this room.|one": "Máte jedno nepřečtené oznámení v předchozí verzi této místnosti.",
+    "You have %(count)s unread notifications in a prior version of this room.|one": "Máte %(count)s nepřečtených oznámení v předchozí verzi této místnosti.",
     "Your profile": "Váš profil",
     "Your Matrix account on <underlinedServerName />": "Váš účet Matrix na serveru <underlinedServerName />",
     "Failed to get autodiscovery configuration from server": "Nepovedlo se automaticky načíst konfiguraci ze serveru",
@@ -1509,31 +1509,31 @@
     "Show image": "Zobrazit obrázek",
     "You verified %(name)s": "Ověřili jste %(name)s",
     "You cancelled verifying %(name)s": "Zrušili jste ověření %(name)s",
-    "%(name)s cancelled verifying": "Uživatel %(name)s zrušil ověření",
+    "%(name)s cancelled verifying": "%(name)s zrušil(a) ověření",
     "You accepted": "Přijali jste",
-    "%(name)s accepted": "Uživatel %(name)s přijal",
+    "%(name)s accepted": "%(name)s přijal(a)",
     "You cancelled": "Zrušili jste",
-    "%(name)s cancelled": "Uživatel %(name)s zrušil",
+    "%(name)s cancelled": "%(name)s zrušil(a)",
     "%(name)s wants to verify": "%(name)s chce ověřit",
     "You sent a verification request": "Poslali jste požadavek na ověření",
     "Show all": "Zobrazit vše",
     "Edited at %(date)s. Click to view edits.": "Upraveno v %(date)s. Klinutím zobrazíte změny.",
     "Frequently Used": "Často používané",
-    "Smileys & People": "Obličeje & Lidé",
-    "Animals & Nature": "Zvířata & Příroda",
-    "Food & Drink": "Jídlo & Nápoje",
+    "Smileys & People": "Obličeje a lidé",
+    "Animals & Nature": "Zvířata a příroda",
+    "Food & Drink": "Jídlo a nápoje",
     "Activities": "Aktivity",
-    "Travel & Places": "Cestování & Místa",
+    "Travel & Places": "Cestování a místa",
     "Objects": "Objekty",
     "Symbols": "Symboly",
     "Flags": "Vlajky",
     "Quick Reactions": "Rychlé reakce",
     "Cancel search": "Zrušit hledání",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Vyrobte prosím <newIssueLink>nové issue</newIssueLink> na GitHubu abychom mohli chybu opravit.",
-    "%(severalUsers)smade no changes %(count)s times|other": "Uživatelé %(severalUsers)s neudělali %(count)s krát žádnou změnu",
-    "%(severalUsers)smade no changes %(count)s times|one": "Uživatelé %(severalUsers)s neudělali žádnou změnu",
-    "%(oneUser)smade no changes %(count)s times|other": "Uživatel %(oneUser)s neudělal %(count)s krát žádnou změnu",
-    "%(oneUser)smade no changes %(count)s times|one": "Uživatel %(oneUser)s neudělal žádnou změnu",
+    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s neudělali %(count)s krát žádnou změnu",
+    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s neudělali žádnou změnu",
+    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s neudělal(a) %(count)s krát žádnou změnu",
+    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s neudělal(a) žádnou změnu",
     "e.g. my-room": "např. moje-mistnost",
     "Use bots, bridges, widgets and sticker packs": "Použít roboty, propojení, widgety a balíky samolepek",
     "Terms of Service": "Podmínky použití",
@@ -1555,7 +1555,7 @@
     "Explore": "Procházet",
     "Filter": "Filtr místností",
     "Filter rooms…": "Najít místnost…",
-    "%(creator)s created and configured the room.": "%(creator)s vytvořil a nakonfiguroval místnost.",
+    "%(creator)s created and configured the room.": "%(creator)s vytvořil(a) a nakonfiguroval(a) místnost.",
     "Preview": "Náhled",
     "View": "Zobrazit",
     "Find a room…": "Najít místnost…",
@@ -1589,27 +1589,27 @@
     "Custom (%(level)s)": "Vlastní (%(level)s)",
     "Error upgrading room": "Chyba při upgrade místnosti",
     "Double check that your server supports the room version chosen and try again.": "Zkontrolujte, že váš server opravdu podporuje zvolenou verzi místnosti.",
-    "%(senderName)s placed a voice call.": "%(senderName)s spustil hovor.",
-    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s spustil hovor. (není podporováno tímto prohlížečem)",
-    "%(senderName)s placed a video call.": "%(senderName)s spustil videohovor.",
-    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s spustil videohovor. (není podporováno tímto prohlížečem)",
-    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s odstranit pravidlo blokující uživatele odpovídající %(glob)s",
+    "%(senderName)s placed a voice call.": "%(senderName)s zahájil(a) hovor.",
+    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s zahájil(a) hovor. (není podporováno tímto prohlížečem)",
+    "%(senderName)s placed a video call.": "%(senderName)s zahájil(a) videohovor.",
+    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s zahájil(a) videohovor. (není podporováno tímto prohlížečem)",
+    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s odstranil(a) pravidlo blokující uživatele odpovídající %(glob)s",
     "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s odstranil pravidlo blokující místnosti odpovídající %(glob)s",
     "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s odstranil pravidlo blokující servery odpovídající %(glob)s",
     "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s odstranil blokující pravidlo %(glob)s",
     "%(senderName)s updated an invalid ban rule": "%(senderName)s aktualizoval neplatné pravidlo blokování",
-    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s aktualizoval pravidlo blokující uživatele odpovídající %(glob)s z důvodu %(reason)s",
+    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s aktualizoval(a) pravidlo blokující uživatele odpovídající %(glob)s z důvodu %(reason)s",
     "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s aktualizoval pravidlo blokující místnosti odpovídající %(glob)s z důvodu %(reason)s",
     "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s aktualizoval pravidlo blokující servery odpovídající %(glob)s z důvodu %(reason)s",
     "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s aktualizoval blokovací pravidlo odpovídající %(glob)s z důvodu %(reason)s",
-    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s vytvořil pravidlo blokující uživatele odpovídající %(glob)s z důvodu %(reason)s",
+    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s vytvořil(a) pravidlo blokující uživatele odpovídající %(glob)s z důvodu %(reason)s",
     "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s vytvořil pravidlo blokující místnosti odpovídající %(glob)s z důvodu %(reason)s",
     "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s vytvořil pravidlo blokující servery odpovídající %(glob)s z důvodu %(reason)s",
     "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s vytvořil blokovací pravidlo odpovídající %(glob)s z důvodu %(reason)s",
-    "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s změnil pravidlo blokující uživatele odpovídající %(oldGlob)s na uživatele odpovídající %(newGlob)s z důvodu %(reason)s",
-    "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s změnil pravidlo blokující místnosti odpovídající %(oldGlob)s na místnosti odpovídající %(newGlob)s z důvodu %(reason)s",
-    "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s změnil pravidlo blokující servery odpovídající %(oldGlob)s na servery odpovídající %(newGlob)s z důvodu %(reason)s",
-    "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s změnil blokovací pravidlo odpovídající %(oldGlob)s na odpovídající %(newGlob)s z důvodu %(reason)s",
+    "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s změnil(a) pravidlo blokující uživatele odpovídající %(oldGlob)s na uživatele odpovídající %(newGlob)s z důvodu %(reason)s",
+    "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s změnil(a) pravidlo blokující místnosti odpovídající %(oldGlob)s na místnosti odpovídající %(newGlob)s z důvodu %(reason)s",
+    "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s změnil(a) pravidlo blokující servery odpovídající %(oldGlob)s na servery odpovídající %(newGlob)s z důvodu %(reason)s",
+    "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s změnil(a) blokovací pravidlo odpovídající %(oldGlob)s na odpovídající %(newGlob)s z důvodu %(reason)s",
     "Try out new ways to ignore people (experimental)": "Vyzkoušejte nové metody ignorování lidí (experimentální)",
     "Match system theme": "Nastavit podle vzhledu systému",
     "My Ban List": "Můj seznam zablokovaných",
@@ -1650,7 +1650,7 @@
     "Subscribed lists": "Odebírané seznamy",
     "Subscribe": "Odebírat",
     "This message cannot be decrypted": "Zprávu nelze rozšifrovat",
-    "Unencrypted": "Nešifrované",
+    "Unencrypted": "Nezašifrované",
     "<userName/> wants to chat": "<userName/> si chce psát",
     "Start chatting": "Zahájit konverzaci",
     "Failed to connect to integration manager": "Nepovedlo se připojit ke správci integrací",
@@ -1745,7 +1745,7 @@
     "Waiting for %(displayName)s to verify…": "Čekám až nás %(displayName)s ověří…",
     "They match": "Odpovídají",
     "They don't match": "Neodpovídají",
-    "To be secure, do this in person or use a trusted way to communicate.": "Aby to bylo bezpečné, udělejte to osobně nebo použijte důvěryhodný komunikační prostředek.",
+    "To be secure, do this in person or use a trusted way to communicate.": "Aby bylo ověření bezpečné, proveďte ho osobně nebo použijte důvěryhodný komunikační prostředek.",
     "Lock": "Zámek",
     "Verify yourself & others to keep your chats safe": "Ověřte sebe a ostatní, aby byla vaše komunikace bezpečná",
     "Other users may not trust it": "Ostatní uživatelé této relaci nemusí věřit",
@@ -1753,9 +1753,9 @@
     "Review": "Prohlédnout",
     "This bridge was provisioned by <user />.": "Toto propojení poskytuje <user />.",
     "This bridge is managed by <user />.": "Toto propojení spravuje <user />.",
-    "Workspace: %(networkName)s": "Workspace: %(networkName)s",
+    "Workspace: %(networkName)s": "Pracovní oblast: %(networkName)s",
     "Channel: %(channelName)s": "Kanál: %(channelName)s",
-    "Show less": "Skrýt detaily",
+    "Show less": "Zobrazit méně",
     "Show more": "Více",
     "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.": "Změna hesla resetuje šifrovací klíče pro všechny vaše relace. Pokud si nejdřív nevyexportujete klíče místností a po změně je znovu neimportujete, nedostanete se k historickým zprávám. V budoucnu se toto zjednoduší.",
     "Cross-signing and secret storage are enabled.": "Cross-signing a bezpečné úložiště jsou zapnuté.",
@@ -1801,12 +1801,12 @@
     "Session key:": "Klíč relace:",
     "Message search": "Vyhledávání ve zprávách",
     "Cross-signing": "Cross-signing",
-    "A session's public name is visible to people you communicate with": "Lidé, se kterými komunikujete, mohou veřejný název zobrazit",
+    "A session's public name is visible to people you communicate with": "Lidé, se kterými komunikujete, mohou zobrazit veřejný název",
     "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Tato místnost je propojena s následujícími platformami. <a>Více informací</a>",
     "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Tato místnost není propojená s žádnými dalšími platformami. <a>Více informací.</a>",
     "Bridges": "Propojení",
     "This user has not verified all of their sessions.": "Tento uživatel zatím neověřil všechny své relace.",
-    "You have not verified this user.": "Tohoto uživatele jste neověřil.",
+    "You have not verified this user.": "Tohoto uživatele jste neověřili.",
     "You have verified this user. This user has verified all of their sessions.": "Tohoto uživatele jste ověřili a on ověřil všechny své relace.",
     "Someone is using an unknown session": "Někdo používá neznámou relaci",
     "This room is end-to-end encrypted": "Místnost je šifrovaná end-to-end",
@@ -1820,15 +1820,15 @@
     "Encrypted by a deleted session": "Šifrované smazanou relací",
     "Invite only": "Pouze na pozvání",
     "Send a reply…": "Odpovědět…",
-    "Send a message…": "Napsat zprávu…",
+    "Send a message…": "Odeslat zprávu…",
     "Direct Messages": "Přímé zprávy",
-    "Reject & Ignore user": "Odmítnout & ignorovat uživatele",
+    "Reject & Ignore user": "Odmítnout a ignorovat uživatele",
     "Unknown Command": "Neznámý příkaz",
     "Unrecognised command: %(commandText)s": "Nerozpoznaný příkaz: %(commandText)s",
     "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Můžete použít <code>/help</code> na vypsání všech příkazů. Nebo jste text chtěli odeslat jako zprávu?",
     "Hint: Begin your message with <code>//</code> to start it with a slash.": "Tip: Zprávu můžete začít <code>//</code>, pokud chcete aby začínala lomítkem.",
     "Send as message": "Odeslat jako zprávu",
-    "Waiting for %(displayName)s to accept…": "Čekáme, než %(displayName)s přijme…",
+    "Waiting for %(displayName)s to accept…": "Čekáme, než %(displayName)s výzvu přijme…",
     "Start Verification": "Začít s ověřením",
     "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Vaše zprávy jsou zabezpečené - pouze vy a jejich příjemci máte klíče potřebné k jejich přečtení.",
     "Verify User": "Ověřit uživatele",
@@ -1873,7 +1873,7 @@
     "New session": "Nová relace",
     "Use this session to verify your new one, granting it access to encrypted messages:": "Použijte tuto relaci pro ověření nové a udělení jí přístupu k vašim šifrovaným zprávám:",
     "If you didn’t sign in to this session, your account may be compromised.": "Pokud jste se do této nové relace nepřihlásili, váš účet může být kompromitován.",
-    "This wasn't me": "To jsem nebyl/a já",
+    "This wasn't me": "To jsem nebyl(a) já",
     "This will allow you to return to your account after signing out, and sign in on other sessions.": "Toto vám umožní se přihlásit do dalších relací a vrátit se ke svému účtu poté, co se odhlásíte.",
     "Recovery key mismatch": "Obnovovací klíč neodpovídá",
     "Incorrect recovery passphrase": "Nesprávné heslo pro obnovení",
@@ -1893,7 +1893,7 @@
     "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.": "Varování: Vaše osobní data (včetně šifrovacích klíčů) jsou tu pořád uložena. Smažte je, pokud chcete tuto relaci zahodit, nebo se přihlaste pod jiný účet.",
     "If you cancel now, you won't complete verifying the other user.": "Pokud teď proces zrušíte, tak nebude druhý uživatel ověřen.",
     "If you cancel now, you won't complete verifying your other session.": "Pokud teď proces zrušíte, tak nebude druhá relace ověřena.",
-    "Cancel entering passphrase?": "Zrušit zadávání hesla?",
+    "Cancel entering passphrase?": "Zrušit zadávání přístupové fráze?",
     "Setting up keys": "Příprava klíčů",
     "%(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)su chybí nějaké komponenty, které jsou potřeba pro vyhledávání v zabezpečených místnostech. Pokud chcete s touto funkcí experimentovat, tak si pořiďte vlastní %(brand)s Desktop s <nativeLink>přidanými komponentami</nativeLink>.",
     "Subscribing to a ban list will cause you to join it!": "Odebíráním seznamu zablokovaných uživatelů se přidáte do jeho místnosti!",
@@ -1922,7 +1922,7 @@
     "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.": "Relace, kterou se snažíte ověřit, neumožňuje ověření QR kódem ani pomocí emoji, což je to, co %(brand)s podporuje. Zkuste použít jiného klienta.",
     "Verify by scanning": "Ověřte naskenováním",
     "You declined": "Odmítli jste",
-    "%(name)s declined": "Uživatel %(name)s odmítl",
+    "%(name)s declined": "%(name)s odmítl(a)",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Uschovejte si kopii na bezpečném místě, například ve správci hesel nebo v trezoru.",
     "Your recovery key": "Váš obnovovací klíč",
     "Copy": "Zkopírovat",
@@ -1948,7 +1948,7 @@
     "Show shortcuts to recently viewed rooms above the room list": "Zobrazovat zkratky do nedávno zobrazených místností navrchu",
     "Cancelling…": "Rušení…",
     "Your homeserver does not support cross-signing.": "Váš domovský server nepodporuje cross-signing.",
-    "Homeserver feature support:": "Funkce podporované domovským serverem:",
+    "Homeserver feature support:": "Funkce podporovaná domovským serverem:",
     "Accepting…": "Přijímání…",
     "Accepting …": "Přijímání…",
     "Declining …": "Odmítání…",
@@ -1963,14 +1963,14 @@
     "Mark all as read": "Označit vše jako přečtené",
     "Not currently indexing messages for any room.": "Aktuálně neindexujeme žádné zprávy.",
     "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s z %(totalRooms)s",
-    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s změnil/a jméno místnosti z %(oldRoomName)s na %(newRoomName)s.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s přidal/a této místnosti alternativní adresy %(addresses)s.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s přidal/a této místnosti alternativní adresu %(addresses)s.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s odebral/a této místnosti alternativní adresy %(addresses)s.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s odebral/a této místnosti alternativní adresu %(addresses)s.",
-    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s změnil/a této místnosti alternativní adresy.",
-    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s změnil/a této místnosti hlavní a alternativní adresy.",
-    "%(senderName)s changed the addresses for this room.": "%(senderName)s změnil/a této místnosti adresy.",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s změnil(a) jméno místnosti z %(oldRoomName)s na %(newRoomName)s.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s přidal(a) této místnosti alternativní adresy %(addresses)s.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s přidal(a) této místnosti alternativní adresu %(addresses)s.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s odebral(a) této místnosti alternativní adresy %(addresses)s.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s odebral(a) této místnosti alternativní adresu %(addresses)s.",
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s změnil(a) alternativní adresy této místnosti.",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s změnil(a) hlavní a alternativní adresy této místnosti.",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s změnil(a) adresy této místnosti.",
     "Manually Verify by Text": "Manuální textové ověření",
     "Interactively verify by Emoji": "Interaktivní ověření s emotikonami",
     "Support adding custom themes": "Umožnit přidání vlastního vzhledu",
@@ -2041,10 +2041,10 @@
     "Where you’re logged in": "Kde jste přihlášení",
     "You've successfully verified your device!": "Úspěšně jste ověřili vaše zařízení!",
     "Start verification again from the notification.": "Začít proces ověření znovu pomocí notifikace.",
-    "Start verification again from their profile.": "Začít proces ověření znovu z jejich profilu.",
+    "Start verification again from their profile.": "Proces ověření začněte znovu z profilu kontaktu.",
     "Verification timed out.": "Ověření vypršelo.",
     "You cancelled verification on your other session.": "Na druhé relace jste proces ověření zrušili.",
-    "%(displayName)s cancelled verification.": "%(displayName)s zrušil/a proces ověření.",
+    "%(displayName)s cancelled verification.": "%(displayName)s zrušil(a) proces ověření.",
     "You cancelled verification.": "Zrušili jste proces ověření.",
     "Message deleted": "Zpráva smazána",
     "Message deleted by %(name)s": "Zpráva smazána uživatelem %(name)s",
@@ -2064,7 +2064,7 @@
     "%(networkName)s rooms": "místnosti v %(networkName)s",
     "Matrix rooms": "místnosti na Matrixu",
     "Enable end-to-end encryption": "Povolit E2E šifrování",
-    "You can’t disable this later. Bridges & most bots won’t work yet.": "Už to v budoucnu nepůjde vypnout. Většina botů a propojení zatím nefunguje.",
+    "You can’t disable this later. Bridges & most bots won’t work yet.": "Toto nelze později vypnout. Většina botů a propojení zatím nefunguje.",
     "Server did not require any authentication": "Server nevyžadoval žádné ověření",
     "Server did not return valid authentication information.": "Server neposkytl platné informace o ověření.",
     "Confirm your account deactivation by using Single Sign On to prove your identity.": "Potvrďte deaktivaci účtu použtím Jednotného přihlášení.",
@@ -2104,7 +2104,7 @@
     "Restart": "Restartovat",
     "Upgrade your %(brand)s": "Aktualizovat %(brand)s",
     "A new version of %(brand)s is available!": "Je dostupná nová verze %(brand)su!",
-    "Are you sure you want to cancel entering passphrase?": "Chcete určitě zrušit zadávání hesla?",
+    "Are you sure you want to cancel entering passphrase?": "Chcete určitě zrušit zadávání přístupové fráze?",
     "Use your account to sign in to the latest version": "Přihlašte se za pomoci svého účtu do nejnovější verze",
     "Riot is now Element!": "Riot je nyní Element!",
     "Learn More": "Zjistit více",
@@ -2172,7 +2172,7 @@
     "%(senderName)s left the call": "%(senderName)s opustil/a hovor",
     "Call ended": "Hovor skončil",
     "You started a call": "Začali jste hovor",
-    "%(senderName)s started a call": "%(senderName)s začal/a hovor",
+    "%(senderName)s started a call": "%(senderName)s začal(a) hovor",
     "Waiting for answer": "Čekání na odpověď",
     "%(senderName)s is calling": "%(senderName)s volá",
     "* %(senderName)s %(emote)s": "* %(senderName)s %(emote)s",
@@ -2180,7 +2180,7 @@
     "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
     "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
     "Change notification settings": "Upravit nastavení oznámení",
-    "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Prototyp komunit verze 2. Vyžaduje kompatibilní domovský server. Experimentální - používejte opatrně.",
+    "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Prototyp skupin verze 2. Vyžaduje kompatibilní domovský server. Experimentální - používejte opatrně.",
     "Use custom size": "Použít vlastní velikost",
     "Use a more compact ‘Modern’ layout": "Používat kompaktní ‘Moderní’ vzhled",
     "Use a system font": "Používat systémové nastavení písma",
@@ -2193,7 +2193,7 @@
     "Incoming call": "Příchozí hovor",
     "Your server isn't responding to some <a>requests</a>.": "Váš server neodpovídá na některé <a>požadavky</a>.",
     "Master private key:": "Hlavní soukromý klíč:",
-    "%(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 nemůže v prohlížeči lokálně bezpečně uložit zprávy. Použijte <desktopLink>%(brand)s Desktop</desktopLink> aby fungovalo vyhledávání v šifrovaných zprávách.",
+    "%(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 nemůže bezpečně ukládat šifrované zprávy lokálně v prohlížeči. Pro zobrazení šifrovaných zpráv ve výsledcích vyhledávání použijte <desktopLink>%(brand)s Desktop</desktopLink>.",
     "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Váš administrátor vypnul šifrování ve výchozím nastavení soukromých místností a přímých chatů.",
     "To link to this room, please add an address.": "Přidejte prosím místnosti adresu aby na ní šlo odkazovat.",
     "The authenticity of this encrypted message can't be guaranteed on this device.": "Pravost této šifrované zprávy nelze na tomto zařízení ověřit.",
@@ -2213,5 +2213,773 @@
     "Upload completed": "Nahrávání dokončeno",
     "Cancelled signature upload": "Nahrávání podpisu zrušeno",
     "Unable to upload": "Nelze nahrát",
-    "Server isn't responding": "Server neodpovídá"
+    "Server isn't responding": "Server neodpovídá",
+    "End": "End",
+    "Space": "Mezerník",
+    "Enter": "Enter",
+    "Esc": "Esc",
+    "Page Down": "Page Down",
+    "Page Up": "Page Up",
+    "Cancel autocomplete": "Zrušit automatické doplňování",
+    "Move autocomplete selection up/down": "Posun nahoru/dolu v automatickém doplňování",
+    "Toggle this dialog": "Zobrazit/skrýt tento dialog",
+    "Activate selected button": "Aktivovat označené tlačítko",
+    "Close dialog or context menu": "Zavřít dialog nebo kontextové menu",
+    "Toggle the top left menu": "Zobrazit/skrýt menu vlevo nahoře",
+    "Scroll up/down in the timeline": "Posunous se nahoru/dolů v historii",
+    "Clear room list filter field": "Smazat filtr místností",
+    "Expand room list section": "Rozbalit seznam místností",
+    "Collapse room list section": "Sbalit seznam místností",
+    "Select room from the room list": "Vybrat místnost v seznamu",
+    "Navigate up/down in the room list": "Posouvat se nahoru/dolů v seznamu místností",
+    "Jump to room search": "Filtrovat místnosti",
+    "Toggle video on/off": "Zapnout nebo vypnout video",
+    "Toggle microphone mute": "Ztlumit nebo zapnout mikrofon",
+    "Jump to start/end of the composer": "Skočit na konec/začátek textového pole",
+    "New line": "Nový řádek",
+    "Toggle Quote": "Citace",
+    "Toggle Italics": "Kurzíva",
+    "Toggle Bold": "Tučné písmo",
+    "Ctrl": "Ctrl",
+    "Shift": "Shift",
+    "Alt Gr": "Alt Gr",
+    "Autocomplete": "Automatické doplňování",
+    "Room List": "Seznam místností",
+    "Calls": "Hovory",
+    "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.": "Pro nastavení filtru přetáhněte avatar skupiny do panelu filtrování na levé straně obrazovky. Pak v tomto panelu můžete kdykoliv klepnout na avatar skupiny a uvidíte jen místnosti a lidi z dané skupiny.",
+    "Send feedback": "Odeslat zpětnou vazbu",
+    "Feedback": "Zpětná vazba",
+    "Feedback sent": "Zpětná vazba byla odeslána",
+    "Security & privacy": "Zabezpečení",
+    "All settings": "Všechna nastavení",
+    "Start a conversation with someone using their name, email address or username (like <userId/>).": "Napište jméno nebo emailovou adresu uživatele se kterým chcete začít konverzaci (např. <userId/>).",
+    "Start a new chat": "Založit novou konverzaci",
+    "Which officially provided instance you are using, if any": "Kterou oficiální instanci Riot.im používáte (a jestli vůbec)",
+    "Change the topic of this room": "Změnit téma této místnosti",
+    "%(senderName)s declined the call.": "%(senderName)s odmítl(a) hovor.",
+    "(an error occurred)": "(došlo k chybě)",
+    "(their device couldn't start the camera / microphone)": "(zařízení druhé strany nemohlo spustit kameru / mikrofon)",
+    "(connection failed)": "(spojení selhalo)",
+    "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 K místnosti nemá přístup žádný server! Místnost už nemůže být používána.",
+    "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Vloží ( ͡° ͜ʖ ͡°) na začátek zprávy",
+    "Czech Republic": "Česká republika",
+    "Algeria": "Alžírsko",
+    "Albania": "Albánie",
+    "Åland Islands": "Alandy",
+    "Afghanistan": "Afgánistán",
+    "United States": "Spojené Státy",
+    "United Kingdom": "Spojené Království",
+    "This will end the conference for everyone. Continue?": "Ukončíme konferenci pro všechny účastníky. Chcete pokračovat?",
+    "End conference": "Ukončit konferenci",
+    "No other application is using the webcam": "Webkamera není blokována jinou aplikací",
+    "Permission is granted to use the webcam": "Aplikace má k webkameře povolen přístup",
+    "A microphone and webcam are plugged in and set up correctly": "Mikrofon a webkamera jsou zapojeny a správně nastaveny",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "Hovor selhal, protože nešlo použít mikrofon nebo webkameru. Zkontrolujte, že:",
+    "Unable to access webcam / microphone": "Není možné použít webkameru nebo mikrofon",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Hovor selhal, protože nešlo použít mikrofon. Zkontrolujte, že je mikrofon připojen a správně nastaven.",
+    "Unable to access microphone": "Není možné použít mikrofon",
+    "The call was answered on another device.": "Hovor byl přijat na jiném zařízení.",
+    "Answered Elsewhere": "Zodpovězeno jinde",
+    "The call could not be established": "Hovor se nepovedlo navázat",
+    "The other party declined the call.": "Druhá strana hovor odmítla.",
+    "Call Declined": "Hovor odmítnut",
+    "PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> to help us track down the problem.": "TIP pro profíky: Pokud nahlásíte chybu, odešlete prosím <debugLogsLink>ladicí protokoly</debugLogsLink>, které nám pomohou problém vypátrat.",
+    "Please view <existingIssuesLink>existing bugs on Github</existingIssuesLink> first. No match? <newIssueLink>Start a new one</newIssueLink>.": "Nejříve si prosím prohlédněte <existingIssuesLink>existující chyby na Githubu</existingIssuesLink>. Žádná shoda? <newIssueLink>Nahlašte novou chybu</newIssueLink>.",
+    "Report a bug": "Nahlásit chybu",
+    "Add widgets, bridges & bots": "Přidat widgety, bridge a boty",
+    "Widgets": "Widgety",
+    "Show Widgets": "Zobrazit widgety",
+    "Hide Widgets": "Skrýt widgety",
+    "Room settings": "Nastavení místnosti",
+    "Use the <a>Desktop app</a> to see all encrypted files": "Pro zobrazení všech šifrovaných souborů použijte <a>desktopovou aplikaci</a>",
+    "Attach files from chat or just drag and drop them anywhere in a room.": "Připojte soubory z chatu nebo je jednoduše přetáhněte kamkoli do místnosti.",
+    "No files visible in this room": "V této místnosti nejsou viditelné žádné soubory",
+    "Show files": "Zobrazit soubory",
+    "%(count)s people|other": "%(count)s osob",
+    "About": "O",
+    "You’re all caught up": "Vše vyřízeno",
+    "You have no visible notifications in this room.": "V této místnosti nemáte žádná viditelná oznámení.",
+    "Hey you. You're the best!": "Hej ty. Jsi nejlepší!",
+    "Secret storage:": "Bezpečné úložiště:",
+    "Backup key cached:": "Klíč zálohy cachován:",
+    "Backup key stored:": "Klíč zálohy uložen:",
+    "Backup version:": "Verze zálohy:",
+    "Algorithm:": "Algoritmus:",
+    "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Tuto možnost můžete povolit, pokud bude místnost použita pouze pro spolupráci s interními týmy na vašem domovském serveru. Toto nelze později změnit.",
+    "Block anyone not part of %(serverName)s from ever joining this room.": "Blokovat komukoli, kdo není součástí serveru %(serverName)s, aby se připojil do této místnosti.",
+    "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.": "Zálohujte šifrovací klíče s daty vašeho účtu pro případ, že ztratíte přístup k relacím. Vaše klíče budou zabezpečeny jedinečným klíčem pro obnovení.",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Níže můžete spravovat názvy a odhlásit se ze svých relací nebo <a>je ověřit v uživatelském profilu</a>.",
+    "or another cross-signing capable Matrix client": "nebo jiný Matrix klient schopný cross-signing",
+    "Cross-signing is not set up.": "Cross-signing není nastaveno.",
+    "Cross-signing is ready for use.": "Cross-signing je připraveno k použití.",
+    "Create a Group Chat": "Vytvořit skupinový chat",
+    "Send a Direct Message": "Poslat přímou zprávu",
+    "This requires the latest %(brand)s on your other devices:": "To vyžaduje nejnovější %(brand)s na vašich ostatních zařízeních:",
+    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Potvrďte svou identitu ověřením tohoto přihlášení z jedné z vašich dalších relací a udělte mu přístup k šifrovaným zprávám.",
+    "Verify this login": "Ověřte toto přihlášení",
+    "Welcome to %(appName)s": "Vítá vás %(appName)s",
+    "Liberate your communication": "Osvoboďte svou komunikaci",
+    "Navigation": "Navigace",
+    "Use the + to make a new room or explore existing ones below": "Pomocí + vytvořte novou místnost nebo prozkoumejte stávající místnosti",
+    "Secure Backup": "Zabezpečená záloha",
+    "Jump to oldest unread message": "Jít na nejstarší nepřečtenou zprávu",
+    "Upload a file": "Nahrát soubor",
+    "You've reached the maximum number of simultaneous calls.": "Dosáhli jste maximálního počtu souběžných hovorů.",
+    "Too Many Calls": "Přiliš mnoho hovorů",
+    "Community and user menu": "Nabídka skupiny a uživatele",
+    "User menu": "Uživatelská nabídka",
+    "Switch theme": "Přepnout téma",
+    "Switch to dark mode": "Přepnout do tmavého režimu",
+    "Switch to light mode": "Přepnout do světlého režimu",
+    "User settings": "Uživatelská nastavení",
+    "Community settings": "Nastavení skupiny",
+    "Confirm your recovery passphrase": "Potvrďte vaši přístupovou frázi pro obnovení",
+    "Repeat your recovery passphrase...": "Opakujte přístupovou frázi pro obnovení...",
+    "Please enter your recovery passphrase a second time to confirm.": "Potvrďte prosím podruhé svou frázi pro obnovení.",
+    "Use a different passphrase?": "Použít jinou přístupovou frázi?",
+    "Great! This recovery passphrase looks strong enough.": "Skvělé! Tato fráze pro obnovení vypadá dostatečně silně.",
+    "Enter a recovery passphrase": "Zadejte frázi pro obnovení",
+    "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s nebo %(usernamePassword)s",
+    "If you've joined lots of rooms, this might take a while": "Pokud jste se připojili ke spoustě místností, může to chvíli trvat",
+    "There was a problem communicating with the homeserver, please try again later.": "Při komunikaci s domovským serverem došlo k potížím, zkuste to prosím později.",
+    "Continue with %(ssoButtons)s": "Pokračovat s %(ssoButtons)s",
+    "Use Recovery Key": "Použít klíč pro obnovu",
+    "Use Recovery Key or Passphrase": "Použít klíč pro obnovu nebo frázi",
+    "Already have an account? <a>Sign in here</a>": "Máte již účet? <a>Přihlašte se zde</a>",
+    "Host account on": "Hostovat účet na",
+    "Signing In...": "Přihlašování...",
+    "Syncing...": "Synchronizuji...",
+    "That username already exists, please try another.": "Toto uživatelské jméno již existuje, zkuste prosím jiné.",
+    "Verify other session": "Ověření jiné relace",
+    "Filter rooms and people": "Filtrovat místnosti a lidi",
+    "Explore rooms in %(communityName)s": "Prozkoumejte místnosti v %(communityName)s",
+    "delete the address.": "smazat adresu.",
+    "Delete the room address %(alias)s and remove %(name)s from the directory?": "Smazat adresu místnosti %(alias)s a odebrat %(name)s z adresáře?",
+    "Self-verification request": "Požadavek na sebeověření",
+    "%(creator)s created this DM.": "%(creator)s vytvořil(a) tuto přímou zprávu.",
+    "You do not have permission to create rooms in this community.": "Nemáte oprávnění k vytváření místností v této skupině.",
+    "Cannot create rooms in this community": "V této skupině nelze vytvořit místnosti",
+    "Great, that'll help people know it's you": "Skvělé, to pomůže lidem zjistit, že jste to vy",
+    "Add a photo so people know it's you.": "Přidejte fotku, aby lidé věděli, že jste to vy.",
+    "Explore Public Rooms": "Prozkoumat veřejné místnosti",
+    "Welcome %(name)s": "Vítejte %(name)s",
+    "Now, let's help you get started": "Nyní vám pomůžeme začít",
+    "Effects": "Efekty",
+    "Alt": "Alt",
+    "Approve": "Schválit",
+    "Looks good!": "To vypadá dobře!",
+    "Wrong file type": "Špatný typ souboru",
+    "The server has denied your request.": "Server odmítl váš požadavek.",
+    "The server is offline.": "Server je offline.",
+    "not ready": "nepřipraveno",
+    "Remove messages sent by others": "Odstranit zprávy odeslané ostatními",
+    "Decline All": "Odmítnout vše",
+    "Use the <a>Desktop app</a> to search encrypted messages": "K prohledávání šifrovaných zpráv použijte <a>aplikaci pro stolní počítače</a>",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Pozvěte někoho pomocí jeho jména, e-mailové adresy, uživatelského jména (například <userId/>) nebo <a>sdílejte tuto místnost</a>.",
+    "Super": "Super",
+    "Toggle right panel": "Zobrazit/skrýt pravý panel",
+    "Add a photo, so people can easily spot your room.": "Přidejte fotografii, aby lidé mohli snadno najít váši místnost.",
+    "%(displayName)s created this room.": "%(displayName)s vytvořil tuto místnost.",
+    "This is the start of <roomName/>.": "Toto je začátek místnosti <roomName/>.",
+    "Topic: %(topic)s ": "Téma: %(topic)s ",
+    "Topic: %(topic)s (<a>edit</a>)": "Téma: %(topic)s (<a>upravit</a>)",
+    "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Zprávy zde jsou šifrovány end-to-end. Ověřte uživatele %(displayName)s v jeho profilu - klepněte na jeho avatar.",
+    "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.": "Zadejte frázi zabezpečení, kterou znáte jen vy, k ochraně vašich dat. Z důvodu bezpečnosti byste neměli znovu používat heslo k účtu.",
+    "Use a secret phrase only you know, and optionally save a Security Key to use for backup.": "Použijte tajnou frázi, kterou znáte pouze vy, a volitelně uložte bezpečnostní klíč, který použijete pro zálohování.",
+    "Enter a Security Phrase": "Zadání bezpečnostní fráze",
+    "We’ll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": "Vygenerujeme bezpečnostní klíč, který můžete uložit někde v bezpečí, například ve správci hesel nebo trezoru.",
+    "Generate a Security Key": "Vygenerovat bezpečnostní klíč",
+    "Set up Secure Backup": "Nastavení zabezpečené zálohy",
+    "Safeguard against losing access to encrypted messages & data by backing up encryption keys on your server.": "Chraňte se před ztrátou přístupu k šifrovaným zprávám a datům zálohováním šifrovacích klíčů na serveru.",
+    "Safeguard against losing access to encrypted messages & data": "Zabezpečení proti ztrátě přístupu k šifrovaným zprávám a datům",
+    "This is the beginning of your direct message history with <displayName/>.": "Toto je začátek historie vašich přímých zpráv s uživatelem <displayName />.",
+    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "V této konverzaci jste pouze vy dva, dokud někdo z vás nepozve někoho dalšího.",
+    "You created this room.": "Vytvořili jste tuto místnost.",
+    "<a>Add a topic</a> to help people know what it is about.": "<a>Přidejte téma</a>, aby lidé věděli, o co jde.",
+    "Invite by email": "Pozvat emailem",
+    "Comment": "Komentář",
+    "Add comment": "Přidat komentář",
+    "Update community": "Aktualizovat skupinu",
+    "Create a room in %(communityName)s": "Vytvořit místnost v %(communityName)s",
+    "Your server requires encryption to be enabled in private rooms.": "Váš server vyžaduje povolení šifrování v soukromých místnostech.",
+    "An image will help people identify your community.": "Obrázek pomůže lidem identifikovat vaši skupinu.",
+    "Invite people to join %(communityName)s": "Pozvat lidi do %(communityName)s",
+    "Send %(count)s invites|one": "Poslat %(count)s pozvánku",
+    "Send %(count)s invites|other": "Poslat %(count)s pozvánek",
+    "People you know on %(brand)s": "Lidé, které znáte z %(brand)s",
+    "Add another email": "Přidat další emailovou adresu",
+    "Show": "Zobrazit",
+    "Reason (optional)": "Důvod (volitelné)",
+    "Add image (optional)": "Přidat obrázek (volitelné)",
+    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Do soukromé místnosti se lze připojit pouze s pozvánkou. Veřejné místnosti lze najít a může se do nich připojit kdokoli.",
+    "Currently indexing: %(currentRoom)s": "Aktuálně se indexuje: %(currentRoom)s",
+    "Secure your backup with a recovery passphrase": "Zabezpečte zálohu pomocí fráze pro obnovení",
+    "%(brand)s Android": "%(brand)s Android",
+    "%(brand)s iOS": "%(brand)s iOS",
+    "%(brand)s Desktop": "%(brand)s Desktop",
+    "%(brand)s Web": "%(brand)s Web",
+    "Use email to optionally be discoverable by existing contacts.": "Pomocí e-mailu můžete být volitelně viditelní pro existující kontakty.",
+    "Use email or phone to optionally be discoverable by existing contacts.": "Použijte e-mail nebo telefon, abyste byli volitelně viditelní pro stávající kontakty.",
+    "Sign in with SSO": "Přihlásit pomocí SSO",
+    "Create community": "Vytvořit skupinu",
+    "Add an email to be able to reset your password.": "Přidejte email, abyste mohli obnovit své heslo.",
+    "That phone number doesn't look quite right, please check and try again": "Toto telefonní číslo nevypadá úplně správně, zkontrolujte ho a zkuste to znovu",
+    "Forgot password?": "Zapomenuté heslo?",
+    "Enter phone number": "Zadejte telefonní číslo",
+    "Enter email address": "Zadejte emailovou adresu",
+    "Open the link in the email to continue registration.": "Pro pokračování v registraci, otevřete odkaz v e-mailu.",
+    "A confirmation email has been sent to %(emailAddress)s": "Na adresu %(emailAddress)s byl zaslán potvrzovací e-mail",
+    "Take a picture": "Vyfotit",
+    "Hold": "Podržet",
+    "Resume": "Pokračovat",
+    "Successfully restored %(sessionCount)s keys": "Úspěšně obnoveno %(sessionCount)s klíčů",
+    "Keys restored": "Klíče byly obnoveny",
+    "You're all caught up.": "Vše vyřízeno.",
+    "There was an error updating your community. The server is unable to process your request.": "Při aktualizaci skupiny došlo k chybě. Server nemůže zpracovat váš požadavek.",
+    "There are two ways you can provide feedback and help us improve %(brand)s.": "Jsou dva způsoby, jak můžete poskytnout zpětnou vazbu a pomoci nám vylepšit %(brand)s.",
+    "Rate %(brand)s": "Ohodnotit %(brand)s",
+    "You've previously used a newer version of %(brand)s with this session. To use this version again with end to end encryption, you will need to sign out and back in again.": "V této relaci jste již dříve používali novější verzi %(brand)s. Chcete-li tuto verzi znovu použít s šifrováním, budete se muset odhlásit a znovu přihlásit.",
+    "Homeserver": "Domovský server",
+    "Continue with %(provider)s": "Pokračovat s %(provider)s",
+    "Server Options": "Možnosti serveru",
+    "This version of %(brand)s does not support viewing some encrypted files": "Tato verze %(brand)s nepodporuje zobrazení některých šifrovaných souborů",
+    "This version of %(brand)s does not support searching encrypted messages": "Tato verze %(brand)s nepodporuje hledání v šifrovaných zprávách",
+    "Information": "Informace",
+    "%(count)s results|one": "%(count)s výsledek",
+    "Explore community rooms": "Prozkoumat místnosti skupin",
+    "Role": "Role",
+    "Madagascar": "Madagaskar",
+    "Macedonia": "Makedonie",
+    "Macau": "Macao",
+    "Luxembourg": "Lucembursko",
+    "Lithuania": "Litva",
+    "Liechtenstein": "Lichtenštejnsko",
+    "Libya": "Libye",
+    "Liberia": "Libérie",
+    "Lesotho": "Lesotho",
+    "Lebanon": "Libanon",
+    "Latvia": "Lotyšsko",
+    "Laos": "Laos",
+    "Kyrgyzstan": "Kyrgyzstán",
+    "Myanmar": "Myanmar",
+    "Mozambique": "Mosambik",
+    "Morocco": "Maroko",
+    "Montserrat": "Montserrat",
+    "Montenegro": "Černá Hora",
+    "Mongolia": "Mongolsko",
+    "Monaco": "Monako",
+    "Moldova": "Moldavsko",
+    "Micronesia": "Mikronésie",
+    "Mexico": "Mexiko",
+    "Mayotte": "Mayotte",
+    "Mauritius": "Mauricius",
+    "Mauritania": "Mauretánie",
+    "Martinique": "Martinik",
+    "Marshall Islands": "Marshallovy ostrovy",
+    "Malta": "Malta",
+    "Mali": "Mali",
+    "Maldives": "Maledivy",
+    "Malaysia": "Malajsie",
+    "Malawi": "Malawi",
+    "Kuwait": "Kuwait",
+    "Kosovo": "Kosovo",
+    "Kiribati": "Kiribati",
+    "Kenya": "Keňa",
+    "Kazakhstan": "Kazachstán",
+    "Congo - Brazzaville": "Kongo - Brazzaville",
+    "Cambodia": "Kambodža",
+    "Burundi": "Burundi",
+    "Burkina Faso": "Burkina Faso",
+    "Bulgaria": "Bulharsko",
+    "Brunei": "Brunej",
+    "British Virgin Islands": "Britské indickooceánské území",
+    "British Indian Ocean Territory": "Britské indickooceánské území",
+    "Brazil": "Brazílie",
+    "Bouvet Island": "Bouvetův ostrov",
+    "Botswana": "Botswana",
+    "Bosnia": "Bosna",
+    "Bolivia": "Bolívie",
+    "Bhutan": "Bhútán",
+    "Bermuda": "Bermudy",
+    "Jordan": "Jordánsko",
+    "Jersey": "Jersey",
+    "Japan": "Japonsko",
+    "Jamaica": "Jamajka",
+    "Italy": "Itálie",
+    "Israel": "Izrael",
+    "Isle of Man": "Ostrov Man",
+    "Ireland": "Irsko",
+    "Iraq": "Irák",
+    "Iran": "Írán",
+    "Indonesia": "Indonésie",
+    "India": "Indie",
+    "Iceland": "Island",
+    "Hungary": "Maďarsko",
+    "Hong Kong": "Hong Kong",
+    "Honduras": "Honduras",
+    "Heard & McDonald Islands": "Heardovy a McDonaldovy ostrovy",
+    "Haiti": "Haiti",
+    "Guyana": "Guyana",
+    "Guinea-Bissau": "Guinea-Bissau",
+    "Guinea": "Guinea",
+    "Guernsey": "Guernsey",
+    "Guatemala": "Guatemala",
+    "Guam": "Guam",
+    "Guadeloupe": "Guadeloupe",
+    "Grenada": "Grenada",
+    "Greenland": "Grónsko",
+    "Greece": "Řecko",
+    "Gibraltar": "Gibraltar",
+    "Ghana": "Ghana",
+    "Germany": "Německo",
+    "Georgia": "Gruzie",
+    "Gambia": "Gambie",
+    "Gabon": "Gabon",
+    "French Southern Territories": "Francouzská jižní území",
+    "French Polynesia": "Francouzská Polynésie",
+    "French Guiana": "Francouzská Guyana",
+    "France": "Francie",
+    "Finland": "Finsko",
+    "Fiji": "Fiji",
+    "Faroe Islands": "Faerské ostrovy",
+    "Falkland Islands": "Falklandy",
+    "Ethiopia": "Etiopie",
+    "Estonia": "Estonsko",
+    "Eritrea": "Eritrea",
+    "Equatorial Guinea": "Rovníková Guinea",
+    "El Salvador": "El Salvador",
+    "Egypt": "Egypt",
+    "Ecuador": "Ekvádor",
+    "Dominican Republic": "Dominikánská republika",
+    "Dominica": "Dominika",
+    "Djibouti": "Džibuti",
+    "Denmark": "Dánsko",
+    "Côte d’Ivoire": "Pobřeží slonoviny",
+    "Cyprus": "Kypr",
+    "Curaçao": "Curaçao",
+    "Cuba": "Kuba",
+    "Croatia": "Chorvatsko",
+    "Costa Rica": "Kostarika",
+    "Cook Islands": "Cookovy ostrovy",
+    "Congo - Kinshasa": "Kongo - Brazzaville",
+    "Comoros": "Komory",
+    "Colombia": "Kolumbie",
+    "Cocos (Keeling) Islands": "Kokosové (Keelingovy) ostrovy",
+    "Christmas Island": "Vánoční ostrov",
+    "China": "Čína",
+    "Chile": "Chile",
+    "Chad": "Čad",
+    "Central African Republic": "Středoafrická republika",
+    "Cayman Islands": "Kajmanské ostrovy",
+    "Caribbean Netherlands": "Karibské Nizozemsko",
+    "Cape Verde": "Kapverdy",
+    "Canada": "Kanada",
+    "Cameroon": "Kamerun",
+    "Benin": "Benin",
+    "Belize": "Belize",
+    "Belgium": "Belgie",
+    "Belarus": "Bělorusko",
+    "Bangladesh": "Bangladéš",
+    "Barbados": "Barbados",
+    "Bahrain": "Bahrain",
+    "Bahamas": "Bahamy",
+    "Azerbaijan": "Ázerbajdžán",
+    "Austria": "Rakousko",
+    "Australia": "Austrálie",
+    "Aruba": "Aruba",
+    "Armenia": "Arménie",
+    "Argentina": "Argentina",
+    "Antigua & Barbuda": "Antigua a Barbuda",
+    "Antarctica": "Antarktida",
+    "Anguilla": "Anguilla",
+    "Angola": "Angola",
+    "Andorra": "Andorra",
+    "American Samoa": "Americká Samoa",
+    "Room Info": "Informace o místnosti",
+    "Enable desktop notifications": "Povolit oznámení na ploše",
+    "Invalid Recovery Key": "Neplatný klíč pro obnovení",
+    "Security Key": "Bezpečnostní klíč",
+    "Use your Security Key to continue.": "Pokračujte pomocí bezpečnostního klíče.",
+    "If they don't match, the security of your communication may be compromised.": "Pokud se neshodují, bezpečnost vaší komunikace může být kompromitována.",
+    "Confirm this user's session by comparing the following with their User Settings:": "Potvrďte relaci tohoto uživatele porovnáním následujícího s jeho uživatelským nastavením:",
+    "Confirm Security Phrase": "Potvrďte bezpečnostní frázi",
+    "Privacy": "Soukromí",
+    "Click the button below to confirm setting up encryption.": "Kliknutím na tlačítko níže potvrďte nastavení šifrování.",
+    "Confirm encryption setup": "Potvrďte nastavení šifrování",
+    "Return to call": "Návrat do hovoru",
+    "Unable to set up keys": "Nepovedlo se nastavit klíče",
+    "Save your Security Key": "Uložte svůj bezpečnostní klíč",
+    "We call the places where you can host your account ‘homeservers’.": "Místům, kde můžete hostovat svůj účet, říkáme ‘domovské servery’.",
+    "About homeservers": "O domovských serverech",
+    "Learn more": "Zjistit více",
+    "Use your preferred Matrix homeserver if you have one, or host your own.": "Použijte svůj preferovaný domovský server Matrix, pokud ho máte, nebo hostujte svůj vlastní.",
+    "Other homeserver": "Jiný domovský server",
+    "Sign into your homeserver": "Přihlaste se do svého domovského serveru",
+    "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "Matrix.org je největší veřejný domovský server na světě, pro mnoho lidí je dobrým místem.",
+    "not found in storage": "nebylo nalezeno v úložišti",
+    "ready": "připraven",
+    "May include members not in %(communityName)s": "Může zahrnovat členy, kteří nejsou v %(communityName)s",
+    "Specify a homeserver": "Zadejte domovský server",
+    "Invalid URL": "Neplatné URL",
+    "Unable to validate homeserver": "Nelze ověřit domovský server",
+    "New? <a>Create account</a>": "Jste zde nový? <a>Vytvořte si účet</a>",
+    "Navigate recent messages to edit": "Procházet poslední zprávy k úpravám",
+    "Navigate composer history": "Procházet historii editoru",
+    "Cancel replying to a message": "Zrušení odpovědi na zprávu",
+    "Don't miss a reply": "Nezmeškejte odpovědět",
+    "Unknown App": "Neznámá aplikace",
+    "%(name)s paused": "%(name)s pozastaven",
+    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Zálohu nebylo možné dešifrovat pomocí tohoto klíče pro obnovení: ověřte, zda jste zadali správný klíč pro obnovení.",
+    "Move right": "Posunout doprava",
+    "Move left": "Posunout doleva",
+    "Go to Home View": "Přejít na domovské zobrazení",
+    "Dismiss read marker and jump to bottom": "Zavřít značku přečtených zpráv a skočit dolů",
+    "Previous/next room or DM": "Předchozí/další místnost nebo přímá zpráva",
+    "Previous/next unread room or DM": "Předchozí/další nepřečtená místnost nebo přímá zpráva",
+    "Not encrypted": "Není šifrováno",
+    "New here? <a>Create an account</a>": "Jste zde nový? <a>Vytvořte si účet</a>",
+    "Got an account? <a>Sign in</a>": "Máte již účet? <a>Přihlásit se</a>",
+    "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>": "Toto je nepozve do %(communityName)s. Chcete-li někoho pozvat na %(communityName)s, klikněte <a>sem</a>",
+    "Approve widget permissions": "Schválit oprávnění widgetu",
+    "Enter name": "Zadejte jméno",
+    "Ignored attempt to disable encryption": "Ignorovaný pokus o deaktivaci šifrování",
+    "Show chat effects": "Zobrazit efekty chatu",
+    "%(count)s people|one": "%(count)s osoba",
+    "Takes the call in the current room off hold": "Zruší podržení hovoru v aktuální místnosti",
+    "Places the call in the current room on hold": "Podrží hovor v aktuální místnosti",
+    "Zimbabwe": "Zimbabwe",
+    "Zambia": "Zambie",
+    "Yemen": "Jemen",
+    "Western Sahara": "Západní Sahara",
+    "Wallis & Futuna": "Wallis a Futuna",
+    "Vietnam": "Vietnam",
+    "Venezuela": "Venezuela",
+    "Vatican City": "Vatikán",
+    "Vanuatu": "Vanuatu",
+    "Uzbekistan": "Uzbekistán",
+    "Uruguay": "Uruguay",
+    "United Arab Emirates": "Spojené arabské emiráty",
+    "Ukraine": "Ukrajina",
+    "Uganda": "Uganda",
+    "U.S. Virgin Islands": "Panenské ostrovy",
+    "Tuvalu": "Tuvalu",
+    "Turks & Caicos Islands": "Ostrovy Turks a Caicos",
+    "Turkmenistan": "Turkmenistán",
+    "Turkey": "Turecko",
+    "Tunisia": "Tunisko",
+    "Trinidad & Tobago": "Trinidad a Tobago",
+    "Tonga": "Tonga",
+    "Tokelau": "Tokelau",
+    "Togo": "Togo",
+    "Timor-Leste": "Východní Timor",
+    "Thailand": "Thajsko",
+    "Tanzania": "Tanzánie",
+    "Tajikistan": "Tádžikistán",
+    "Taiwan": "Taiwan",
+    "São Tomé & Príncipe": "Svatý Tomáš a Princův ostrov",
+    "Syria": "Sýrie",
+    "Switzerland": "Švýcarsko",
+    "Sweden": "Švédsko",
+    "Swaziland": "Svazijsko",
+    "Svalbard & Jan Mayen": "Špicberky a Jan Mayen",
+    "Suriname": "Surinam",
+    "Sudan": "Súdán",
+    "St. Vincent & Grenadines": "Svatý Vincenc a Grenadiny",
+    "St. Pierre & Miquelon": "Saint Pierre a Miquelon",
+    "St. Martin": "Svatý Martin",
+    "St. Lucia": "Svatá Lucie",
+    "St. Kitts & Nevis": "Svatý Kryštof a Nevis",
+    "St. Helena": "Svatá Helena",
+    "St. Barthélemy": "Svatý Bartoloměj",
+    "Sri Lanka": "Srí Lanka",
+    "Spain": "Španělsko",
+    "South Sudan": "Jižní Súdán",
+    "South Korea": "Jižní Korea",
+    "South Georgia & South Sandwich Islands": "Jižní Georgie a Jižní Sandwichovy ostrovy",
+    "South Africa": "Jižní Afrika",
+    "Somalia": "Somálsko",
+    "Solomon Islands": "Šalomounovy ostrovy",
+    "Slovenia": "Slovinsko",
+    "Slovakia": "Slovensko",
+    "Sint Maarten": "Sint Maarten",
+    "Singapore": "Singapur",
+    "Sierra Leone": "Sierra Leone",
+    "Seychelles": "Seychely",
+    "Serbia": "Srbsko",
+    "Senegal": "Senegal",
+    "Saudi Arabia": "Saudská arábie",
+    "San Marino": "San Marino",
+    "Samoa": "Samoa",
+    "Réunion": "Réunion",
+    "Rwanda": "Rwanda",
+    "Russia": "Rusko",
+    "Romania": "Rumunsko",
+    "Qatar": "Katar",
+    "Puerto Rico": "Portoriko",
+    "Portugal": "Portugalsko",
+    "Poland": "Polsko",
+    "Pitcairn Islands": "Pitcairnovy ostrovy",
+    "Philippines": "Filipíny",
+    "Peru": "Peru",
+    "Paraguay": "Paraguay",
+    "Papua New Guinea": "Papua-Nová Guinea",
+    "Panama": "Panama",
+    "Palestine": "Palestina",
+    "Palau": "Palau",
+    "Pakistan": "Pákistán",
+    "Oman": "Omán",
+    "Norway": "Norsko",
+    "Northern Mariana Islands": "Severní Mariany",
+    "North Korea": "Severní Korea",
+    "Norfolk Island": "Ostrov Norfolk",
+    "Niue": "Niue",
+    "Nigeria": "Nigérie",
+    "Niger": "Niger",
+    "Nicaragua": "Nikaragua",
+    "New Zealand": "Nový Zéland",
+    "New Caledonia": "Nová Kaledonie",
+    "Netherlands": "Holandsko",
+    "Nepal": "Nepál",
+    "Nauru": "Nauru",
+    "Namibia": "Namibie",
+    "Security Phrase": "Bezpečnostní fráze",
+    "Wrong Recovery Key": "Nesprávný klíč pro obnovení",
+    "Fetching keys from server...": "Načítání klíčů ze serveru ...",
+    "Use Command + Enter to send a message": "K odeslání zprávy použijte Command + Enter",
+    "Use Ctrl + Enter to send a message": "K odeslání zprávy použijte Ctrl + Enter",
+    "Decide where your account is hosted": "Rozhodněte, kde je váš účet hostován",
+    "Unable to query secret storage status": "Nelze zjistit stav úložiště klíčů",
+    "Update %(brand)s": "Aktualizovat %(brand)s",
+    "You can also set up Secure Backup & manage your keys in Settings.": "Zabezpečené zálohování a správu klíčů můžete také nastavit v Nastavení.",
+    "Set a Security Phrase": "Nastavit bezpečnostní frázi",
+    "Use this when referencing your community to others. The community ID cannot be changed.": "Použijte toto, když odkazujete svou skupinu na ostatní. ID skupiny nelze změnit.",
+    "Please go into as much detail as you like, so we can track down the problem.": "Udejte prosím co nejvíce podrobností, abychom mohli problém vystopovat.",
+    "Start a conversation with someone using their name or username (like <userId/>).": "Začněte konverzaci s někým pomocí jeho jména nebo uživatelského jména (například <userId />).",
+    "Tell us below how you feel about %(brand)s so far.": "Níže se podělte s vašimi zkušenostmi s %(brand)s.",
+    "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s nastavil seznam přístupů serveru pro tuto místnost.",
+    "What's the name of your community or team?": "Jak se jmenuje vaše skupina nebo tým?",
+    "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.": "Pozvěte někoho pomocí svého jména, uživatelského jména (například <userId />) nebo <a>sdílejte tuto místnost</a>.",
+    "Confirm by comparing the following with the User Settings in your other session:": "Potvrďte porovnáním následujícího s uživatelským nastavením v jiné relaci:",
+    "Data on this screen is shared with %(widgetDomain)s": "Data na této obrazovce jsou sdílena s %(widgetDomain)s",
+    "Just a heads up, if you don't add an email and forget your password, you could <b>permanently lose access to your account</b>.": "Jen upozornění, pokud nepřidáte e-mail a zapomenete heslo, můžete <b>trvale ztratit přístup ke svému účtu</b>.",
+    "Your area is experiencing difficulties connecting to the internet.": "Ve vaší oblasti dochází k problémům s připojením k internetu.",
+    "A connection error occurred while trying to contact the server.": "Při pokusu o kontakt se serverem došlo k chybě připojení.",
+    "The server is not configured to indicate what the problem is (CORS).": "Server není nakonfigurován tak, aby indikoval, v čem je problém (CORS).",
+    "Recent changes that have not yet been received": "Nedávné změny, které dosud nebyly přijaty",
+    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Nelze získat přístup k úložišti klíčů. Ověřte, zda jste zadali správnou přístupovou frázi pro obnovení.",
+    "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "Pokračujte zadáním bezpečnostní fráze nebo <button>použijte váš bezpečnostní klíč</button> pro pokračování.",
+    "Restoring keys from backup": "Obnovení klíčů ze zálohy",
+    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Zálohu nebylo možné dešifrovat pomocí této přístupové fráze pro obnovení: ověřte, zda jste zadali správnou přístupovou frázi pro obnovení.",
+    "%(completed)s of %(total)s keys restored": "Obnoveno %(completed)s z %(total)s klíčů",
+    "Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.": "Uložte bezpečnostní klíč někam na bezpečné místo, například do správce hesel nebo do trezoru, který slouží k ochraně vašich šifrovaných dat.",
+    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Váš klíč pro obnovení je bezpečnostní sítí - můžete jej použít k obnovení přístupu k šifrovaným zprávám, pokud zapomenete přístupovou frázi pro obnovení.",
+    "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.": "Byla zjištěna data ze starší verze %(brand)s. To bude mít za následek nefunkčnost end-to-end kryptografie ve starší verzi. End-to-end šifrované zprávy vyměněné nedávno při používání starší verze nemusí být v této verzi dešifrovatelné. To může také způsobit selhání zpráv vyměňovaných s touto verzí. Pokud narazíte na problémy, odhlaste se a znovu se přihlaste. Chcete-li zachovat historii zpráv, exportujte a znovu importujte klíče.",
+    "Failed to find the general chat for this community": "Nepodařilo se najít obecný chat pro tuto skupinu",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Na náš server uložíme zašifrovanou kopii vašich klíčů. Zabezpečte zálohu pomocí přístupové fráze pro obnovení.",
+    "Enter your recovery passphrase a second time to confirm it.": "Zadejte podruhé přístupovou frázi pro obnovení a potvrďte ji.",
+    "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "Pokud nyní nebudete pokračovat, můžete ztratit šifrované zprávy a data, pokud ztratíte přístup ke svým přihlašovacím údajům.",
+    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Zprávy v této místnosti jsou šifrovány end-to-end. Když se lidé připojí, můžete je ověřit v jejich profilu, stačí klepnout na jejich avatara.",
+    "Revoke permissions": "Odvolat oprávnění",
+    "Continuing without email": "Pokračuje se bez e-mailu",
+    "You can change this later if needed.": "V případě potřeby to můžete později změnit.",
+    "Video conference started by %(senderName)s": "Videokonferenci byla zahájena uživatelem %(senderName)s",
+    "Video conference updated by %(senderName)s": "Videokonference byla aktualizována uživatelem %(senderName)s",
+    "Video conference ended by %(senderName)s": "Videokonference byla ukončena uživatelem %(senderName)s",
+    "Unpin": "Odepnout",
+    "Fill Screen": "Vyplnit obrazovku",
+    "Voice Call": "Hlasový hovor",
+    "Video Call": "Videohovor",
+    "%(senderName)s ended the call": "%(senderName)s ukončil(a) hovor",
+    "You ended the call": "Ukončili jste hovor",
+    "New version of %(brand)s is available": "K dispozici je nová verze %(brand)s",
+    "Error leaving room": "Při opouštění místnosti došlo k chybě",
+    "See messages posted to your active room": "Zobrazit zprávy odeslané do vaší aktivní místnosti",
+    "See messages posted to this room": "Zobrazit zprávy odeslané do této místnosti",
+    "See when the avatar changes in your active room": "Podívejte se, kdy se změní avatar ve vaší aktivní místnosti",
+    "Change the avatar of your active room": "Změňte avatar vaší aktivní místnosti",
+    "See when the avatar changes in this room": "Podívejte se, kdy se změní avatar v této místnosti",
+    "Change the avatar of this room": "Změňte avatar této místnosti",
+    "See when the name changes in your active room": "Podívejte se, kdy se ve vaší aktivní místnosti změní název",
+    "Change the name of your active room": "Změňte název své aktivní místnosti",
+    "Change the name of this room": "Změňte název této místnosti",
+    "A browser extension is preventing the request.": "Rozšíření prohlížeče brání požadavku.",
+    "Your firewall or anti-virus is blocking the request.": "Váš firewall nebo antivirový program blokuje požadavek.",
+    "The server (%(serverName)s) took too long to respond.": "Serveru (%(serverName)s) trvalo příliš dlouho, než odpověděl.",
+    "Your server isn't responding to some of your requests. Below are some of the most likely reasons.": "Váš server neodpovídá na některé vaše požadavky. Níže jsou některé z nejpravděpodobnějších důvodů.",
+    "<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 pro vaši stránku skupiny</h1>\n<p>\n    Pomocí popisu můžete představit nové členy skupiny nebo distribuovat\n    některé důležité <a href=\"foo\">odkazy</a>\n</p>\n<p>\n    Můžete dokonce přidat obrázky pomocí Matrix URL <img src=\"mxc://url\" />\n</p>\n",
+    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Soukromé místnosti lze najít a připojit se do nich pouze na pozvání. Veřejné místnosti může najít a připojit se do nich kdokoli v této skupině.",
+    "Community ID: +<localpart />:%(domain)s": "ID skupiny: +<localpart />:%(domain)s",
+    "The operation could not be completed": "Operace nemohla být dokončena",
+    "Failed to save your profile": "Váš profil se nepodařilo uložit",
+    "%(peerName)s held the call": "%(peerName)s podržel hovor",
+    "You held the call <a>Resume</a>": "Podrželi jste hovor <a>Pokračovat</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 Element with an existing Matrix account on a different homeserver.": "Můžete použít vlastní volbu serveru a přihlásit se k jiným Matrix serverům zadáním adresy URL domovského serveru. To vám umožní používat Element s existujícím Matrix účtem na jiném domovském serveru.",
+    "Unpin a widget to view it in this panel": "Odepněte widget, aby mohl být zobrazen v tomto panelu",
+    "You can only pin up to %(count)s widgets|other": "Můžete připnout až %(count)s widgetů",
+    "Edit widgets, bridges & bots": "Upravujte widgety, mosty a boty",
+    "a device cross-signing signature": "zařízení používající cross-signing podpis",
+    "This widget would like to:": "Tento widget by chtěl:",
+    "Modal Widget": "Modální widget",
+    "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.": "Toto můžete deaktivovat, pokud bude místnost použita pro spolupráci s externími týmy, které mají svůj vlastní domovský server. Toto nelze později změnit.",
+    "Join the conference from the room information card on the right": "Připojte se ke konferenci z informační karty místnosti napravo",
+    "Join the conference at the top of this room": "Připojte se ke konferenci v horní části této místnosti",
+    "There are advanced notifications which are not shown here.": "Existují pokročilá oznámení, která se zde nezobrazují.",
+    "Enable advanced debugging for the room list": "Povolit pokročilé ladění pro seznam místností",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Bezpečně uloží zašifrované zprávy v místním úložišti, aby se mohly objevit ve výsledcích vyhledávání, využívá se %(size)s k ukládání zpráv z %(rooms)s místnosti.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Bezpečně uloží zašifrované zprávy v místním úložišti, aby se mohly objevit ve výsledcích vyhledávání, využívá se %(size)s k ukládání zpráv z %(rooms)s místností.",
+    "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "Možná jste je nakonfigurovali v jiném klientovi než %(brand)s. Nelze je zobrazit v %(brand)s, ale stále platí.",
+    "well formed": "ve správném tvaru",
+    "There was an error creating your community. The name may be taken or the server is unable to process your request.": "Při vytváření vaší skupiny došlo k chybě. Název může být již obsazen nebo server nemůže zpracovat váš požadavek.",
+    "See <b>%(eventType)s</b> events posted to this room": "Zobrazit události <b>%(eventType)s</b> zveřejněné v této místnosti",
+    "Send stickers to your active room as you": "Poslat nálepky do vaší aktivní místnosti jako vy",
+    "Send stickers to this room as you": "Poslat samolepky jako vy do této místnosti",
+    "Change the topic of your active room": "Změnit téma vaší aktivní místnosti",
+    "Change which room you're viewing": "Změnit kterou místnost si prohlížíte",
+    "Send stickers into your active room": "Poslat nálepky do vaší aktivní místnosti",
+    "Send stickers into this room": "Poslat nálepky do této místnosti",
+    "Send messages as you in this room": "Poslat zprávy jako vy v této místnosti",
+    "Send messages as you in your active room": "Poslat zprávy jako vy ve vaší aktivní místnosti",
+    "Send text messages as you in this room": "Poslat textové zprávy jako vy v této místnosti",
+    "Send text messages as you in your active room": "Poslat textové zprávy jako vy ve vaší aktivní místnosti",
+    "See text messages posted to this room": "Podívat se na textové zprávy odeslané do této místnosti",
+    "See text messages posted to your active room": "Podívat se na textové zprávy odeslané do vaší aktivní místnosti",
+    "Send images as you in this room": "Poslat obrázky jako vy v této místnosti",
+    "Send images as you in your active room": "Poslat obrázky jako vy ve vaší aktivní místnosti",
+    "See images posted to this room": "Podívat se na obrázky zveřejněné v této místnosti",
+    "See images posted to your active room": "Podívat se na obrázky zveřejněné ve vaší aktivní místnosti",
+    "Send videos as you in this room": "Poslat videa jako vy v této místnosti",
+    "Send videos as you in your active room": "Podívat se na videa jako vy ve vaší aktivní místnosti",
+    "See videos posted to this room": "Podívat se na videa zveřejněná v této místnosti",
+    "See videos posted to your active room": "Podívat se na videa zveřejněná ve vaší aktivní místnosti",
+    "Send general files as you in this room": "Poslat obecné soubory jako vy v této místnosti",
+    "Send general files as you in your active room": "Poslat obecné soubory jako vy ve vaší aktivní místnosti",
+    "See general files posted to this room": "Prohlédnout obecné soubory zveřejněné v této místnosti",
+    "See general files posted to your active room": "Prohlédnout obecné soubory zveřejněné ve vaší aktivní místnosti",
+    "Send <b>%(msgtype)s</b> messages as you in this room": "Poslat zprávy <b>%(msgtype)s</b> jako vy v této místnosti",
+    "Send <b>%(msgtype)s</b> messages as you in your active room": "Poslat zprávy <b>%(msgtype)s</b> jako vy ve vašá aktivní místnosti",
+    "See <b>%(msgtype)s</b> messages posted to this room": "Prohlédnout zprávy <b>%(msgtype)s</b> zveřejněné v této místnosti",
+    "See <b>%(msgtype)s</b> messages posted to your active room": "Prohlédnout zprávy <b>%(msgtype)s</b> zveřejněné ve vaší aktivní místnosti",
+    "Render LaTeX maths in messages": "Ve zprávách vykreslit matematické výrazy LaTeXu",
+    "New spinner design": "Nový design ukazatele zpracování",
+    "Show message previews for reactions in DMs": "Zobrazit náhledy zpráv pro reakce v přímých zprávách",
+    "Show message previews for reactions in all rooms": "Zobrazit náhledy zpráv pro reakce ve všech místnostech",
+    "Sends the given message with confetti": "Pošle zprávu s konfetami",
+    "sends confetti": "pošle konfety",
+    "Sends the given message with fireworks": "Pošle zprávu s ohňostrojem",
+    "sends fireworks": "pošle ohňostroj",
+    "The <b>%(capability)s</b> capability": "Schopnost <b>%(capability)s</b>",
+    "See <b>%(eventType)s</b> events posted to your active room": "Zobrazit události <b>%(eventType)s</b> odeslané do vaší aktivní místnosti",
+    "Send <b>%(eventType)s</b> events as you in your active room": "Poslat události <b>%(eventType)s</b> jako vy ve vaší aktivní místnosti",
+    "Send <b>%(eventType)s</b> events as you in this room": "Poslat události <b>%(eventType)s</b> jako vy v této místnosti",
+    "with an empty state key": "s prázdným stavovým klíčem",
+    "with state key %(stateKey)s": "se stavovým klíčem %(stateKey)s",
+    "User signing private key:": "Podpisový klíč uživatele:",
+    "Self signing private key:": "Vlastní podpisový klíč:",
+    "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "Vloží ┬──┬ ノ( ゜-゜ノ) na začátek zprávy",
+    "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "Vloží (╯°□°）╯︵ ┻━┻ na začátek zprávy",
+    "Remain on your screen while running": "Při běhu zůstává na obrazovce",
+    "Remain on your screen when viewing another room, when running": "Při prohlížení jiné místnosti zůstává při běhu na obrazovce",
+    "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s změnil(a) seznam přístupů serveru pro tuto místnost.",
+    "Offline encrypted messaging using dehydrated devices": "Offline šifrovaná komunikace pomocí dehydrovaných zařízení",
+    "See emotes posted to your active room": "Prohlédněte si emoji zveřejněné ve vaší aktivní místnosti",
+    "See emotes posted to this room": "Prohlédněte si emoji zveřejněné v této místnosti",
+    "Send emotes as you in your active room": "Poslat emoji jako vy ve své aktivní místnosti",
+    "Send emotes as you in this room": "Poslat emoji jako vy v této místnosti",
+    "See when anyone posts a sticker to your active room": "Podívejte se, kdy někdo zveřejní nálepku ve vaší aktivní místnosti",
+    "See when a sticker is posted in this room": "Podívejte se, kdy je zveřejněna nálepka v této místnosti",
+    "See when the name changes in this room": "Podívejte se, kdy se změní název v této místnosti",
+    "See when the topic changes in your active room": "Podívejte se, kdy se změní téma ve vaší aktivní místnosti",
+    "See when the topic changes in this room": "Podívejte se, kdy se změní téma v této místnosti",
+    "%(name)s on hold": "%(name)s podržen",
+    "You held the call <a>Switch</a>": "Podrželi jste hovor <a>Přepnout</a>",
+    "sends snowfall": "pošle sněžení",
+    "Sends the given message with snowfall": "Pošle zprávu se sněžením",
+    "You have no visible notifications.": "Nejsou dostupná žádná oznámení.",
+    "Transfer": "Přepojit",
+    "Failed to transfer call": "Hovor se nepodařilo přepojit",
+    "A call can only be transferred to a single user.": "Hovor lze přepojit pouze jednomu uživateli.",
+    "There was an error finding this widget.": "Při hledání tohoto widgetu došlo k chybě.",
+    "Active Widgets": "Aktivní widgety",
+    "Open dial pad": "Otevřít číselník",
+    "Start a Conversation": "Zahájit konverzaci",
+    "Dial pad": "Číselník",
+    "There was an error looking up the phone number": "Při vyhledávání telefonního čísla došlo k chybě",
+    "Unable to look up phone number": "Nelze nalézt telefonní číslo",
+    "Channel: <channelLink/>": "Kanál: <channelLink/>",
+    "Change which room, message, or user you're viewing": "Změňte, kterou místnost, zprávu nebo uživatele si prohlížíte",
+    "Workspace: <networkLink/>": "Pracovní oblast: <networkLink/>",
+    "If you've forgotten your Security Key you can <button>set up new recovery options</button>": "Pokud jste zapomněli bezpečnostní klíč, můžete <button>nastavit nové možnosti obnovení</button>",
+    "If you've forgotten your Security Phrase you can <button1>use your Security Key</button1> or <button2>set up new recovery options</button2>": "Pokud jste zapomněli bezpečnostní frázi, můžete <button1>použít bezpečnostní klíč</button1> nebo <button2>nastavit nové možnosti obnovení</button2>",
+    "Backup could not be decrypted with this Security Phrase: please verify that you entered the correct Security Phrase.": "Zálohu nebylo možné dešifrovat pomocí této bezpečnostní fráze: ověřte, zda jste zadali správnou bezpečnostní frázi.",
+    "Backup could not be decrypted with this Security Key: please verify that you entered the correct Security Key.": "Zálohu nebylo možné dešifrovat pomocí tohoto bezpečnostního klíče: ověřte, zda jste zadali správný bezpečnostní klíč.",
+    "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 Security Key.": "Zálohujte šifrovací klíče s daty účtu pro případ, že ztratíte přístup k relacím. Vaše klíče budou zabezpečeny jedinečným bezpečnostním klíčem.",
+    "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "Váš bezpečnostní klíč je bezpečnostní síť - můžete ji použít k obnovení přístupu k šifrovaným zprávám, pokud zapomenete bezpečnostní frázi.",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "Na náš server uložíme zašifrovanou kopii vašich klíčů. Zabezpečte zálohu pomocí bezpečnostní fráze.",
+    "Access your secure message history and set up secure messaging by entering your Security Key.": "Vstupte do historie zabezpečených zpráv a nastavte zabezpečené zprávy zadáním bezpečnostního klíče.",
+    "Access your secure message history and set up secure messaging by entering your Security Phrase.": "Vstupte do historie zabezpečených zpráv a nastavte zabezpečené zprávy zadáním bezpečnostní fráze.",
+    "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "Nelze získat přístup k zabezpečenému úložišti. Ověřte, zda jste zadali správnou bezpečnostní frázi.",
+    "We recommend you change your password and Security Key in Settings immediately": "Doporučujeme vám okamžitě změnit heslo a bezpečnostní klíč v Nastavení",
+    "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "Tato relace zjistila, že byla odstraněna vaše bezpečnostní fráze a klíč pro zabezpečené zprávy.",
+    "A new Security Phrase and key for Secure Messages have been detected.": "Byla zjištěna nová bezpečnostní fráze a klíč pro zabezpečené zprávy.",
+    "Make a copy of your Security Key": "Vytvořte kopii bezpečnostního klíče",
+    "Confirm your Security Phrase": "Potvrďte svou bezpečnostní frázi",
+    "Secure your backup with a Security Phrase": "Zabezpečte zálohu pomocí bezpečnostní fráze",
+    "Repeat your Security Phrase...": "Zopakujte vaši bezpečnostní frázi...",
+    "Set up with a Security Key": "Nastavit pomocí bezpečnostního klíče",
+    "Use Security Key": "Použít bezpečnostní klíč",
+    "This looks like a valid Security Key!": "Vypadá to jako platný bezpečnostní klíč!",
+    "Invalid Security Key": "Neplatný bezpečnostní klíč",
+    "Your Security Key has been <b>copied to your clipboard</b>, paste it to:": "Váš bezpečnostní klíč byl <b>zkopírován do schránky</b>, vložte jej do:",
+    "Your Security Key is in your <b>Downloads</b> folder.": "Váš bezpečnostní klíč je ve složce <b>Stažené soubory</b>.",
+    "Your Security Key": "Váš bezpečnostní klíč",
+    "Please enter your Security Phrase a second time to confirm.": "Potvrďte prosím svou bezpečnostní frázi.",
+    "Great! This Security Phrase looks strong enough.": "Skvělé! Tato bezpečnostní fráze vypadá dostatečně silně.",
+    "Use Security Key or Phrase": "Použijte bezpečnostní klíč nebo frázi",
+    "Not a valid Security Key": "Neplatný bezpečnostní klíč",
+    "Enter Security Key": "Zadejte bezpečnostní klíč",
+    "Enter Security Phrase": "Zadejte bezpečnostní frázi",
+    "Incorrect Security Phrase": "Nesprávná bezpečnostní fráze",
+    "Security Key mismatch": "Neshoda bezpečnostního klíče",
+    "Wrong Security Key": "Špatný bezpečnostní klíč",
+    "Set my room layout for everyone": "Nastavit všem rozložení mé místnosti",
+    "%(senderName)s has updated the widget layout": "%(senderName)s aktualizoval rozložení widgetu",
+    "Search (must be enabled)": "Hledat (musí být povoleno)",
+    "Remember this": "Zapamatujte si toto",
+    "The widget will verify your user ID, but won't be able to perform actions for you:": "Widget ověří vaše uživatelské ID, ale nebude za vás moci provádět akce:",
+    "Allow this widget to verify your identity": "Povolte tomuto widgetu ověřit vaši identitu",
+    "Use Ctrl + F to search": "Hledejte pomocí Ctrl + F",
+    "Use Command + F to search": "Hledejte pomocí Command + F",
+    "Converts the DM to a room": "Převede přímou zprávu na místnost",
+    "Converts the room to a DM": "Převede místnost na přímou zprávu",
+    "Mobile experience": "Zážitek na mobilních zařízeních",
+    "Element Web is currently experimental on mobile. The native apps are recommended for most people.": "Element Web je v současné době experimentální na mobilních zařízeních. Nativní aplikace se doporučují pro většinu lidí.",
+    "Use app for a better experience": "Pro lepší zážitek použijte aplikaci",
+    "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Element Web je experimentální na mobilních zařízeních. Pro lepší zážitek a nejnovější funkce použijte naši bezplatnou nativní aplikaci.",
+    "Use app": "Použijte aplikaci",
+    "Something went wrong in confirming your identity. Cancel and try again.": "Při ověřování vaší identity se něco pokazilo. Zrušte to a zkuste to znovu.",
+    "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "Váš domovský server odmítl váš pokus o přihlášení. Může to být způsobeno tím, že věci trvají příliš dlouho. Prosím zkuste to znovu. Pokud to bude pokračovat, obraťte se na správce domovského serveru.",
+    "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "Váš domovský server nebyl dosažitelný a nemohl vás přihlásit. Zkuste to prosím znovu. Pokud to bude pokračovat, obraťte se na správce domovského serveru.",
+    "Try again": "Zkuste to znovu",
+    "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "Požádali jsme prohlížeč, aby si pamatoval, který domovský server používáte k přihlášení, ale váš prohlížeč to bohužel zapomněl. Přejděte na přihlašovací stránku a zkuste to znovu.",
+    "We couldn't log you in": "Nemohli jsme vás přihlásit",
+    "Show stickers button": "Tlačítko Zobrazit nálepky",
+    "Windows": "Okna",
+    "Screens": "Obrazovky",
+    "Share your screen": "Sdílejte svou obrazovku",
+    "Expand code blocks by default": "Ve výchozím nastavení rozbalit bloky kódu",
+    "Show line numbers in code blocks": "Zobrazit čísla řádků v blocích kódu",
+    "Recently visited rooms": "Nedávno navštívené místnosti",
+    "Upgrade to pro": "Upgradujte na profesionální verzi",
+    "Minimize dialog": "Minimalizovat dialog",
+    "Maximize dialog": "Maximalizovat dialog",
+    "%(hostSignupBrand)s Setup": "Nastavení %(hostSignupBrand)s",
+    "You should know": "Měli byste vědět",
+    "Privacy Policy": "Zásady ochrany osobních údajů",
+    "Cookie Policy": "Zásady používání souborů cookie",
+    "Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.": "Další informace najdete v našich <privacyPolicyLink />, <termsOfServiceLink /> a <cookiePolicyLink />.",
+    "Continuing temporarily allows the %(hostSignupBrand)s setup process to access your account to fetch verified email addresses. This data is not stored.": "Dočasné pokračování umožňuje procesu nastavení %(hostSignupBrand)s přístup k vašemu účtu za účelem načtení ověřených e-mailových adres. Tato data se neukládají.",
+    "Failed to connect to your homeserver. Please close this dialog and try again.": "Připojení k domovskému serveru se nezdařilo. Zavřete toto dialogové okno a zkuste to znovu.",
+    "Abort": "Přerušit",
+    "Are you sure you wish to abort creation of the host? The process cannot be continued.": "Opravdu chcete přerušit vytváření hostitele? Proces nemůže být navázán.",
+    "Confirm abort of host creation": "Potvrďte přerušení vytváření hostitele"
 }
diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json
index f44d724643..1f4eef4d93 100644
--- a/src/i18n/strings/da.json
+++ b/src/i18n/strings/da.json
@@ -18,7 +18,7 @@
     "Kicks user with given id": "Smider bruger med givet id ud",
     "Changes your display nickname": "Ændrer dit viste navn",
     "Searches DuckDuckGo for results": "Søger på DuckDuckGo efter resultater",
-    "Commands": "kommandoer",
+    "Commands": "Kommandoer",
     "Emoji": "Emoji",
     "Sign in": "Log ind",
     "Warning!": "Advarsel!",
@@ -69,7 +69,7 @@
     "World readable": "Læselig af alle",
     "Guests can join": "Gæster kan deltage",
     "No rooms to show": "Ingen rum at vise",
-    "This email address is already in use": "Denne emailadresse er allerede i brug",
+    "This email address is already in use": "Denne email adresse er allerede i brug",
     "This phone number is already in use": "Dette telefonnummer er allerede i brug",
     "Failed to verify email address: make sure you clicked the link in the email": "Kunne ikke bekræfte emailaddressen: vær sikker på at klikke på linket i emailen",
     "Call Timeout": "Opkalds Timeout",
@@ -536,5 +536,87 @@
     "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s opdaterede den regel der banner rum som matcher %(glob)s på grund af %(reason)s",
     "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s opdaterede den regel der banner servere der matcher %(glob)s på grund af %(reason)s",
     "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s opdaterede en ban-regel der matcher %(glob)s på grund af %(reason)s",
-    "Explore rooms": "Udforsk rum"
+    "Explore rooms": "Udforsk rum",
+    "Verification code": "Verifikationskode",
+    "Who can access this room?": "Hvem kan tilgå dette rum?",
+    "Encrypted": "Krypteret",
+    "Once enabled, encryption cannot be disabled.": "Efter aktivering er det ikke muligt at slå kryptering fra.",
+    "Security & Privacy": "Sikkerhed & Privatliv",
+    "Who can read history?": "Hvem kan læse historikken?",
+    "Enable encryption?": "Aktiver kryptering?",
+    "Only people who have been invited": "Kun folk som er blevet inviteret",
+    "Add a User": "Tilføj en bruger",
+    "Everyone": "Alle",
+    "Description": "Beskrivelse",
+    "Create a Group Chat": "Opret en gruppechat",
+    "Explore Public Rooms": "Udforsk offentlige rum",
+    "Send a Direct Message": "Send en Direkte Besked",
+    "Permissions": "Tilladelser",
+    "Headphones": "Hovedtelefoner",
+    "Show more": "Vis mere",
+    "Show less": "Vis mindre",
+    "Passwords don't match": "Adgangskoderne matcher ikke",
+    "Confirm password": "Bekræft adgangskode",
+    "Reset": "Nulstil",
+    "No": "Nej",
+    "Enter password": "Indtast adgangskode",
+    "Add a new server": "Tilføj en ny server",
+    "Matrix": "Matrix",
+    "Remove server": "Fjern server",
+    "Change notification settings": "Skift notifikations indstillinger",
+    "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
+    "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
+    "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
+    "* %(senderName)s %(emote)s": "* %(senderName)s %(emote)s",
+    "%(senderName)s is calling": "%(senderName)s ringer",
+    "Waiting for answer": "Venter på svar",
+    "%(senderName)s started a call": "%(senderName)s startede et opkald",
+    "You started a call": "Du startede et opkald",
+    "Verified!": "Bekræftet!",
+    "Video Call": "Video Opkald",
+    "Accept": "Accepter",
+    "Decline": "Afvis",
+    "Save": "Gem",
+    "Profile picture": "Profil billede",
+    "Categories": "Kategorier",
+    "Checking server": "Tjekker server",
+    "You're signed out": "Du er logget ud",
+    "Change Password": "Skift adgangskode",
+    "Current password": "Nuværende adgangskode",
+    "Theme added!": "Tema tilføjet!",
+    "The other party declined the call.": "Den anden part afviste opkaldet.",
+    "Comment": "Kommentar",
+    "or": "eller",
+    "%(brand)s Android": "%(brand)s Android",
+    "%(brand)s iOS": "%(brand)s iOS",
+    "Privacy": "Privatliv",
+    "Please enter a name for the room": "Indtast et navn for rummet",
+    "No results": "Ingen resultater",
+    "Disable": "Deaktiver",
+    "Profile": "Profil",
+    "Local address": "Lokal adresse",
+    "This room has no local addresses": "Dette rum har ingen lokal adresse",
+    "The conversation continues here.": "Samtalen fortsætter her.",
+    "Send a message…": "Send en besked…",
+    "Send an encrypted message…": "Send en krypteret besked…",
+    "Send a reply…": "Besvar…",
+    "Message deleted on %(date)s": "Besked slettet d. %(date)s",
+    "Message deleted by %(name)s": "Besked slettet af %(name)s",
+    "Message deleted": "Besked slettet",
+    "Theme": "Tema",
+    "France": "Frankrig",
+    "Finland": "Finland",
+    "Egypt": "Egypten",
+    "Denmark": "Danmark",
+    "Cuba": "Cuba",
+    "China": "Kina",
+    "Canada": "Canada",
+    "End conference": "Afslut konference",
+    "Too Many Calls": "For mange opkald",
+    "Permission is granted to use the webcam": "Tilladelse er givet til brug af webcam",
+    "Unable to access webcam / microphone": "Kan ikke tilgå webcam / mikrofon",
+    "Unable to access microphone": "Kan ikke tilgå mikrofonen",
+    "The call could not be established": "Opkaldet kunne ikke etableres",
+    "Call Declined": "Opkald afvist",
+    "Folder": "Mappe"
 }
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 734d3af75a..3f657e105b 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -12,15 +12,15 @@
     "Name": "Name",
     "Session ID": "Sitzungs-ID",
     "Displays action": "Zeigt Aktionen an",
-    "Bans user with given id": "Verbannt den Benutzer mit der angegebenen ID",
-    "Deops user with given id": "Setzt das Berechtigungslevel beim Benutzer mit der angegebenen ID zurück",
-    "Invites user with given id to current room": "Lädt den Benutzer mit der angegebenen ID in den aktuellen Raum ein",
-    "Kicks user with given id": "Benutzer mit der angegebenen ID kicken",
+    "Bans user with given id": "Verbannt den/die Benutzer:in mit der angegebenen ID",
+    "Deops user with given id": "Setzt das Berechtigungslevel des/der Benutzer:in mit der angegebenen ID zurück",
+    "Invites user with given id to current room": "Lädt den/die Benutzer:in mit der angegebenen ID in den aktuellen Raum ein",
+    "Kicks user with given id": "Benutzer:in mit der angegebenen ID kicken",
     "Changes your display nickname": "Ändert deinen angezeigten Nicknamen",
     "Change Password": "Passwort ändern",
     "Searches DuckDuckGo for results": "Verwendet DuckDuckGo für Suchergebnisse",
     "Commands": "Kommandos",
-    "Emoji": "Emoji",
+    "Emoji": "Emojis",
     "Sign in": "Anmelden",
     "Warning!": "Warnung!",
     "Error": "Fehler",
@@ -35,7 +35,7 @@
     "Deactivate Account": "Benutzerkonto deaktivieren",
     "Failed to send email": "Fehler beim Senden der E-Mail",
     "Account": "Benutzerkonto",
-    "Click here to fix": "Zum reparieren hier klicken",
+    "Click here to fix": "Zum Reparieren hier klicken",
     "Default": "Standard",
     "Export E2E room keys": "E2E-Raum-Schlüssel exportieren",
     "Failed to change password. Is your password correct?": "Passwortänderung fehlgeschlagen. Ist dein Passwort richtig?",
@@ -59,13 +59,13 @@
     "Moderator": "Moderator",
     "Notifications": "Benachrichtigungen",
     "<not supported>": "<nicht unterstützt>",
-    "No users have specific privileges in this room": "Kein Benutzer hat in diesem Raum besondere Berechtigungen",
+    "No users have specific privileges in this room": "Keine Nutzer:innen haben in diesem Raum privilegierte Berechtigungen",
     "Only people who have been invited": "Nur Personen, die eingeladen wurden",
     "Password": "Passwort",
     "Permissions": "Berechtigungen",
     "Phone": "Telefon",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Bitte prüfe deinen E-Mail-Posteingang und klicke auf den in der E-Mail enthaltenen Link. Anschließend auf \"Fortsetzen\" klicken.",
-    "Privileged Users": "Privilegierte Benutzer",
+    "Privileged Users": "Privilegierte Nutzer:innen",
     "Profile": "Profil",
     "Reject invitation": "Einladung ablehnen",
     "Remove": "Entfernen",
@@ -83,13 +83,13 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "Server ist nicht verfügbar, überlastet oder du bist auf einen Softwarefehler gestoßen.",
     "Labs": "Labor",
     "Unable to add email address": "E-Mail-Adresse konnte nicht hinzugefügt werden",
-    "Unable to remove contact information": "Die Kontakt-Informationen konnten nicht gelöscht werden",
+    "Unable to remove contact information": "Die Kontaktinformationen können nicht gelöscht werden",
     "Unable to verify email address.": "Die E-Mail-Adresse konnte nicht verifiziert werden.",
     "Unban": "Verbannung aufheben",
     "unknown error code": "Unbekannter Fehlercode",
     "Upload avatar": "Profilbild hochladen",
     "Upload file": "Datei hochladen",
-    "Users": "Benutzer",
+    "Users": "Nutzer:innen",
     "Verification Pending": "Verifizierung ausstehend",
     "Video call": "Videoanruf",
     "Voice call": "Sprachanruf",
@@ -131,7 +131,7 @@
     "Jun": "Jun",
     "Jul": "Juli",
     "Aug": "Aug",
-    "Sep": "Sep",
+    "Sep": "Sept",
     "Oct": "Okt",
     "Nov": "Nov",
     "Dec": "Dez",
@@ -149,7 +149,7 @@
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s hat das Berechtigungslevel von %(powerLevelDiffText)s geändert.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s hat den Raumnamen geändert zu %(roomName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s hat das Thema geändert in \"%(topic)s\".",
-    "/ddg is not a command": "/ddg ist kein Kommando",
+    "/ddg is not a command": "/ddg ist kein Befehl",
     "%(senderName)s ended the call.": "%(senderName)s hat den Anruf beendet.",
     "Failed to send request.": "Anfrage konnte nicht gesendet werden.",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s von %(fromPowerLevel)s zu %(toPowerLevel)s",
@@ -160,7 +160,7 @@
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s hat den zukünftigen Chatverlauf für alle Raum-Mitglieder sichtbar gemacht (ab dem Zeitpunkt, an dem sie eingeladen wurden).",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s hat den zukünftigen Chatverlauf für alle Raum-Mitglieder sichtbar gemacht (ab dem Zeitpunkt, an dem sie beigetreten sind).",
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s hat den zukünftigen Chatverlauf sichtbar gemacht für: Alle Raum-Mitglieder.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s hat den zukünftigen Chatverlauf sichtbar gemacht für: Alle.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s hat den zukünftigen Chatverlauf für alle sichtbar gemacht.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s hat den zukünftigen Chatverlauf für Unbekannte sichtbar gemacht (%(visibility)s).",
     "Missing room_id in request": "Fehlende room_id in Anfrage",
     "Missing user_id in request": "Fehlende user_id in Anfrage",
@@ -177,11 +177,11 @@
     "%(senderName)s set a profile picture.": "%(senderName)s hat ein Profilbild gesetzt.",
     "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s hat den Anzeigenamen geändert in %(displayName)s.",
     "This room is not recognised.": "Dieser Raum wurde nicht erkannt.",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Um diese Funktion zu nutzen, warte einfach auf die Autovervollständigungsergebnisse und benutze dann die TAB-Taste zum durchblättern.",
+    "To use it, just wait for autocomplete results to load and tab through them.": "Um diese Funktion zu nutzen, warte einfach auf die Ergebnisse der Autovervollständigung und benutze dann die TAB-Taste zum Durchblättern.",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s hat die Verbannung von %(targetName)s aufgehoben.",
     "Usage": "Verwendung",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s hat die Einladung für %(targetName)s zurückgezogen.",
-    "You need to be able to invite users to do that.": "Du musst die Berechtigung haben, Benutzer einzuladen, um diese Aktion ausführen zu können.",
+    "You need to be able to invite users to do that.": "Du brauchst die Berechtigung Benutzer:innen einzuladen haben, um diese Aktion ausführen zu können.",
     "You need to be logged in.": "Du musst angemeldet sein.",
     "There are no visible files in this room": "Es gibt keine sichtbaren Dateien in diesem Raum",
     "Connectivity to the server has been lost.": "Verbindung zum Server wurde unterbrochen.",
@@ -197,12 +197,12 @@
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Es kann keine Verbindung zum Heimserver via HTTP aufgebaut werden, wenn die Adresszeile des Browsers eine HTTPS-URL enthält. Entweder HTTPS verwenden oder alternativ <a>unsichere Skripte erlauben</a>.",
     "Click to mute audio": "Klicke um den Ton stumm zu stellen",
     "Click to mute video": "Klicken, um das Video stummzuschalten",
-    "Command error": "Befehlsfehler",
+    "Command error": "Fehler im Befehl",
     "Decrypt %(text)s": "%(text)s entschlüsseln",
     "Disinvite": "Einladung zurückziehen",
     "Download %(text)s": "%(text)s herunterladen",
     "Failed to ban user": "Verbannen des Benutzers fehlgeschlagen",
-    "Failed to change power level": "Ändern des Berechtigungslevels fehlgeschlagen",
+    "Failed to change power level": "Ändern der Berechtigungsstufe fehlgeschlagen",
     "Failed to join room": "Betreten des Raumes ist fehlgeschlagen",
     "Failed to kick": "Kicken fehlgeschlagen",
     "Failed to mute user": "Stummschalten des Nutzers fehlgeschlagen",
@@ -228,7 +228,7 @@
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Es wurde versucht, einen bestimmten Punkt im Chatverlauf dieses Raumes zu laden, der Punkt konnte jedoch nicht gefunden werden.",
     "You seem to be in a call, are you sure you want to quit?": "Du scheinst in einem Gespräch zu sein, bist du sicher, dass du aufhören willst?",
     "You seem to be uploading files, are you sure you want to quit?": "Du scheinst Dateien hochzuladen. Bist du sicher schließen zu wollen?",
-    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Du wirst diese Änderung nicht rückgängig machen können, da der Benutzer dasselbe Berechtigungslevel wie du selbst erhalten wird.",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Du wirst diese Änderung nicht rückgängig machen können, da der/die Nutzer!n dasselbe Berechtigungsstufe wie du selbst erhalten wird.",
     "Room": "Raum",
     "Cancel": "Abbrechen",
     "Click to unmute video": "Klicken, um die Video-Stummschaltung zu deaktivieren",
@@ -285,7 +285,7 @@
     "Error decrypting video": "Video-Entschlüsselung fehlgeschlagen",
     "Import room keys": "Raum-Schlüssel importieren",
     "File to import": "Zu importierende Datei",
-    "Failed to invite the following users to the %(roomName)s room:": "Folgende Benutzer konnten nicht in den Raum \"%(roomName)s\" eingeladen werden:",
+    "Failed to invite the following users to the %(roomName)s room:": "Folgende Benutzer:innen konnten nicht in den Raum \"%(roomName)s\" eingeladen werden:",
     "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.": "Bist du sicher, dass du dieses Ereignis entfernen (löschen) möchtest? Wenn du die Änderung eines Raum-Namens oder eines Raum-Themas löscht, kann dies dazu führen, dass die ursprüngliche Änderung rückgängig gemacht wird.",
     "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.": "Dieser Prozess erlaubt es dir, die Schlüssel für die in verschlüsselten Räumen empfangenen Nachrichten in eine lokale Datei zu exportieren. In Zukunft wird es möglich sein, diese Datei in einen anderen Matrix-Client zu importieren, sodass dieser Client diese Nachrichten ebenfalls entschlüsseln kann.",
     "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.": "Mit der exportierten Datei kann jeder, der diese Datei lesen kann, jede verschlüsselte Nachricht entschlüsseln, die für dich lesbar ist. Du solltest die Datei also unbedingt sicher verwahren. Um den Vorgang sicherer zu gestalten, solltest du unten eine Passphrase eingeben, die dazu verwendet wird, die exportierten Daten zu verschlüsseln. Anschließend wird es nur möglich sein, die Daten zu importieren, wenn dieselbe Passphrase verwendet wird.",
@@ -301,7 +301,7 @@
     "Drop file here to upload": "Datei hier loslassen zum hochladen",
     "Idle": "Untätig",
     "Ongoing conference call%(supportedText)s.": "Laufendes Konferenzgespräch%(supportedText)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?": "Du wirst jetzt auf die Website eines Drittanbieters weitergeleitet, damit du dein Benutzerkonto  für die Verwendung von %(integrationsUrl)s authentifizieren kannst. Möchtest du fortfahren?",
+    "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?": "Du wirst jetzt auf die Website eines Drittanbieters weitergeleitet, damit du dein Benutzerkonto für die Verwendung von %(integrationsUrl)s authentifizieren kannst. Möchtest du fortfahren?",
     "Start automatically after system login": "Nach System-Login automatisch starten",
     "Jump to first unread message.": "Zur ersten ungelesenen Nachricht springen.",
     "Options": "Optionen",
@@ -311,10 +311,10 @@
     "No Microphones detected": "Keine Mikrofone erkannt",
     "No media permissions": "Keine Medienberechtigungen",
     "You may need to manually permit %(brand)s to access your microphone/webcam": "Gegebenenfalls kann es notwendig sein, dass du %(brand)s manuell den Zugriff auf dein Mikrofon bzw. deine Webcam gewähren musst",
-    "Default Device": "Standard-Gerät",
+    "Default Device": "Standardgerät",
     "Microphone": "Mikrofon",
     "Camera": "Kamera",
-    "Export": "Export",
+    "Export": "Exportieren",
     "Import": "Importieren",
     "Incorrect username and/or password.": "Inkorrekter Nutzername und/oder Passwort.",
     "Results from DuckDuckGo": "Ergebnisse von DuckDuckGo",
@@ -357,7 +357,7 @@
     "Custom": "Erweitert",
     "Decline": "Ablehnen",
     "Drop File Here": "Lasse Datei hier los",
-    "Failed to upload profile picture!": "Hochladen des Profilbild's fehlgeschlagen!",
+    "Failed to upload profile picture!": "Hochladen des Profilbilds fehlgeschlagen!",
     "Incoming call from %(name)s": "Eingehender Anruf von %(name)s",
     "Incoming video call from %(name)s": "Eingehender Videoanruf von %(name)s",
     "Incoming voice call from %(name)s": "Eingehender Sprachanruf von %(name)s",
@@ -416,31 +416,31 @@
     "You are now ignoring %(userId)s": "%(userId)s wird jetzt ignoriert",
     "You are no longer ignoring %(userId)s": "%(userId)s wird nicht mehr ignoriert",
     "Leave": "Verlassen",
-    "Failed to invite the following users to %(groupId)s:": "Die folgenden Benutzer konnten nicht in die Gruppe %(groupId)s eingeladen werden:",
+    "Failed to invite the following users to %(groupId)s:": "Die folgenden Benutzer:innen konnten nicht in die Gruppe %(groupId)s eingeladen werden:",
     "Leave %(groupName)s?": "%(groupName)s verlassen?",
     "Add a Room": "Raum hinzufügen",
-    "Add a User": "Benutzer hinzufügen",
+    "Add a User": "Benutzer:in hinzufügen",
     "You have entered an invalid address.": "Du hast eine ungültige Adresse eingegeben.",
     "Matrix ID": "Matrix-ID",
-    "Unignore": "Ignorieren aufheben",
-    "Unignored user": "Benutzer nicht mehr ignoriert",
-    "Ignored user": "Benutzer ignoriert",
+    "Unignore": "Nicht mehr ignorieren",
+    "Unignored user": "Benutzer:in nicht mehr ignoriert",
+    "Ignored user": "Benutzer:in ignoriert",
     "Stops ignoring a user, showing their messages going forward": "Beendet das Ignorieren eines Benutzers, nachfolgende Nachrichten werden wieder angezeigt",
-    "Ignores a user, hiding their messages from you": "Ignoriert einen Benutzer und verbirgt dessen Nachrichten",
+    "Ignores a user, hiding their messages from you": "Ignoriert eine:n Benutzer:in und verbirgt dessen/deren Nachrichten",
     "Banned by %(displayName)s": "Verbannt von %(displayName)s",
     "Description": "Beschreibung",
     "Unable to accept invite": "Einladung kann nicht angenommen werden",
-    "Failed to invite users to %(groupId)s": "Benutzer konnten nicht in %(groupId)s eingeladen werden",
+    "Failed to invite users to %(groupId)s": "Benutzer:innen konnten nicht in %(groupId)s eingeladen werden",
     "Unable to reject invite": "Einladung konnte nicht abgelehnt werden",
     "Who would you like to add to this summary?": "Wen möchtest zu dieser Übersicht hinzufügen?",
     "Add to summary": "Zur Übersicht hinzufügen",
-    "Failed to add the following users to the summary of %(groupId)s:": "Die folgenden Benutzer konnten nicht zur Übersicht von %(groupId)s hinzugefügt werden:",
+    "Failed to add the following users to the summary of %(groupId)s:": "Die folgenden Benutzer:innen konnten nicht zur Übersicht von %(groupId)s hinzugefügt werden:",
     "Which rooms would you like to add to this summary?": "Welche Räume möchtest du zu dieser Übersicht hinzufügen?",
     "Failed to add the following rooms to the summary of %(groupId)s:": "Die folgenden Räume konnten nicht zur Übersicht von %(groupId)s hinzugefügt werden:",
     "Failed to remove the room from the summary of %(groupId)s": "Der Raum konnte nicht aus der Übersicht von %(groupId)s entfernt werden",
     "The room '%(roomName)s' could not be removed from the summary.": "Der Raum '%(roomName)s' konnte nicht aus der Übersicht entfernt werden.",
-    "Failed to remove a user from the summary of %(groupId)s": "Benutzer konnte nicht aus der Übersicht von %(groupId)s entfernt werden",
-    "The user '%(displayName)s' could not be removed from the summary.": "Der Benutzer '%(displayName)s' konnte nicht aus der Übersicht entfernt werden.",
+    "Failed to remove a user from the summary of %(groupId)s": "Benutzer:in konnte nicht aus der Übersicht von %(groupId)s entfernt werden",
+    "The user '%(displayName)s' could not be removed from the summary.": "Der Benutzer:in '%(displayName)s' konnte nicht aus der Übersicht entfernt werden.",
     "Unknown": "Unbekannt",
     "Failed to add the following rooms to %(groupId)s:": "Die folgenden Räume konnten nicht zu %(groupId)s hinzugefügt werden:",
     "Matrix Room ID": "Matrix-Raum-ID",
@@ -451,7 +451,7 @@
     "Pinned Messages": "Angeheftete Nachrichten",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s hat die angehefteten Nachrichten für diesen Raum geändert.",
     "Jump to read receipt": "Zur Lesebestätigung springen",
-    "Message Pinning": "Anheften von Nachrichten",
+    "Message Pinning": "Nachrichten-Anheftung",
     "Long Description (HTML)": "Lange Beschreibung (HTML)",
     "Jump to message": "Zur Nachricht springen",
     "No pinned messages.": "Keine angehefteten Nachrichten vorhanden.",
@@ -469,7 +469,7 @@
     "Which rooms would you like to add to this community?": "Welche Räume sollen zu dieser Community hinzugefügt werden?",
     "Add rooms to the community": "Räume zur Community hinzufügen",
     "Add to community": "Zur Community hinzufügen",
-    "Failed to invite users to community": "Benutzer konnten nicht in die Community eingeladen werden",
+    "Failed to invite users to community": "Benutzer:innen konnten nicht in die Community eingeladen werden",
     "Communities": "Communities",
     "Invalid community ID": "Ungültige Community-ID",
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s' ist keine gültige Community-ID",
@@ -485,26 +485,26 @@
     "Community ID": "Community-ID",
     "example": "Beispiel",
     "Add rooms to the community summary": "Fügt Räume zur Community-Übersicht hinzu",
-    "Add users to the community summary": "Füge Benutzer zur Community-Übersicht hinzu",
+    "Add users to the community summary": "Füge Benutzer:innen zur Community-Übersicht hinzu",
     "Failed to update community": "Aktualisieren der Community fehlgeschlagen",
     "Leave Community": "Community verlassen",
     "Add rooms to this community": "Räume zu dieser Community hinzufügen",
     "%(inviter)s has invited you to join this community": "%(inviter)s hat dich in diese Community eingeladen",
-    "You are a member of this community": "Du bist ein Mitglied dieser Community",
-    "You are an administrator of this community": "Du bist ein Administrator dieser Community",
+    "You are a member of this community": "Du bist Mitglied dieser Community",
+    "You are an administrator of this community": "Du bist ein:e Administrator:in dieser Community",
     "Community %(groupId)s not found": "Community '%(groupId)s' nicht gefunden",
     "Failed to load %(groupId)s": "'%(groupId)s' konnte nicht geladen werden",
     "Error whilst fetching joined communities": "Fehler beim Laden beigetretener Communities",
     "Create a new community": "Neue Community erstellen",
     "Your Communities": "Deine Communities",
     "You're not currently a member of any communities.": "Du gehörst aktuell keiner Community an.",
-    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Erstelle eine Community, um Benutzer und Räume miteinander zu verbinden! Erstelle zusätzlich eine eigene Homepage, um deinen individuellen Bereich im Matrix-Universum zu gestalten.",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Erstelle eine Community, um Benutzer:innen und Räume miteinander zu verbinden! Erstelle zusätzlich eine eigene Homepage, um deinen individuellen Bereich im Matrix-Universum zu gestalten.",
     "Something went wrong whilst creating your community": "Beim Erstellen deiner Community ist ein Fehler aufgetreten",
     "And %(count)s more...|other": "Und %(count)s weitere...",
     "Delete Widget": "Widget löschen",
     "Mention": "Erwähnen",
     "Invite": "Einladen",
-    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Das Löschen eines Widgets entfernt es für alle Nutzer in diesem Raum. Möchtest du dieses Widget wirklich löschen?",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Das Löschen eines Widgets entfernt es für alle Nutzer:innen in diesem Raum. Möchtest du dieses Widget wirklich löschen?",
     "Mirror local video feed": "Lokalen Video-Feed spiegeln",
     "Failed to withdraw invitation": "Die Einladung konnte nicht zurückgezogen werden",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Community-IDs dürfen nur die folgenden Zeichen enthalten: a-z, 0-9, or '=_-./'",
@@ -550,17 +550,17 @@
     "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)shaben das Profilbild geändert",
     "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)shat das Profilbild %(count)s-mal geändert",
     "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)shat das Profilbild geändert",
-    "Disinvite this user?": "Einladung für diesen Benutzer zurückziehen?",
-    "Kick this user?": "Diesen Benutzer kicken?",
-    "Unban this user?": "Verbannung für diesen Benutzer aufheben?",
-    "Ban this user?": "Diesen Benutzer verbannen?",
+    "Disinvite this user?": "Einladung für diese:n Benutzer:in zurückziehen?",
+    "Kick this user?": "Diese:n Benutzer:in kicken?",
+    "Unban this user?": "Verbannung für diese:n Benutzer:in aufheben?",
+    "Ban this user?": "Diese:n Benutzer:in verbannen?",
     "Members only (since the point in time of selecting this option)": "Nur Mitglieder (ab dem Zeitpunkt, an dem diese Option ausgewählt wird)",
     "Members only (since they were invited)": "Nur Mitglieder (ab dem Zeitpunkt, an dem sie eingeladen wurden)",
     "Members only (since they joined)": "Nur Mitglieder (ab dem Zeitpunkt, an dem sie beigetreten sind)",
     "An email has been sent to %(emailAddress)s": "Eine E-Mail wurde an %(emailAddress)s gesendet",
     "A text message has been sent to %(msisdn)s": "Eine Textnachricht wurde an %(msisdn)s gesendet",
-    "Disinvite this user from community?": "Community-Einladung für diesen Benutzer zurückziehen?",
-    "Remove this user from community?": "Diesen Benutzer aus der Community entfernen?",
+    "Disinvite this user from community?": "Community-Einladung für diese:n Benutzer:in zurückziehen?",
+    "Remove this user from community?": "Diese:n Benutzer:in aus der Community entfernen?",
     "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)shaben ihre Einladungen %(count)s-mal abgelehnt",
     "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)shat die Einladung %(count)s-mal abgelehnt",
     "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)shat die Einladung abgelehnt",
@@ -588,7 +588,7 @@
     "Enable inline URL previews by default": "URL-Vorschau standardmäßig aktivieren",
     "Enable URL previews for this room (only affects you)": "URL-Vorschau für diesen Raum aktivieren (betrifft nur dich)",
     "Enable URL previews by default for participants in this room": "URL-Vorschau standardmäßig für Mitglieder dieses Raumes aktivieren",
-    "Please note you are logging into the %(hs)s server, not matrix.org.": "Hinweis: Du meldest dich auf dem %(hs)s-Server an, nicht auf matrix.org.",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Hinweis: Du bist im Begriff, dich auf dem %(hs)s-Server anzumelden, nicht auf matrix.org.",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Sonst ist hier aktuell niemand. Möchtest du <inviteText>Benutzer einladen</inviteText> oder die <nowarnText>Warnmeldung bezüglich des leeren Raums deaktivieren</nowarnText>?",
     "URL previews are disabled by default for participants in this room.": "URL-Vorschau ist für Mitglieder dieses Raumes standardmäßig deaktiviert.",
     "URL previews are enabled by default for participants in this room.": "URL-Vorschau ist für Mitglieder dieses Raumes standardmäßig aktiviert.",
@@ -604,9 +604,9 @@
     "Flair": "Abzeichen",
     "Showing flair for these communities:": "Abzeichen für diese Communities zeigen:",
     "This room is not showing flair for any communities": "Dieser Raum zeigt für keine Communities die Abzeichen an",
-    "Something went wrong when trying to get your communities.": "Beim Laden deiner Communites ist etwas schief gelaufen.",
+    "Something went wrong when trying to get your communities.": "Beim Laden deiner Communities ist etwas schief gelaufen.",
     "Display your community flair in rooms configured to show it.": "Zeige deinen Community-Flair in den Räumen, die es erlauben.",
-    "This homeserver doesn't offer any login flows which are supported by this client.": "Dieser Heimserver verfügt über keinen, von diesem Client unterstütztes Anmeldeverfahren.",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Dieser Heimserver verfügt über kein von diesem Client unterstütztes Anmeldeverfahren.",
     "Call Failed": "Anruf fehlgeschlagen",
     "Send": "Senden",
     "collapse": "Verbergen",
@@ -629,7 +629,7 @@
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Ob du den Richtext-Modus des Editors benutzt oder nicht",
     "Your homeserver's URL": "Deine Homeserver-URL",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
-    "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.": "Du wirst nicht in der Lage sein, die Änderung zurückzusetzen, da du dich degradierst. Wenn du der letze Nutzer mit Berechtigungen bist, wird es unmöglich sein die Privilegien zurückzubekommen.",
+    "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.": "Du wirst nicht in der Lage sein, die Änderung zurückzusetzen, da du dich degradierst. Wenn du der/die letze Nutzer:in mit Berechtigungen bist, wird es unmöglich sein die Privilegien zurückzubekommen.",
     "Community IDs cannot be empty.": "Community-IDs können nicht leer sein.",
     "Learn more about how we use analytics.": "Lerne mehr darüber, wie wir die Analysedaten nutzen.",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Wenn diese Seite identifizierbare Informationen wie Raum-, Nutzer- oder Gruppen-ID enthält, werden diese Daten entfernt bevor sie an den Server gesendet werden.",
@@ -641,10 +641,10 @@
     "Failed to remove tag %(tagName)s from room": "Entfernen der Raum-Kennzeichnung %(tagName)s fehlgeschlagen",
     "Failed to add tag %(tagName)s to room": "Fehler beim Hinzufügen des \"%(tagName)s\"-Tags an dem Raum",
     "Did you know: you can use communities to filter your %(brand)s experience!": "Wusstest du: Du kannst Communities nutzen um deine %(brand)s-Erfahrung zu filtern!",
-    "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.": "Um einen Filter zu setzen, ziehe ein Community-Bild auf das Filter-Panel ganz links. Du kannst jederzeit auf einen Avatar im Filter-Panel klicken um nur die Räume und Personen aus der Community zu sehen.",
+    "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.": "Um einen Filter zu setzen, ziehe ein Community-Bild auf das Filter-Panel ganz links. Du kannst jederzeit auf einen Avatar im Filter-Panel klicken, um nur die Räume und Personen aus der Community zu sehen.",
     "Clear filter": "Filter zurücksetzen",
     "Key request sent.": "Schlüssel-Anfragen gesendet.",
-    "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.": "Wenn du einen Fehler via GitHub gemeldet hast, können Fehlerberichte uns helfen um das Problem zu finden. Sie enthalten Anwendungsdaten wie deinen Nutzernamen, Raum- und Gruppen-ID's und Aliase die du besucht hast und Nutzernamen anderer Nutzer. Sie enthalten keine Nachrichten.",
+    "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.": "Wenn du einen Fehler via GitHub meldest, können Fehlerberichte uns helfen um das Problem zu finden. Sie enthalten Anwendungsdaten wie deinen Nutzernamen, Raum- und Gruppen-ID's und Aliase die du besucht hast und Nutzernamen anderer Nutzer:innen. Sie enthalten keine Nachrichten.",
     "Submit debug logs": "Fehlerberichte einreichen",
     "Code": "Code",
     "Opens the Developer Tools dialog": "Öffnet die Entwickler-Werkzeuge",
@@ -711,7 +711,7 @@
     "Enter keywords separated by a comma:": "Schlüsselwörter kommagetrennt eingeben:",
     "Forward Message": "Nachricht weiterleiten",
     "You have successfully set a password and an email address!": "Du hast erfolgreich ein Passwort und eine E-Mail-Adresse gesetzt!",
-    "Remove %(name)s from the directory?": "Soll der Raum %(name)s  aus dem Verzeichnis entfernt werden?",
+    "Remove %(name)s from the directory?": "Soll der Raum %(name)s aus dem Verzeichnis entfernt werden?",
     "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s nutzt zahlreiche fortgeschrittene Browser-Funktionen, die teilweise in deinem aktuell verwendeten Browser noch nicht verfügbar sind oder sich noch im experimentellen Status befinden.",
     "Developer Tools": "Entwicklerwerkzeuge",
     "Preparing to send logs": "Senden von Logs wird vorbereitet",
@@ -759,7 +759,7 @@
     "Unhide Preview": "Vorschau wieder anzeigen",
     "Unable to join network": "Es ist nicht möglich, dem Netzwerk beizutreten",
     "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Es tut uns leid, aber dein Browser kann %(brand)s <b>nicht</b> ausführen.",
-    "Messages in group chats": "Nachrichten in Gruppen-Chats",
+    "Messages in group chats": "Nachrichten in Gruppenchats",
     "Yesterday": "Gestern",
     "Error encountered (%(errorDetail)s).": "Es ist ein Fehler aufgetreten (%(errorDetail)s).",
     "Low Priority": "Niedrige Priorität",
@@ -802,25 +802,25 @@
     "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>": "Dies wird deinen Account permanent unbenutzbar machen. Du wirst nicht in der Lage sein, dich anzumelden und keiner wird dieselbe Benutzer-ID erneut registrieren können. Alle Räume, in denen der Account ist, werden verlassen und deine Account-Daten werden vom Identitätsserver gelöscht. <b>Diese Aktion ist unumkehrbar.</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.": "Standardmäßig werden <b>die von dir gesendeten Nachrichten beim Deaktiveren nicht gelöscht</b>. Wenn du dies von uns möchtest, aktivere das Auswalfeld unten.",
     "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.": "Die Sichtbarkeit der Nachrichten in Matrix ist vergleichbar mit E-Mails: Wenn wir deine Nachrichten vergessen heißt das, dass diese nicht mit neuen oder nicht registrierten Nutzern teilen werden, aber registrierte Nutzer, die bereits zugriff haben, werden Zugriff auf ihre Kopie behalten.",
-    "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)": "Bitte vergesst alle Nachrichten, die ich gesendet habe, wenn mein Account deaktiviert wird. (<b>Warnung:</b> Zukünftige Nutzer werden eine unvollständige Konversation sehen)",
+    "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)": "Bitte vergesst alle Nachrichten, die ich gesendet habe, wenn mein Account deaktiviert wird. (<b>Warnung:</b> Zukünftige Nutzer:innen werden eine unvollständige Konversation sehen)",
     "To continue, please enter your password:": "Um fortzufahren, bitte Passwort eingeben:",
     "Can't leave Server Notices room": "Du kannst den Raum für Server-Notizen nicht verlassen",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Du kannst diesen Raum nicht verlassen, da dieser Raum für wichtige Nachrichten vom Heimserver verwendet wird.",
     "Terms and Conditions": "Geschäftsbedingungen",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Um den %(homeserverDomain)s -Heimserver weiter zu verwenden, musst du die Geschäftsbedingungen sichten und ihnen zustimmen.",
     "Review terms and conditions": "Geschäftsbedingungen anzeigen",
-    "Share Link to User": "Sende Link an Benutzer",
-    "Share room": "Teile Raum",
-    "Share Room": "Teile Raum",
+    "Share Link to User": "Link zum/r Benutzer:in teilen",
+    "Share room": "Raum teilen",
+    "Share Room": "Raum teilen",
     "Link to most recent message": "Link zur aktuellsten Nachricht",
     "Share User": "Teile Benutzer",
     "Share Community": "Teile Community",
-    "Share Room Message": "Teile Raumnachricht",
+    "Share Room Message": "Raumnachricht teilen",
     "Link to selected message": "Link zur ausgewählten Nachricht",
     "COPY": "KOPIEREN",
     "Share Message": "Nachricht teilen",
-    "No Audio Outputs detected": "Keine Ton-Ausgabe erkannt",
-    "Audio Output": "Ton-Ausgabe",
+    "No Audio Outputs detected": "Keine Audioausgabe erkannt",
+    "Audio Output": "Audioausgabe",
     "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "In verschlüsselten Räumen, wie diesem, ist die Link-Vorschau standardmäßig deaktiviert damit dein Heimserver (auf dem die Vorschau erzeugt wird) keine Informationen über Links in diesem Raum bekommt.",
     "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.": "Wenn jemand eine URL in seine Nachricht einfügt, kann eine URL-Vorschau angezeigt werden, um mehr Informationen über diesen Link zu erhalten, wie z.B. den Titel, die Beschreibung und ein Bild von der Website.",
     "The email field must not be blank.": "Das E-Mail-Feld darf nicht leer sein.",
@@ -851,7 +851,7 @@
     "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.": "Deine Nachricht wurde nicht gesendet, weil dieser Heimserver ein Ressourcen-Limit erreicht hat. Bitte <a>kontaktiere deinen Systemadministrator</a> um diesen Dienst weiter zu nutzen.",
     "Please <a>contact your service administrator</a> to continue using this service.": "Bitte <a>kontaktiere deinen Systemadministrator</a> um diesen Dienst weiter zu nutzen.",
     "Sorry, your homeserver is too old to participate in this room.": "Sorry, dein Homeserver ist zu alt, um an diesem Raum teilzunehmen.",
-    "Please contact your homeserver administrator.": "Bitte setze dich mit dem Administrator deines Homeservers in Verbindung.",
+    "Please contact your homeserver administrator.": "Bitte setze dich mit der Administration deines Homeservers in Verbindung.",
     "Legal": "Rechtliches",
     "This room has been replaced and is no longer active.": "Dieser Raum wurde ersetzt und ist nicht länger aktiv.",
     "The conversation continues here.": "Die Konversation wird hier fortgesetzt.",
@@ -865,7 +865,7 @@
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s setzte die Hauptadresse zu diesem Raum auf %(address)s.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s entfernte die Hauptadresse von diesem Raum.",
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Bevor du Log-Dateien übermittelst, musst du ein <a>GitHub-Issue erstellen</a> um dein Problem zu beschreiben.",
-    "%(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!": "%(brand)s benutzt nun 3-5-mal weniger Arbeitsspeicher, indem Informationen über andere Nutzer erst bei Bedarf geladen werden. Bitte warte, während die Daten erneut mit dem Server abgeglichen werden!",
+    "%(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!": "%(brand)s benutzt nun 3 - 5-mal weniger Arbeitsspeicher, indem Informationen über andere Nutzer:innen erst bei Bedarf geladen werden. Bitte warte, während die Daten erneut mit dem Server abgeglichen werden!",
     "Updating %(brand)s": "Aktualisiere %(brand)s",
     "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.": "Du hast zuvor %(brand)s auf %(host)s ohne das verzögerte Laden von Mitgliedern genutzt. In dieser Version war das verzögerte Laden deaktiviert. Da die lokal zwischengespeicherten Daten zwischen diesen Einstellungen nicht kompatibel sind, muss %(brand)s dein Konto neu synchronisieren.",
     "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.": "Wenn %(brand)s mit der alten Version in einem anderen Tab geöffnet ist, schließe dies bitte, da das parallele Nutzen von %(brand)s auf demselben Host mit aktivierten und deaktivierten verzögertem Laden, Probleme verursachen wird.",
@@ -873,9 +873,9 @@
     "Clear cache and resync": "Zwischenspeicher löschen und erneut synchronisieren",
     "Please review and accept the policies of this homeserver:": "Bitte sieh dir alle Bedingungen dieses Heimservers an und akzeptiere sie:",
     "Add some now": "Jemanden jetzt hinzufügen",
-    "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Du bist ein Administrator dieser Community. Du wirst nicht erneut hinzutreten können, wenn du nicht von einem anderen Administrator eingeladen wirst.",
-    "Open Devtools": "Öffne Entwickler-Werkzeuge",
-    "Show developer tools": "Zeige Entwickler-Werkzeuge",
+    "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Du bist ein:e Administrator:in dieser Community. Du wirst nicht erneut hinzutreten können, wenn du nicht von einem/r anderen Administrator:in eingeladen wirst.",
+    "Open Devtools": "Entwicklerwerkzeuge öffnen",
+    "Show developer tools": "Zeige Entwicklerwerkzeuge",
     "Unable to load! Check your network connectivity and try again.": "Konnte nicht geladen werden! Überprüfe die Netzwerkverbindung und versuche es erneut.",
     "Delete Backup": "Sicherung löschen",
     "Backup version: ": "Sicherungsversion: ",
@@ -909,7 +909,7 @@
     "All-uppercase is almost as easy to guess as all-lowercase": "Alles groß zu geschrieben ist fast genauso schnell zu raten, wie alles klein zu schreiben",
     "Reversed words aren't much harder to guess": "Umgedrehte Worte sind nicht schwerer zu erraten",
     "Predictable substitutions like '@' instead of 'a' don't help very much": "Vorhersagbare Ersetzungen wie '@' anstelle von 'a' helfen nicht viel",
-    "Add another word or two. Uncommon words are better.": "Füge ein weiteres wort hinzu - oder mehr. Ungewöhnliche Worte sind besser.",
+    "Add another word or two. Uncommon words are better.": "Füge ein weiteres Wort - oder mehr - hinzu. Ungewöhnliche Worte sind besser.",
     "Repeats like \"aaa\" are easy to guess": "Wiederholungen wie \"aaa\" sind einfach zu erraten",
     "Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"": "Wiederholungen wie \"abcabcabc\" sind nur leicht schwerer zu raten als \"abc\"",
     "Sequences like abc or 6543 are easy to guess": "Sequenzen wie \"abc\" oder \"6543\" sind leicht zu raten",
@@ -923,12 +923,12 @@
     "Names and surnames by themselves are easy to guess": "Namen und Familiennamen alleine sind einfach zu erraten",
     "Common names and surnames are easy to guess": "Häufige Namen und Familiennamen sind einfach zu erraten",
     "You do not have permission to invite people to this room.": "Du hast keine Berechtigung um Personen in diesen Raum einzuladen.",
-    "User %(user_id)s does not exist": "Benutzer %(user_id)s existiert nicht",
-    "Unknown server error": "Unbekannter Server-Fehler",
-    "Failed to invite users to the room:": "Konnte Benutzer nicht in den Raum einladen:",
+    "User %(user_id)s does not exist": "Benutzer:in %(user_id)s existiert nicht",
+    "Unknown server error": "Unbekannter Serverfehler",
+    "Failed to invite users to the room:": "Konnte Benutzer:innen nicht in den Raum einladen:",
     "Short keyboard patterns are easy to guess": "Kurze Tastaturmuster sind einfach zu erraten",
     "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Zeige eine Erinnerung um die Sichere Nachrichten-Wiederherstellung in verschlüsselten Räumen zu aktivieren",
-    "Messages containing @room": "Nachrichten die \"@room\" enthalten",
+    "Messages containing @room": "Nachrichten, die \"@room\" enthalten",
     "Encrypted messages in one-to-one chats": "Verschlüsselte Nachrichten in 1:1 Chats",
     "Encrypted messages in group chats": "Verschlüsselte Nachrichten in Gruppenchats",
     "Use a longer keyboard pattern with more turns": "Nutze ein längeres Tastaturmuster mit mehr Abwechslung",
@@ -962,9 +962,9 @@
     "Go to Settings": "Gehe zu Einstellungen",
     "Sign in with single sign-on": "Melde dich mit „Single Sign-On“ an",
     "Unrecognised address": "Nicht erkannte Adresse",
-    "User %(user_id)s may or may not exist": "Existenz der Benutzer %(user_id)s unsicher",
-    "Prompt before sending invites to potentially invalid matrix IDs": "Nachfragen bevor Einladungen zu möglichen ungültigen Matrix IDs gesendet werden",
-    "The following users may not exist": "Eventuell existieren folgende Benutzer nicht",
+    "User %(user_id)s may or may not exist": "Existenz des/der Benutzers/in %(user_id)s unsicher",
+    "Prompt before sending invites to potentially invalid matrix IDs": "Nachfragen, bevor Einladungen zu möglichen ungültigen Matrix-IDs gesendet werden",
+    "The following users may not exist": "Eventuell existieren folgende Benutzer:innen nicht",
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Profile für die unteren Matrix IDs wurden nicht gefunden - willst Du sie trotzdem einladen?",
     "Invite anyway and never warn me again": "Trotzdem einladen und mich nicht mehr warnen",
     "Invite anyway": "Trotzdem einladen",
@@ -979,7 +979,7 @@
     "Render simple counters in room header": "Einfache Zähler in Raum-Kopfzeile anzeigen",
     "Enable Emoji suggestions while typing": "Emoji-Vorschläge während der Eingabe aktivieren",
     "Show a placeholder for removed messages": "Zeigt einen Platzhalter für gelöschte Nachrichten an",
-    "Show join/leave messages (invites/kicks/bans unaffected)": "Zeige Betreten-/Verlassen-Nachrichten (Einladungen/Kicks/Bans sind dadurch nicht betroffen)",
+    "Show join/leave messages (invites/kicks/bans unaffected)": "Betreten-/Verlassen-Nachrichten zeigen (betrifft nicht Einladungen/Kicks/Bans)",
     "Show avatar changes": "Avatar-Änderungen anzeigen",
     "Show display name changes": "Anzeigenamen-Änderungen anzeigen",
     "Send typing notifications": "Tipp-Benachrichtigungen senden",
@@ -989,10 +989,10 @@
     "Messages containing my username": "Nachrichten, die meinen Benutzernamen enthalten",
     "The other party cancelled the verification.": "Die Gegenstelle hat die Überprüfung abgebrochen.",
     "Verified!": "Verifiziert!",
-    "You've successfully verified this user.": "Du hast diesen Benutzer erfolgreich verifiziert.",
-    "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Sichere Nachrichten mit diesem Benutzer sind Ende-zu-Ende-verschlüsselt und können nicht von Dritten gelesen werden.",
+    "You've successfully verified this user.": "Du hast diese:n Benutzer:in erfolgreich verifiziert.",
+    "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Sichere Nachrichten mit diesem/r Benutzer:in sind Ende-zu-Ende-verschlüsselt und können nicht von Dritten gelesen werden.",
     "Got It": "Verstanden",
-    "Verify this user by confirming the following number appears on their screen.": "Verifiziere diese Nutzer!n, indem du bestätigst, dass die folgende Nummer auf dessen Bildschirm erscheint.",
+    "Verify this user by confirming the following number appears on their screen.": "Verifiziere diese Nutzer:in, indem du bestätigst, dass die folgende Nummer auf dessen Bildschirm erscheint.",
     "Yes": "Ja",
     "No": "Nein",
     "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Wir haben dir eine E-Mail geschickt, um deine Adresse zu überprüfen. Bitte folge den Anweisungen dort und klicke dann auf die Schaltfläche unten.",
@@ -1006,9 +1006,9 @@
     "Profile picture": "Profilbild",
     "Display Name": "Anzeigename",
     "Room information": "Rauminformationen",
-    "Internal room ID:": "Interne Raum ID:",
-    "Room version": "Raum Version",
-    "Room version:": "Raum-Version:",
+    "Internal room ID:": "Interne Raum-ID:",
+    "Room version": "Raumversion",
+    "Room version:": "Raumversion:",
     "Developer options": "Entwickleroptionen",
     "General": "Allgemein",
     "Set a new account password...": "Neues Benutzerkonto-Passwort festlegen...",
@@ -1025,19 +1025,19 @@
     "FAQ": "Häufige Fragen",
     "Versions": "Versionen",
     "Room Addresses": "Raum-Adressen",
-    "Deactivating your account is a permanent action - be careful!": "Das Deaktivieren deines Kontos ist nicht widerruflich - sei vorsichtig!",
+    "Deactivating your account is a permanent action - be careful!": "Die Deaktivierung deines Kontos ist nicht widerruflich - sei vorsichtig!",
     "Preferences": "Einstellungen",
     "Room list": "Raumliste",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Die Datei '%(fileName)s' überschreitet die maximale Größe für Uploads auf diesem Heimserver",
     "This room has no topic.": "Dieser Raum hat kein Thema.",
     "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s machte den Raum für jeden, der den Link kennt öffentlich.",
-    "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s hat den Raum auf eingeladene User beschränkt.",
+    "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s hat den Raum auf eingeladene Benutzer beschränkt.",
     "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s änderte die Zutrittsregel auf '%(rule)s'",
     "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s erlaubte Gäste diesem Raum beizutreten.",
-    "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s hat Gästen verboten diesem Raum beizutreten.",
+    "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s hat Gästen verboten, diesem Raum beizutreten.",
     "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s änderte den Gastzugriff auf '%(rule)s'",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Gruppiere & filtere Räume nach eigenen Tags (neu laden um Änderungen zu übernehmen)",
-    "Unable to find a supported verification method.": "Konnte kein unterstützte Verifikationsmethode finden.",
+    "Unable to find a supported verification method.": "Konnte keine unterstützte Verifikationsmethode finden.",
     "Dog": "Hund",
     "Cat": "Katze",
     "Lion": "Löwe",
@@ -1045,7 +1045,7 @@
     "Unicorn": "Einhorn",
     "Pig": "Schwein",
     "Elephant": "Elefant",
-    "Rabbit": "Kaninchen",
+    "Rabbit": "Hase",
     "Panda": "Panda",
     "Rooster": "Hahn",
     "Penguin": "Pinguin",
@@ -1073,7 +1073,7 @@
     "Hat": "Hut",
     "Glasses": "Brille",
     "Spanner": "Schraubenschlüssel",
-    "Santa": "Nikolaus",
+    "Santa": "Weihnachtsmann",
     "Thumbs up": "Daumen hoch",
     "Umbrella": "Regenschirm",
     "Hourglass": "Sanduhr",
@@ -1099,11 +1099,11 @@
     "Anchor": "Anker",
     "Headphones": "Kopfhörer",
     "Folder": "Ordner",
-    "Pin": "Stecknadel",
+    "Pin": "Anheften",
     "Timeline": "Chatverlauf",
     "Autocomplete delay (ms)": "Verzögerung zur Autovervollständigung (ms)",
     "Roles & Permissions": "Rollen & Berechtigungen",
-    "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Änderungen daran, wer den Chatverlauf lesen kann werden nur zukünftige Nachrichten in diesem Raum angewendet. Die Sichtbarkeit der existierenden Historie bleibt unverändert.",
+    "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Änderungen daran, wer den Chatverlauf lesen kann werden nur zukünftige Nachrichten in diesem Raum angewendet. Die Sichtbarkeit des existierenden Verlaufs bleibt unverändert.",
     "Security & Privacy": "Sicherheit & Datenschutz",
     "Encryption": "Verschlüsselung",
     "Once enabled, encryption cannot be disabled.": "Sobald aktiviert, kann die Verschlüsselung nicht mehr deaktiviert werden.",
@@ -1111,7 +1111,7 @@
     "Ignored users": "Ignorierte Benutzer",
     "Key backup": "Schlüsselsicherung",
     "Gets or sets the room topic": "Frage das Thema des Raums ab oder setze es",
-    "Verify this user by confirming the following emoji appear on their screen.": "Verifiziere diese Nutzer!n, indem du bestätigst, dass folgendes Emoji auf dessen Bildschirm erscheint.",
+    "Verify this user by confirming the following emoji appear on their screen.": "Verifiziere diese Nutzer:in, indem du bestätigst, dass folgende Emojis auf dessen Bildschirm erscheinen.",
     "Missing media permissions, click the button below to request.": "Fehlende Medienberechtigungen. Drücke auf den Knopf unten, um sie anzufordern.",
     "Request media permissions": "Medienberechtigungen anfordern",
     "Main address": "Primäre Adresse",
@@ -1121,8 +1121,8 @@
     "Join": "Beitreten",
     "Waiting for partner to confirm...": "Warte auf Bestätigung des Gesprächspartners...",
     "Incoming Verification Request": "Eingehende Verifikationsanfrage",
-    "Allow Peer-to-Peer for 1:1 calls": "Erlaube Peer-to-Peer für 1:1-Anrufe",
-    "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Bist du sicher? Du wirst deine verschlüsselten Nachrichten verlieren, wenn deine Schlüssel nicht gesichert sind.",
+    "Allow Peer-to-Peer for 1:1 calls": "Peer-to-Peer-Verbindungen für 1:1-Anrufe erlauben",
+    "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Bist du sicher? Du wirst deine verschlüsselten Nachrichten verlieren, wenn deine Schlüssel nicht gut gesichert sind.",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Verschlüsselte Nachrichten sind mit Ende-zu-Ende-Verschlüsselung gesichert. Nur du und der/die Empfänger haben die Schlüssel um diese Nachrichten zu lesen.",
     "Restore from Backup": "Von Sicherung wiederherstellen",
     "Back up your keys before signing out to avoid losing them.": "Sichere deine Schlüssel bevor du dich abmeldest, damit du sie nicht verlierst.",
@@ -1189,13 +1189,13 @@
     "Unable to query for supported registration methods.": "Konnte unterstützte Registrierungsmethoden nicht abrufen.",
     "Bulk options": "Sammeloptionen",
     "Join millions for free on the largest public server": "Schließe dich kostenlos auf dem größten öffentlichen Server Millionen von Menschen an",
-    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Fügt ¯\\_(ツ)_/¯ vor einer Klartextnachricht ein",
+    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Stellt ¯\\_(ツ)_/¯ einer Klartextnachricht voran",
     "Changes your display nickname in the current room only": "Ändert den Anzeigenamen ausschließlich für den aktuellen Raum",
     "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s aktivierte Abzeichen der Gruppen %(groups)s für diesen Raum.",
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s deaktivierte Abzeichen der Gruppen %(groups)s in diesem Raum.",
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s aktivierte Abzeichen von %(newGroups)s und deaktivierte die Abzeichen von %(oldGroups)s in diesem Raum.",
-    "User %(userId)s is already in the room": "Nutzer %(userId)s ist bereits im Raum",
-    "The user must be unbanned before they can be invited.": "Nutzer müssen entbannt werden, bevor sie eingeladen werden können.",
+    "User %(userId)s is already in the room": "Nutzer:in %(userId)s ist bereits im Raum",
+    "The user must be unbanned before they can be invited.": "Die Verbannung des/der Nutzer:in muss aufgehoben werden, bevor er/sie eingeladen werden kann.",
     "Show read receipts sent by other users": "Zeige Lesebestätigungen anderer Benutzer",
     "Scissors": "Scheren",
     "<a>Upgrade</a> to your own domain": "<a>Upgrade</a> zu deiner eigenen Domain",
@@ -1208,22 +1208,22 @@
     "Change topic": "Ändere das Thema",
     "Modify widgets": "Ändere Widgets",
     "Default role": "Standard Rolle",
-    "Send messages": "Sende Nachrichten",
-    "Invite users": "Benutzer einladen",
-    "Change settings": "Ändere Einstellungen",
-    "Kick users": "Benutzer kicken",
-    "Ban users": "Benutzer verbannen",
+    "Send messages": "Nachrichten senden",
+    "Invite users": "Benutzer:innen einladen",
+    "Change settings": "Einstellungen ändern",
+    "Kick users": "Benutzer:innen kicken",
+    "Ban users": "Benutzer:innen verbannen",
     "Remove messages": "Nachrichten löschen",
-    "Notify everyone": "Jeden Benachrichtigen",
-    "Send %(eventType)s events": "Sende %(eventType)s-Ereignisse",
-    "Select the roles required to change various parts of the room": "Wähle Rollen die benötigt werden um einige Teile des Raumes zu ändern",
+    "Notify everyone": "Jeden benachrichtigen",
+    "Send %(eventType)s events": "%(eventType)s-Ereignisse senden",
+    "Select the roles required to change various parts of the room": "Wähle Rollen, die benötigt werden, um einige Teile des Raumes zu ändern",
     "Enable encryption?": "Verschlüsselung aktivieren?",
-    "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>": "Sobald aktiviert, kann die Verschlüsselung für einen Raum nicht mehr deaktiviert werden. Nachrichten in einem verschlüsselten Raum können nur noch von Teilnehmern aber nicht mehr vom Server gelesen werden. Einige Bots und Brücken werden vielleicht nicht mehr funktionieren. <a>Lerne mehr über Verschlüsselung</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>": "Sobald aktiviert, kann die Verschlüsselung für einen Raum nicht mehr deaktiviert werden. Nachrichten in einem verschlüsselten Raum können nur noch von Teilnehmern aber nicht mehr vom Server gelesen werden. Einige Bots und Brücken werden vielleicht nicht mehr funktionieren. <a>Erfahre mehr über Verschlüsselung.</a>",
     "Error updating main address": "Fehler beim Aktualisieren der Hauptadresse",
     "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Es gab ein Problem beim Aktualisieren der Raum-Hauptadresse. Es kann sein, dass es vom Server verboten ist oder ein temporäres Problem auftrat.",
-    "Error updating flair": "Konnte Abzeichen nicht aktualisieren",
+    "Error updating flair": "Abzeichen-Aktualisierung fehlgeschlagen",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Es gab ein Problem beim Aktualisieren des Abzeichens für diesen Raum. Es kann sein, dass der Server es nicht erlaubt oder ein temporäres Problem auftrat.",
-    "Power level": "Berechtigungslevel",
+    "Power level": "Berechtigungsstufe",
     "Room Settings - %(roomName)s": "Raumeinstellungen - %(roomName)s",
     "A username can only contain lower case letters, numbers and '=_-./'": "Ein Benutzername kann nur Kleinbuchstaben, Nummern und '=_-./' enthalten",
     "Share Permalink": "Teile permanenten Link",
@@ -1235,7 +1235,7 @@
     "Your Matrix account on %(serverName)s": "Dein Matrixkonto auf %(serverName)s",
     "Name or Matrix ID": "Name oder Matrix ID",
     "Your %(brand)s is misconfigured": "Dein %(brand)s ist falsch konfiguriert",
-    "You cannot modify widgets in this room.": "Du kannst in diesem Raum keine Widgets verändern.",
+    "You cannot modify widgets in this room.": "Du darfst in diesem Raum keine Widgets verändern.",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Ob du die \"Breadcrumbs\"-Funktion nutzt oder nicht (Avatare oberhalb der Raumliste)",
     "The server does not support the room version specified.": "Der Server unterstützt die angegebene Raumversion nicht.",
     "<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>Achtung</b>: Ein Raum-Upgrade wird <i>die Mitglieder des Raumes nicht automatisch auf die neue Version migrieren.</i> Wir werden in der alten Raumversion einen Link zum neuen Raum posten - Raum-Mitglieder müssen dann auf diesen Link klicken um dem neuen Raum beizutreten.",
@@ -1243,11 +1243,11 @@
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Momentan ist es nicht möglich mit einer Datei zu antworten. Möchtest Du die Datei hochladen ohne zu antworten?",
     "The file '%(fileName)s' failed to upload.": "Die Datei \"%(fileName)s\" konnte nicht hochgeladen werden.",
     "Changes your avatar in this current room only": "Ändert deinen Avatar für diesen Raum",
-    "Unbans user with given ID": "Entbannt den Benutzer mit der angegebenen ID",
+    "Unbans user with given ID": "Hebt die Verbannung des/der Benutzer:in mit der angegebenen ID auf",
     "Sends the given message coloured as a rainbow": "Sendet die Nachricht in Regenbogenfarben",
     "Adds a custom widget by URL to the room": "Fügt ein Benutzer-Widget über eine URL zum Raum hinzu",
     "Please supply a https:// or http:// widget URL": "Bitte gib eine https:// oder http:// Widget-URL an",
-    "Sends the given emote coloured as a rainbow": "Sendet das Emoji in Regenbogenfarben",
+    "Sends the given emote coloured as a rainbow": "Zeigt Aktionen in Regenbogenfarben",
     "%(senderName)s made no change.": "%(senderName)s hat keine Änderung vorgenommen.",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s hat die Einladung zum Raumbeitritt für %(targetDisplayName)s zurückgezogen.",
     "Cannot reach homeserver": "Der Heimserver ist nicht erreichbar",
@@ -1264,7 +1264,7 @@
     "Show hidden events in timeline": "Zeige versteckte Ereignisse in der Chronik",
     "Low bandwidth mode": "Modus für niedrige Bandbreite",
     "Reset": "Zurücksetzen",
-    "Joining room …": "Raum beitreten…",
+    "Joining room …": "Trete Raum bei …",
     "Rejecting invite …": "Einladung ablehnen…",
     "Sign Up": "Registrieren",
     "Sign In": "Anmelden",
@@ -1301,9 +1301,9 @@
     "Multiple integration managers": "Mehrere Integrationsmanager",
     "Public Name": "Öffentlicher Name",
     "Identity Server URL must be HTTPS": "Die Identity Server-URL muss HTTPS sein",
-    "Could not connect to Identity Server": "Verbindung zum Identity Server konnte nicht hergestellt werden",
+    "Could not connect to Identity Server": "Verbindung zum Identitätsserver konnte nicht hergestellt werden",
     "Checking server": "Server wird überprüft",
-    "Identity server has no terms of service": "Für den Identity Server gelten keine Nutzungsbedingungen",
+    "Identity server has no terms of service": "Der Identitätsserver hat keine Nutzungsbedingungen",
     "Disconnect": "Trennen",
     "Identity Server": "Identitätsserver",
     "Use an identity server": "Benutze einen Identitätsserver",
@@ -1317,7 +1317,7 @@
     "Enter a new identity server": "Gib einen neuen Identitätsserver ein",
     "Clear personal data": "Persönliche Daten löschen",
     "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.": "Wenn du die Verbindung zu deinem Identitätsserver trennst, heißt das, dass du nicht mehr von anderen Benutzern gefunden werden und auch andere nicht mehr per E-Mail oder Telefonnummer einladen kannst.",
-    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Bitte frage den Administrator deines Heimservers (<code>%(homeserverDomain)s</code>) darum, einen TURN-Server einzurichten, damit Anrufe zuverlässig funktionieren.",
+    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Bitte frage die Administration deines Heimservers (<code>%(homeserverDomain)s</code>) darum, einen TURN-Server einzurichten, damit Anrufe zuverlässig funktionieren.",
     "Disconnect from the identity server <idserver />?": "Verbindung zum Identitätsserver <idserver /> trennen?",
     "Add Email Address": "E-Mail-Adresse hinzufügen",
     "Add Phone Number": "Telefonnummer hinzufügen",
@@ -1325,21 +1325,21 @@
     "Deactivate account": "Benutzerkonto deaktivieren",
     "Show previews/thumbnails for images": "Zeige Vorschauen/Thumbnails für Bilder",
     "View": "Vorschau",
-    "Find a room…": "Suche einen Raum…",
-    "Find a room… (e.g. %(exampleRoom)s)": "Suche einen Raum… (z.B. %(exampleRoom)s)",
+    "Find a room…": "Einen Raum suchen…",
+    "Find a room… (e.g. %(exampleRoom)s)": "Einen Raum suchen… (z.B. %(exampleRoom)s)",
     "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Wenn du den gesuchten Raum nicht finden kannst, frage nach einer Einladung für den Raum oder <a>Erstelle einen neuen Raum</a>.",
-    "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.": "Alternativ kannst du versuchen, den öffentlichen Server unter <code>turn.matrix.org</code> zu verwenden. Allerdings wird dieser nicht so zuverlässig sein, und deine IP-Adresse mit diesem Server teilen. Du kannst dies auch in den Einstellungen konfigurieren.",
+    "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.": "Alternativ kannst du versuchen, den öffentlichen Server unter <code>turn.matrix.org</code> zu verwenden. Allerdings wird dieser nicht so zuverlässig sein und du teilst deine IP-Adresse mit diesem Server. Du kannst dies auch in den Einstellungen konfigurieren.",
     "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.": "Diese Handlung erfordert es, auf den Standard-Identitätsserver <server /> zuzugreifen, um eine E-Mail Adresse oder Telefonnummer zu validieren, aber der Server hat keine Nutzungsbedingungen.",
-    "Only continue if you trust the owner of the server.": "Fahre nur fort, wenn du dem/r Besitzer*in des Servers vertraust.",
+    "Only continue if you trust the owner of the server.": "Fahre nur fort, wenn du dem/r Besitzer:in des Servers vertraust.",
     "Trust": "Vertrauen",
     "Custom (%(level)s)": "Benutzerdefinierte (%(level)s)",
-    "Sends a message as plain text, without interpreting it as markdown": "Verschickt eine Nachricht in reinem Textformat, ohne sie in Markdown zu formatieren",
+    "Sends a message as plain text, without interpreting it as markdown": "Verschickt eine Nachricht in Rohtext, ohne sie als Markdown darzustellen",
     "Use an identity server to invite by email. Manage in Settings.": "Nutze einen Identitätsserver, um über E-Mail Einladungen zu verschicken. Verwalte es in den Einstellungen.",
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
     "Try out new ways to ignore people (experimental)": "Versuche neue Möglichkeiten, um Menschen zu ignorieren (experimentell)",
     "Send read receipts for messages (requires compatible homeserver to disable)": "Lesebestätigungen für Nachrichten senden (Deaktivieren erfordert einen kompatiblen Heimserver)",
     "My Ban List": "Meine Bannliste",
-    "This is your list of users/servers you have blocked - don't leave the room!": "Dies ist die Liste von Benutzer*innen/Servern, die du blockiert hast - verlasse den Raum nicht!",
+    "This is your list of users/servers you have blocked - don't leave the room!": "Dies ist die Liste von Benutzer:innen und Servern, die du blockiert hast - verlasse diesen Raum nicht!",
     "Accept <policyLink /> to continue:": "Akzeptiere <policyLink />, um fortzufahren:",
     "Change identity server": "Wechsle den Identitätsserver",
     "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.": "Du solltest deine <b>persönlichen Daten</b> vom Identitätsserver <idserver /> entfernen, bevor du die Verbindung trennst. Leider ist der Identitätsserver <idserver /> derzeit offline oder kann nicht erreicht werden.",
@@ -1370,11 +1370,11 @@
     "%(num)s days from now": "in %(num)s Tagen",
     "Show info about bridges in room settings": "Information über Bridges in den Raumeinstellungen anzeigen",
     "Enable message search in encrypted rooms": "Nachrichtensuche in verschlüsselten Räumen aktivieren",
-    "Lock": "Sperren",
+    "Lock": "Schloss",
     "Later": "Später",
     "Review": "Überprüfen",
     "Verify": "Verifizieren",
-    "Decline (%(counter)s)": "Zurückweisen (%(counter)s)",
+    "Decline (%(counter)s)": "Ablehnen (%(counter)s)",
     "not found": "nicht gefunden",
     "rooms.": "Räumen zu speichern.",
     "Manage": "Verwalten",
@@ -1384,24 +1384,24 @@
     "Cannot connect to integration manager": "Verbindung zum Integrationsmanager fehlgeschlagen",
     "The integration manager is offline or it cannot reach your homeserver.": "Der Integrationsmanager ist offline oder er kann den Heimserver nicht erreichen.",
     "not stored": "nicht gespeichert",
-    "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Die Sicherung hat eine Signatur von <verify>unbekanntem/r</verify> Nutzer!n mit ID %(deviceId)s",
+    "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Die Sicherung hat eine Signatur von <verify>unbekanntem/r</verify> Nutzer:in mit ID %(deviceId)s",
     "Backup key stored: ": "Backup Schlüssel gespeichert: ",
     "Clear notifications": "Benachrichtigungen löschen",
-    "Disconnect from the identity server <current /> and connect to <new /> instead?": "Verbindung vom Identitätsserver <current /> trennen und stattdessen zu <new /> verbinden?",
-    "The identity server you have chosen does not have any terms of service.": "Der Identitätsserver, den du gewählt hast, hat keine Nutzungsbedingungen.",
+    "Disconnect from the identity server <current /> and connect to <new /> instead?": "Vom Identitätsserver <current /> trennen, und stattdessen eine Verbindung zu <new /> aufbauen?",
+    "The identity server you have chosen does not have any terms of service.": "Der von dir gewählte Identitätsserver hat keine Nutzungsbedingungen.",
     "Disconnect identity server": "Verbindung zum Identitätsserver trennen",
-    "contact the administrators of identity server <idserver />": "Administrator des Identitätsservers <idserver /> kontaktieren",
+    "contact the administrators of identity server <idserver />": "Administration des Identitätsservers <idserver /> kontaktieren",
     "wait and try again later": "warte und versuche es später erneut",
     "Disconnect anyway": "Verbindung trotzdem trennen",
     "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Du <b>teilst deine persönlichen Daten</b> immer noch auf dem Identitätsserver <idserver />.",
     "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Wir empfehlen, dass du deine Email Adressen und Telefonnummern vom Identitätsserver löschst, bevor du die Verbindung trennst.",
-    "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Du nutzt momentan keinen Identitätsserver. Um von bestehenden Kontakten die du kennst gefunden zu werden und diese zu finden, füge unten einen hinzu.",
-    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Nutze einen Integrationsmanager <b>(%(serverName)s)</b> um Bots, Widgets und Sticker Packs zu verwalten.",
-    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Verwende einen Integrationsmanager um Bots, Widgets und Sticker Packs zu verwalten.",
+    "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Zur Zeit benutzt du keinen Identitätsserver. Trage unten einen Server ein, um Kontakte finden und von anderen gefunden zu werden.",
+    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Nutze einen Integrationsmanager <b>(%(serverName)s)</b>, um Bots, Widgets und Stickerpacks zu verwalten.",
+    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Verwende einen Integrationsmanager, um Bots, Widgets und Sticker Packs zu verwalten.",
     "Manage integrations": "Integrationen verwalten",
-    "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Stimme den Nutzungsbedingungen des Identitätsservers %(serverName)s zu, um dich per Email Adresse und Telefonnummer auffindbar zu machen.",
+    "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Stimme den Nutzungsbedingungen des Identitätsservers %(serverName)s zu, um dich per E-Mail-Adresse und Telefonnummer auffindbar zu machen.",
     "Clear cache and reload": "Zwischenspeicher löschen und neu laden",
-    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Passe deine Erfahrung mit experimentellen Lab Funktionen an. <a>Mehr erfahren</a>.",
+    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Passe deine Erfahrung mit experimentellen Funktionen an. <a>Mehr erfahren</a>.",
     "Ignored/Blocked": "Ignoriert/Blockiert",
     "Something went wrong. Please try again or view your console for hints.": "Etwas ist schief gelaufen. Bitte versuche es erneut oder sieh für weitere Hinweise in deiner Konsole nach.",
     "Error subscribing to list": "Fehler beim Abonnieren der Liste",
@@ -1413,10 +1413,10 @@
     "You have not ignored anyone.": "Du hast niemanden ignoriert.",
     "You are currently ignoring:": "Du ignorierst momentan:",
     "Unsubscribe": "Deabonnieren",
-    "View rules": "Regeln betrachten",
+    "View rules": "Regeln öffnen",
     "You are currently subscribed to:": "Du abonnierst momentan:",
-    "⚠ These settings are meant for advanced users.": "⚠ Diese Einstellungen sind für fortgeschrittene Nutzer gedacht.",
-    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Ob du %(brand)s auf einem Gerät verwendest, bei dem Berührung der primäre Eingabemechanismus ist",
+    "⚠ These settings are meant for advanced users.": "⚠ Diese Einstellungen sind für fortgeschrittene Nutzer:innen gedacht.",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Ob du %(brand)s auf einem Gerät verwendest, bei dem Touch das primäre Eingabegerät ist",
     "Whether you're using %(brand)s as an installed Progressive Web App": "Ob du %(brand)s als installierte progressive Web-App verwendest",
     "Your user agent": "Dein User-Agent",
     "If you cancel now, you won't complete verifying the other user.": "Wenn Sie jetzt abbrechen, werden Sie die Verifizierung des anderen Nutzers nicht beenden können.",
@@ -1427,14 +1427,14 @@
     "Verifies a user, session, and pubkey tuple": "Verifiziert einen Benutzer, eine Sitzung und Pubkey-Tupel",
     "Unknown (user, session) pair:": "Unbekanntes (Nutzer-, Sitzungs-) Paar:",
     "Session already verified!": "Sitzung bereits verifiziert!",
-    "WARNING: Session already verified, but keys do NOT MATCH!": "ACHTUNG: Sitzung bereits verifiziert, aber die Schlüssel passen NICHT ZUSAMMEN!",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "WARNUNG: Die Sitzung wurde bereits verifiziert, aber die Schlüssel passen NICHT ZUSAMMEN!",
     "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!": "ACHTUNG: SCHLÜSSEL-VERIFIZIERUNG FEHLGESCHLAGEN! Der Signierschlüssel für %(userId)s und Sitzung %(deviceId)s ist \"%(fprint)s\", was nicht mit dem bereitgestellten Schlüssel \"%(fingerprint)s\" übereinstimmt. Das könnte bedeuten, dass deine Kommunikation abgehört wird!",
     "Never send encrypted messages to unverified sessions from this session": "Sende niemals verschlüsselte Nachrichten von dieser Sitzung zu unverifizierten Sitzungen",
     "Never send encrypted messages to unverified sessions in this room from this session": "Sende niemals verschlüsselte Nachrichten von dieser Sitzung zu unverifizierten Sitzungen in diesem Raum",
     "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.": "Durch die Änderung des Passworts werden derzeit alle Ende-zu-Ende-Verschlüsselungsschlüssel in allen Sitzungen zurückgesetzt, sodass der verschlüsselte Chat-Verlauf nicht mehr lesbar ist, es sei denn, du exportierst zuerst deine Raumschlüssel und importierst sie anschließend wieder. In Zukunft wird dies verbessert werden.",
-    "Delete %(count)s sessions|other": "Lösche %(count)s Sitzungen",
+    "Delete %(count)s sessions|other": "%(count)s Sitzungen löschen",
     "Backup is not signed by any of your sessions": "Die Sicherung wurde von keiner deiner Sitzungen unterzeichnet",
-    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Dein Passwort wurde erfolgreich geändert. Du erhälst keine Push-Benachrichtigungen zu anderen Sitzungen, bis du dich wieder bei diesen anmeldst",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Dein Passwort wurde erfolgreich geändert. Du erhältst keine Push-Benachrichtigungen zu anderen Sitzungen, bis du dich wieder bei diesen anmeldest",
     "Notification sound": "Benachrichtigungston",
     "Set a new custom sound": "Setze einen neuen benutzerdefinierten Ton",
     "Browse": "Durchsuche",
@@ -1451,13 +1451,13 @@
     "Filter": "Filtern",
     "Filter rooms…": "Räume filtern…",
     "You have %(count)s unread notifications in a prior version of this room.|one": "Du hast %(count)s ungelesene Benachrichtigungen in einer früheren Version dieses Raumes.",
-    "Go Back": "Gehe zurück",
+    "Go Back": "Zurückgehen",
     "Notification Autocomplete": "Benachrichtigung Autovervollständigen",
     "If disabled, messages from encrypted rooms won't appear in search results.": "Wenn deaktiviert, werden Nachrichten von verschlüsselten Räumen nicht in den Ergebnissen auftauchen.",
-    "This user has not verified all of their sessions.": "Dieser Benutzer hat nicht alle seine Sitzungen verifiziert.",
-    "You have verified this user. This user has verified all of their sessions.": "Du hast diese/n Nutzer!n verifiziert. Er/Sie hat alle seine/ihre Sitzungen verifiziert.",
+    "This user has not verified all of their sessions.": "Diese:r Benutzer:in hat nicht alle seine/ihre Sitzungen verifiziert.",
+    "You have verified this user. This user has verified all of their sessions.": "Du hast diese/n Nutzer:in verifiziert. Er/Sie hat alle seine/ihre Sitzungen verifiziert.",
     "Your key share request has been sent - please check your other sessions for key share requests.": "Deine Schlüsselanfrage wurde gesendet - sieh in deinen anderen Sitzungen nach der Schlüsselanfrage.",
-    "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.": "Schlüsselanfragen werden automatisch an deine anderen Sitzungen gesendet. Wenn du sie abgelehnt oder ignoriert hast klicke hier, um die Schlüssel erneut anzufordern.",
+    "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.": "Schlüsselanfragen werden automatisch an deine anderen Sitzungen gesendet. Wenn du sie abgelehnt oder ignoriert hast, klicke hier, um die Schlüssel erneut anzufordern.",
     "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Wenn deine anderen Sitzungen nicht über den Schlüssel für diese Nachricht verfügen, kannst du die Nachricht nicht entschlüsseln.",
     "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Fordere die Verschlüsselungsschlüssel aus deinen anderen Sitzungen erneut an</requestLink>.",
     "Room %(name)s": "Raum %(name)s",
@@ -1490,12 +1490,12 @@
     "Use bots, bridges, widgets and sticker packs": "Benutze Bots, Bridges, Widgets und Sticker-Packs",
     "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Wenn du dein Passwort änderst, werden alle Ende-zu-Ende-Verschlüsselungsschlüssel für alle deine Sitzungen zurückgesetzt, sodass der verschlüsselte Chat-Verlauf nicht mehr lesbar ist. Richte ein Schlüssel-Backup ein oder exportiere deine Raumschlüssel aus einer anderen Sitzung, bevor du dein Passwort zurücksetzst.",
     "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.": "Du wurdest von allen Sitzungen abgemeldet und erhälst keine Push-Benachrichtigungen mehr. Um die Benachrichtigungen wieder zu aktivieren, melde dich auf jedem Gerät erneut an.",
-    "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Aktualisiere diese Sitzung, damit sie andere Sitzungen verifizieren kann, indem sie dir Zugang zu verschlüsselten Nachrichten gewährt und sie für andere Benutzer als vertrauenswürdig markiert.",
+    "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Aktualisiere diese Sitzung, damit sie andere Sitzungen verifizieren kann, indem sie dir Zugang zu verschlüsselten Nachrichten gewährt und sie für andere Benutzer:innen als vertrauenswürdig markiert.",
     "Sign out and remove encryption keys?": "Abmelden und Verschlüsselungsschlüssel entfernen?",
     "Sign in to your Matrix account on <underlinedServerName />": "Melde dich bei deinem Matrix-Konto auf <underlinedServerName /> an",
     "Enter your password to sign in and regain access to your account.": "Gib dein Passwort ein, um dich anzumelden und wieder Zugang zu deinem Konto zu erhalten.",
     "Sign in and regain access to your account.": "Melden dich an und erhalte wieder Zugang zu deinem Konto.",
-    "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Du kannst dich nicht bei deinem Konto anmelden. Bitte kontaktiere deinen Homeserver-Administrator für weitere Informationen.",
+    "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Du kannst dich nicht bei deinem Konto anmelden. Bitte kontaktiere deine Homeserver-Administration für weitere Informationen.",
     "Sign In or Create Account": "Anmelden oder Account erstellen",
     "Use your account or create a new one to continue.": "Benutze deinen Account oder erstellen einen neuen, um fortzufahren.",
     "Create Account": "Account erstellen",
@@ -1528,7 +1528,7 @@
     "Summary": "Zusammenfassung",
     "Document": "Dokument",
     "Explore": "Erkunde",
-    "Explore rooms": "Erkunde Räume",
+    "Explore rooms": "Räume erkunden",
     "Maximize apps": "Apps maximieren",
     "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Dein bereitgestellter Signaturschlüssel passt zu dem Schlüssel, der von %(userId)s's Sitzung %(deviceId)s empfangen wurde. Sitzung wird als verifiziert markiert.",
     "Match system theme": "An System-Design anpassen",
@@ -1545,7 +1545,7 @@
     "Discovery options will appear once you have added a phone number above.": "Entdeckungsoptionen werden angezeigt, sobald eine Telefonnummer hinzugefügt wurde.",
     "Close preview": "Vorschau schließen",
     "Loading room preview": "Lade Raumvorschau",
-    "Join the discussion": "Trete der Diskussion bei",
+    "Join the discussion": "Tritt der Diskussion bei",
     "Remove for everyone": "Für alle entfernen",
     "Remove for me": "Für mich entfernen",
     "Create your Matrix account on <underlinedServerName />": "Erstelle dein Matrix-Konto auf <underlinedServerName />",
@@ -1555,7 +1555,7 @@
     "Remove %(phone)s?": "%(phone)s entfernen?",
     "Remove recent messages by %(user)s": "Letzte Nachrichten von %(user)s entfernen",
     "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "Du bist dabei %(count)s Nachrichten von %(user)s zu löschen, was nicht rückgängig gemacht werden kann. Fortfahren?",
-    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "Du bist dabei eine Nachrichten von %(user)s zu löschen, was nicht rückgängig gemacht werden kann. Fortfahren?",
+    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "Du bist dabei, eine Nachricht von %(user)s zu löschen. Das kann nicht rückgängig gemacht werden. Fortfahren?",
     "Remove %(count)s messages|other": "%(count)s Nachrichten entfernen",
     "Remove %(count)s messages|one": "Eine Nachricht entfernen",
     "Remove recent messages": "Letzte Nachrichten entfernen",
@@ -1568,72 +1568,72 @@
     "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s hat die alternativen Adressen %(addresses)s für diesen Raum entfernt.",
     "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s hat die alternative Adresse %(addresses)s für diesen Raum entfernt.",
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s hat die alternative Adresse für diesen Raum geändert.",
-    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s hat die Haupt- und Alternativadresse für diesen Raum geändert.",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s hat die Haupt- und Alternativadressen für diesen Raum geändert.",
     "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s entfernte die Ausschluss-Regel für Nutzer!nnen, die %(glob)s entsprechen",
     "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s entfernte die Ausschluss-Regel für Räume, die %(glob)s entsprechen",
     "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s entfernte die Ausschluss-Regel für Server, die %(glob)s entsprechen",
     "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s entfernte die Ausschluss-Regel, die %(glob)s entspricht",
-    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s aktualisierte die Ausschluss-Regel für Nutzer, die aufgrund von %(reason)s %(glob)s entsprechen",
+    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s aktualisierte die Ausschluss-Regel für Nutzer:innen, die aufgrund von %(reason)s %(glob)s entsprechen",
     "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s aktualisierte die Ausschluss-Regel für Räume, die aufgrund von %(reason)s %(glob)s entsprechen",
     "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s aktualisierte die Ausschluss-Regel für Server, die aufgrund von %(reason)s %(glob)s entsprechen",
     "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s aktualisierte eine Ausschluss-Regel, die wegen %(reason)s %(glob)s entspricht",
     "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s erstellte eine Ausschluss-Regel für Nutzer, die wegen %(reason)s %(glob)s entspricht",
     "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s erstellt eine Ausschluss-Regel für Räume, die %(glob)s aufgrund von %(reason)s entspricht",
     "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s erstellte eine Ausschluss-Regel für Server, die aufgrund von %(reason)s %(glob)s entsprechen",
-    "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s erstellt eine Ausschluss-Regel, die aufgrund von %(reason)s %(glob)s entsprechen",
+    "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s erstellte eine Ausschluss-Regel, die aufgrund von %(reason)s %(glob)s entspricht",
     "Do you want to chat with %(user)s?": "Möchtest du mit %(user)s chatten?",
     "<userName/> wants to chat": "<userName/> möchte mit dir chatten",
     "Start chatting": "Chat starten",
-    "Reject & Ignore user": "Ablehnen & Nutzer ignorieren",
+    "Reject & Ignore user": "Ablehnen & Nutzer:in ignorieren",
     "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ändert eine Ausschluss-Regel von %(oldGlob)s nach %(newGlob)s, wegen %(reason)s",
     "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ändert eine Ausschluss-Regel für Räume von %(oldGlob)s nach %(newGlob)s, wegen %(reason)s",
     "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Auf den Server turn.matrix.org zurückgreifen, falls deine Heimserver keine Anruf-Assistenz anbietet (deine IP-Adresse wird während eines Anrufs geteilt)",
     "Show more": "Mehr zeigen",
-    "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.": "Diese Sitzung <b>speichert deine Schlüssel nicht</b>, du kannst sie aber an die Schlüsselsicherung anschließen.",
+    "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.": "Diese Sitzung <b>sichert deine Schlüssel nicht</b>, aber du hast eine vorhandene Sicherung, die du wiederherstellen und in Zukunft hinzufügen kannst.",
     "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Verbinde diese Sitzung mit deiner Schlüsselsicherung bevor du dich abmeldest, um den Verlust von Schlüsseln zu vermeiden.",
     "This backup is trusted because it has been restored on this session": "Dieser Sicherung wird vertraut, da sie während dieser Sitzung wiederhergestellt wurde",
     "Enable desktop notifications for this session": "Desktop-Benachrichtigungen für diese Sitzung aktivieren",
     "Enable audible notifications for this session": "Aktiviere die akustischen Benachrichtigungen für diese Sitzung",
-    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integrationsserver können für dich Widgets einstellen, Raum-Einladungen verschicken oder deine Berechtigungen setzen.",
+    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integrationsmanager erhalten Konfigurationsdaten und können Widgets modifizieren, Raumeinladungen verschicken und in deinem Namen Berechtigungslevel setzen.",
     "Read Marker lifetime (ms)": "Gültigkeitsdauer der Gelesen-Markierung (ms)",
     "Read Marker off-screen lifetime (ms)": "Gültigkeitsdauer der Gelesen-Markierung außerhalb des Bildschirms (ms)",
     "Session key:": "Sitzungsschlüssel:",
     "A session's public name is visible to people you communicate with": "Der öffentliche Sitzungsname ist sichtbar für Personen, mit denen du kommunizierst",
     "Sounds": "Töne",
     "Upgrade the room": "Raum hochstufen",
-    "Enable room encryption": "Verschlüsselung aktivieren",
-    "This message cannot be decrypted": "Diese Nachricht konnte nicht entschlüsselt werden",
-    "Encrypted by an unverified session": "Verschlüsselt von einer unbekannten Sitzung",
+    "Enable room encryption": "Raumverschlüsselung aktivieren",
+    "This message cannot be decrypted": "Diese Nachricht kann nicht entschlüsselt werden",
+    "Encrypted by an unverified session": "Verschlüsselt von einer nicht verifizierten Sitzung",
     "Unencrypted": "Unverschlüsselt",
     "Encrypted by a deleted session": "Verschlüsselt von einer gelöschten Sitzung",
-    "The encryption used by this room isn't supported.": "Die Verschlüsselung, die dieser Raum verwendet, wird nicht unterstützt.",
-    "React": "Reaktion hinzufügen",
+    "The encryption used by this room isn't supported.": "Die von diesem Raum verwendete Verschlüsselung wird nicht unterstützt.",
+    "React": "Reagieren",
     "e.g. my-room": "z.B. mein-raum",
-    "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Verwende einen Identitätsserver um mit einer E-Mail-Adresse einzuladen. <default>Benutzer den Standard-Identitätsserver (%(defaultIdentityServerName)s)</default> oder konfiguriere einen in den <settings>Einstellungen</settings>.",
-    "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Verwende einen Identitätsserver um mit einer E-Mail-Adresse einzuladen. Diese können in den <settings>Einstellungen</settings> konfiguriert werden.",
-    "Create a public room": "Erstelle einen öffentlichen Raum",
+    "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Verwende einen Identitätsserver, um per E-Mail einzuladen. <default>Nutze den Standard-Identitätsserver (%(defaultIdentityServerName)s)</default> oder konfiguriere einen in den <settings>Einstellungen</settings>.",
+    "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Verwende einen Identitätsserver, um mit einer E-Mail-Adresse einzuladen. Diese können in den <settings>Einstellungen</settings> konfiguriert werden.",
+    "Create a public room": "Öffentlichen Raum erstellen",
     "Show advanced": "Weitere Einstellungen anzeigen",
     "Verify session": "Sitzung verifizieren",
     "Session key": "Sitzungsschlüssel",
     "Recent Conversations": "Letzte Unterhaltungen",
-    "Report Content to Your Homeserver Administrator": "Inhalte an den Administrator deines Heimservers melden",
-    "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Wenn du diese Nachricht meldest wird dessen einzigartige 'event ID' an den Administrator deines Heimservers übermittelt. Wenn die Nachrichten in diesem Raum verschlüsselt sind wird dein Administrator nicht in der Lage sein den Text zu lesen oder Medien einzusehen.",
+    "Report Content to Your Homeserver Administrator": "Inhalte an die Administration deines Heimservers melden",
+    "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Wenn du diese Nachricht meldest, wird die eindeutige Event-ID an die Administration deines Heimservers übermittelt. Wenn die Nachrichten in diesem Raum verschlüsselt sind, wird deine Heimserver-Administration nicht in der Lage sein, Nachrichten zu lesen oder Medien einzusehen.",
     "Send report": "Bericht senden",
     "Enter recovery passphrase": "Gib die Wiederherstellungspassphrase ein",
     "Enter recovery key": "Wiederherstellungspassphrase eingeben",
-    "Report Content": "Inhalte melden",
+    "Report Content": "Inhalt melden",
     "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Gib eine E-Mail-Adresse an um dein Konto wiederherstellen zu können. Die E-Mail-Adresse kann auch genutzt werden um deinen Kontakt zu finden.",
     "Enter your custom homeserver URL <a>What does this mean?</a>": "Gib eine andere Heimserver-Adresse an <a>Was bedeutet das?</a>",
     "%(creator)s created and configured the room.": "%(creator)s hat den Raum erstellt und konfiguriert.",
     "Set up with a recovery key": "Mit einem Wiederherstellungsschlüssel einrichten",
-    "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Bewahre ihn sicher auf, wie in einem Passwort-Manager oder einem Safe.",
+    "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Bewahre eine Kopie an einem sicheren Ort, wie einem Passwort-Manager oder in einem Safe auf.",
     "Your recovery key": "Dein Wiederherstellungsschlüssel",
     "Copy": "In Zwischenablage kopieren",
     "Make a copy of your recovery key": "Speichere deinen Wiederherstellungsschlüssel",
-    "Sends a message as html, without interpreting it as markdown": "Verschickt eine Nachricht im html-Format, ohne sie in Markdown zu formatieren",
+    "Sends a message as html, without interpreting it as markdown": "Verschickt eine Nachricht im HTML-Format, ohne sie als Markdown zu darzustellen",
     "Show rooms with unread notifications first": "Räume mit ungelesenen Benachrichtigungen zuerst zeigen",
     "Show shortcuts to recently viewed rooms above the room list": "Kurzbefehle zu den kürzlich gesichteten Räumen über der Raumliste anzeigen",
-    "Use Single Sign On to continue": "Benutze Single Sign-On um fortzufahren",
+    "Use Single Sign On to continue": "Single-Sign-On zum Fortfahren nutzen",
     "Confirm adding this email address by using Single Sign On to prove your identity.": "Bestätige die hinzugefügte E-Mail-Adresse mit Single Sign-On, um deine Identität nachzuweisen.",
     "Single Sign On": "Single Sign-On",
     "Confirm adding email": "Bestätige hinzugefügte E-Mail-Addresse",
@@ -1643,23 +1643,23 @@
     "%(name)s is requesting verification": "%(name)s fordert eine Verifizierung an",
     "Failed to set topic": "Das Festlegen des Themas ist fehlgeschlagen",
     "Command failed": "Befehl fehlgeschlagen",
-    "Could not find user in room": "Der Benutzer konnte im Raum nicht gefunden werden",
+    "Could not find user in room": "Benutzer:in konnte nicht im Raum gefunden werden",
     "Click the button below to confirm adding this email address.": "Klicke unten auf die Schaltfläche, um die hinzugefügte E-Mail-Adresse zu bestätigen.",
-    "Confirm adding phone number": "Bestätige hinzugefügte Telefonnummer",
+    "Confirm adding phone number": "Hinzugefügte Telefonnummer bestätigen",
     "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ändert eine Ausschluss-Regel für Server von %(oldGlob)s nach %(newGlob)s wegen %(reason)s",
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s erneuert eine Ausschluss-Regel von %(oldGlob)s nach %(newGlob)s wegen %(reason)s",
     "Not Trusted": "Nicht vertraut",
     "Manually Verify by Text": "Verifiziere manuell mit einem Text",
     "Interactively verify by Emoji": "Verifiziere interaktiv mit Emojis",
     "Support adding custom themes": "Unterstütze das Hinzufügen von benutzerdefinierten Designs",
-    "Ask this user to verify their session, or manually verify it below.": "Bitte diesen Nutzer, seine Sitzung zu verifizieren, oder verifiziere diesen unten manuell.",
+    "Ask this user to verify their session, or manually verify it below.": "Bitte diese/n Nutzer:in, seine/ihre Sitzung zu verifizieren, oder verifiziere diese unten manuell.",
     "a few seconds from now": "in ein paar Sekunden",
     "Manually verify all remote sessions": "Verifiziere alle Remotesitzungen",
     "Confirm the emoji below are displayed on both sessions, in the same order:": "Bestätige, dass die unten angezeigten Emojis auf beiden Sitzungen in der selben Reihenfolge angezeigt werden:",
     "Verify this session by confirming the following number appears on its screen.": "Verfiziere diese Sitzung, indem du bestätigst, dass die folgende Nummer auf ihrem Bildschirm erscheint.",
     "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Warte auf deine andere Sitzung,%(deviceName)s /%(deviceId)s), um zu verfizieren…",
     "How fast should messages be downloaded.": "Wie schnell Nachrichten heruntergeladen werden sollen.",
-    "Compare a unique set of emoji if you don't have a camera on either device": "Vergleiche eine einmalige Reihe von Emoji, sofern du an keinem Gerät eine Kamera hast",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Vergleiche eine einmalige Reihe von Emojis, sofern du an keinem Gerät eine Kamera hast",
     "Waiting for %(displayName)s to verify…": "Warte darauf, dass %(displayName)s bestätigt…",
     "Cancelling…": "Abbrechen…",
     "They match": "Sie passen zueinander",
@@ -1671,24 +1671,24 @@
     "Workspace: %(networkName)s": "Arbeitsbereich: %(networkName)s",
     "Channel: %(channelName)s": "Kanal: %(channelName)s",
     "Show less": "Weniger zeigen",
-    "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Achtung</b>: Du solltest die Schlüsselsicherung nur auf einem vertrauenswürdigen Gerät einrichten.",
-    "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.": "Melde dich an um die ausschließlich in dieser Sitzung gespeicherten Verschlüsselungsschlüssel wiederherzustellen. Du benötigst sie, um deine verschlüsselten Nachrichten in jeder Sitzung zu lesen.",
+    "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Achtung</b>: Du solltest die Schlüsselsicherung nur von einem vertrauenswürdigen Computer aus einrichten.",
+    "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.": "Melde dich an, um die ausschließlich in dieser Sitzung gespeicherten Verschlüsselungsschlüssel wiederherzustellen. Du benötigst sie, um deine verschlüsselten Nachrichten in jeder Sitzung zu lesen.",
     "Forgotten your password?": "Passwort vergessen?",
     "You're signed out": "Du wurdest abgemeldet",
-    "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.": "Achtung: Deine persönlichen Daten (inclusive der Verschlüsselungsschlüssel) sind noch in dieser Sitzung gespeichert. Lösche diese Daten wenn du die Sitzung nicht mehr benötigst oder dich mit einem anderen Konto anmelden möchtest.",
+    "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.": "Achtung: Deine persönlichen Daten (einschließlich Verschlüsselungsschlüssel) sind noch in dieser Sitzung gespeichert. Lösche diese Daten, wenn du diese Sitzung nicht mehr benötigst, oder dich mit einem anderen Konto anmelden möchtest.",
     "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Bestätige das Löschen dieser Sitzung indem du dich mittels Single Sign-On anmeldest um deine Identität nachzuweisen.",
     "Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "Bestätige das Löschen dieser Sitzung indem du dich mittels Single Sign-On anmeldest um deine Identität nachzuweisen.",
     "Confirm deleting these sessions": "Bestätige das Löschen dieser Sitzungen",
-    "Click the button below to confirm deleting these sessions.|other": "Klicke den Button um das Löschen dieser Sitzungen zu bestätigen.",
-    "Click the button below to confirm deleting these sessions.|one": "Klicke den Button um das Löschen dieser Sitzung zu bestätigen.",
+    "Click the button below to confirm deleting these sessions.|other": "Klicke den Knopf, um das Löschen dieser Sitzungen zu bestätigen.",
+    "Click the button below to confirm deleting these sessions.|one": "Klicke den Knopf, um das Löschen dieser Sitzung zu bestätigen.",
     "Clear all data in this session?": "Alle Daten dieser Sitzung löschen?",
-    "Clear all data": "Daten löschen",
+    "Clear all data": "Alle Daten löschen",
     "Confirm your account deactivation by using Single Sign On to prove your identity.": "Bestätige das Löschen deines Kontos indem du dich mittels Single Sign-On anmeldest um deine Identität nachzuweisen.",
     "Confirm account deactivation": "Konto löschen bestätigen",
-    "Confirm your identity by entering your account password below.": "Bestätige deine Identität indem du dein Passwort unten eingibst.",
+    "Confirm your identity by entering your account password below.": "Bestätige deine Identität, indem du unten dein Kontopasswort eingibst.",
     "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Bestätige deine Identität indem du diesen Login von einer deiner anderen Sitzungen verifizierst um Zugriff auf deine verschlüsselten Nachrichten zu erhalten.",
-    "Enter your account password to confirm the upgrade:": "Gib dein Passwort ein um die Aktualisierung zu bestätigen:",
-    "You'll need to authenticate with the server to confirm the upgrade.": "Du musst dich am Server authentifizieren um die Aktualisierung zu bestätigen.",
+    "Enter your account password to confirm the upgrade:": "Gib dein Kontopasswort ein, um die Aktualisierung zu bestätigen:",
+    "You'll need to authenticate with the server to confirm the upgrade.": "Du musst dich am Server authentifizieren, um die Aktualisierung zu bestätigen.",
     "Enter your recovery passphrase a second time to confirm it.": "Gib deine Wiederherstellungspassphrase zur Bestätigung erneut ein.",
     "Confirm your recovery passphrase": "Bestätige deine Wiederherstellungspassphrase",
     "Please enter your recovery passphrase a second time to confirm.": "Bitte gib deine Wiederherstellungspassphrase ein zweites Mal ein um sie zu bestätigen.",
@@ -1702,15 +1702,15 @@
     "Error adding ignored user/server": "Fehler beim Hinzufügen eines ignorierten Nutzers/Servers",
     "None": "Keine",
     "Ban list rules - %(roomName)s": "Verbotslistenregeln - %(roomName)s",
-    "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.": "Füge hier Benutzer!nnen und Server hinzu, die du ignorieren willst. Verwende Sternchen, damit %(brand)s mit beliebigen Zeichen übereinstimmt. Bspw. würde <code>@bot: *</code> alle Benutzer!nnen ignorieren, die auf einem Server den Namen 'bot' haben.",
-    "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.": "Ignorieren von Personen erfolgt über Sperrlisten. Wenn eine Sperrliste abonniert wird, werden die von dieser Liste blockierten Benutzer!nnen/Server ausgeblendet.",
+    "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.": "Füge hier Benutzer!nnen und Server hinzu, die du ignorieren willst. Verwende Sternchen, damit %(brand)s mit beliebigen Zeichen übereinstimmt. Bspw. würde <code>@bot: *</code> alle Benutzer:innen ignorieren, die auf einem Server den Namen 'bot' haben.",
+    "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.": "Das Ignorieren von Personen erfolgt über Sperrlisten. Wenn eine Sperrliste abonniert wird, werden die von dieser Liste blockierten Benutzer:innen und Server ausgeblendet.",
     "Personal ban list": "Persönliche Sperrliste",
-    "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.": "Deine persönliche Sperrliste enthält alle Benutzer!nnen/Server, von denen du persönlich keine Nachrichten sehen willst. Nachdem du den ersten Benutzer/Server ignoriert hast, wird in der Raumliste \"Meine Sperrliste\" angezeigt - bleibe in diesem Raum, um die Sperrliste aufrecht zu halten.",
+    "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.": "Deine persönliche Sperrliste enthält alle Benutzer:innen/Server, von denen du persönlich keine Nachrichten sehen willst. Nachdem du den ersten Benutzer/Server ignoriert hast, wird in der Raumliste \"Meine Sperrliste\" angezeigt - bleibe in diesem Raum, um die Sperrliste aufrecht zu halten.",
     "Server or user ID to ignore": "Zu ignorierende Server- oder Benutzer-ID",
     "eg: @bot:* or example.org": "z.B. @bot:* oder example.org",
     "Subscribed lists": "Abonnierte Listen",
     "Subscribing to a ban list will cause you to join it!": "Eine Verbotsliste abonnieren bedeutet ihr beizutreten!",
-    "If this isn't what you want, please use a different tool to ignore users.": "Wenn dies nicht das ist, was du willst, verwende ein anderes Tool, um Benutzer!nnen zu ignorieren.",
+    "If this isn't what you want, please use a different tool to ignore users.": "Wenn dies nicht das ist, was du willst, verwende ein anderes Tool, um Benutzer:innen zu ignorieren.",
     "Subscribe": "Abonnieren",
     "Always show the window menu bar": "Fenstermenüleiste immer anzeigen",
     "Show tray icon and minimize window to it on close": "Taskleistensymbol anzeigen und Fenster beim Schließen dorthin minimieren",
@@ -1728,7 +1728,7 @@
     "Verify all your sessions to ensure your account & messages are safe": "Verifiziere alle deine Sitzungen, um dein Konto und deine Nachrichten zu schützen",
     "Verify your other session using one of the options below.": "Verifiziere deine andere Sitzung mit einer der folgenden Optionen.",
     "You signed in to a new session without verifying it:": "Du hast dich in einer neuen Sitzung angemeldet ohne sie zu verifizieren:",
-    "Other users may not trust it": "Andere Benutzer vertrauen ihr vielleicht nicht",
+    "Other users may not trust it": "Andere Benutzer:innen vertrauen ihr vielleicht nicht",
     "Upgrade": "Hochstufen",
     "Verify the new login accessing your account: %(name)s": "Verifiziere die neue Anmeldung an deinem Konto: %(name)s",
     "From %(deviceName)s (%(deviceId)s)": "Von %(deviceName)s (%(deviceId)s)",
@@ -1742,7 +1742,7 @@
     "Cross-signing public keys:": "Öffentliche Cross-Signing-Schlüssel:",
     "in memory": "im Speicher",
     "Cross-signing private keys:": "Private Cross-Signing-Schlüssel:",
-    "in secret storage": "im sicheren Speicher",
+    "in secret storage": "im Schlüsselspeicher",
     "Self signing private key:": "Selbst signierter privater Schlüssel:",
     "cached locally": "lokal zwischengespeichert",
     "not found locally": "lokal nicht gefunden",
@@ -1752,21 +1752,21 @@
     "in account data": "in den Kontodaten",
     "Homeserver feature support:": "Home-Server-Funktionsunterstützung:",
     "exists": "existiert",
-    "Delete sessions|other": "Lösche Sitzungen",
-    "Delete sessions|one": "Lösche Sitzung",
+    "Delete sessions|other": "Sitzungen löschen",
+    "Delete sessions|one": "Sitzung löschen",
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Alle Sitzungen einzeln verifizieren, anstatt auch Sitzungen zu vertrauen, die durch Cross-Signing verifiziert sind.",
     "Securely cache encrypted messages locally for them to appear in search results, using ": "Der Zwischenspeicher für die lokale Suche in verschlüsselten Nachrichten benötigt ",
-    " to store messages from ": " um Nachrichten zu speichern von ",
+    " to store messages from ": " um Nachrichten von ",
     "%(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 benötigt weitere Komponenten um verschlüsselte Nachrichten lokal zu durchsuchen. Wenn du diese Funktion testen möchtest kannst du dir deine eigene Version von %(brand)s Desktop mit der <nativeLink>integrierten Suchfunktion bauen</nativeLink>.",
     "Backup has a <validity>valid</validity> signature from this user": "Die Sicherung hat eine <validity>gültige</validity> Signatur dieses Benutzers",
-    "Backup has a <validity>invalid</validity> signature from this user": "Die Sicherung hat eine <validity>ungültige</validity> Signatur dieses Benutzers",
+    "Backup has a <validity>invalid</validity> signature from this user": "Die Sicherung hat eine <validity>ungültige</validity> Signatur von diesem/r Benutzer!n",
     "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "Die Sicherung hat eine <validity>gültige</validity> Signatur von einer <verify>verifizierten</verify> Sitzung <device></device>",
     "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "Die Sicherung hat eine <validity>gültige</validity> Signatur von einer <verify>nicht verifizierten</verify> Sitzung <device></device>",
     "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "Die Sicherung hat eine <validity>ungültige</validity> Signatur von einer <verify>verifizierten</verify> Sitzung <device></device>",
     "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "Die Sicherung hat eine <validity>ungültige</validity> Signatur von einer <verify>nicht verifizierten</verify> Sitzung <device></device>",
     "Your keys are <b>not being backed up from this session</b>.": "Deine Schlüssel werden <b>nicht von dieser Sitzung gesichert</b>.",
-    "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "Du verwendest aktuell <server></server> um andere Benutzer zu finden und gefunden zu werden. Du kannst deinen Identitätsserver unten ändern.",
-    "Invalid theme schema.": "Ungültiges Design Schema.",
+    "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "Zur Zeit verwendest du <server></server>, um Kontakte zu finden und von anderen gefunden zu werden. Du kannst deinen Identitätsserver weiter unten ändern.",
+    "Invalid theme schema.": "Ungültiges Designschema.",
     "Error downloading theme information.": "Fehler beim herunterladen des Themas.",
     "Theme added!": "Design hinzugefügt!",
     "Custom theme URL": "URL des benutzerdefinierten Designs",
@@ -1776,29 +1776,29 @@
     "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Benenne deine Sitzungen, melde dich aus den Sitzungen ab oder <a>verifiziere sie in deinen Benutzereinstellungen</a>.",
     "Error changing power level requirement": "Fehler beim Ändern der Anforderungen für Benutzerrechte",
     "Error changing power level": "Fehler beim Ändern der Benutzerrechte",
-    "Your email address hasn't been verified yet": "Deine E-Mail Adresse wurde noch nicht verifiziert",
-    "Verify the link in your inbox": "Verifiziere den Link in deinem Nachrichteneingang",
-    "Complete": "Fertig",
-    "Revoke": "Zurückziehen",
+    "Your email address hasn't been verified yet": "Deine E-Mail-Adresse wurde noch nicht überprüft",
+    "Verify the link in your inbox": "Verifiziere den Link in deinem Posteingang",
+    "Complete": "Abschließen",
+    "Revoke": "Widerrufen",
     "Share": "Teilen",
-    "You have not verified this user.": "Du hast diesen Benutzer nicht verifiziert.",
-    "Everyone in this room is verified": "Jeder in diesem Raum ist verifiziert",
+    "You have not verified this user.": "Du hast diese:n Nutzer:in nicht verifiziert.",
+    "Everyone in this room is verified": "Alle in diesem Raum sind verifiziert",
     "Mod": "Mod",
     "Invite only": "Nur auf Einladung",
-    "Scroll to most recent messages": "Springe zur neusten Nachricht",
+    "Scroll to most recent messages": "Zur neusten Nachricht springen",
     "No recent messages by %(user)s found": "Keine neuen Nachrichten von %(user)s gefunden",
-    "Try scrolling up in the timeline to see if there are any earlier ones.": "Versuche nach oben zu scrollen um zu sehen ob sich dort frühere Nachrichten befinden.",
+    "Try scrolling up in the timeline to see if there are any earlier ones.": "Versuche nach oben zu scrollen, um zu sehen ob sich dort frühere Nachrichten befinden.",
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Dies kann bei vielen Nachrichten einige Zeit dauern. Bitte lade die Anwendung in dieser Zeit nicht neu.",
-    "Deactivate user?": "Benutzer deaktivieren?",
-    "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?": "Beim Deaktivieren wird der Benutzer abgemeldet und ein erneutes Anmelden verhindert. Zusätzlich wird er aus allen Räumen entfernt. Diese Aktion kann nicht rückgängig gemacht werden. Bist du sicher dass du diesen Benutzer deaktivieren willst?",
-    "Deactivate user": "Benutzer deaktivieren",
-    "Failed to deactivate user": "Deaktivieren des Benutzers fehlgeschlagen",
+    "Deactivate user?": "Nutzer!n deaktivieren?",
+    "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?": "Beim Deaktivieren wird dieser/s Nutzer!n/s abgemeldet und ein erneutes Anmelden verhindert. Zusätzlich wird sie/er aus allen Räumen entfernt. Diese Aktion kann nicht rückgängig gemacht werden. Bist du sicher, dass du diese/n Nutzer!n deaktivieren willst?",
+    "Deactivate user": "Nutzer!n deaktivieren",
+    "Failed to deactivate user": "Deaktivieren des/der Nutzer!n fehlgeschlagen",
     "Send a reply…": "Sende eine Antwort…",
     "Send a message…": "Sende eine Nachricht…",
     "Bold": "Fett",
     "Italics": "Kursiv",
     "Strikethrough": "Durchgestrichen",
-    "Code block": "Quelltext",
+    "Code block": "Code-Block",
     "Recent rooms": "Letzte Räume",
     "Loading …": "Lade …",
     "Join the conversation with an account": "Tritt der Unterhaltung mit einem Konto bei",
@@ -1806,33 +1806,33 @@
     "Re-join": "Wieder beitreten",
     "You were banned from %(roomName)s by %(memberName)s": "Du wurdest von %(memberName)s aus %(roomName)s verbannt",
     "Something went wrong with your invite to %(roomName)s": "Bei deiner Einladung zu %(roomName)s ist ein Fehler aufgetreten",
-    "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "Während der Verifizierung deiner Einladung ist ein Fehler (%(errcode)s) aufgetreten. Du kannst diese Information einem Raum-Administrator weitergeben.",
+    "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "Während der Verifizierung deiner Einladung ist ein Fehler (%(errcode)s) aufgetreten. Du kannst diese Information einem/r Raum-Administrator:in weitergeben.",
     "You can only join it with a working invite.": "Du kannst nur mit einer gültigen Einladung beitreten.",
-    "Try to join anyway": "Versuche trotzdem beizutreten",
-    "You can still join it because this is a public room.": "Du kannst trotzdem beitreten da dies ein öffentlicher Raum ist.",
+    "Try to join anyway": "Dennoch versuchen beizutreten",
+    "You can still join it because this is a public room.": "Du kannst dennoch beitreten, da es ein öffentlicher Raum ist.",
     "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Diese Einladung zu %(roomName)s wurde an die Adresse %(email)s gesendet, die nicht zu deinem Konto gehört",
     "Link this email with your account in Settings to receive invites directly in %(brand)s.": "Verbinde diese E-Mail-Adresse in den Einstellungen mit deinem Konto um die Einladungen direkt in %(brand)s zu erhalten.",
     "This invite to %(roomName)s was sent to %(email)s": "Diese Einladung zu %(roomName)s wurde an %(email)s gesendet",
     "Use an identity server in Settings to receive invites directly in %(brand)s.": "Verknüpfe einen Identitätsserver in den Einstellungen um die Einladungen direkt in %(brand)s zu erhalten.",
     "Share this email in Settings to receive invites directly in %(brand)s.": "Teile diese E-Mail-Adresse in den Einstellungen um Einladungen direkt in %(brand)s zu erhalten.",
-    "%(roomName)s can't be previewed. Do you want to join it?": "Für %(roomName)s kann keine Vorschau erzeugt werden. Möchtest du den Raum betreten?",
-    "This room doesn't exist. Are you sure you're at the right place?": "Dieser Raum existiert nicht. Bist du sicher dass du hier richtig bist?",
-    "Try again later, or ask a room admin to check if you have access.": "Versuche es später erneut oder bitte einen Raum-Administrator deine Zutrittsrechte zu überprüfen.",
-    "%(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>.": "Beim Betreten des Raums ist ein Fehler aufgetreten %(errcode)s. Wenn du denkst dass diese Meldung nicht korrekt ist <issueLink>sende bitte einen Fehlerbericht</issueLink>.",
-    "%(count)s unread messages including mentions.|other": "%(count)s ungelesene Nachrichten, inklusive Erwähnungen.",
+    "%(roomName)s can't be previewed. Do you want to join it?": "Vorschau von %(roomName)s kann nicht angezeigt werden. Möchtest du den Raum betreten?",
+    "This room doesn't exist. Are you sure you're at the right place?": "Dieser Raum existiert nicht. Bist du sicher, dass du hier richtig bist?",
+    "Try again later, or ask a room admin to check if you have access.": "Versuche es später erneut oder bitte eine/n Raum-Administrator:in zu prüfen, ob du berechtigt bist.",
+    "%(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 wurde, beim Versuch den Raum zu betreten, zurückgegeben. Wenn du denkst dass diese Meldung nicht korrekt ist, <issueLink>erstelle bitte einen Fehlerbericht</issueLink>.",
+    "%(count)s unread messages including mentions.|other": "%(count)s ungelesene Nachrichten einschließlich Erwähnungen.",
     "%(count)s unread messages including mentions.|one": "1 ungelesene Erwähnung.",
     "%(count)s unread messages.|other": "%(count)s ungelesene Nachrichten.",
     "%(count)s unread messages.|one": "1 ungelesene Nachricht.",
     "Unread mentions.": "Ungelesene Erwähnungen.",
     "Unread messages.": "Ungelesene Nachrichten.",
-    "This room has already been upgraded.": "Dieser Raum wurde bereits hochgestuft.",
-    "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Dieser Raum läuft mit der Raumversion <roomVersion />, welcher dieser Heimserver als <i>instabil</i> markiert hat.",
+    "This room has already been upgraded.": "Diese Raum wurde bereits aktualisiert.",
+    "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Dieser Raum läuft mit der Raumversion <roomVersion />, welche dieser Heimserver als <i>instabil</i> markiert hat.",
     "Unknown Command": "Unbekannter Befehl",
     "Unrecognised command: %(commandText)s": "Unbekannter Befehl: %(commandText)s",
-    "Hint: Begin your message with <code>//</code> to start it with a slash.": "Hinweis: Beginne deine Nachricht mit <code>//</code> um sie mit einem Querstrich zu beginnen.",
+    "Hint: Begin your message with <code>//</code> to start it with a slash.": "Hinweis: Beginne deine Nachricht mit <code>//</code>, um sie mit einem Schrägstrich zu beginnen.",
     "Send as message": "Als Nachricht senden",
     "Failed to connect to integration manager": "Fehler beim Verbinden mit dem Integrationsserver",
-    "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Konnte die Einladung nicht zurückziehen. Der Server hat ein vorübergehendes Problem oder du besitzt nicht die nötigen Rechte um die Einladung zurückzuziehen.",
+    "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Die Einladung konnte nicht zurückgezogen werden. Der Server hat möglicherweise ein vorübergehendes Problem oder du hast nicht ausreichende Berechtigungen, um die Einladung zurückzuziehen.",
     "Mark all as read": "Alle als gelesen markieren",
     "Local address": "Lokale Adresse",
     "Published Addresses": "Öffentliche Adresse",
@@ -1841,28 +1841,28 @@
     "No other published addresses yet, add one below": "Keine anderen öffentlichen Adressen vorhanden, füge unten eine hinzu",
     "New published address (e.g. #alias:server)": "Neue öffentliche Adresse (z.B. #alias:server)",
     "Local Addresses": "Lokale Adressen",
-    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Erstelle Adressen für diesen Raum, damit andere Benutzer den Raum auf deinem Heimserver (%(localDomain)s) finden können",
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Erstelle Adressen für diesen Raum, damit andere Nutzer:innen den Raum auf deinem Heimserver (%(localDomain)s) finden können",
     "Waiting for you to accept on your other session…": "Warte auf die Bestätigung in deiner anderen Sitzung…",
     "Waiting for %(displayName)s to accept…": "Warte auf die Annahme von %(displayName)s …",
     "Accepting…": "Annehmen…",
     "Start Verification": "Starte Verifikation",
     "Messages in this room are end-to-end encrypted.": "Nachrichten in diesem Raum sind Ende-zu-Ende verschlüsselt.",
-    "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Diese Nachrichten sind verschlüsselt und nur du und der Empfänger habt die Schlüssel um sie zu entschlüsseln.",
+    "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Diese Nachrichten sind verschlüsselt und nur du und der/die Empfänger:in haben die Schlüssel, um sie zu entschlüsseln.",
     "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "In verschlüsselten Räumen sind deine Nachrichten verschlüsselt und nur du und der Empfänger habt die Schlüssel um sie zu entschlüsseln.",
-    "Verify User": "Benutzer verifizieren",
-    "For extra security, verify this user by checking a one-time code on both of your devices.": "Verifiziere den Benutzer, durch Vergleichen eines Einmal-Codes auf euren beiden Geräten, um die Sicherheit zu erhöhen.",
+    "Verify User": "Nutzer!n verifizieren",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "Für zusätzliche Sicherheit, verifiziere diese/n Nutzer!n, durch Vergleichen eines Einmal-Codes auf euren beiden Geräten.",
     "Your messages are not secure": "Deine Nachrichten sind nicht sicher",
     "One of the following may be compromised:": "Eines der folgenden könnte kompromittiert sein:",
     "Your homeserver": "Dein Heimserver",
-    "The homeserver the user you’re verifying is connected to": "Der Heimserver an dem der zu verifizierende Benutzer angemeldet ist",
-    "Yours, or the other users’ internet connection": "Deine Internetverbindung oder die des anderen Benutzers",
-    "Yours, or the other users’ session": "Deine Sitzung oder die des anderen Benutzers",
+    "The homeserver the user you’re verifying is connected to": "Der Heimserver, an dem der/die zu verifizierende Nutzer:in angemeldet ist",
+    "Yours, or the other users’ internet connection": "Deine oder die Internetverbindung des Gegenüber",
+    "Yours, or the other users’ session": "Deine Sitzung oder die des Gegenüber",
     "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> in %(roomName)s",
     "This client does not support end-to-end encryption.": "Diese Anwendung unterstützt keine Ende-zu-Ende-Verschlüsselung.",
-    "Verify by scanning": "Mit Scannen eines QR Codes verifizieren",
-    "If you can't scan the code above, verify by comparing unique emoji.": "Wenn du den obenstehenden Code nicht scannen kannst versuche es mit der Emoji Verifikation.",
-    "Verify all users in a room to ensure it's secure.": "Verifiziere alle Benutzer in einem Raum um die vollständige Sicherheit zu gewährleisten.",
-    "In encrypted rooms, verify all users to ensure it’s secure.": "Verifiziere alle Benutzer in verschlüsselten Räumen um die vollständige Sicherheit zu gewährleisten.",
+    "Verify by scanning": "Verifizierung durch QR-Code-Scannen",
+    "If you can't scan the code above, verify by comparing unique emoji.": "Wenn du den obigen Code nicht scannen kannst, verifiziere stattdessen durch den Emoji-Vergleich.",
+    "Verify all users in a room to ensure it's secure.": "Verifiziere alle Benutzer:innen in einem Raum um die vollständige Sicherheit zu gewährleisten.",
+    "In encrypted rooms, verify all users to ensure it’s secure.": "Verifiziere alle Benutzer:innen in verschlüsselten Räumen um die vollständige Sicherheit zu gewährleisten.",
     "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Du hast %(deviceName)s (%(deviceId)s) erfolgreich verifiziert!",
     "Verified": "Verifiziert",
     "Start verification again from the notification.": "Starte die Verifikation aus der Benachrichtigung erneut.",
@@ -1873,15 +1873,15 @@
     "You cancelled verification.": "Du hast die Verifikation abgebrochen.",
     "Verification cancelled": "Verifikation abgebrochen",
     "Compare emoji": "Vergleiche Emojis",
-    "Message Actions": "Nachrichten Aktionen",
-    "Show image": "Zeige Bild",
-    "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Du ignorierst diesen Benutzer, deshalb werden seine Nachrichten nicht angezeigt. <a>Trotzdem anzeigen.</a>",
+    "Message Actions": "Nachrichtenaktionen",
+    "Show image": "Bild anzeigen",
+    "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Du hast diese/n Nutzer!n ignoriert, sodass seine/ihre Nachricht ausgeblendet ist. <a>Dennoch anzeigen.</a>",
     "You accepted": "Du hast angenommen",
     "You declined": "Du hast abgelehnt",
     "You cancelled": "Du hast abgebrochen",
     "Accepting …": "Annehmen …",
     "Declining …": "Ablehnen …",
-    "You sent a verification request": "Du hast eine Verifikationsanfrage gesendet",
+    "You sent a verification request": "Du hast eine Verifizierungsanfrage gesendet",
     "Show all": "Alle zeigen",
     "Reactions": "Reaktionen",
     "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> hat mit %(content)s reagiert</reactedWith>",
@@ -1903,15 +1903,15 @@
     "Quick Reactions": "Praktische Reaktionen",
     "Cancel search": "Suche abbrechen",
     "Any of the following data may be shared:": "Die folgenden Daten können geteilt werden:",
-    "Your avatar URL": "Deine Avatar URL",
-    "Your user ID": "Deine Benutzer ID",
+    "Your avatar URL": "Deine Avatar-URL",
+    "Your user ID": "Deine Nutzer-ID",
     "Your theme": "Dein Design",
     "%(brand)s URL": "%(brand)s URL",
-    "Room ID": "Raum ID",
-    "Widget ID": "Widget ID",
-    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Wenn du dieses Widget verwendest können Daten <helpIcon /> zu %(widgetDomain)s und deinem Integrationsserver übertragen werden.",
-    "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Wenn du dieses Widget verwendest können Daten <helpIcon /> zu %(widgetDomain)s übertragen werden.",
-    "Widgets do not use message encryption.": "Widgets verschlüsseln deine Nachrichten nicht.",
+    "Room ID": "Raum-ID",
+    "Widget ID": "Widget-ID",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Wenn du dieses Widget verwendest, können Daten <helpIcon /> zu %(widgetDomain)s und deinem Integrationsserver übertragen werden.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Wenn du dieses Widget verwendest, können Daten <helpIcon /> zu %(widgetDomain)s übertragen werden.",
+    "Widgets do not use message encryption.": "Widgets verwenden keine Nachrichtenverschlüsselung.",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Bitte <newIssueLink>erstelle ein neues Issue</newIssueLink> auf GitHub damit wir diesen Fehler untersuchen können.",
     "Rotate Left": "Nach links drehen",
     "Rotate counter-clockwise": "Gegen den Uhrzeigersinn drehen",
@@ -1921,7 +1921,7 @@
     "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)shaben keine Änderung vorgenommen",
     "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)shat %(count)s mal keine Änderung vorgenommen",
     "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)shat keine Änderung vorgenommen",
-    "Some characters not allowed": "Manche Zeichen sind nicht erlaubt",
+    "Some characters not allowed": "Einige Zeichen sind nicht erlaubt",
     "Enter a server name": "Gibt einen Servernamen ein",
     "Looks good": "Das sieht gut aus",
     "Can't find this server or its room list": "Kann diesen Server oder seine Raumliste nicht finden",
@@ -1937,13 +1937,13 @@
     "%(networkName)s rooms": "%(networkName)s Räume",
     "Matrix rooms": "Matrix Räume",
     "Close dialog": "Dialog schließen",
-    "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Bitte teile uns mit was schiefgelaufen ist oder erstelle ein Github Issue und beschreibe das Problem.",
+    "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Bitte teile uns mit, was schief lief - oder besser, erstelle ein GitHub-Issue, das das Problem beschreibt.",
     "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Warnung: Dein Browser wird nicht unterstützt. Die Anwendung kann instabil sein.",
     "Notes": "Notizen",
-    "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.": "Wenn du mehr Informationen hast die uns bei Untersuchung des Problems helfen (z.B. was du gerade getan hast, Raum IDs, Benutzer IDs, etc.) gib sie bitte hier an.",
+    "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.": "Wenn du mehr Informationen hast, die uns bei Untersuchung des Problems helfen (z.B. was du gerade getan hast, Raum-IDs, Benutzer-IDs, etc.), gib sie bitte hier an.",
     "Removing…": "Löschen…",
-    "Destroy cross-signing keys?": "Cross-signing Schlüssel löschen?",
-    "Clear cross-signing keys": "Entferne Cross-signing Schlüssel",
+    "Destroy cross-signing keys?": "Cross-Signing-Schlüssel zerstören?",
+    "Clear cross-signing keys": "Cross-Signing-Schlüssel löschen",
     "Enable end-to-end encryption": "Ende-zu-Ende Verschlüsselung aktivieren",
     "You can’t disable this later. Bridges & most bots won’t work yet.": "Du kannst dies später nicht mehr ändern. Bridges und die meisten Bots werden nicht funktionieren.",
     "Server did not require any authentication": "Der Server benötigt keine Authentifizierung",
@@ -1951,15 +1951,15 @@
     "Are you sure you want to deactivate your account? This is irreversible.": "Bist du sicher dass du dein Konto deaktivieren möchtest? Dies kann nicht rückgängig gemacht werden.",
     "There was a problem communicating with the server. Please try again.": "Bei der Kommunikation mit dem Server ist ein Fehler aufgetreten. Bitte versuche es erneut.",
     "View Servers in Room": "Zeige Server im Raum",
-    "Verification Requests": "Verifikationsanfragen",
+    "Verification Requests": "Verifizierungsanfrage",
     "Integrations are disabled": "Integrationen sind deaktiviert",
     "Integrations not allowed": "Integrationen sind nicht erlaubt",
-    "Failed to invite the following users to chat: %(csvUsers)s": "Fehler beim Einladen der folgenden Benutzer: %(csvUsers)s",
-    "Something went wrong trying to invite the users.": "Beim Einladen der Benutzer ist ein Fehler aufgetreten.",
-    "Failed to find the following users": "Kann die folgenden Benutzer nicht finden",
-    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Die folgenden Benutzer konnten nicht eingeladen werden, da sie nicht existieren oder ungültig sind: %(csvNames)s",
+    "Failed to invite the following users to chat: %(csvUsers)s": "Einladen der folgenden Nutzer:innen fehlgeschlagen: %(csvUsers)s",
+    "Something went wrong trying to invite the users.": "Beim Einladen der Nutzer:innen lief etwas schief.",
+    "Failed to find the following users": "Folgenden Nutzer:innen konnten nicht gefunden werden",
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Folgende Nutzer:innen konnten nicht eingeladen werden, da sie nicht existieren oder ungültig sind: %(csvNames)s",
     "a new master key signature": "Eine neue Hauptschlüssel Signatur",
-    "a new cross-signing key signature": "Eine neue cross-signing Schlüssel Signatur",
+    "a new cross-signing key signature": "Eine neue Cross-Signing-Schlüsselsignatur",
     "a device cross-signing signature": "Eine Geräte Schlüssel Signatur",
     "a key signature": "Eine Schlüssel Signatur",
     "Your password": "Dein Passwort",
@@ -1986,9 +1986,9 @@
     "If you didn’t sign in to this session, your account may be compromised.": "Wenn du dich nicht bei dieser Sitzung angemeldet hast, ist dein Konto möglicherweise gefährdet.",
     "This wasn't me": "Das war ich nicht",
     "Please fill why you're reporting.": "Bitte gib an, weshalb du einen Fehler meldest.",
-    "Automatically invite users": "Benutzer automatisch einladen",
-    "Upgrade private room": "Privaten Raum hochstufen",
-    "Upgrade public room": "Öffentlichen Raum hochstufen",
+    "Automatically invite users": "Nutzer:innen automatisch einladen",
+    "Upgrade private room": "Privaten Raum aktualisieren",
+    "Upgrade public room": "Öffentlichen Raum aktualisieren",
     "This usually only affects how the room is processed on the server. If you're having problems with your %(brand)s, please <a>report a bug</a>.": "Dies wirkt sich normalerweise nur darauf aus, wie der Raum auf dem Server verarbeitet wird. Wenn du Probleme mit deinem %(brand)s hast, <a>melde bitte einen Bug</a>.",
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Du wirst diesen Raum von <oldVersion /> zu <newVersion /> aktualisieren.",
     "Missing session data": "Fehlende Sitzungsdaten",
@@ -2001,7 +2001,7 @@
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Die Datei ist <b>zu groß</b>, um hochgeladen zu werden. Die maximale Dateigröße ist %(limit)s.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Einige Dateien sind <b>zu groß</b>, um hochgeladen zu werden. Die maximale Dateigröße ist %(limit)s.",
     "Verify other session": "Andere Sitzung verifizieren",
-    "Verification Request": "Verifikationsanfrage",
+    "Verification Request": "Verifizierungsanfrage",
     "Upload %(count)s other files|other": "%(count)s andere Dateien hochladen",
     "Upload %(count)s other files|one": "%(count)s andere Datei hochladen",
     "A widget would like to verify your identity": "Ein Widget möchte deine Identität verifizieren",
@@ -2013,7 +2013,7 @@
     "Successfully restored %(sessionCount)s keys": "%(sessionCount)s Schlüssel erfolgreich wiederhergestellt",
     "Reload": "Neu laden",
     "Take picture": "Foto machen",
-    "User Status": "Benutzerstatus",
+    "User Status": "Nutzerstatus",
     "Country Dropdown": "Landauswahl",
     "Recovery key mismatch": "Nicht übereinstimmende Wiederherstellungsschlüssel",
     "Incorrect recovery passphrase": "Falsche Wiederherstellungspassphrase",
@@ -2052,14 +2052,14 @@
     "Continue with previous account": "Mit vorherigen Konto fortfahren",
     "<a>Log in</a> to your new account.": "Mit deinem neuen Konto <a>anmelden</a>.",
     "You can now close this window or <a>log in</a> to your new account.": "Du kannst dieses Fenster jetzt schließen oder dich mit deinem neuen Konto <a>anmelden</a>.",
-    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Deine neue Sitzung ist nun verifiziert. Sie hat Zugriff auf deine verschlüsselten Nachrichten, und andere Benutzer sehen sie als vertrauenswürdig an.",
-    "Your new session is now verified. Other users will see it as trusted.": "Deine neue Sitzung ist nun verifiziert. Andere Benutzer sehen sie als vertrauenswürdig an.",
+    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Deine neue Sitzung ist nun verifiziert. Sie hat Zugriff auf deine verschlüsselten Nachrichten, und andere Benutzer:innen sehen sie als vertrauenswürdig an.",
+    "Your new session is now verified. Other users will see it as trusted.": "Deine neue Sitzung ist nun verifiziert. Andere Benutzer:innen sehen sie als vertrauenswürdig an.",
     "well formed": "wohlgeformt",
     "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Wenn du <server /> nicht verwenden willst, um Kontakte zu finden und von anderen gefunden zu werden, trage unten einen anderen Identitätsserver ein.",
-    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Wenn du einen sicherheitsrelevaten Fehler melden möchtest, lies bitte die Matrix.org  <a>Security Disclosure Policy</a>.",
-    "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "Beim Ändern der Anforderungen für Benutzerrechte ist ein Fehler aufgetreten. Stelle sicher dass du die nötigen Berechtigungen besitzt und versuche es erneut.",
-    "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "Beim Ändern der Benutzerrechte ist ein Fehler aufgetreten. Stelle sicher dass du die nötigen Berechtigungen besitzt und versuche es erneut.",
-    "Unable to share email address": "E-Mail Adresse konnte nicht geteilt werden",
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Um ein Matrix-bezogenes Sicherheitsproblem zu melden, lies bitte die Matrix.org <a>Sicherheitsrichtlinien</a>.",
+    "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "Beim Ändern der Anforderungen für Benutzerrechte ist ein Fehler aufgetreten. Stelle sicher, dass du die nötigen Berechtigungen besitzt und versuche es erneut.",
+    "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "Beim Ändern der Benutzerrechte ist ein Fehler aufgetreten. Stelle sicher, dass du die nötigen Berechtigungen besitzt und versuche es erneut.",
+    "Unable to share email address": "E-Mail-Adresse kann nicht geteilt werden",
     "Please enter verification code sent via text.": "Gib den Verifikationscode ein, den du empfangen hast.",
     "Almost there! Is your other session showing the same shield?": "Fast geschafft! Zeigt deine andere Sitzung das gleiche Schild?",
     "Almost there! Is %(displayName)s showing the same shield?": "Fast geschafft! Wird bei %(displayName)s das gleiche Schild angezeigt?",
@@ -2069,12 +2069,12 @@
     "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s haben %(count)s mal nichts geändert",
     "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Das Löschen von Cross-Signing-Schlüsseln ist dauerhaft. Jeder, mit dem du dich verifiziert hast, bekommt Sicherheitswarnungen angezeigt. Du möchtest dies mit ziemlicher Sicherheit nicht tun, es sei denn, du hast jedes Gerät verloren, von dem aus du ein Cross-Signing durchführen kannst.",
     "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Das Löschen aller Daten aus dieser Sitzung ist dauerhaft. Verschlüsselte Nachrichten gehen verloren, sofern deine Schlüssel nicht gesichert wurden.",
-    "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Wenn du diesen Benutzer verifizierst werden seine Sitzungen für dich und deine Sitzungen für ihn als vertrauenswürdig markiert.",
+    "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Wenn du diese/e Nutzer!n verifizierst werden seine/ihre Sitzungen für dich und deine Sitzungen für ihn/sie als vertrauenswürdig markiert.",
     "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.": "Verifiziere dieses Gerät, um es als vertrauenswürdig zu markieren. Das Vertrauen in dieses Gerät gibt dir und anderen Benutzern zusätzliche Sicherheit, wenn ihr Ende-zu-Ende verschlüsselte Nachrichten verwendet.",
     "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Verifiziere dieses Gerät und es wird es als vertrauenswürdig markiert. Benutzer, die sich bei dir verifiziert haben, werden diesem Gerät auch vertrauen.",
     "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Dein %(brand)s erlaubt dir nicht, eine Integrationsverwaltung zu verwenden, um dies zu tun. Bitte kontaktiere einen Administrator.",
     "We couldn't create your DM. Please check the users you want to invite and try again.": "Wir konnten deine Direktnachricht nicht erstellen. Bitte überprüfe den Benutzer, den du einladen möchtest, und versuche es erneut.",
-    "We couldn't invite those users. Please check the users you want to invite and try again.": "Wir konnten diese Benutzer nicht einladen. Bitte überprüfe sie und versuche es erneut.",
+    "We couldn't invite those users. Please check the users you want to invite and try again.": "Wir konnten diese Benutzer:innen nicht einladen. Bitte überprüfe sie und versuche es erneut.",
     "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Starte eine Unterhaltung mit jemandem indem du seinen Namen, Benutzernamen (z.B. <userId/>) oder E-Mail-Adresse eingibst.",
     "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Lade jemanden mit seinem Namen, Benutzernamen (z.B. <userId/>) oder E-Mail-Adresse ein oder <a>teile diesen Raum</a>.",
     "Upload completed": "Hochladen abgeschlossen",
@@ -2096,9 +2096,9 @@
     "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Die Sicherung konnte nicht mit dem angegebenen Wiederherstellungsschlüssel entschlüsselt werden: Bitte überprüfe ob du den richtigen Wiederherstellungsschlüssel eingegeben hast.",
     "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Die Sicherung konnte mit diesem Wiederherstellungsschlüssel nicht entschlüsselt werden: Bitte überprüfe ob du die richtige Wiederherstellungspassphrase eingegeben hast.",
     "Nice, strong password!": "Super, ein starkes Passwort!",
-    "Other users can invite you to rooms using your contact details": "Andere Benutzer können dich mit deinen Kontaktdaten in Räume einladen",
+    "Other users can invite you to rooms using your contact details": "Andere Benutzer:innen können dich mit deinen Kontaktdaten in Räume einladen",
     "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Lege eine E-Mail für die Kontowiederherstellung fest. Verwende optional E-Mail oder Telefon, um von Anderen gefunden zu werden.",
-    "Explore Public Rooms": "Erkunde öffentliche Räume",
+    "Explore Public Rooms": "Öffentliche Räume erkunden",
     "If you've joined lots of rooms, this might take a while": "Du bist einer Menge Räumen beigetreten, das kann eine Weile dauern",
     "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s konnte die Protokollliste nicht vom Heimserver abrufen. Der Heimserver ist möglicherweise zu alt, um Netzwerke von Drittanbietern zu unterstützen.",
     "No identity server is configured: add one in server settings to reset your password.": "Kein Identitätsserver konfiguriert: Füge einen in den Servereinstellungen hinzu, um dein Kennwort zurückzusetzen.",
@@ -2131,12 +2131,12 @@
     "Room List": "Raumliste",
     "Autocomplete": "Auto-Vervollständigung",
     "Alt": "Alt",
-    "Toggle microphone mute": "Schalte Mikrophon stumm",
+    "Toggle microphone mute": "Schalte Mikrofon stumm/an",
     "Toggle video on/off": "Schalte Video an/aus",
     "Jump to room search": "Springe zur Raumsuche",
     "Close dialog or context menu": "Schließe Dialog oder Kontextmenü",
     "Cancel autocomplete": "Deaktiviere Auto-Vervollständigung",
-    "Unable to revoke sharing for email address": "Das Teilen der E-Mail-Adresse kann nicht widerrufen werden",
+    "Unable to revoke sharing for email address": "Dem Teilen der E-Mail-Adresse kann nicht widerrufen werden",
     "Unable to validate homeserver/identity server": "Heimserver/Identitätsserver nicht validierbar",
     "Without completing security on this session, it won’t have access to encrypted messages.": "Ohne Abschluss der Sicherungseinrichtung in dieser Sitzung wird sie keinen Zugriff auf verschlüsselte Nachrichten erhalten.",
     "Disable": "Deaktivieren",
@@ -2174,11 +2174,11 @@
     "Toggle this dialog": "Diesen Dialog ein-/ausblenden",
     "Move autocomplete selection up/down": "Auto-Vervollständigung nach oben/unten verschieben",
     "Opens chat with the given user": "Öffnet einen Chat mit diesem Benutzer",
-    "Sends a message to the given user": "Sendet diesem Benutzer eine Nachricht",
+    "Sends a message to the given user": "Sendet diesem/r Benutzer:in eine Nachricht",
     "Waiting for your other session to verify…": "Warte auf die Verifikation deiner anderen Sitzungen…",
     "You've successfully verified your device!": "Du hast dein Gerät erfolgreich verifiziert!",
     "QR Code": "QR-Code",
-    "To continue, use Single Sign On to prove your identity.": "Zum Fortfahren, nutze Single Sign On um deine Identität zu bestätigen.",
+    "To continue, use Single Sign On to prove your identity.": "Zum Fortfahren, nutze Single Sign-On um deine Identität zu bestätigen.",
     "Confirm to continue": "Bestätige um fortzufahren",
     "Click the button below to confirm your identity.": "Klicke den Button unten um deine Identität zu bestätigen.",
     "Confirm encryption setup": "Bestätige die Einrichtung der Verschlüsselung",
@@ -2187,8 +2187,8 @@
     "Font size": "Schriftgröße",
     "IRC display name width": "Breite des IRC Anzeigenamens",
     "Size must be a number": "Größe muss eine Zahl sein",
-    "Custom font size can only be between %(min)s pt and %(max)s pt": "Eigene Schriftgröße kann nur eine Zahl zwischen  %(min)s pt und %(max)s pt sein",
-    "Use between %(min)s pt and %(max)s pt": "Verwende eine Zahl zwischen  %(min)s pt und %(max)s pt",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "Eigene Schriftgröße kann nur eine Zahl zwischen %(min)s pt und %(max)s pt sein",
+    "Use between %(min)s pt and %(max)s pt": "Verwende eine Zahl zwischen %(min)s pt und %(max)s pt",
     "Appearance": "Erscheinungsbild",
     "Create room": "Raum erstellen",
     "Jump to oldest unread message": "Zur ältesten ungelesenen Nachricht springen",
@@ -2202,7 +2202,7 @@
     "I want to help": "Ich möchte helfen",
     "Your homeserver has exceeded its user limit.": "Dein Heimserver hat das Benutzerlimit erreicht.",
     "Your homeserver has exceeded one of its resource limits.": "Dein Heimserver hat eine seiner Ressourcengrenzen erreicht.",
-    "Contact your <a>server admin</a>.": "Kontaktiere deinen <a>Heimserver Administrator</a>.",
+    "Contact your <a>server admin</a>.": "Kontaktiere deine <a>Heimserver-Administration</a>.",
     "Ok": "Ok",
     "Set password": "Setze Passwort",
     "To return to your account in future you need to set a password": "Um dein Konto zukünftig wieder verwenden zu können, setze ein Passwort",
@@ -2225,7 +2225,7 @@
     "Address (optional)": "Adresse (optional)",
     "delete the address.": "lösche die Adresse.",
     "Use a different passphrase?": "Eine andere Passphrase verwenden?",
-    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Dein Server-Administrator hat die Ende-zu-Ende-Verschlüsselung für private Räume und Direktnachrichten standardmäßig deaktiviert.",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Deine Server-Administration hat die Ende-zu-Ende-Verschlüsselung für private Räume und Direktnachrichten standardmäßig deaktiviert.",
     "People": "Personen",
     "There was an error removing that address. It may no longer exist or a temporary error occurred.": "Beim Entfernen dieser Adresse ist ein Fehler aufgetreten. Vielleicht existiert diese nicht mehr oder es kam zu einem temporären Fehler.",
     "Set a room address to easily share your room with other people.": "Vergebe eine Raum-Adresse, um diesen Raum auf einfache Weise mit anderen Personen teilen zu können.",
@@ -2333,7 +2333,7 @@
     "Incoming voice call": "Eingehender Sprachanruf",
     "Incoming video call": "Eingehender Videoanruf",
     "Incoming call": "Eingehender Anruf",
-    "There are advanced notifications which are not shown here.": "Erweiterte Benachrichtigungen, werden hier nicht angezeigt.",
+    "There are advanced notifications which are not shown here.": "Erweiterte Benachrichtigungen werden hier nicht angezeigt.",
     "Are you sure you want to cancel entering passphrase?": "Bist du sicher, dass du die Eingabe der Passphrase abbrechen möchtest?",
     "Use your account to sign in to the latest version": "Melde dich mit deinem Account in der neuesten Version an",
     "* %(senderName)s %(emote)s": "* %(senderName)s %(emote)s",
@@ -2345,17 +2345,17 @@
     "%(brand)s iOS": "%(brand)s iOS",
     "%(brand)s X for Android": "%(brand)s X für Android",
     "We’re excited to announce Riot is now Element": "Wir freuen uns zu verkünden, dass Riot jetzt Element ist",
-    "%(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 kann verschlüsselte Nachrichten nicht sicher zwischenspeichern während es in einem Browser läuft. Verwende <desktopLink>%(brand)s Desktop</desktopLink> damit verschlüsselte Nachrichten durchsuchbar werden.",
-    "Show rooms with unread messages first": "Zeige Räume mit ungelesenen Nachrichten zuerst",
-    "Show previews of messages": "Zeige Vorschau von Nachrichten",
-    "Use default": "Verwende den Standard",
+    "%(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 kann verschlüsselte Nachrichten nicht sicher während der Ausführung im Browser durchsuchen. Benutze <desktopLink>%(brand)s Desktop</desktopLink>, um verschlüsselte Nachrichten in den Suchergebnissen angezeigt zu bekommen.",
+    "Show rooms with unread messages first": "Räume mit ungelesenen Nachrichten zuerst zeigen",
+    "Show previews of messages": "Nachrichtenvorschau anzeigen",
+    "Use default": "Standardeinstellungen benutzen",
     "Mentions & Keywords": "Erwähnungen & Schlüsselwörter",
     "Notification options": "Benachrichtigungsoptionen",
-    "Forget Room": "Vergesse Raum",
+    "Forget Room": "Raum vergessen",
     "Favourited": "Favorisiert",
     "This room is public": "Dieser Raum ist öffentlich",
     "Away": "Abwesend",
-    "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.": "Die Sitzung, die du verifizieren möchtest, unterstützt weder das scannen eines QR Codes noch eine Emoji Verifikation, welche von %(brand)s unterstützt werden. Versuche es mit einem anderen 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.": "Die Sitzung, die du verifizieren möchtest, unterstützt weder das scannen eines QR-Codes noch eine Emoji-Verifikation, welche von %(brand)s unterstützt werden. Versuche es mit einer anderen Anwendung.",
     "Edited at %(date)s": "Geändert am %(date)s",
     "Click to view edits": "Klicke um Änderungen anzuzeigen",
     "%(brand)s encountered an error during upload of:": "%(brand)s hat einen Fehler festgestellt beim hochladen von:",
@@ -2378,7 +2378,7 @@
     "A connection error occurred while trying to contact the server.": "Beim Versuch, den Server zu kontaktieren, ist ein Verbindungsfehler aufgetreten.",
     "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "Du hast sie ggf. in einem anderen Client als %(brand)s konfiguriert. Du kannst sie nicht in %(brand)s verändern, aber sie werden trotzdem angewandt.",
     "Master private key:": "Privater Hauptschlüssel:",
-    "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Setze den Schriftnamen auf eine in deinem System installierte Schriftart & %(brand)s werden versuchen sie zu verwenden.",
+    "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Setze den Schriftnamen auf eine in deinem System installierte Schriftart & %(brand)s wird versuchen, sie zu verwenden.",
     "Custom Tag": "Benutzerdefinierter Tag",
     "You’re already signed in and good to go here, but you can also grab the latest versions of the app on all platforms at <a>element.io/get-started</a>.": "Du bist bereits eingeloggt und kannst loslegen. Allerdings kannst du auch die neuesten Versionen der App für alle Plattformen unter <a>element.io/get-started</a> herunterladen.",
     "You're all caught up.": "Alles gesichtet.",
@@ -2413,16 +2413,16 @@
     "Show message previews for reactions in all rooms": "Zeige eine Nachrichtenvorschau für Reaktionen in allen Räumen an",
     "Uploading logs": "Protokolle werden hochgeladen",
     "Downloading logs": "Protokolle werden heruntergeladen",
-    "Explore public rooms": "Erkunde öffentliche Räume",
+    "Explore public rooms": "Öffentliche Räume erkunden",
     "Can't see what you’re looking for?": "Kannst du nicht finden wonach du suchst?",
-    "Explore all public rooms": "Erkunde alle öffentlichen Räume",
+    "Explore all public rooms": "Alle öffentlichen Räume erkunden",
     "%(count)s results|other": "%(count)s Ergebnisse",
     "Preparing to download logs": "Bereite das Herunterladen der Protokolle vor",
     "Download logs": "Protokolle herunterladen",
     "Unexpected server error trying to leave the room": "Unerwarteter Server-Fehler beim Versuch den Raum zu verlassen",
     "Error leaving room": "Fehler beim Verlassen des Raums",
     "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Communities v2 Prototyp. Benötigt einen kompatiblen Heimserver. Höchst experimentell - mit Vorsicht verwenden.",
-    "Explore rooms in %(communityName)s": "Erkunde Räume in %(communityName)s",
+    "Explore rooms in %(communityName)s": "Räume in %(communityName)s erkunden",
     "Set up Secure Backup": "Schlüsselsicherung einrichten",
     "Information": "Information",
     "Add another email": "Weitere E-Mail-Adresse hinzufügen",
@@ -2519,5 +2519,545 @@
     "Video conference updated by %(senderName)s": "Videokonferenz wurde von %(senderName)s aktualisiert",
     "Video conference started by %(senderName)s": "Videokonferenz wurde von %(senderName)s gestartet",
     "Ignored attempt to disable encryption": "Versuch, die Verschlüsselung zu deaktivieren, wurde ignoriert",
-    "Failed to save your profile": "Profil speichern fehlgeschlagen"
+    "Failed to save your profile": "Profil speichern fehlgeschlagen",
+    "The operation could not be completed": "Die Operation konnte nicht abgeschlossen werden",
+    "Remove messages sent by others": "Nachrichten von anderen entfernen",
+    "Starting camera...": "Starte Kamera...",
+    "Call connecting...": "Verbinde den Anruf...",
+    "Calling...": "Rufe an...",
+    "Starting microphone...": "Starte Mikrofon...",
+    "Move right": "Nach rechts schieben",
+    "Move left": "Nach links schieben",
+    "Revoke permissions": "Berechtigungen widerrufen",
+    "Unpin a widget to view it in this panel": "Widget nicht mehr anheften, um es in diesem Bereich anzuzeigen",
+    "You can only pin up to %(count)s widgets|other": "Du kannst nur bis zu %(count)s Widgets anheften",
+    "Show Widgets": "Widgets anzeigen",
+    "Hide Widgets": "Widgets verstecken",
+    "%(senderName)s declined the call.": "%(senderName)s hat den Anruf abgelehnt.",
+    "(an error occurred)": "(ein Fehler ist aufgetreten)",
+    "(their device couldn't start the camera / microphone)": "(ihr/sein Gerät konnte Kamera / Mikrophon nicht starten)",
+    "(connection failed)": "(Verbindung fehlgeschlagen)",
+    "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Alle Server sind von der Teilnahme ausgeschlossen! Dieser Raum kann nicht mehr genutzt werden.",
+    "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s hat die Server-ACLs für diesen Raum geändert.",
+    "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s hat die Server-ACLs für diesen Raum gesetzt.",
+    "The call was answered on another device.": "Der Anruf wurde an einem anderen Gerät angenommen.",
+    "Answered Elsewhere": "Anderswo beantwortet",
+    "The call could not be established": "Der Anruf konnte nicht hergestellt werden",
+    "The other party declined the call.": "Die andere Seite hat den Anruf abgelehnt.",
+    "Call Declined": "Anruf abgelehnt",
+    "Data on this screen is shared with %(widgetDomain)s": "Daten auf diesem Bildschirm werden mit %(widgetDomain)s geteilt",
+    "Modal Widget": "Modales Widget",
+    "Offline encrypted messaging using dehydrated devices": "Offline verschlüsselte Kommunikation mit Hilfe von dehydrierten Geräten",
+    "Send feedback": "Feedback senden",
+    "Report a bug": "Einen Fehler melden",
+    "Add comment": "Kommentar hinzufügen",
+    "Rate %(brand)s": "%(brand)s bewerten",
+    "Feedback sent": "Feedback gesendet",
+    "Takes the call in the current room off hold": "Beendet das Halten des Anrufs",
+    "Places the call in the current room on hold": "Den aktuellen Anruf halten",
+    "Uzbekistan": "Usbekistan",
+    "Send stickers into this room": "Stickers in diesen Raum senden",
+    "Send stickers into your active room": "Sticker in deinen aktiven Raum senden",
+    "Change which room you're viewing": "Ändern, welchen Raum du siehst",
+    "Change the topic of this room": "Das Thema von diesem Raum ändern",
+    "See when the topic changes in this room": "Sehen wenn sich das Thema in diesem Raum ändert",
+    "Change the topic of your active room": "Das Thema von deinem aktiven Raum ändern",
+    "See when the topic changes in your active room": "Sehen wenn sich das Thema in deinem aktiven Raum ändert",
+    "Change the name of this room": "Name von diesem Raum ändern",
+    "See when the name changes in this room": "Sehen wenn sich der Name in diesem Raum ändert",
+    "Change the name of your active room": "Den Namen deines aktiven Raums ändern",
+    "See when the name changes in your active room": "Sehen wenn der Name sich in deinem aktiven Raum ändert",
+    "Change the avatar of this room": "Avatar von diesem Raum ändern",
+    "See when the avatar changes in this room": "Sehen wenn der Avatar sich in diesem Raum ändert",
+    "Change the avatar of your active room": "Den Avatar deines aktiven Raums ändern",
+    "See when the avatar changes in your active room": "Sehen wenn ein Avatar in deinem aktiven Raum geändert wird",
+    "Send stickers to this room as you": "Einen Sticker in diesen Raum als du senden",
+    "See when a sticker is posted in this room": "Sehe wenn ein Sticker in diesen Raum gesendet wird",
+    "Send stickers to your active room as you": "Einen Sticker als du in deinen aktiven Raum senden",
+    "See when anyone posts a sticker to your active room": "Sehen, wenn jemand einen Sticker in deinen aktiven Raum sendet",
+    "with an empty state key": "mit einem leeren Zustandsschlüssel",
+    "with state key %(stateKey)s": "mit Zustandsschlüssel %(stateKey)s",
+    "Send <b>%(eventType)s</b> events as you in this room": "<b>%(eventType)s</b>-Events als du in diesem Raum senden",
+    "See <b>%(eventType)s</b> events posted to this room": "In diesem Raum gesendete <b>%(eventType)s</b>-Events anzeigen",
+    "Send <b>%(eventType)s</b> events as you in your active room": "<b>%(eventType)s</b>-Events als du in deinem aktiven Raum senden",
+    "See <b>%(eventType)s</b> events posted to your active room": "In deinem aktiven Raum gesendete <b>%(eventType)s</b>-Events anzeigen",
+    "The <b>%(capability)s</b> capability": "Die <b>%(capability)s</b> Fähigkeit",
+    "Send messages as you in this room": "Nachrichten als du in diesem Raum senden",
+    "Send messages as you in your active room": "Eine Nachricht als du in deinen aktiven Raum senden",
+    "See messages posted to this room": "In diesen Raum gesendete Nachrichten anzeigen",
+    "See messages posted to your active room": "In deinen aktiven Raum gesendete Nachrichten anzeigen",
+    "Send text messages as you in this room": "Textnachrichten als du in diesen Raum senden",
+    "Send text messages as you in your active room": "Textnachrichten als du in deinen aktiven Raum senden",
+    "See text messages posted to this room": "In diesen Raum gesendete Textnachrichten anzeigen",
+    "See text messages posted to your active room": "In deinen aktiven Raum gesendete Textnachrichten anzeigen",
+    "Send emotes as you in this room": "Emojis als du in diesen Raum senden",
+    "Send emotes as you in your active room": "Emojis als du in deinen aktiven Raum senden",
+    "See emotes posted to this room": "In diesem Raum gesendete Emojis anzeigen",
+    "See emotes posted to your active room": "In deinen aktiven Raum gesendete Emojis anzeigen",
+    "See videos posted to your active room": "In deinen aktiven Raum gesendete Videos anzeigen",
+    "See videos posted to this room": "In diesen Raum gesendete Videos anzeigen",
+    "Send images as you in this room": "Bilder als du in diesen Raum senden",
+    "Send images as you in your active room": "Bilder als du in deinem aktiven Raum senden",
+    "See images posted to this room": "In diesen Raum gesendete Bilder anzeigen",
+    "See images posted to your active room": "In deinen aktiven Raum gesendete Bilder anzeigen",
+    "Send videos as you in this room": "Videos als du in diesen Raum senden",
+    "Send videos as you in your active room": "Videos als du in deinen aktiven Raum senden",
+    "Send general files as you in this room": "Allgemeine Dateien als du in diesen Raum senden",
+    "Send general files as you in your active room": "Allgemeine Dateien als du in deinen aktiven Raum senden",
+    "See general files posted to your active room": "Allgemeine in deinen aktiven Raum gesendete Dateien anzeigen",
+    "See general files posted to this room": "Allgemeine in diesen Raum gesendete Dateien anzeigen",
+    "Send <b>%(msgtype)s</b> messages as you in this room": "Sende <b>%(msgtype)s</b> Nachrichten als du in diesen Raum",
+    "Send <b>%(msgtype)s</b> messages as you in your active room": "Sende <b>%(msgtype)s</b> Nachrichten als du in deinen aktiven Raum",
+    "See <b>%(msgtype)s</b> messages posted to this room": "Zeige <b>%(msgtype)s</b> Nachrichten, welche in diesen Raum gesendet worden sind",
+    "See <b>%(msgtype)s</b> messages posted to your active room": "Zeige <b>%(msgtype)s</b> Nachrichten, welche in deinen aktiven Raum gesendet worden sind",
+    "Don't miss a reply": "Verpasse keine Antwort",
+    "Enable desktop notifications": "Aktiviere Desktopbenachrichtigungen",
+    "Update %(brand)s": "Aktualisiere %(brand)s",
+    "New version of %(brand)s is available": "Neue Version von %(brand)s verfügbar",
+    "You ended the call": "Du hast den Anruf beendet",
+    "%(senderName)s ended the call": "%(senderName)s hat den Anruf beendet",
+    "Use Command + Enter to send a message": "Benutze Betriebssystemtaste + Enter um eine Nachricht zu senden",
+    "Use Ctrl + Enter to send a message": "Benutze Strg + Enter um eine Nachricht zu senden",
+    "Call Paused": "Anruf pausiert",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Verschlüsselte Nachrichten sicher lokal zwischenspeichern, um sie in Suchergebnissen finden zu können. Es werden %(size)s benötigt, um die Nachrichten von den Räumen %(rooms)s zu speichern.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Verschlüsselte Nachrichten sicher lokal zwischenspeichern, um sie in Suchergebnissen finden zu können. Es werden %(size)s benötigt, um die Nachrichten vom Raum %(rooms)s zu speichern.",
+    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Nur ihr zwei seid in dieser Konversation, außer einer von euch lädt jemanden neues ein.",
+    "This is the beginning of your direct message history with <displayName/>.": "Dies ist der Beginn deiner Direktnachrichtenhistorie mit <displayName/>.",
+    "Topic: %(topic)s (<a>edit</a>)": "Thema: %(topic)s (<a>ändern</a>)",
+    "Topic: %(topic)s ": "Thema: %(topic)s ",
+    "<a>Add a topic</a> to help people know what it is about.": "<a>Füge ein Thema hinzu</a> um Personen zu verdeutlichen um was es in ihm geht.",
+    "You created this room.": "Du hast diesen Raum erstellt.",
+    "%(displayName)s created this room.": "%(displayName)s erstellte diesen Raum.",
+    "Add a photo, so people can easily spot your room.": "Füge ein Foto hinzu, sodass Personen deinen Raum einfach finden können.",
+    "This is the start of <roomName/>.": "Dies ist der Beginn von <roomName/>.",
+    "Start a new chat": "Starte einen neuen Chat",
+    "Role": "Rolle",
+    "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Nachrichten hier sind Ende-zu-Ende-verschlüsselt. Verifiziere %(displayName)s im deren Profil - klicke auf deren 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.": "Nachrichten in diesem Raum sind Ende-zu-Ende-verschlüsselt. Wenn Personen beitreten, kannst du sie in ihrem Profil verifizieren, klicke hierfür auf deren Avatar.",
+    "Tell us below how you feel about %(brand)s so far.": "Erzähle uns wie %(brand)s dir soweit gefällt.",
+    "Please go into as much detail as you like, so we can track down the problem.": "Bitte nenne so viele Details wie du möchtest, sodass wir das Problem finden können.",
+    "Comment": "Kommentar",
+    "There are two ways you can provide feedback and help us improve %(brand)s.": "Es gibt zwei Wege wie du Feedback geben kannst und uns helfen kannst %(brand)s zu verbessern.",
+    "Please view <existingIssuesLink>existing bugs on Github</existingIssuesLink> first. No match? <newIssueLink>Start a new one</newIssueLink>.": "Bitte wirf einen Blick auf <existingIssuesLink>existierende Bugs auf Github</existingIssuesLink>. Keinen gefunden? <newIssueLink>Erstelle einen neuen</newIssueLink>.",
+    "PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> to help us track down the problem.": "PRO TIPP: Wenn du einen Bug meldest, füge bitte <debugLogsLink>Debug-Logs</debugLogsLink> hinzu um uns zu helfen das Problem zu finden.",
+    "Invite by email": "Via Email einladen",
+    "Start a conversation with someone using their name, email address or username (like <userId/>).": "Beginne eine Konversation mit jemanden unter Benutzung des Namens, der Email-Adresse oder der Matrix-ID (wie <userId/>).",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Lade jemanden unter Benutzung seines Namens, E-Mailaddresse oder Benutzername (siehe <userId/>) ein, oder <a>teile diesen Raum</a>.",
+    "Approve widget permissions": "Rechte für das Widget genehmigen",
+    "This widget would like to:": "Dieses Widget würde gerne:",
+    "Approve": "Zustimmen",
+    "Decline All": "Alles ablehnen",
+    "Go to Home View": "Zur Startseite gehen",
+    "Filter rooms and people": "Räume und Personen filtern",
+    "%(creator)s created this DM.": "%(creator)s hat diese DM erstellt.",
+    "Now, let's help you get started": "Nun, lassen Sie uns Ihnen den Einstieg erleichtern",
+    "Welcome %(name)s": "Willkommen %(name)s",
+    "Add a photo so people know it's you.": "Fügen Sie ein Foto hinzu, damit die Leute wissen, dass Sie es sind.",
+    "Great, that'll help people know it's you": "Großartig, das wird den Leuten helfen, zu wissen, dass Sie es sind",
+    "<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 für die Seite Ihrer Community</h1>\n<p>\n    Verwenden Sie die ausführliche Beschreibung, um die Community neuen Mitgliedern vorzustellen,\n    oder teilen Sie einige wichtige Links <a href=\"foo\">links</a>\n</p>\n<p>\n    Sie können sogar Bilder mit Matrix-URLs hinzufügen <img src=\"mxc://url\" />\n</p>\n",
+    "Enter phone number": "Telefonnummer eingeben",
+    "Enter email address": "E-Mail-Adresse eingeben",
+    "Open the link in the email to continue registration.": "Öffnen Sie den Link in der E-Mail, um mit der Registrierung fortzufahren.",
+    "A confirmation email has been sent to %(emailAddress)s": "Eine Bestätigungs-E-Mail wurde an %(emailAddress)s gesendet",
+    "Use the + to make a new room or explore existing ones below": "Benutze das + um einen neuen Raum zu erstellen oder darunter um existierende Räume zu suchen",
+    "Return to call": "Zurück zum Anruf",
+    "Fill Screen": "Bildschirm ausfüllen",
+    "Voice Call": "Sprachanruf",
+    "Video Call": "Videoanruf",
+    "Remain on your screen while running": "Bleiben Sie auf Ihrem Bildschirm während der Ausführung von",
+    "Remain on your screen when viewing another room, when running": "Bleiben Sie auf Ihrem Bildschirm, während Sie einen anderen Raum betrachten, wenn Sie ausführen",
+    "Zimbabwe": "Simbabwe",
+    "Zambia": "Sambia",
+    "Yemen": "Jemen",
+    "Western Sahara": "Westsahara",
+    "Wallis & Futuna": "Wallis und Futuna",
+    "Vietnam": "Vietnam",
+    "Venezuela": "Venezuela",
+    "Vatican City": "Vatikanstadt",
+    "Vanuatu": "Vanuatu",
+    "Uruguay": "Uruguay",
+    "United Arab Emirates": "Vereinigte Arabische Emirate",
+    "Ukraine": "Ukraine",
+    "Uganda": "Uganda",
+    "U.S. Virgin Islands": "Amerikanische Jungferninseln",
+    "Tuvalu": "Tuvalu",
+    "Turks & Caicos Islands": "Turks- und Caicosinseln",
+    "Turkmenistan": "Turkmenistan",
+    "Turkey": "Türkei",
+    "Tunisia": "Tunesien",
+    "Trinidad & Tobago": "Trinidad und Tobago",
+    "Tonga": "Tonga",
+    "Tokelau": "Tokelau",
+    "Togo": "Togo",
+    "Timor-Leste": "Timor-Leste",
+    "Thailand": "Thailand",
+    "Tanzania": "Tansania",
+    "Tajikistan": "Tadschikistan",
+    "Taiwan": "Taiwan",
+    "São Tomé & Príncipe": "São Tomé und Príncipe",
+    "Syria": "Syrien",
+    "Switzerland": "Schweiz",
+    "Sweden": "Schweden",
+    "Swaziland": "Swasiland",
+    "Svalbard & Jan Mayen": "Spitzbergen & Jan Mayen",
+    "Suriname": "Surinam",
+    "Sudan": "Sudan",
+    "St. Vincent & Grenadines": "St. Vincent und die Grenadinen",
+    "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": "Spanien",
+    "South Sudan": "Südsudan",
+    "South Korea": "Südkorea",
+    "South Georgia & South Sandwich Islands": "Südgeorgien & Südliche Sandwichinseln",
+    "South Africa": "Südafrika",
+    "Somalia": "Somalia",
+    "Solomon Islands": "Salomonen",
+    "Slovenia": "Slowenien",
+    "Slovakia": "Slowakei",
+    "Sint Maarten": "St. Martin",
+    "Singapore": "Singapur",
+    "Sierra Leone": "Sierra Leone",
+    "Seychelles": "Seychellen",
+    "Serbia": "Serbien",
+    "Senegal": "Senegal",
+    "Saudi Arabia": "Saudi-Arabien",
+    "San Marino": "San Marino",
+    "Samoa": "Samoa",
+    "Réunion": "Réunion",
+    "Rwanda": "Ruanda",
+    "Russia": "Russland",
+    "Romania": "Rumänien",
+    "Qatar": "Katar",
+    "Puerto Rico": "Puerto Rico",
+    "Portugal": "Portugal",
+    "Poland": "Polen",
+    "Pitcairn Islands": "Pitcairninseln",
+    "Philippines": "Philippinen",
+    "Peru": "Peru",
+    "Paraguay": "Paraguay",
+    "Papua New Guinea": "Papua-Neuguinea",
+    "Panama": "Panama",
+    "Palestine": "Palästina",
+    "Palau": "Palau",
+    "Pakistan": "Pakistan",
+    "Oman": "Oman",
+    "Norway": "Norwegen",
+    "Northern Mariana Islands": "Nördliche Marianeninseln",
+    "North Korea": "Nordkorea",
+    "Norfolk Island": "Norfolkinsel",
+    "Niue": "Niue",
+    "Nigeria": "Nigeria",
+    "Niger": "Niger",
+    "Nicaragua": "Nicaragua",
+    "New Zealand": "Neuseeland",
+    "New Caledonia": "Neukaledonien",
+    "Netherlands": "Niederlande",
+    "Nepal": "Nepal",
+    "Nauru": "Nauru",
+    "Namibia": "Namibia",
+    "Myanmar": "Myanmar",
+    "Mozambique": "Mosambik",
+    "Morocco": "Marokko",
+    "Montserrat": "Montserrat",
+    "Montenegro": "Montenegro",
+    "Mongolia": "Mongolei",
+    "Czech Republic": "Tschechische Republik",
+    "Monaco": "Monaco",
+    "Moldova": "Moldawien",
+    "Micronesia": "Mikronesien",
+    "Mexico": "Mexiko",
+    "Mayotte": "Mayotte",
+    "Mauritius": "Mauritius",
+    "Mauritania": "Mauretanien",
+    "Martinique": "Martinique",
+    "Marshall Islands": "Marshallinseln",
+    "Malta": "Malta",
+    "Mali": "Mali",
+    "Maldives": "Malediven",
+    "Malaysia": "Malaysia",
+    "Malawi": "Malawi",
+    "Madagascar": "Madagaskar",
+    "Macedonia": "Mazedonien",
+    "Macau": "Macau",
+    "Luxembourg": "Luxemburg",
+    "Lithuania": "Litauen",
+    "Liechtenstein": "Liechtenstein",
+    "Libya": "Libyen",
+    "Liberia": "Liberia",
+    "Lesotho": "Lesotho",
+    "Lebanon": "Libanon",
+    "Latvia": "Lettland",
+    "Laos": "Laos",
+    "Kyrgyzstan": "Kirgisistan",
+    "Kuwait": "Kuwait",
+    "Kosovo": "Kosovo",
+    "Kiribati": "Kiribati",
+    "Kenya": "Kenia",
+    "Kazakhstan": "Kasachstan",
+    "Jordan": "Jordanien",
+    "Jersey": "Jersey",
+    "Japan": "Japan",
+    "Jamaica": "Jamaika",
+    "Italy": "Italien",
+    "Israel": "Israel",
+    "Isle of Man": "Insel Man",
+    "Ireland": "Irland",
+    "Iraq": "Irak",
+    "Iran": "Iran",
+    "Indonesia": "Indonesien",
+    "India": "Indien",
+    "Iceland": "Island",
+    "Hungary": "Ungarn",
+    "Hong Kong": "Hongkong",
+    "Honduras": "Honduras",
+    "Heard & McDonald Islands": "Heard & McDonald-Inseln",
+    "Haiti": "Haiti",
+    "Guyana": "Guyana",
+    "Guinea-Bissau": "Guinea-Bissau",
+    "Guinea": "Guinea",
+    "Guernsey": "Guernsey",
+    "Guatemala": "Guatemala",
+    "Guam": "Guam",
+    "Guadeloupe": "Guadeloupe",
+    "Grenada": "Grenada",
+    "Greenland": "Grönland",
+    "Greece": "Griechenland",
+    "Gibraltar": "Gibraltar",
+    "Ghana": "Ghana",
+    "Germany": "Deutschland",
+    "Georgia": "Georgien",
+    "Gambia": "Gambia",
+    "Gabon": "Gabun",
+    "French Southern Territories": "Französische Süd-Territorien",
+    "French Polynesia": "Französisch-Polynesien",
+    "French Guiana": "Französisch-Guayana",
+    "France": "Frankreich",
+    "Finland": "Finnland",
+    "Fiji": "Fidschi",
+    "Faroe Islands": "Färöer-Inseln",
+    "Falkland Islands": "Falklandinseln",
+    "Ethiopia": "Äthiopien",
+    "Estonia": "Estland",
+    "Eritrea": "Eritrea",
+    "Equatorial Guinea": "Äquatorialguinea",
+    "El Salvador": "El Salvador",
+    "Egypt": "Ägypten",
+    "Ecuador": "Ecuador",
+    "Dominican Republic": "Dominikanische Republik",
+    "Dominica": "Dominica",
+    "Djibouti": "Dschibuti",
+    "Denmark": "Dänemark",
+    "Côte d’Ivoire": "Tschechische Republik",
+    "Cyprus": "Zypern",
+    "Curaçao": "Curaçao",
+    "Cuba": "Kuba",
+    "Croatia": "Kroatien",
+    "Cook Islands": "Cookinseln",
+    "Costa Rica": "Costa Rica",
+    "Congo - Kinshasa": "Republik Kongo - Kinshasa",
+    "Congo - Brazzaville": "Republik Kongo - Brazzaville",
+    "Comoros": "Komoren",
+    "Colombia": "Kolumbien",
+    "Cocos (Keeling) Islands": "Kokosinseln (Keeling)",
+    "Christmas Island": "Weihnachtsinsel",
+    "China": "China",
+    "Chile": "Chile",
+    "Chad": "Tschad",
+    "Central African Republic": "Zentralafrikanische Republik",
+    "Cayman Islands": "Kaimaninseln",
+    "Caribbean Netherlands": "Karibische Niederlande",
+    "Cape Verde": "Kap Verde",
+    "Canada": "Kanada",
+    "Cameroon": "Kamerun",
+    "Cambodia": "Kambodscha",
+    "Burundi": "Burundi",
+    "Burkina Faso": "Burkina Faso",
+    "Bulgaria": "Bulgarien",
+    "Brunei": "Brunei",
+    "British Virgin Islands": "Britische Jungferninseln",
+    "British Indian Ocean Territory": "Britisches Territorium im Indischen Ozean",
+    "Brazil": "Brasilien",
+    "Bouvet Island": "Bouvetinsel",
+    "Botswana": "Botswana",
+    "Bosnia": "Bosnien",
+    "Bolivia": "Bolivien",
+    "Bhutan": "Bhutan",
+    "Bermuda": "Bermuda",
+    "Benin": "Benin",
+    "Belize": "Belize",
+    "Belgium": "Belgien",
+    "Belarus": "Weißrussland",
+    "Barbados": "Barbados",
+    "Bangladesh": "Bangladesch",
+    "Bahrain": "Bahrain",
+    "Bahamas": "Bahamas",
+    "Azerbaijan": "Aserbaidschan",
+    "Austria": "Österreich",
+    "Australia": "Australien",
+    "Aruba": "Aruba",
+    "Armenia": "Armenien",
+    "Argentina": "Argentinien",
+    "Antigua & Barbuda": "Antigua und Barbuda",
+    "Antarctica": "Antarktis",
+    "Anguilla": "Anguilla",
+    "Angola": "Angola",
+    "Andorra": "Andorra",
+    "American Samoa": "Amerikanisch-Samoa",
+    "Algeria": "Algerien",
+    "Albania": "Albanien",
+    "Åland Islands": "Äland-Inseln",
+    "Afghanistan": "Afghanistan",
+    "United States": "Vereinigte Staaten",
+    "United Kingdom": "Großbritannien",
+    "We call the places you where you can host your account ‘homeservers’.": "Orte, an denen du dein Benutzerkonto hosten kannst, nennen wir \"Homeserver\".",
+    "Specify a homeserver": "Gib einen Homeserver an",
+    "Render LaTeX maths in messages": "Zeige LaTeX-Matheformeln in Nachrichten an",
+    "Decide where your account is hosted": "Gib an wo dein Benutzerkonto gehostet werden soll",
+    "Already have an account? <a>Sign in here</a>": "Hast du schon ein Benutzerkonto? <a>Melde dich hier an</a>",
+    "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s oder %(usernamePassword)s",
+    "Continue with %(ssoButtons)s": "Mit %(ssoButtons)s fortfahren",
+    "That username already exists, please try another.": "Dieser Benutzername existiert schon. Bitte versuche es mit einem anderen.",
+    "New? <a>Create account</a>": "Neu? <a>Erstelle ein Benutzerkonto</a>",
+    "There was a problem communicating with the homeserver, please try again later.": "Es gab ein Problem bei der Kommunikation mit dem Homseserver. Bitte versuche es später erneut.",
+    "New here? <a>Create an account</a>": "Neu hier? <a>Erstelle ein Benutzerkonto</a>",
+    "Got an account? <a>Sign in</a>": "Hast du schon ein Benutzerkonto? <a>Melde dich an</a>",
+    "Use email to optionally be discoverable by existing contacts.": "Nutze optional eine E-Mail-Adresse, um von Nutzern gefunden werden zu können.",
+    "Use email or phone to optionally be discoverable by existing contacts.": "Nutze optional eine E-Mail-Adresse oder Telefonnummer, um von Nutzern gefunden werden zu können.",
+    "Add an email to be able to reset your password.": "Füge eine E-Mail-Adresse hinzu, um dein Passwort zurücksetzen zu können.",
+    "Forgot password?": "Passwort vergessen?",
+    "That phone number doesn't look quite right, please check and try again": "Diese Telefonummer sieht nicht ganz richtig aus. Bitte überprüfe deine Eingabe und versuche es erneut",
+    "About homeservers": "Über Homeserver",
+    "Learn more": "Mehr dazu",
+    "Use your preferred Matrix homeserver if you have one, or host your own.": "Verwende einen Matrix-Homeserver deiner Wahl oder hoste deinen eigenen.",
+    "Other homeserver": "Anderer Homeserver",
+    "Sign into your homeserver": "Melde dich bei deinem Homeserver an",
+    "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "Matrix.org ist der größte öffentliche Homeserver der Welt und daher ein guter Ort für viele.",
+    "Just a heads up, if you don't add an email and forget your password, you could <b>permanently lose access to your account</b>.": "Aufgepasst: Wenn du keine E-Mail-Adresse angibst und dein Passwort vergisst, kannst du den <b>Zugriff auf deinen Account dauerhaft verlieren</b>.",
+    "Continuing without email": "Ohne E-Mail fortfahren",
+    "Reason (optional)": "Grund (optional)",
+    "Continue with %(provider)s": "Mit %(provider)s fortfahren",
+    "Homeserver": "Heimserver",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Element with an existing Matrix account on a different homeserver.": "Du kannst in den benutzerdefinierten Serveroptionen eine andere Heimserver-URL angeben, um dich bei anderen Matrixservern anzumelden.",
+    "Server Options": "Servereinstellungen",
+    "No other application is using the webcam": "Keine andere Anwendung auf die Webcam zugreift",
+    "Permission is granted to use the webcam": "Auf die Webcam zugegriffen werden darf",
+    "A microphone and webcam are plugged in and set up correctly": "Mikrofon und Webcam eingesteckt und richtig eingerichtet sind",
+    "Call failed because no microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Der Anruf ist fehlgeschlagen weil nicht auf das Mikrofon zugegriffen werden konnte. Stelle sicher, dass das Mikrofon richtig eingesteckt und eingerichtet ist.",
+    "Call failed because no webcam or microphone could not be accessed. Check that:": "Der Anruf ist fehlgeschlagen weil nicht auf das Mikrofon oder die Webcam zugegriffen werden konnte. Stelle sicher, dass:",
+    "Unable to access webcam / microphone": "Auf Webcam / Mikrofon konnte nicht zugegriffen werden",
+    "Unable to access microphone": "Es konnte nicht auf das Mikrofon zugegriffen werden",
+    "Host account on": "Benutzer*innenkonto betreiben an",
+    "Hold": "Halten",
+    "Resume": "Fortsetzen",
+    "We call the places where you can host your account ‘homeservers’.": "Den Ort, an dem du dein Benutzer*innenkonto betreibst, nennen wir „Heimserver“.",
+    "Invalid URL": "Ungültiger Link",
+    "Unable to validate homeserver": "Überprüfung des Heimservers nicht möglich",
+    "%(name)s paused": "%(name)s hat pausiert",
+    "%(peerName)s held the call": "%(peerName)s hält den Anruf",
+    "You held the call <a>Resume</a>": "Du hältst den Anruf <a>Fortsetzen</a>",
+    "sends fireworks": "sendet Feuerwerk",
+    "Sends the given message with fireworks": "Sendet die gewählte Nachricht mit Feuerwerk",
+    "sends confetti": "sendet Konfetti",
+    "Sends the given message with confetti": "Sendet die gewählte Nachricht mit Konfetti",
+    "Show chat effects": "Chat-Effekte anzeigen",
+    "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "Stellt ┬──┬ ノ( ゜-゜ノ) einer Klartextnachricht voran",
+    "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "Stellt (╯°□°）╯︵ ┻━┻ einer Klartextnachricht voran",
+    "Effects": "Effekte",
+    "You've reached the maximum number of simultaneous calls.": "Du hast die maximale Anzahl gleichzeitiger Anrufe erreicht.",
+    "Too Many Calls": "Zu viele Anrufe",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "Der Anruf ist fehlgeschlagen, weil nicht auf die Webcam oder der das Mikrofon zugegriffen werden konnte. Prüfe nach, ob:",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Der Anruf ist fehlgeschlagen, weil nicht auf das Mikrofon zugegriffen werden konnte. Prüfe noch einmal nach, ob das Mikrofon eingesteckt und richtig eingestellt ist.",
+    "You have no visible notifications.": "Du hast keine sichtbaren Benachrichtigungen.",
+    "%(name)s on hold": "%(name)s wird gehalten",
+    "You held the call <a>Switch</a>": "Du hältst den Anruf <a>Wechseln</a>",
+    "sends snowfall": "sendet Schneeflocken",
+    "Sends the given message with snowfall": "Sendet die gewählte Nachricht mit Schneeflocken",
+    "Transfer": "Übertragen",
+    "Failed to transfer call": "Anruf-Übertragung fehlgeschlagen",
+    "A call can only be transferred to a single user.": "Ein Anruf kann nur auf eine:n einzelne:n Nutzer:in übertragen werden.",
+    "Set up with a Security Key": "Mit einem Sicherheitsschlüssel einrichten",
+    "Use Security Key": "Sicherheitsschlüssel benutzen",
+    "Use Security Key or Phrase": "Sicherheitsschlüssel oder -phrase benutzen",
+    "Not a valid Security Key": "Kein gültiger Sicherheisschlüssel",
+    "This looks like a valid Security Key!": "Dies sieht aus wie ein gültiger Sicherheitsschlüssel!",
+    "Enter Security Key": "Sicherheitsschlüssel eingeben",
+    "Enter Security Phrase": "Sicherheitsphrase eingeben",
+    "Backup could not be decrypted with this Security Phrase: please verify that you entered the correct Security Phrase.": "Das Backup konnte mit dieser Sicherheitsphrase nicht entschlüsselt werden: Bitte überprüfe, ob du die richtige eingegeben hast.",
+    "Incorrect Security Phrase": "Falsche Sicherheitsphrase",
+    "Backup could not be decrypted with this Security Key: please verify that you entered the correct Security Key.": "Das Backup konnte mit diesem Sicherheitsschlüssel nicht entschlüsselt werden: Bitte überprüfe, ob du den richtigen Sicherheitsschlüssel eingegeben hast.",
+    "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "Zugriff auf geheimen Speicher nicht möglich. Bitte überprüfe, ob du die richtige Sicherheitsphrase eingegeben hast.",
+    "Invalid Security Key": "Ungültiger Sicherheitsschlüssel",
+    "Wrong Security Key": "Falscher Sicherheitsschlüssel",
+    "We recommend you change your password and Security Key in Settings immediately": "Wir empfehlen dir, dein Passwort und deinen Sicherheitsschlüssel sofort in den Einstellungen zu ändern",
+    "There was an error finding this widget.": "Fehler beim Finden dieses Widgets.",
+    "Active Widgets": "Aktive Widgets",
+    "Open dial pad": "Wähltastatur öffnen",
+    "Start a Conversation": "Beginne eine Konversation",
+    "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 Security Key.": "Sichere deine Verschlüsselungsschlüssel mit deinen Kontodaten, falls du den Zugriff auf deine Sitzungen verlierst. Deine Schlüssel werden mit einem eindeutigen Sicherheitsschlüssel gesichert.",
+    "Channel: <channelLink/>": "Kanal: <channelLink/>",
+    "Workspace: <networkLink/>": "Arbeitsraum: <networkLink/>",
+    "Dial pad": "Wähltastatur",
+    "There was an error looking up the phone number": "Beim Suchen der Telefonnummer ist ein Fehler aufgetreten",
+    "Change which room, message, or user you're viewing": "Ändere welchen Raum, Nachricht oder Nutzer:in du siehst",
+    "Unable to look up phone number": "Telefonnummer kann nicht gesucht werden",
+    "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "In dieser Sitzung wurde festgestellt, dass deine Sicherheitsphrase und dein Schlüssel für sichere Nachrichten entfernt wurden.",
+    "A new Security Phrase and key for Secure Messages have been detected.": "Eine neue Sicherheitsphrase und ein neuer Schlüssel für sichere Nachrichten wurden erkannt.",
+    "Make a copy of your Security Key": "Mache eine Kopie von deinem Sicherheitsschlüssel",
+    "Confirm your Security Phrase": "Deine Sicherheitsphrase bestätigen",
+    "Secure your backup with a Security Phrase": "Sichere dein Backup mit einer Sicherheitsphrase",
+    "Your Security Key is in your <b>Downloads</b> folder.": "Dein Sicherheitsschlüssel ist in deinem <b>Download</b>-Ordner.",
+    "Your Security Key has been <b>copied to your clipboard</b>, paste it to:": "Dein Sicherheitsschlüssel wurde <b>in die Zwischenablage kopiert</b>, füge ihn ein in:",
+    "Your Security Key": "Dein Sicherheitsschlüssel",
+    "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "Dein Sicherheitsschlüssel ist ein Sicherheitsnetz. Du kannst ihn nutzen, um den Zugriff auf deine verschlüsselten Nachrichten wiederherzustellen, falls du deine Sicherheitsphrase vergessen hast.",
+    "Repeat your Security Phrase...": "Wiederhole deine Sicherheitsphrase...",
+    "Please enter your Security Phrase a second time to confirm.": "Gib deine Sicherheitsphrase zur Bestätigung ein zweites Mal ein.",
+    "Great! This Security Phrase looks strong enough.": "Großartig! Diese Sicherheitsphrase sieht stark genug aus.",
+    "Access your secure message history and set up secure messaging by entering your Security Phrase.": "Greife auf deinen sicheren Chatverlauf zu und richte die sichere Nachrichtenübermittlung ein, indem du deine Sicherheitsphrase (z.B. einem langen Satz, den niemand errät) eingibst.",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "Wir werden eine verschlüsselte Kopie deiner Schlüssel auf unserem Server speichern. Sichere dein Backup mit einer Sicherheitsphrase (z.B. einem langen Satz, den niemand errät).",
+    "If you've forgotten your Security Key you can <button>set up new recovery options</button>": "Wenn du deinen Sicherheitsschlüssel vergessen hast, kannst du <button>neue Wiederherstellungsoptionen einrichten</button>",
+    "Access your secure message history and set up secure messaging by entering your Security Key.": "Greife auf deinen sicheren Chatverlauf zu und richte die sichere Nachrichtenübermittlung ein, indem du deinen Sicherheitsschlüssel eingibst.",
+    "If you've forgotten your Security Phrase you can <button1>use your Security Key</button1> or <button2>set up new recovery options</button2>": "Wenn du deine Sicherheitsphrase vergessen hast, kannst du <button1>deinen Sicherheitsschlüssel nutzen</button1> oder <button2>neue Wiederherstellungsoptionen einrichten</button2>",
+    "Security Key mismatch": "Nicht übereinstimmende Sicherheitsschlüssel",
+    "Set my room layout for everyone": "Setze mein Raum-Layout für alle",
+    "%(senderName)s has updated the widget layout": "%(senderName)s hat das Widget-Layout aktualisiert",
+    "Search (must be enabled)": "Suche (muss aktiviert sein)",
+    "Remember this": "Dies merken",
+    "The widget will verify your user ID, but won't be able to perform actions for you:": "Das Widget überprüft deine Nutzer-ID, kann jedoch keine Aktionen für dich ausführen:",
+    "Allow this widget to verify your identity": "Erlaube diesem Widget deine Identität zu überprüfen",
+    "Use Command + F to search": "Nutze Befehlstaste (⌘) + F zum Suchen",
+    "Use Ctrl + F to search": "Nutze Strg + F zum Suchen",
+    "Element Web is currently experimental on mobile. The native apps are recommended for most people.": "Element Web ist derzeit experimentell auf mobilen Endgeräten. Die nativen Apps werden empfohlen.",
+    "Converts the DM to a room": "Wandelt die Direktnachricht zu Raum um",
+    "Converts the room to a DM": "Wandelt den Raum zu Direktnachricht um",
+    "Something went wrong in confirming your identity. Cancel and try again.": "Bei der Bestätigung deiner Identität ist ein Fehler aufgetreten. Abbrechen und erneut versuchen.",
+    "Use app": "App verwenden",
+    "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Element Web ist experimentell auf mobilen Endgeräten. Für eine bessere Erfahrung und die neuesten Erweiterungen, nutze unsere freie, native App.",
+    "Use app for a better experience": "Nutze die App für eine bessere Erfahrung",
+    "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "Wir haben deinen Browser gebeten, sich zu merken, bei welchem Homeserver du dich anmeldest, aber dein Browser hat dies leider vergessen. Gehe zur Anmeldeseite und versuche es erneut.",
+    "Show stickers button": "Sticker-Schaltfläche anzeigen",
+    "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "Dein Homeserver hat deinen Anmeldeversuch abgelehnt. Dies könnte daran liegen, dass der Prozess einfach zu lange dauert. Bitte versuche es erneut. Wenn dies so weitergeht, wende dich bitte an deine Homeserver-Administration.",
+    "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "Dein Homeserver war nicht erreichbar und konnte dich nicht anmelden. Bitte versuche es erneut. Wenn dies so weitergeht, wende dich bitte an deine Homeserver-Administration.",
+    "We couldn't log you in": "Wir konnten dich nicht anmelden",
+    "Windows": "Fenster",
+    "Screens": "Bildschirme",
+    "Share your screen": "Deinen Bildschirm teilen",
+    "Recently visited rooms": "Kürzlich besuchte Räume",
+    "Show line numbers in code blocks": "Zeilennummern in Code-Blöcken anzeigen",
+    "Expand code blocks by default": "Code-Blöcke standardmäßig erweitern",
+    "Try again": "Erneut versuchen",
+    "Upgrade to pro": "Hochstufen zu Pro",
+    "Minimize dialog": "Dialog minimieren",
+    "Maximize dialog": "Dialog maximieren",
+    "%(hostSignupBrand)s Setup": "%(hostSignupBrand)s-Einrichtung",
+    "You should know": "Du solltest wissen",
+    "Privacy Policy": "Datenschutz-Richtlinie",
+    "Cookie Policy": "Cookie-Richtlinie",
+    "Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.": "Erfahren mehr in unserer <privacyPolicyLink />, <termsOfServiceLink /> und <cookiePolicyLink />.",
+    "Failed to connect to your homeserver. Please close this dialog and try again.": "Verbindung zum Homeserver fehlgeschlagen. Bitte schließe diesen Dialog and versuche es erneut.",
+    "Abort": "Abbrechen"
 }
diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index 118c87e153..9bbef87a69 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -31,7 +31,7 @@
     "%(senderName)s banned %(targetName)s.": "Ο χρήστης %(senderName)s έδιωξε τον χρήστη %(targetName)s.",
     "Autoplay GIFs and videos": "Αυτόματη αναπαραγωγή GIFs και βίντεο",
     "Anyone who knows the room's link, apart from guests": "Oποιοσδήποτε",
-    "%(items)s and %(lastItem)s": "%(items)s  %(lastItem)s",
+    "%(items)s and %(lastItem)s": "%(items)s και %(lastItem)s",
     "Access Token:": "Κωδικός πρόσβασης:",
     "Always show message timestamps": "Εμφάνιση πάντα της ένδειξης ώρας στα μηνύματα",
     "and %(count)s others...|one": "και ένας ακόμα...",
@@ -51,7 +51,7 @@
     "Cryptography": "Κρυπτογραφία",
     "Current password": "Τωρινός κωδικός πρόσβασης",
     "Custom level": "Προσαρμοσμένο επίπεδο",
-    "/ddg is not a command": "/ddg δεν αναγνωρίζεται ως εντολή",
+    "/ddg is not a command": "Το /ddg δεν αναγνωρίζεται ως εντολή",
     "Deactivate Account": "Απενεργοποίηση λογαριασμού",
     "Decrypt %(text)s": "Αποκρυπτογράφηση %(text)s",
     "Default": "Προεπιλογή",
@@ -60,7 +60,7 @@
     "Email": "Ηλεκτρονική διεύθυνση",
     "Email address": "Ηλεκτρονική διεύθυνση",
     "Emoji": "Εικονίδια",
-    "%(senderName)s ended the call.": "%(senderName)s τερμάτισε την κλήση.",
+    "%(senderName)s ended the call.": "Ο %(senderName)s τερμάτισε την κλήση.",
     "Error decrypting attachment": "Σφάλμα κατά την αποκρυπτογράφηση της επισύναψης",
     "Existing Call": "Υπάρχουσα κλήση",
     "Export": "Εξαγωγή",
@@ -92,7 +92,7 @@
     "Invited": "Προσκλήθηκε",
     "Invites": "Προσκλήσεις",
     "Sign in with": "Συνδεθείτε με",
-    "%(targetName)s joined the room.": "ο %(targetName)s συνδέθηκε στο δωμάτιο.",
+    "%(targetName)s joined the room.": "Ο %(targetName)s συνδέθηκε στο δωμάτιο.",
     "Jump to first unread message.": "Πηγαίνετε στο πρώτο μη αναγνωσμένο μήνυμα.",
     "%(senderName)s kicked %(targetName)s.": "Ο %(senderName)s έδιωξε τον χρήστη %(targetName)s.",
     "Kick": "Απομάκρυνση",
@@ -604,5 +604,322 @@
     "Sets the room name": "Θέτει το θέμα του δωματίου",
     "Use an identity server": "Χρησιμοποιήστε ένα διακομιστή ταυτοτήτων",
     "Your %(brand)s is misconfigured": "Οι παράμετροι του %(brand)s σας είναι λανθασμένα ρυθμισμένοι",
-    "Explore rooms": "Εξερευνήστε δωμάτια"
+    "Explore rooms": "Εξερευνήστε δωμάτια",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "Εάν χρησιμοπιείται %(brand)s σαν εγκατεστημένο Progressive Web App",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Ενα χρησιμοποιείται το %(brand)s σε συσκευή αφής",
+    "Click the button below to confirm adding this phone number.": "Πιέστε το κουμπί από κάτω για να επιβεβαίωσετε την προσθήκη του τηλεφωνικού αριθμού.",
+    "Confirm": "Επιβεβαίωση",
+    "Use custom size": "Χρησιμοποιήστε προσαρμοσμένο μέγεθος",
+    "Font size": "Μέγεθος γραμματοσειράς",
+    "Render LaTeX maths in messages": "Εμφανίστε μαθηματικά LaTeX σε μηνύματα",
+    "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": "Συνδεθήκατε στην κλήση",
+    "Guest": "Επισκέπτης",
+    "Ok": "Εντάξει",
+    "Your homeserver has exceeded its user limit.": "Ο διακομιστής σας ξεπέρασε το όριο χρηστών.",
+    "Use app": "Χρησιμοποιήστε την εφαρμογή",
+    "Use app for a better experience": "Χρησιμοποιήστε την εφαρμογή για καλύτερη εμπειρία",
+    "Enable": "Ενεργοποίηση",
+    "No": "Όχι",
+    "Yes": "Ναι",
+    "No need for symbols, digits, or uppercase letters": "Δεν χρειάζονται σύμβολα, ψηφία, ή κεφαλαία γράμματα",
+    "Use a few words, avoid common phrases": "Χρησιμοποιήστε αρκετές λέξεις, αποφύγετε συνηθισμένες φράσεις",
+    "Unknown server error": "Άγνωστο σφάλμα διακομιστή",
+    "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 είναι ήδη στο δωμάτιο",
+    "You do not have permission to invite people to this room.": "Δεν έχετε δικαίωμα να προσκαλείτε άτομα σε αυτό το δωμάτιο.",
+    "Unrecognised address": "Η διεύθυνση δεν αναγνωρίστηκε",
+    "Error leaving room": "Σφάλμα στην έξοδο από το δωμάτιο",
+    "%(num)s days ago": "%(num)s μέρες πριν",
+    "about a day ago": "σχεδόν μία μέρα πριν",
+    "%(num)s hours ago": "%(num)s ώρες πριν",
+    "about an hour ago": "σχεδόν μία ώρα πριν",
+    "%(num)s minutes ago": "%(num)s λεπτά πριν",
+    "about a minute ago": "σχεδόν ένα λεπτό πριν",
+    "a few seconds ago": "λίγα δευτερόλεπτα πριν",
+    "%(items)s and %(count)s others|one": "%(items)s και ένα ακόμα",
+    "%(items)s and %(count)s others|other": "%(items)s και %(count)s άλλα",
+    "%(names)s and %(lastPerson)s are typing …": "%(names)s και %(lastPerson)s πληκτρολογούν …",
+    "%(names)s and %(count)s others are typing …|one": "%(names)s και ένας ακόμα πληκτρολογούν …",
+    "%(names)s and %(count)s others are typing …|other": "%(names)s και %(count)s άλλοι πληκτρολογούν …",
+    "%(displayName)s is typing …": "%(displayName)s πληκτρολογεί …",
+    "Ask this user to verify their session, or manually verify it below.": "Ζητήστε από αυτόν τον χρήστη να επιβεβαιώσει την συνεδρία του, ή επιβεβαιώστε την χειροκίνητα παρακάτω.",
+    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "Ο %(name)s (%(userId)s) συνδέθηκε σε μία νέα συνεδρία χωρίς να την επιβεβαιώσει:",
+    "Verify your other session using one of the options below.": "Επιβεβαιώστε την άλλη σας συνεδρία χρησιμοποιώντας μία από τις παρακάτω επιλογές.",
+    "You signed in to a new session without verifying it:": "Συνδεθήκατε σε μια νέα συνεδρία χωρίς να την επιβεβαιώσετε:",
+    "Dark": "Σκούρο",
+    "Light": "Ανοιχτό",
+    "%(senderName)s removed the rule banning users matching %(glob)s": "Ο %(senderName)s αφαίρεσε τον κανόνα που αποκλείει τους χρήστες που ταιριάζουν με %(glob)s",
+    "%(senderName)s placed a video call. (not supported by this browser)": "Ο %(senderName)s έκανε μια κλήση βίντεο. (δεν υποστηρίζεται από το πρόγραμμα περιήγησης)",
+    "%(senderName)s placed a video call.": "Ο %(senderName)s έκανε μία κλήση βίντεο.",
+    "%(senderName)s placed a voice call. (not supported by this browser)": "Ο %(senderName)s έκανε μια ηχητική κλήση. (δεν υποστηρίζεται από το πρόγραμμα περιήγησης)",
+    "%(senderName)s placed a voice call.": "Ο %(senderName)s έκανε μία ηχητική κλήση.",
+    "%(senderName)s declined the call.": "Ο %(senderName)s απέρριψε την κλήση.",
+    "(an error occurred)": "(συνέβη ένα σφάλμα)",
+    "(their device couldn't start the camera / microphone)": "(η συσκευή δεν μπόρεσε να ανοίξει την κάμερα / μικρόφωνο)",
+    "(connection failed)": "(αποτυχία σύνδεσης)",
+    "%(senderName)s changed the alternative addresses for this room.": "Ο %(senderName)s άλλαξε την εναλλακτική διεύθυνση για αυτό το δωμάτιο.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "Ο %(senderName)s αφαίρεσε την εναλλακτική διεύθυνση %(addresses)s για αυτό το δωμάτιο.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "Ο %(senderName)s αφαίρεσε τις εναλλακτικές διευθύνσεις %(addresses)s για αυτό το δωμάτιο.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "Ο %(senderName)s πρόσθεσε τις εναλλακτικές διευθύνσεις %(addresses)s για αυτό το δωμάτιο.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "Ο %(senderName)s πρόσθεσε τις εναλλακτικές διευθύνσεις %(addresses)s για αυτό το δωμάτιο.",
+    "%(senderName)s removed the main address for this room.": "Ο %(senderName)s αφαίρεσε την κύρια διεύθυνση για αυτό το δωμάτιο.",
+    "%(senderName)s set the main address for this room to %(address)s.": "Ο %(senderName)s έθεσε την κύρια διεύθυνση αυτού του δωματίου σε %(address)s.",
+    "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Όλοι οι διακομιστές αποκλείστηκαν από την συμμετοχή! Αυτό το δωμάτιο δεν μπορεί να χρησιμοποιηθεί πλέον.",
+    "%(senderDisplayName)s changed guest access to %(rule)s": "Ο %(senderDisplayName)s άλλαξε την πρόσβαση επισκεπτών σε %(rule)s",
+    "%(senderDisplayName)s has prevented guests from joining the room.": "Ο %(senderDisplayName)s απέτρεψε τους επισκέπτες από το να μπαίνουν στο δωμάτιο.",
+    "%(senderDisplayName)s has allowed guests to join the room.": "Ο %(senderDisplayName)s επέτρεψε τους επισκέπτες να μπαίνουν στο δωμάτιο.",
+    "%(senderDisplayName)s changed the join rule to %(rule)s": "Ο %(senderDisplayName)s άλλαξε τους κανόνες εισόδου σε %(rule)s",
+    "%(senderDisplayName)s made the room invite only.": "Ο %(senderDisplayName)s άλλαξε το δωμάτιο σε \"μόνο με πρόσκληση\".",
+    "%(senderDisplayName)s made the room public to whoever knows the link.": "Ο %(senderDisplayName)s έκανε το δωμάτιο δημόσιο για όποιον γνωρίζει τον σύνδεσμο.",
+    "%(senderDisplayName)s upgraded this room.": "Ο %(senderDisplayName)s αναβάθμισε αυτό το δωμάτιο.",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "Ο %(senderDisplayName)s άλλαξε το όνομα δωματίου από %(oldRoomName)s σε %(newRoomName)s.",
+    "%(senderName)s made no change.": "Ο %(senderName)s δεν έκανε καμία αλλαγή.",
+    "Converts the DM to a room": "Μετατρέπει την προσωπική συνομιλία σε δωμάτιο",
+    "Converts the room to a DM": "Μετατρέπει το δωμάτιο σε προσωπική συνομιλία",
+    "Takes the call in the current room off hold": "Επαναφέρει την κλήση στο τρέχον δωμάτιο από την αναμονή",
+    "Places the call in the current room on hold": "Βάζει την κλήση στο τρέχον δωμάτιο σε αναμονή",
+    "Sends a message to the given user": "Στέλνει ένα μήνυμα στον δοσμένο χρήστη",
+    "Opens chat with the given user": "Ανοίγει την συνομιλία με τον δοσμένο χρήστη",
+    "Send a bug report with logs": "Στέλνει μία αναφορά σφάλματος με logs",
+    "Displays information about a user": "Εμφανίζει πληροφορίες για έναν χρήστη",
+    "Displays list of commands with usages and descriptions": "Εμφανίζει τη λίστα εντολών με τρόπους χρήσης και περιγραφές",
+    "Sends the given emote coloured as a rainbow": "Στέλνει το δοσμένο emote χρωματισμένο σαν ουράνιο τόξο",
+    "Sends the given message coloured as a rainbow": "Στέλνει το δοσμένο μήνυμα χρωματισμένο σαν ουράνιο τόξο",
+    "Session already verified!": "Η συνεδρία έχει ήδη επιβεβαιωθεί!",
+    "Unknown (user, session) pair:": "Άγνωστο ζευγάρι (χρήστης, συνεδρία):",
+    "You cannot modify widgets in this room.": "Δεν μπορείτε να τροποποιήσετε τα widget σε αυτό το δωμάτιο.",
+    "Please supply a https:// or http:// widget URL": "Παρακαλώ εισάγετε ένα widget URL με https:// ή http://",
+    "Please supply a widget URL or embed code": "Παρακαλώ εισάγετε ένα widget URL ή ενσωματώστε κώδικα",
+    "Adds a custom widget by URL to the room": "Προσθέτει ένα προσαρμοσμένο widget μέσω URL στο δωμάτιο",
+    "Opens the Developer Tools dialog": "Ανοίγει το παράθυρο Εργαλείων για Προγραμματιστές",
+    "Could not find user in room": "Δεν βρέθηκε ο χρήστης στο δωμάτιο",
+    "Failed to set topic": "Αποτυχία ορισμού θέματος",
+    "Double check that your server supports the room version chosen and try again.": "Επανελέγξτε ότι ο διακομιστής σας υποστηρίζει την έκδοση δωματίου που επιλέξατε και προσπαθήστε ξανά.",
+    "Error upgrading room": "Σφάλμα αναβάθμισης δωματίου",
+    "Sends a message as html, without interpreting it as markdown": "Αποστέλλει ένα μήνυμα ως html, χωρίς να το ερμηνεύει ως markdown",
+    "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Προ-εισάγει ( ͡° ͜ʖ ͡°) σε ένα μήνυμα απλού κειμένου",
+    "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "Προ-εισάγει ┬──┬ ノ( ゜-゜ノ) σε ένα μήνυμα απλού κειμένου",
+    "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "Προ-εισάγει (╯°□°）╯︵ ┻━┻ σε ένα μήνυμα απλού κειμένου",
+    "Go Back": "Πηγαίνετε Πίσω",
+    "Are you sure you want to cancel entering passphrase?": "Είστε σίγουρος/η ότι θέλετε να ακυρώσετε την εισαγωγή κωδικού;",
+    "Cancel entering passphrase?": "Ακύρωση εισαγωγής κωδικού;",
+    "Sign In": "Σύνδεση",
+    "Create Account": "Δημιουργία Λογαριασμού",
+    "Use your account or create a new one to continue.": "Χρησιμοποιήστε τον λογαριασμό σας ή δημιουργήστε νέο για να συνεχίσετε.",
+    "Sign In or Create Account": "Συνδεθείτε ή Δημιουργήστε Λογαριασμό",
+    "Zimbabwe": "Ζιμπάμπουε",
+    "Zambia": "Ζαμπία",
+    "Yemen": "Υεμένη",
+    "Western Sahara": "Δυτική Σαχάρα",
+    "Vietnam": "Βιετνάμ",
+    "Venezuela": "Βενεζουέλα",
+    "Vatican City": "Πόλη του Βατικανό",
+    "Uzbekistan": "Ουζμπεκιστάν",
+    "Uruguay": "Ουρουγουάη",
+    "United Arab Emirates": "Ηνωμένα Αραβικά Εμιράτα",
+    "Ukraine": "Ουκρανία",
+    "Uganda": "Ουγκάντα",
+    "Tuvalu": "Τουβαλού",
+    "Turkmenistan": "Τουρκμενιστάν",
+    "Turkey": "Τουρκία",
+    "Tunisia": "Τυνησία",
+    "Trinidad & Tobago": "Τρινιντάντ & Τομπάγκο",
+    "Togo": "Τογκό",
+    "Thailand": "Ταϊλάνδη",
+    "Tanzania": "Τανζανία",
+    "Tajikistan": "Τατζικιστάν",
+    "Taiwan": "Ταϊβάν",
+    "Syria": "Συρία",
+    "Switzerland": "Ελβετία",
+    "Sweden": "Σουηδία",
+    "Sudan": "Σουδάν",
+    "Sri Lanka": "Σρι Λάνκα",
+    "Spain": "Ισπανία",
+    "South Sudan": "Νότιο Σουδάν",
+    "South Korea": "Νότια Κορέα",
+    "South Africa": "Νότια Αφρική",
+    "Somalia": "Σομαλία",
+    "Solomon Islands": "Νήσοι Σολομώντα",
+    "Slovenia": "Σλοβενία",
+    "Slovakia": "Σλοβακία",
+    "Singapore": "Σινγκαπούρη",
+    "Sierra Leone": "Σιέρα Λεόνε",
+    "Seychelles": "Σεϋχέλες",
+    "Serbia": "Σερβία",
+    "Senegal": "Σενεγάλη",
+    "Saudi Arabia": "Σαουδική Αραβία",
+    "Samoa": "Σαμόα",
+    "Rwanda": "Ρουάντα",
+    "Russia": "Ρωσία",
+    "Romania": "Ρουμανία",
+    "Qatar": "Κατάρ",
+    "Puerto Rico": "Πουέρτο Ρίκο",
+    "Portugal": "Πορτογαλία",
+    "Poland": "Πολωνία",
+    "Philippines": "Φιλιπίνες",
+    "Peru": "Περού",
+    "Paraguay": "Παραγουάη",
+    "Papua New Guinea": "Παπούα Νέα Γουινέα",
+    "Panama": "Παναμάς",
+    "Palestine": "Παλεστίνη",
+    "Palau": "Παλάο",
+    "Pakistan": "Πακιστάν",
+    "Oman": "Ομάν",
+    "Norway": "Νορβηγία",
+    "North Korea": "Βόρεια Κορέα",
+    "Nigeria": "Νιγηρία",
+    "Niger": "Νίγηρας",
+    "Nicaragua": "Νικαράγουα",
+    "New Zealand": "Νέα Ζηλανδία",
+    "Netherlands": "Ολλανδία",
+    "Nepal": "Νεπάλ",
+    "Namibia": "Ναμίμπια",
+    "Mozambique": "Μοζαμβίκη",
+    "Morocco": "Μαρόκο",
+    "Montenegro": "Μαυροβούνιο",
+    "Mongolia": "Μονγκολία",
+    "Monaco": "Μονακό",
+    "Moldova": "Μολδαβία",
+    "Micronesia": "Μικρονησία",
+    "Mexico": "Μεξικό",
+    "Mauritania": "Μαυριτανία",
+    "Martinique": "Μαρτινίκη",
+    "Marshall Islands": "Νήσοι Μάρσαλ",
+    "Malta": "Μάλτα",
+    "Mali": "Μάλι",
+    "Maldives": "Μαλδίβες",
+    "Malaysia": "Μαλαισία",
+    "Madagascar": "Μαδαγασκάρη",
+    "Macedonia": "Μακεδονία",
+    "Macau": "Μακάο",
+    "Luxembourg": "Λουξεμβούργο",
+    "Lithuania": "Λιθουανία",
+    "Liechtenstein": "Λιχτενστάιν",
+    "Libya": "Λιβύη",
+    "Lebanon": "Λίβανος",
+    "Latvia": "Λετονία",
+    "Laos": "Λάος",
+    "Kyrgyzstan": "Κιργιστάν",
+    "Kuwait": "Κουβέιτ",
+    "Kosovo": "Κόσοβο",
+    "Kiribati": "Κιριμπάτι",
+    "Kenya": "Κένυα",
+    "Kazakhstan": "Καζακστάν",
+    "Jordan": "Ιορδανία",
+    "Jersey": "Τζέρσεϋ",
+    "Japan": "Ιαπωνία",
+    "Jamaica": "Τζαμάικα",
+    "Italy": "Ιταλία",
+    "Israel": "Ισραήλ",
+    "Ireland": "Ιρλανδία",
+    "Iraq": "Ιράκ",
+    "Iran": "Ιράν",
+    "Indonesia": "Ινδονησία",
+    "India": "Ινδία",
+    "Iceland": "Ισλανδία",
+    "Hungary": "Ουγγαρία",
+    "Hong Kong": "Χονγκ Κονγκ",
+    "Honduras": "Ονδούρα",
+    "Haiti": "Χαϊτί",
+    "Guinea": "Γουινέα",
+    "Guatemala": "Γουατεμάλα",
+    "Guadeloupe": "Γουαδελούπη",
+    "Grenada": "Γρενάδα",
+    "Greenland": "Γρινλανδία",
+    "Greece": "Ελλάδα",
+    "Gibraltar": "Γιβραλτάρ",
+    "Ghana": "Γκάνα",
+    "Germany": "Γερμανία",
+    "Georgia": "Γεωργία",
+    "French Polynesia": "Γαλλική Πολυνησία",
+    "French Guiana": "Γαλλική Γουιάνα",
+    "France": "Γαλλία",
+    "Finland": "Φινλανδία",
+    "Fiji": "Φίτζι",
+    "Faroe Islands": "Νήσοι Φαρόε",
+    "Ethiopia": "Αιθιοπία",
+    "Estonia": "Εσθονία",
+    "Eritrea": "Ερυθραία",
+    "El Salvador": "Ελ Σαλβαδόρ",
+    "Egypt": "Αίγυπτος",
+    "Ecuador": "Ισημερινός",
+    "Dominican Republic": "Δομινικανή Δημοκρατία",
+    "Djibouti": "Τζιμπουτί",
+    "Denmark": "Δανία",
+    "Côte d’Ivoire": "Ακτή Ελεφαντοστού",
+    "Czech Republic": "Δημοκρατία της Τσεχίας",
+    "Cyprus": "Κύπρος",
+    "Cuba": "Κούβα",
+    "Croatia": "Κροατία",
+    "Costa Rica": "Κόστα Ρίκα",
+    "Colombia": "Κολομβία",
+    "China": "Κίνα",
+    "Chile": "Χιλή",
+    "Chad": "Τσαντ",
+    "Central African Republic": "Δημοκρατία της Κεντρικής Αφρικής",
+    "Cayman Islands": "Νήσοι Κέιμαν",
+    "Canada": "Καναδάς",
+    "Cameroon": "Καμερούν",
+    "Burundi": "Μπουρούντι",
+    "Burkina Faso": "Μπουρκίνα Φάσο",
+    "Bulgaria": "Βουλγαρία",
+    "Brazil": "Βραζιλία",
+    "Botswana": "Μποτσουάνα",
+    "Bosnia": "Βοσνία",
+    "Bolivia": "Βολιβία",
+    "Bhutan": "Μπουτάν",
+    "Belgium": "Βέλγιο",
+    "Belarus": "Λευκορωσία",
+    "Barbados": "Μπαρμπάντος",
+    "Bangladesh": "Μπαγκλαντές",
+    "Bahrain": "Μπαχρέιν",
+    "Bahamas": "Μπαχάμες",
+    "Azerbaijan": "Αζερμπαϊτζάν",
+    "Austria": "Αυστρία",
+    "Australia": "Αυστραλία",
+    "Armenia": "Αρμενία",
+    "Argentina": "Αργεντινή",
+    "Antarctica": "Ανταρκτική",
+    "Angola": "Ανγκόλα",
+    "Andorra": "Ανδόρα",
+    "American Samoa": "Αμερικανική Σαμόα",
+    "Algeria": "Αλγερία",
+    "Albania": "Αλβανία",
+    "Åland Islands": "Νήσοι Åland",
+    "Afghanistan": "Αφγανιστάν",
+    "United States": "Ηνωμένες Πολιτείες",
+    "United Kingdom": "Ηνωμένο Βασίλειο",
+    "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "Ο διακομιστής σας απέρριψε την προσπάθεια σύνδεσης. Αυτό μπορεί να συνέβη απλά λόγω καθυστέρησης. Παρακαλώ προσπαθήστε ξανά. Αν αυτό συνεχιστεί, παρακαλώ επικοινωνήστε με τον διαχειριστή του διακομιστή σας.",
+    "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "Δεν μπορέσαμε να επικοινωνήσουμε με τον διακομιστή και δεν σας έχει συνδέσει. Παρακαλώ προσπαθήστε ξανά. Αν αυτό συνεχιστεί, παρακαλώ επικοινωνήστε με τον διαχειριστή του διακομιστή σας.",
+    "Try again": "Προσπαθήστε ξανά",
+    "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "Ζητήσαμε από το πρόγραμμα περιήγησης να θυμάται τον διακομιστή που χρησιμοποιείτε για να συνδέεστε, αλλά το πρόγραμμα περιήγησης δεν το έχει αποθηκεύσει. Πηγαίνετε στην σελίδα σύνδεσεις για να προσπαθήσετε ξανά.",
+    "We couldn't log you in": "Δεν μπορέσαμε να σας συνδέσουμε",
+    "Room name or address": "Όνομα ή διεύθυνση δωματίου",
+    "This will end the conference for everyone. Continue?": "Αυτό θα σταματήσει την διάσκεψη για όλους. Συνέχεια;",
+    "End conference": "Τέλος διάσκεψης",
+    "You've reached the maximum number of simultaneous calls.": "Έχετε φτάσει τον μέγιστο αριθμό ταυτοχρόνων κλήσεων.",
+    "Too Many Calls": "Πάρα Πολλές Κλήσεις",
+    "No other application is using the webcam": "Η κάμερα δεν χρησιμοποιείται από καμία άλλη εφαρμογή",
+    "Permission is granted to use the webcam": "Έχετε παραχωρήσει την άδεια χρήσης της κάμερας",
+    "A microphone and webcam are plugged in and set up correctly": "Ένα μικρόφωνο και μια κάμερα έχουν συνδεθεί και εγκατασταθεί σωστά",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "Η κλήση απέτυχε επειδή δεν μπόρεσε να βρεθεί κάμερα ή μικρόφωνο. Ελέγξτε ότι:",
+    "Unable to access webcam / microphone": "Αδυναμία πρόσβασης κάμερας / μικροφώνου",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Η κλήση απέτυχε επειδή δεν μπόρεσε να βρεθεί μικρόφωνο. Ελέγξτε ότι έχετε συνδέσει ένα μικρόφωνο και έχει εγκατασταθεί σωστά.",
+    "Unable to access microphone": "Αδυναμία πρόσβασης μικροφώνου",
+    "The call was answered on another device.": "Η κλήση απαντήθηκε σε μια άλλη συσκευή.",
+    "Answered Elsewhere": "Απαντήθηκε αλλού",
+    "The call could not be established": "Η κλήση δεν μπόρεσε να πραγματοποιηθεί",
+    "The other party declined the call.": "Η άλλη πλευρά απέρριψε την κλήση.",
+    "Call Declined": "Η κλήση απορρίφθηκε",
+    "Your user agent": "Η συσκευή σας",
+    "Confirm adding phone number": "Επιβεβαιώστε την προσθήκη του τηλεφωνικού αριθμού",
+    "Click the button below to confirm adding this email address.": "Πιέστε το κουμπί από κάτω για να επιβεβαιώσετε την προσθήκη της διεύθυνσης ηλ. ταχυδρομείου.",
+    "Confirm adding email": "Επιβεβαιώστε την προσθήκη διεύθυνσης ηλ. ταχυδρομείου"
 }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index a57a68e7b4..cb0ac11f05 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -35,18 +35,31 @@
     "Unable to load! Check your network connectivity and try again.": "Unable to load! Check your network connectivity and try again.",
     "Dismiss": "Dismiss",
     "Call Failed": "Call Failed",
-    "Call Timeout": "Call Timeout",
+    "Call Declined": "Call Declined",
+    "The other party declined the call.": "The other party declined the call.",
     "The remote side failed to pick up": "The remote side failed to pick up",
+    "The call could not be established": "The call could not be established",
+    "Answered Elsewhere": "Answered Elsewhere",
+    "The call was answered on another device.": "The call was answered on another device.",
     "Call failed due to misconfigured server": "Call failed due to misconfigured server",
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.",
     "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.": "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.",
     "Try using turn.matrix.org": "Try using turn.matrix.org",
     "OK": "OK",
+    "Unable to access microphone": "Unable to access microphone",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.",
+    "Unable to access webcam / microphone": "Unable to access webcam / microphone",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "Call failed because webcam or microphone could not be accessed. Check that:",
+    "A microphone and webcam are plugged in and set up correctly": "A microphone and webcam are plugged in and set up correctly",
+    "Permission is granted to use the webcam": "Permission is granted to use the webcam",
+    "No other application is using the webcam": "No other application is using the webcam",
     "Unable to capture screen": "Unable to capture screen",
-    "Existing Call": "Existing Call",
-    "You are already in a call.": "You are already in a call.",
     "VoIP is unsupported": "VoIP is unsupported",
     "You cannot place VoIP calls in this browser.": "You cannot place VoIP calls in this browser.",
+    "Too Many Calls": "Too Many Calls",
+    "You've reached the maximum number of simultaneous calls.": "You've reached the maximum number of simultaneous calls.",
+    "Already in call": "Already in call",
+    "You're already in a call with this person.": "You're already in a call with this person.",
     "You cannot place a call with yourself.": "You cannot place a call with yourself.",
     "Call in Progress": "Call in Progress",
     "A call is currently being placed!": "A call is currently being placed!",
@@ -107,12 +120,266 @@
     "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.": "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.",
     "Only continue if you trust the owner of the server.": "Only continue if you trust the owner of the server.",
     "Trust": "Trust",
+    "We couldn't log you in": "We couldn't log you in",
+    "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.",
+    "Try again": "Try again",
+    "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.",
+    "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.",
     "%(name)s is requesting verification": "%(name)s is requesting verification",
     "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s does not have permission to send you notifications - please check your browser settings",
     "%(brand)s was not given permission to send notifications - please try again": "%(brand)s was not given permission to send notifications - please try again",
     "Unable to enable Notifications": "Unable to enable Notifications",
     "This email address was not found": "This email address was not found",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Your email address does not appear to be associated with a Matrix ID on this Homeserver.",
+    "United Kingdom": "United Kingdom",
+    "United States": "United States",
+    "Afghanistan": "Afghanistan",
+    "Åland Islands": "Åland Islands",
+    "Albania": "Albania",
+    "Algeria": "Algeria",
+    "American Samoa": "American Samoa",
+    "Andorra": "Andorra",
+    "Angola": "Angola",
+    "Anguilla": "Anguilla",
+    "Antarctica": "Antarctica",
+    "Antigua & Barbuda": "Antigua & Barbuda",
+    "Argentina": "Argentina",
+    "Armenia": "Armenia",
+    "Aruba": "Aruba",
+    "Australia": "Australia",
+    "Austria": "Austria",
+    "Azerbaijan": "Azerbaijan",
+    "Bahamas": "Bahamas",
+    "Bahrain": "Bahrain",
+    "Bangladesh": "Bangladesh",
+    "Barbados": "Barbados",
+    "Belarus": "Belarus",
+    "Belgium": "Belgium",
+    "Belize": "Belize",
+    "Benin": "Benin",
+    "Bermuda": "Bermuda",
+    "Bhutan": "Bhutan",
+    "Bolivia": "Bolivia",
+    "Bosnia": "Bosnia",
+    "Botswana": "Botswana",
+    "Bouvet Island": "Bouvet Island",
+    "Brazil": "Brazil",
+    "British Indian Ocean Territory": "British Indian Ocean Territory",
+    "British Virgin Islands": "British Virgin Islands",
+    "Brunei": "Brunei",
+    "Bulgaria": "Bulgaria",
+    "Burkina Faso": "Burkina Faso",
+    "Burundi": "Burundi",
+    "Cambodia": "Cambodia",
+    "Cameroon": "Cameroon",
+    "Canada": "Canada",
+    "Cape Verde": "Cape Verde",
+    "Caribbean Netherlands": "Caribbean Netherlands",
+    "Cayman Islands": "Cayman Islands",
+    "Central African Republic": "Central African Republic",
+    "Chad": "Chad",
+    "Chile": "Chile",
+    "China": "China",
+    "Christmas Island": "Christmas Island",
+    "Cocos (Keeling) Islands": "Cocos (Keeling) Islands",
+    "Colombia": "Colombia",
+    "Comoros": "Comoros",
+    "Congo - Brazzaville": "Congo - Brazzaville",
+    "Congo - Kinshasa": "Congo - Kinshasa",
+    "Cook Islands": "Cook Islands",
+    "Costa Rica": "Costa Rica",
+    "Croatia": "Croatia",
+    "Cuba": "Cuba",
+    "Curaçao": "Curaçao",
+    "Cyprus": "Cyprus",
+    "Czech Republic": "Czech Republic",
+    "Côte d’Ivoire": "Côte d’Ivoire",
+    "Denmark": "Denmark",
+    "Djibouti": "Djibouti",
+    "Dominica": "Dominica",
+    "Dominican Republic": "Dominican Republic",
+    "Ecuador": "Ecuador",
+    "Egypt": "Egypt",
+    "El Salvador": "El Salvador",
+    "Equatorial Guinea": "Equatorial Guinea",
+    "Eritrea": "Eritrea",
+    "Estonia": "Estonia",
+    "Ethiopia": "Ethiopia",
+    "Falkland Islands": "Falkland Islands",
+    "Faroe Islands": "Faroe Islands",
+    "Fiji": "Fiji",
+    "Finland": "Finland",
+    "France": "France",
+    "French Guiana": "French Guiana",
+    "French Polynesia": "French Polynesia",
+    "French Southern Territories": "French Southern Territories",
+    "Gabon": "Gabon",
+    "Gambia": "Gambia",
+    "Georgia": "Georgia",
+    "Germany": "Germany",
+    "Ghana": "Ghana",
+    "Gibraltar": "Gibraltar",
+    "Greece": "Greece",
+    "Greenland": "Greenland",
+    "Grenada": "Grenada",
+    "Guadeloupe": "Guadeloupe",
+    "Guam": "Guam",
+    "Guatemala": "Guatemala",
+    "Guernsey": "Guernsey",
+    "Guinea": "Guinea",
+    "Guinea-Bissau": "Guinea-Bissau",
+    "Guyana": "Guyana",
+    "Haiti": "Haiti",
+    "Heard & McDonald Islands": "Heard & McDonald Islands",
+    "Honduras": "Honduras",
+    "Hong Kong": "Hong Kong",
+    "Hungary": "Hungary",
+    "Iceland": "Iceland",
+    "India": "India",
+    "Indonesia": "Indonesia",
+    "Iran": "Iran",
+    "Iraq": "Iraq",
+    "Ireland": "Ireland",
+    "Isle of Man": "Isle of Man",
+    "Israel": "Israel",
+    "Italy": "Italy",
+    "Jamaica": "Jamaica",
+    "Japan": "Japan",
+    "Jersey": "Jersey",
+    "Jordan": "Jordan",
+    "Kazakhstan": "Kazakhstan",
+    "Kenya": "Kenya",
+    "Kiribati": "Kiribati",
+    "Kosovo": "Kosovo",
+    "Kuwait": "Kuwait",
+    "Kyrgyzstan": "Kyrgyzstan",
+    "Laos": "Laos",
+    "Latvia": "Latvia",
+    "Lebanon": "Lebanon",
+    "Lesotho": "Lesotho",
+    "Liberia": "Liberia",
+    "Libya": "Libya",
+    "Liechtenstein": "Liechtenstein",
+    "Lithuania": "Lithuania",
+    "Luxembourg": "Luxembourg",
+    "Macau": "Macau",
+    "Macedonia": "Macedonia",
+    "Madagascar": "Madagascar",
+    "Malawi": "Malawi",
+    "Malaysia": "Malaysia",
+    "Maldives": "Maldives",
+    "Mali": "Mali",
+    "Malta": "Malta",
+    "Marshall Islands": "Marshall Islands",
+    "Martinique": "Martinique",
+    "Mauritania": "Mauritania",
+    "Mauritius": "Mauritius",
+    "Mayotte": "Mayotte",
+    "Mexico": "Mexico",
+    "Micronesia": "Micronesia",
+    "Moldova": "Moldova",
+    "Monaco": "Monaco",
+    "Mongolia": "Mongolia",
+    "Montenegro": "Montenegro",
+    "Montserrat": "Montserrat",
+    "Morocco": "Morocco",
+    "Mozambique": "Mozambique",
+    "Myanmar": "Myanmar",
+    "Namibia": "Namibia",
+    "Nauru": "Nauru",
+    "Nepal": "Nepal",
+    "Netherlands": "Netherlands",
+    "New Caledonia": "New Caledonia",
+    "New Zealand": "New Zealand",
+    "Nicaragua": "Nicaragua",
+    "Niger": "Niger",
+    "Nigeria": "Nigeria",
+    "Niue": "Niue",
+    "Norfolk Island": "Norfolk Island",
+    "North Korea": "North Korea",
+    "Northern Mariana Islands": "Northern Mariana Islands",
+    "Norway": "Norway",
+    "Oman": "Oman",
+    "Pakistan": "Pakistan",
+    "Palau": "Palau",
+    "Palestine": "Palestine",
+    "Panama": "Panama",
+    "Papua New Guinea": "Papua New Guinea",
+    "Paraguay": "Paraguay",
+    "Peru": "Peru",
+    "Philippines": "Philippines",
+    "Pitcairn Islands": "Pitcairn Islands",
+    "Poland": "Poland",
+    "Portugal": "Portugal",
+    "Puerto Rico": "Puerto Rico",
+    "Qatar": "Qatar",
+    "Romania": "Romania",
+    "Russia": "Russia",
+    "Rwanda": "Rwanda",
+    "Réunion": "Réunion",
+    "Samoa": "Samoa",
+    "San Marino": "San Marino",
+    "Saudi Arabia": "Saudi Arabia",
+    "Senegal": "Senegal",
+    "Serbia": "Serbia",
+    "Seychelles": "Seychelles",
+    "Sierra Leone": "Sierra Leone",
+    "Singapore": "Singapore",
+    "Sint Maarten": "Sint Maarten",
+    "Slovakia": "Slovakia",
+    "Slovenia": "Slovenia",
+    "Solomon Islands": "Solomon Islands",
+    "Somalia": "Somalia",
+    "South Africa": "South Africa",
+    "South Georgia & South Sandwich Islands": "South Georgia & South Sandwich Islands",
+    "South Korea": "South Korea",
+    "South Sudan": "South Sudan",
+    "Spain": "Spain",
+    "Sri Lanka": "Sri Lanka",
+    "St. Barthélemy": "St. Barthélemy",
+    "St. Helena": "St. Helena",
+    "St. Kitts & Nevis": "St. Kitts & Nevis",
+    "St. Lucia": "St. Lucia",
+    "St. Martin": "St. Martin",
+    "St. Pierre & Miquelon": "St. Pierre & Miquelon",
+    "St. Vincent & Grenadines": "St. Vincent & Grenadines",
+    "Sudan": "Sudan",
+    "Suriname": "Suriname",
+    "Svalbard & Jan Mayen": "Svalbard & Jan Mayen",
+    "Swaziland": "Swaziland",
+    "Sweden": "Sweden",
+    "Switzerland": "Switzerland",
+    "Syria": "Syria",
+    "São Tomé & Príncipe": "São Tomé & Príncipe",
+    "Taiwan": "Taiwan",
+    "Tajikistan": "Tajikistan",
+    "Tanzania": "Tanzania",
+    "Thailand": "Thailand",
+    "Timor-Leste": "Timor-Leste",
+    "Togo": "Togo",
+    "Tokelau": "Tokelau",
+    "Tonga": "Tonga",
+    "Trinidad & Tobago": "Trinidad & Tobago",
+    "Tunisia": "Tunisia",
+    "Turkey": "Turkey",
+    "Turkmenistan": "Turkmenistan",
+    "Turks & Caicos Islands": "Turks & Caicos Islands",
+    "Tuvalu": "Tuvalu",
+    "U.S. Virgin Islands": "U.S. Virgin Islands",
+    "Uganda": "Uganda",
+    "Ukraine": "Ukraine",
+    "United Arab Emirates": "United Arab Emirates",
+    "Uruguay": "Uruguay",
+    "Uzbekistan": "Uzbekistan",
+    "Vanuatu": "Vanuatu",
+    "Vatican City": "Vatican City",
+    "Venezuela": "Venezuela",
+    "Vietnam": "Vietnam",
+    "Wallis & Futuna": "Wallis & Futuna",
+    "Western Sahara": "Western Sahara",
+    "Yemen": "Yemen",
+    "Zambia": "Zambia",
+    "Zimbabwe": "Zimbabwe",
     "Sign In or Create Account": "Sign In or Create Account",
     "Use your account or create a new one to continue.": "Use your account or create a new one to continue.",
     "Create Account": "Create Account",
@@ -146,10 +413,13 @@
     "Messages": "Messages",
     "Actions": "Actions",
     "Advanced": "Advanced",
+    "Effects": "Effects",
     "Other": "Other",
     "Command error": "Command error",
     "Usage": "Usage",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Prepends ¯\\_(ツ)_/¯ to a plain-text message",
+    "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message",
+    "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message",
     "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message",
     "Sends a message as plain text, without interpreting it as markdown": "Sends a message as plain text, without interpreting it as markdown",
     "Sends a message as html, without interpreting it as markdown": "Sends a message as html, without interpreting it as markdown",
@@ -209,6 +479,10 @@
     "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",
+    "Converts the room to a DM": "Converts the room to a DM",
+    "Converts the DM to a room": "Converts the DM to a room",
     "Displays action": "Displays action",
     "Reason": "Reason",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepted the invitation for %(displayName)s.",
@@ -259,9 +533,13 @@
     "(not supported by this browser)": "(not supported by this browser)",
     "%(senderName)s answered the call.": "%(senderName)s answered the call.",
     "(could not connect media)": "(could not connect media)",
+    "(connection failed)": "(connection failed)",
+    "(their device couldn't start the camera / microphone)": "(their device couldn't start the camera / microphone)",
+    "(an error occurred)": "(an error occurred)",
     "(no answer)": "(no answer)",
     "(unknown failure: %(reason)s)": "(unknown failure: %(reason)s)",
     "%(senderName)s ended the call.": "%(senderName)s ended the call.",
+    "%(senderName)s declined the call.": "%(senderName)s declined the call.",
     "%(senderName)s placed a voice call.": "%(senderName)s placed a voice call.",
     "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s placed a voice call. (not supported by this browser)",
     "%(senderName)s placed a video call.": "%(senderName)s placed a video call.",
@@ -279,6 +557,7 @@
     "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s widget modified by %(senderName)s",
     "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s widget added by %(senderName)s",
     "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s widget removed by %(senderName)s",
+    "%(senderName)s has updated the widget layout": "%(senderName)s has updated the widget layout",
     "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s removed the rule banning users matching %(glob)s",
     "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s removed the rule banning rooms matching %(glob)s",
     "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s removed the rule banning servers matching %(glob)s",
@@ -310,6 +589,63 @@
     "%(names)s and %(count)s others are typing …|other": "%(names)s and %(count)s others are typing …",
     "%(names)s and %(count)s others are typing …|one": "%(names)s and one other is typing …",
     "%(names)s and %(lastPerson)s are typing …": "%(names)s and %(lastPerson)s are typing …",
+    "Remain on your screen when viewing another room, when running": "Remain on your screen when viewing another room, when running",
+    "Remain on your screen while running": "Remain on your screen while running",
+    "Send stickers into this room": "Send stickers into this room",
+    "Send stickers into your active room": "Send stickers into your active room",
+    "Change which room you're viewing": "Change which room you're viewing",
+    "Change which room, message, or user you're viewing": "Change which room, message, or user you're viewing",
+    "Change the topic of this room": "Change the topic of this room",
+    "See when the topic changes in this room": "See when the topic changes in this room",
+    "Change the topic of your active room": "Change the topic of your active room",
+    "See when the topic changes in your active room": "See when the topic changes in your active room",
+    "Change the name of this room": "Change the name of this room",
+    "See when the name changes in this room": "See when the name changes in this room",
+    "Change the name of your active room": "Change the name of your active room",
+    "See when the name changes in your active room": "See when the name changes in your active room",
+    "Change the avatar of this room": "Change the avatar of this room",
+    "See when the avatar changes in this room": "See when the avatar changes in this room",
+    "Change the avatar of your active room": "Change the avatar of your active room",
+    "See when the avatar changes in your active room": "See when the avatar changes in your active room",
+    "Send stickers to this room as you": "Send stickers to this room as you",
+    "See when a sticker is posted in this room": "See when a sticker is posted in this room",
+    "Send stickers to your active room as you": "Send stickers to your active room as you",
+    "See when anyone posts a sticker to your active room": "See when anyone posts a sticker to your active room",
+    "with an empty state key": "with an empty state key",
+    "with state key %(stateKey)s": "with state key %(stateKey)s",
+    "Send <b>%(eventType)s</b> events as you in this room": "Send <b>%(eventType)s</b> events as you in this room",
+    "See <b>%(eventType)s</b> events posted to this room": "See <b>%(eventType)s</b> events posted to this room",
+    "Send <b>%(eventType)s</b> events as you in your active room": "Send <b>%(eventType)s</b> events as you in your active room",
+    "See <b>%(eventType)s</b> events posted to your active room": "See <b>%(eventType)s</b> events posted to your active room",
+    "The <b>%(capability)s</b> capability": "The <b>%(capability)s</b> capability",
+    "Send messages as you in this room": "Send messages as you in this room",
+    "Send messages as you in your active room": "Send messages as you in your active room",
+    "See messages posted to this room": "See messages posted to this room",
+    "See messages posted to your active room": "See messages posted to your active room",
+    "Send text messages as you in this room": "Send text messages as you in this room",
+    "Send text messages as you in your active room": "Send text messages as you in your active room",
+    "See text messages posted to this room": "See text messages posted to this room",
+    "See text messages posted to your active room": "See text messages posted to your active room",
+    "Send emotes as you in this room": "Send emotes as you in this room",
+    "Send emotes as you in your active room": "Send emotes as you in your active room",
+    "See emotes posted to this room": "See emotes posted to this room",
+    "See emotes posted to your active room": "See emotes posted to your active room",
+    "Send images as you in this room": "Send images as you in this room",
+    "Send images as you in your active room": "Send images as you in your active room",
+    "See images posted to this room": "See images posted to this room",
+    "See images posted to your active room": "See images posted to your active room",
+    "Send videos as you in this room": "Send videos as you in this room",
+    "Send videos as you in your active room": "Send videos as you in your active room",
+    "See videos posted to this room": "See videos posted to this room",
+    "See videos posted to your active room": "See videos posted to your active room",
+    "Send general files as you in this room": "Send general files as you in this room",
+    "Send general files as you in your active room": "Send general files as you in your active room",
+    "See general files posted to this room": "See general files posted to this room",
+    "See general files posted to your active room": "See general files posted to your active room",
+    "Send <b>%(msgtype)s</b> messages as you in this room": "Send <b>%(msgtype)s</b> messages as you in this room",
+    "Send <b>%(msgtype)s</b> messages as you in your active room": "Send <b>%(msgtype)s</b> messages as you in your active room",
+    "See <b>%(msgtype)s</b> messages posted to this room": "See <b>%(msgtype)s</b> messages posted to this room",
+    "See <b>%(msgtype)s</b> messages posted to your active room": "See <b>%(msgtype)s</b> messages posted to your active room",
     "Cannot reach homeserver": "Cannot reach homeserver",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Ensure you have a stable internet connection, or get in touch with the server admin",
     "Your %(brand)s is misconfigured": "Your %(brand)s is misconfigured",
@@ -389,16 +725,19 @@
     "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",
     "Review": "Review",
     "Later": "Later",
+    "Don't miss a reply": "Don't miss a reply",
     "Notifications": "Notifications",
-    "You are not receiving desktop notifications": "You are not receiving desktop notifications",
-    "Enable them now": "Enable them now",
-    "Close": "Close",
+    "Enable desktop notifications": "Enable desktop notifications",
+    "Enable": "Enable",
+    "Use app for a better experience": "Use app for a better experience",
+    "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.",
+    "Use app": "Use app",
     "Your homeserver has exceeded its user limit.": "Your homeserver has exceeded its user limit.",
     "Your homeserver has exceeded one of its resource limits.": "Your homeserver has exceeded one of its resource limits.",
     "Contact your <a>server admin</a>.": "Contact your <a>server admin</a>.",
@@ -416,9 +755,8 @@
     "What's new?": "What's new?",
     "What's New": "What's New",
     "Update": "Update",
-    "Restart": "Restart",
-    "Upgrade your %(brand)s": "Upgrade your %(brand)s",
-    "A new version of %(brand)s is available!": "A new version of %(brand)s is available!",
+    "Update %(brand)s": "Update %(brand)s",
+    "New version of %(brand)s is available": "New version of %(brand)s is available",
     "Guest": "Guest",
     "There was an error joining the room": "There was an error joining the room",
     "Sorry, your homeserver is too old to participate in this room.": "Sorry, your homeserver is too old to participate in this room.",
@@ -429,8 +767,8 @@
     "You joined the call": "You joined the call",
     "%(senderName)s joined the call": "%(senderName)s joined the call",
     "Call in progress": "Call in progress",
-    "You left the call": "You left the call",
-    "%(senderName)s left the call": "%(senderName)s left the call",
+    "You ended the call": "You ended the call",
+    "%(senderName)s ended the call": "%(senderName)s ended the call",
     "Call ended": "Call ended",
     "You started a call": "You started a call",
     "%(senderName)s started a call": "%(senderName)s started a call",
@@ -441,6 +779,8 @@
     "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
     "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
     "Change notification settings": "Change notification settings",
+    "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.",
+    "Render LaTeX maths in messages": "Render LaTeX maths in messages",
     "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.",
     "New spinner design": "New spinner design",
     "Message Pinning": "Message Pinning",
@@ -458,6 +798,7 @@
     "Font size": "Font size",
     "Use custom size": "Use custom size",
     "Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing",
+    "Show stickers button": "Show stickers button",
     "Use a more compact ‘Modern’ layout": "Use a more compact ‘Modern’ layout",
     "Show a placeholder for removed messages": "Show a placeholder for removed messages",
     "Show join/leave messages (invites/kicks/bans unaffected)": "Show join/leave messages (invites/kicks/bans unaffected)",
@@ -468,10 +809,17 @@
     "Always show message timestamps": "Always show message timestamps",
     "Autoplay GIFs and videos": "Autoplay GIFs and videos",
     "Enable automatic language detection for syntax highlighting": "Enable automatic language detection for syntax highlighting",
+    "Expand code blocks by default": "Expand code blocks by default",
+    "Show line numbers in code blocks": "Show line numbers in code blocks",
+    "Jump to the bottom of the timeline when you send a message": "Jump to the bottom of the timeline when you send a message",
     "Show avatars in user and room mentions": "Show avatars in user and room mentions",
     "Enable big emoji in chat": "Enable big emoji in chat",
     "Send typing notifications": "Send typing notifications",
     "Show typing notifications": "Show typing notifications",
+    "Use Command + F to search": "Use Command + F to search",
+    "Use Ctrl + F to search": "Use Ctrl + F to search",
+    "Use Command + Enter to send a message": "Use Command + Enter to send a message",
+    "Use Ctrl + Enter to send a message": "Use Ctrl + Enter to send a message",
     "Automatically replace plain text Emoji": "Automatically replace plain text Emoji",
     "Mirror local video feed": "Mirror local video feed",
     "Enable Community Filter Panel": "Enable Community Filter Panel",
@@ -495,13 +843,12 @@
     "Show hidden events in timeline": "Show hidden events in timeline",
     "Low bandwidth mode": "Low bandwidth mode",
     "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)",
-    "Send read receipts for messages (requires compatible homeserver to disable)": "Send read receipts for messages (requires compatible homeserver to disable)",
     "Show previews/thumbnails for images": "Show previews/thumbnails for images",
     "Enable message search in encrypted rooms": "Enable message search in encrypted rooms",
     "How fast should messages be downloaded.": "How fast should messages be downloaded.",
     "Manually verify all remote sessions": "Manually verify all remote sessions",
     "IRC display name width": "IRC display name width",
-    "Enable experimental, compact IRC style layout": "Enable experimental, compact IRC style layout",
+    "Show chat effects (animations when receiving e.g. confetti)": "Show chat effects (animations when receiving e.g. confetti)",
     "Collecting app version information": "Collecting app version information",
     "Collecting logs": "Collecting logs",
     "Uploading logs": "Uploading logs",
@@ -520,7 +867,23 @@
     "When rooms are upgraded": "When rooms are upgraded",
     "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",
+    "Sends the given message with confetti": "Sends the given message with confetti",
+    "sends confetti": "sends confetti",
+    "Sends the given message with fireworks": "Sends the given message with fireworks",
+    "sends fireworks": "sends fireworks",
+    "Sends the given message with snowfall": "Sends the given message with snowfall",
+    "sends snowfall": "sends snowfall",
+    "You held the call <a>Switch</a>": "You held the call <a>Switch</a>",
+    "You held the call <a>Resume</a>": "You held the call <a>Resume</a>",
+    "%(peerName)s held the call": "%(peerName)s held the call",
+    "Video Call": "Video Call",
+    "Voice Call": "Voice Call",
+    "Fill Screen": "Fill Screen",
+    "Return to call": "Return to call",
+    "%(name)s on hold": "%(name)s on hold",
+    "Unable to look up phone number": "Unable to look up phone number",
+    "There was an error looking up the phone number": "There was an error looking up the phone number",
+    "Dial pad": "Dial pad",
     "Unknown caller": "Unknown caller",
     "Incoming voice call": "Incoming voice call",
     "Incoming video call": "Incoming video call",
@@ -618,14 +981,46 @@
     "From %(deviceName)s (%(deviceId)s)": "From %(deviceName)s (%(deviceId)s)",
     "Decline (%(counter)s)": "Decline (%(counter)s)",
     "Accept <policyLink /> to continue:": "Accept <policyLink /> to continue:",
-    "Remove": "Remove",
+    "Delete": "Delete",
     "Upload": "Upload",
+    "Name": "Name",
+    "Description": "Description",
+    "Create a space": "Create a space",
+    "Organise rooms into spaces, for just you or anyone": "Organise rooms into spaces, for just you or anyone",
+    "Public": "Public",
+    "Open space for anyone, best for communities": "Open space for anyone, best for communities",
+    "Private": "Private",
+    "Invite only space, best for yourself or teams": "Invite only space, best for yourself or teams",
+    "Go back": "Go back",
+    "Personalise your public space": "Personalise your public space",
+    "Personalise your private space": "Personalise your private space",
+    "Give it a photo, name and description to help you identify it.": "Give it a photo, name and description to help you identify it.",
+    "You can change these at any point.": "You can change these at any point.",
+    "Creating...": "Creating...",
+    "Create": "Create",
+    "Expand space panel": "Expand space panel",
+    "Collapse space panel": "Collapse space panel",
+    "Home": "Home",
+    "Click to copy": "Click to copy",
+    "Copied!": "Copied!",
+    "Failed to copy": "Failed to copy",
+    "Share invite link": "Share invite link",
+    "Invite by email or username": "Invite by email or username",
+    "Invite members": "Invite members",
+    "Share your public space": "Share your public space",
+    "Invite people": "Invite people",
+    "Settings": "Settings",
+    "Leave space": "Leave space",
+    "New room": "New room",
+    "Space Home": "Space Home",
+    "Members": "Members",
+    "Explore rooms": "Explore rooms",
+    "Space options": "Space options",
+    "Remove": "Remove",
     "This bridge was provisioned by <user />.": "This bridge was provisioned by <user />.",
     "This bridge is managed by <user />.": "This bridge is managed by <user />.",
-    "Workspace: %(networkName)s": "Workspace: %(networkName)s",
-    "Channel: %(channelName)s": "Channel: %(channelName)s",
-    "Show less": "Show less",
-    "Show more": "Show more",
+    "Workspace: <networkLink/>": "Workspace: <networkLink/>",
+    "Channel: <channelLink/>": "Channel: <channelLink/>",
     "Failed to upload profile picture!": "Failed to upload profile picture!",
     "Upload new:": "Upload new:",
     "No display name": "No display name",
@@ -635,9 +1030,9 @@
     "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.",
     "Export E2E room keys": "Export E2E room keys",
     "Do you want to set an email address?": "Do you want to set an email address?",
-    "Current password": "Current password",
-    "New Password": "New Password",
     "Confirm password": "Confirm password",
+    "Passwords don't match": "Passwords don't match",
+    "Current password": "Current password",
     "Change Password": "Change Password",
     "Your homeserver does not support cross-signing.": "Your homeserver does not support cross-signing.",
     "Cross-signing is ready for use.": "Cross-signing is ready for use.",
@@ -676,12 +1071,10 @@
     "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 %(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.",
-    "Enable": "Enable",
     "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.": "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.",
     "%(brand)s can't securely cache encrypted messages locally while running in a web browser. Use <desktopLink>%(brand)s Desktop</desktopLink> for encrypted messages to appear in search results.": "%(brand)s can't securely cache encrypted messages locally while running in a web browser. Use <desktopLink>%(brand)s Desktop</desktopLink> for encrypted messages to appear in search results.",
     "Connecting to integration manager...": "Connecting to integration manager...",
@@ -700,8 +1093,8 @@
     "Enable notifications for this account": "Enable notifications for this account",
     "Clear notifications": "Clear notifications",
     "All notifications are currently disabled for all targets.": "All notifications are currently disabled for all targets.",
-    "Add an email address to configure email notifications": "Add an email address to configure email notifications",
     "Enable email notifications": "Enable email notifications",
+    "Add an email address to configure email notifications": "Add an email address to configure email notifications",
     "Notifications on the following keywords follow rules which can’t be displayed here:": "Notifications on the following keywords follow rules which can’t be displayed here:",
     "Unable to fetch notification target list": "Unable to fetch notification target list",
     "Notification targets": "Notification targets",
@@ -749,7 +1142,7 @@
     "Back up your keys before signing out to avoid losing them.": "Back up your keys before signing out to avoid losing them.",
     "well formed": "well formed",
     "unexpected type": "unexpected type",
-    "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.": "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.",
+    "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 Security Key.": "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 Security Key.",
     "Backup key stored:": "Backup key stored:",
     "not stored": "not stored",
     "Backup key cached:": "Backup key cached:",
@@ -777,7 +1170,6 @@
     "Disconnect anyway": "Disconnect anyway",
     "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "You are still <b>sharing your personal data</b> on the identity server <idserver />.",
     "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.",
-    "Go back": "Go back",
     "Identity Server (%(server)s)": "Identity Server (%(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.": "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.",
     "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.",
@@ -792,6 +1184,7 @@
     "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Use an Integration Manager to manage bots, widgets, and sticker packs.",
     "Manage integrations": "Manage integrations",
     "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.",
+    "Add": "Add",
     "Error encountered (%(errorDetail)s).": "Error encountered (%(errorDetail)s).",
     "Checking for an update...": "Checking for an update...",
     "No update available.": "No update available.",
@@ -808,10 +1201,10 @@
     "Custom theme URL": "Custom theme URL",
     "Add theme": "Add theme",
     "Theme": "Theme",
-    "Message layout": "Message layout",
-    "Compact": "Compact",
-    "Modern": "Modern",
+    "Hide advanced": "Hide advanced",
+    "Show advanced": "Show advanced",
     "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Set the name of a font installed on your system & %(brand)s will attempt to use it.",
+    "Enable experimental, compact IRC style layout": "Enable experimental, compact IRC style layout",
     "Customise your appearance": "Customise your appearance",
     "Appearance Settings only affect this %(brand)s session.": "Appearance Settings only affect this %(brand)s session.",
     "Flair": "Flair",
@@ -823,6 +1216,7 @@
     "Set a new account password...": "Set a new account password...",
     "Account": "Account",
     "Language and region": "Language and region",
+    "Spell check dictionaries": "Spell check dictionaries",
     "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.",
     "Account management": "Account management",
     "Deactivating your account is a permanent action - be careful!": "Deactivating your account is a permanent action - be careful!",
@@ -864,6 +1258,7 @@
     "Ban list rules - %(roomName)s": "Ban list rules - %(roomName)s",
     "Server rules": "Server rules",
     "User rules": "User rules",
+    "Close": "Close",
     "You have not ignored anyone.": "You have not ignored anyone.",
     "You are currently ignoring:": "You are currently ignoring:",
     "You are not subscribed to any lists": "You are not subscribed to any lists",
@@ -992,11 +1387,11 @@
     "Members only (since the point in time of selecting this option)": "Members only (since the point in time of selecting this option)",
     "Members only (since they were invited)": "Members only (since they were invited)",
     "Members only (since they joined)": "Members only (since they joined)",
+    "Who can read history?": "Who can read history?",
     "Security & Privacy": "Security & Privacy",
     "Once enabled, encryption cannot be disabled.": "Once enabled, encryption cannot be disabled.",
     "Encrypted": "Encrypted",
     "Who can access this room?": "Who can access this room?",
-    "Who can read history?": "Who can read history?",
     "Unable to revoke sharing for email address": "Unable to revoke sharing for email address",
     "Unable to share email address": "Unable to share email address",
     "Your email address hasn't been verified yet": "Your email address hasn't been verified yet",
@@ -1019,13 +1414,11 @@
     "Invalid Email Address": "Invalid Email Address",
     "This doesn't appear to be a valid email address": "This doesn't appear to be a valid email address",
     "Unable to add email address": "Unable to add email address",
-    "Add": "Add",
     "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.",
     "Email Address": "Email Address",
     "Remove %(phone)s?": "Remove %(phone)s?",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.",
     "Phone Number": "Phone Number",
-    "Add a widget": "Add a widget",
     "Drop File Here": "Drop File Here",
     "Drop file here to upload": "Drop file here to upload",
     "This user has not verified all of their sessions.": "This user has not verified all of their sessions.",
@@ -1057,12 +1450,11 @@
     "and %(count)s others...|one": "and one other...",
     "Invite to this room": "Invite to this room",
     "Invite to this community": "Invite to this community",
+    "Invite to this space": "Invite to this space",
     "Invited": "Invited",
     "Filter room members": "Filter room members",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (power %(powerLevelNumber)s)",
-    "Voice call": "Voice call",
-    "Video call": "Video call",
-    "Hangup": "Hangup",
+    "Send message": "Send message",
     "Emoji picker": "Emoji picker",
     "Upload file": "Upload file",
     "Send an encrypted reply…": "Send an encrypted reply…",
@@ -1077,6 +1469,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",
@@ -1098,6 +1499,7 @@
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Seen by %(displayName)s (%(userName)s) at %(dateTime)s",
     "Replying": "Replying",
     "Room %(name)s": "Room %(name)s",
+    "Recently visited rooms": "Recently visited rooms",
     "No recently visited rooms": "No recently visited rooms",
     "No rooms to show": "No rooms to show",
     "Unnamed room": "Unnamed room",
@@ -1107,7 +1509,13 @@
     "(~%(count)s results)|one": "(~%(count)s result)",
     "Join Room": "Join Room",
     "Forget room": "Forget room",
+    "Hide Widgets": "Hide Widgets",
+    "Show Widgets": "Show Widgets",
     "Search": "Search",
+    "Voice call": "Voice call",
+    "Video call": "Video call",
+    "Start a Conversation": "Start a Conversation",
+    "Open dial pad": "Open dial pad",
     "Invites": "Invites",
     "Favourites": "Favourites",
     "People": "People",
@@ -1115,6 +1523,10 @@
     "Rooms": "Rooms",
     "Add room": "Add room",
     "Create new room": "Create new room",
+    "You do not have permissions to create new rooms in this space": "You do not have permissions to create new rooms in this space",
+    "Add existing room": "Add existing room",
+    "You do not have permissions to add rooms to this space": "You do not have permissions to add rooms to this space",
+    "Explore space rooms": "Explore space rooms",
     "Explore community rooms": "Explore community rooms",
     "Explore public rooms": "Explore public rooms",
     "Low priority": "Low priority",
@@ -1122,7 +1534,9 @@
     "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",
     "%(count)s results|one": "%(count)s result",
     "This room": "This room",
@@ -1174,6 +1588,7 @@
     "Jump to first invite.": "Jump to first invite.",
     "Show %(count)s more|other": "Show %(count)s more",
     "Show %(count)s more|one": "Show %(count)s more",
+    "Show less": "Show less",
     "Use default": "Use default",
     "All messages": "All messages",
     "Mentions & Keywords": "Mentions & Keywords",
@@ -1182,7 +1597,6 @@
     "Favourited": "Favourited",
     "Favourite": "Favourite",
     "Low Priority": "Low Priority",
-    "Settings": "Settings",
     "Leave Room": "Leave Room",
     "Room options": "Room options",
     "%(count)s unread messages including mentions.|other": "%(count)s unread messages including mentions.",
@@ -1236,6 +1650,7 @@
     "New published address (e.g. #alias:server)": "New published address (e.g. #alias:server)",
     "Local Addresses": "Local Addresses",
     "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)",
+    "Show more": "Show more",
     "Error updating flair": "Error updating flair",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.",
     "Invalid community ID": "Invalid community ID",
@@ -1270,10 +1685,13 @@
     "The homeserver the user you’re verifying is connected to": "The homeserver the user you’re verifying is connected to",
     "Yours, or the other users’ internet connection": "Yours, or the other users’ internet connection",
     "Yours, or the other users’ session": "Yours, or the other users’ session",
-    "Members": "Members",
     "Room Info": "Room Info",
+    "You can only pin up to %(count)s widgets|other": "You can only pin up to %(count)s widgets",
+    "Unpin": "Unpin",
+    "Unpin a widget to view it in this panel": "Unpin a widget to view it in this panel",
+    "Options": "Options",
+    "Set my room layout for everyone": "Set my room layout for everyone",
     "Widgets": "Widgets",
-    "Unpin app": "Unpin app",
     "Edit widgets, bridges & bots": "Edit widgets, bridges & bots",
     "Add widgets, bridges & bots": "Add widgets, bridges & bots",
     "Not encrypted": "Not encrypted",
@@ -1296,8 +1714,8 @@
     "Invite": "Invite",
     "Share Link to User": "Share Link to User",
     "Direct message": "Direct message",
-    "Options": "Options",
     "Demote yourself?": "Demote yourself?",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the space it will be impossible to regain privileges.": "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the space it will be impossible to regain privileges.",
     "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.": "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": "Demote",
     "Disinvite": "Disinvite",
@@ -1326,7 +1744,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?",
@@ -1334,6 +1751,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.",
@@ -1344,7 +1762,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!",
@@ -1360,12 +1777,6 @@
     "You cancelled verification.": "You cancelled verification.",
     "Verification cancelled": "Verification cancelled",
     "Compare emoji": "Compare emoji",
-    "Take a picture": "Take a picture",
-    "Remove for everyone": "Remove for everyone",
-    "Remove for me": "Remove for me",
-    "Edit": "Edit",
-    "Pin to room": "Pin to room",
-    "You can only pin 2 widgets at a time": "You can only pin 2 widgets at a time",
     "Sunday": "Sunday",
     "Monday": "Monday",
     "Tuesday": "Tuesday",
@@ -1376,14 +1787,16 @@
     "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.",
     "Error decrypting audio": "Error decrypting audio",
     "React": "React",
     "Reply": "Reply",
+    "Edit": "Edit",
     "Message Actions": "Message Actions",
     "Attachment": "Attachment",
     "Error decrypting attachment": "Error decrypting attachment",
@@ -1422,10 +1835,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.",
-    "Copied!": "Copied!",
-    "Failed to copy": "Failed to copy",
+    "This room is a continuation of another conversation.": "This room is a continuation of another conversation.",
     "Add an Integration": "Add an Integration",
     "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?": "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?",
     "Edited at %(date)s": "Edited at %(date)s",
@@ -1476,19 +1887,14 @@
     "Widgets do not use message encryption.": "Widgets do not use message encryption.",
     "Widget added by": "Widget added by",
     "This widget may use cookies.": "This widget may use cookies.",
-    "Delete Widget": "Delete Widget",
-    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?",
-    "Delete widget": "Delete widget",
-    "Failed to remove widget": "Failed to remove widget",
-    "An error ocurred whilst trying to remove the widget from the room": "An error ocurred whilst trying to remove the widget from the room",
-    "Minimize widget": "Minimize widget",
-    "Maximize widget": "Maximize widget",
     "Popout widget": "Popout widget",
-    "More options": "More options",
     "Use the <a>Desktop app</a> to see all encrypted files": "Use the <a>Desktop app</a> to see all encrypted files",
     "Use the <a>Desktop app</a> to search encrypted messages": "Use the <a>Desktop app</a> to search encrypted messages",
     "This version of %(brand)s does not support viewing some encrypted files": "This version of %(brand)s does not support viewing some encrypted files",
     "This version of %(brand)s does not support searching encrypted messages": "This version of %(brand)s does not support searching encrypted messages",
+    "Share your screen": "Share your screen",
+    "Screens": "Screens",
+    "Windows": "Windows",
     "Join": "Join",
     "No results": "No results",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.",
@@ -1567,10 +1973,13 @@
     "Please provide a room address": "Please provide a room address",
     "This address is available to use": "This address is available to use",
     "This address is already in use": "This address is already in use",
-    "Room directory": "Room directory",
+    "Server Options": "Server Options",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Element with an existing Matrix account on a different homeserver.": "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Element with an existing Matrix account on a different homeserver.",
+    "Join millions for free on the largest public server": "Join millions for free on the largest public server",
+    "Homeserver": "Homeserver",
+    "Continue with %(provider)s": "Continue with %(provider)s",
     "Sign in with single sign-on": "Sign in with single sign-on",
     "And %(count)s more...|other": "And %(count)s more...",
-    "Home": "Home",
     "Enter a server name": "Enter a server name",
     "Looks good": "Looks good",
     "Can't find this server or its room list": "Can't find this server or its room list",
@@ -1586,6 +1995,15 @@
     "%(networkName)s rooms": "%(networkName)s rooms",
     "Matrix rooms": "Matrix rooms",
     "Your access token gives full access to your account. Do not share it with anyone.": "Your access token gives full access to your account. Do not share it with anyone.",
+    "Space selection": "Space selection",
+    "Add existing spaces/rooms": "Add existing spaces/rooms",
+    "Filter your rooms and spaces": "Filter your rooms and spaces",
+    "Spaces": "Spaces",
+    "Don't want to add an existing room?": "Don't want to add an existing room?",
+    "Create a new room": "Create a new room",
+    "Applying...": "Applying...",
+    "Apply": "Apply",
+    "Failed to add rooms to space": "Failed to add rooms to space",
     "Matrix ID": "Matrix ID",
     "Matrix Room ID": "Matrix Room ID",
     "email address": "email address",
@@ -1629,6 +2047,7 @@
     "Removing…": "Removing…",
     "Confirm Removal": "Confirm Removal",
     "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.": "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.",
+    "Reason (optional)": "Reason (optional)",
     "Clear all data in this session?": "Clear all data in this session?",
     "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.",
     "Clear all data": "Clear all data",
@@ -1638,7 +2057,6 @@
     "You can change this later if needed.": "You can change this later if needed.",
     "What's the name of your community or team?": "What's the name of your community or team?",
     "Enter name": "Enter name",
-    "Create": "Create",
     "Add image (optional)": "Add image (optional)",
     "An image will help people identify your community.": "An image will help people identify your community.",
     "Community IDs cannot be empty.": "Community IDs cannot be empty.",
@@ -1660,11 +2078,8 @@
     "Create a public room": "Create a public room",
     "Create a private room": "Create a private room",
     "Create a room in %(communityName)s": "Create a room in %(communityName)s",
-    "Name": "Name",
     "Topic (optional)": "Topic (optional)",
     "Make this room public": "Make this room public",
-    "Hide advanced": "Hide advanced",
-    "Show advanced": "Show advanced",
     "Block anyone not part of %(serverName)s from ever joining this room.": "Block anyone not part of %(serverName)s from ever joining this room.",
     "Create Room": "Create Room",
     "Sign out": "Sign out",
@@ -1697,11 +2112,58 @@
     "Explore Account Data": "Explore Account Data",
     "View Servers in Room": "View Servers in Room",
     "Verification Requests": "Verification Requests",
+    "Active Widgets": "Active Widgets",
+    "There was an error finding this widget.": "There was an error finding this widget.",
+    "Settings Explorer": "Settings Explorer",
+    "Failed to save settings": "Failed to save settings",
+    "Setting ID": "Setting ID",
+    "Value": "Value",
+    "Value in this room": "Value in this room",
+    "Setting:": "Setting:",
+    "Caution:": "Caution:",
+    "This UI does NOT check the types of the values. Use at your own risk.": "This UI does NOT check the types of the values. Use at your own risk.",
+    "Setting definition:": "Setting definition:",
+    "Level": "Level",
+    "Settable at global": "Settable at global",
+    "Settable at room": "Settable at room",
+    "Values at explicit levels": "Values at explicit levels",
+    "Values at explicit levels in this room": "Values at explicit levels in this room",
+    "Save setting values": "Save setting values",
+    "Value:": "Value:",
+    "Value in this room:": "Value in this room:",
+    "Values at explicit levels:": "Values at explicit levels:",
+    "Values at explicit levels in this room:": "Values at explicit levels in this room:",
+    "Edit Values": "Edit Values",
     "Toolbox": "Toolbox",
     "Developer Tools": "Developer Tools",
     "There was an error updating your community. The server is unable to process your request.": "There was an error updating your community. The server is unable to process your request.",
     "Update community": "Update community",
     "An error has occurred.": "An error has occurred.",
+    "Feedback sent": "Feedback sent",
+    "Rate %(brand)s": "Rate %(brand)s",
+    "Tell us below how you feel about %(brand)s so far.": "Tell us below how you feel about %(brand)s so far.",
+    "Please go into as much detail as you like, so we can track down the problem.": "Please go into as much detail as you like, so we can track down the problem.",
+    "Add comment": "Add comment",
+    "Comment": "Comment",
+    "There are two ways you can provide feedback and help us improve %(brand)s.": "There are two ways you can provide feedback and help us improve %(brand)s.",
+    "Feedback": "Feedback",
+    "Report a bug": "Report a bug",
+    "Please view <existingIssuesLink>existing bugs on Github</existingIssuesLink> first. No match? <newIssueLink>Start a new one</newIssueLink>.": "Please view <existingIssuesLink>existing bugs on Github</existingIssuesLink> first. No match? <newIssueLink>Start a new one</newIssueLink>.",
+    "PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> to help us track down the problem.": "PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> to help us track down the problem.",
+    "Send feedback": "Send feedback",
+    "Confirm abort of host creation": "Confirm abort of host creation",
+    "Are you sure you wish to abort creation of the host? The process cannot be continued.": "Are you sure you wish to abort creation of the host? The process cannot be continued.",
+    "Abort": "Abort",
+    "Failed to connect to your homeserver. Please close this dialog and try again.": "Failed to connect to your homeserver. Please close this dialog and try again.",
+    "Continuing temporarily allows the %(hostSignupBrand)s setup process to access your account to fetch verified email addresses. This data is not stored.": "Continuing temporarily allows the %(hostSignupBrand)s setup process to access your account to fetch verified email addresses. This data is not stored.",
+    "Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.": "Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.",
+    "Cookie Policy": "Cookie Policy",
+    "Privacy Policy": "Privacy Policy",
+    "Terms of Service": "Terms of Service",
+    "You should know": "You should know",
+    "%(hostSignupBrand)s Setup": "%(hostSignupBrand)s Setup",
+    "Maximize dialog": "Maximize dialog",
+    "Minimize dialog": "Minimize dialog",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.",
     "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.",
     "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.": "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.",
@@ -1715,10 +2177,13 @@
     "To continue, use Single Sign On to prove your identity.": "To continue, use Single Sign On to prove your identity.",
     "Confirm to continue": "Confirm to continue",
     "Click the button below to confirm your identity.": "Click the button below to confirm your identity.",
+    "Invite by email": "Invite by email",
     "Failed to invite the following users to chat: %(csvUsers)s": "Failed to invite the following users to chat: %(csvUsers)s",
     "We couldn't create your DM. Please check the users you want to invite and try again.": "We couldn't create your DM. Please check the users you want to invite and try again.",
     "Something went wrong trying to invite the users.": "Something went wrong trying to invite the users.",
     "We couldn't invite those users. Please check the users you want to invite and try again.": "We couldn't invite those users. Please check the users you want to invite and try again.",
+    "A call can only be transferred to a single user.": "A call can only be transferred to a single user.",
+    "Failed to transfer call": "Failed to transfer call",
     "Failed to find the following users": "Failed to find the following users",
     "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s",
     "Recent Conversations": "Recent Conversations",
@@ -1726,12 +2191,15 @@
     "May include members not in %(communityName)s": "May include members not in %(communityName)s",
     "Recently Direct Messaged": "Recently Direct Messaged",
     "Direct Messages": "Direct Messages",
-    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Start a conversation with someone using their name, username (like <userId/>) or email address.",
+    "Start a conversation with someone using their name, email address or username (like <userId/>).": "Start a conversation with someone using their name, email address or username (like <userId/>).",
     "Start a conversation with someone using their name or username (like <userId/>).": "Start a conversation with someone using their name or username (like <userId/>).",
     "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>": "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>",
     "Go": "Go",
-    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.",
     "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.": "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this space</a>.": "Invite someone using their name, email address, username (like <userId/>) or <a>share this space</a>.",
+    "Invite someone using their name, username (like <userId/>) or <a>share this space</a>.": "Invite someone using their name, username (like <userId/>) or <a>share this space</a>.",
+    "Transfer": "Transfer",
     "a new master key signature": "a new master key signature",
     "a new cross-signing key signature": "a new cross-signing key signature",
     "a device cross-signing signature": "a device cross-signing signature",
@@ -1763,18 +2231,21 @@
     "Verify session": "Verify session",
     "Your homeserver doesn't seem to support this feature.": "Your homeserver doesn't seem to support this feature.",
     "Message edits": "Message edits",
+    "Modal Widget": "Modal Widget",
+    "Data on this screen is shared with %(widgetDomain)s": "Data on this screen is shared with %(widgetDomain)s",
     "Your account is not secure": "Your account is not secure",
     "Your password": "Your password",
     "This session, or the other session": "This session, or the other session",
     "The internet connection either session is using": "The internet connection either session is using",
-    "We recommend you change your password and recovery key in Settings immediately": "We recommend you change your password and recovery key in Settings immediately",
+    "We recommend you change your password and Security Key in Settings immediately": "We recommend you change your password and Security Key in Settings immediately",
     "New session": "New session",
     "Use this session to verify your new one, granting it access to encrypted messages:": "Use this session to verify your new one, granting it access to encrypted messages:",
     "If you didn’t sign in to this session, your account may be compromised.": "If you didn’t sign in to this session, your account may be compromised.",
     "This wasn't me": "This wasn't me",
-    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.",
-    "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.": "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.",
-    "Report bugs & give feedback": "Report bugs & give feedback",
+    "Doesn't look like a valid email address": "Doesn't look like a valid email address",
+    "Continuing without email": "Continuing without email",
+    "Just a heads up, if you don't add an email and forget your password, you could <b>permanently lose access to your account</b>.": "Just a heads up, if you don't add an email and forget your password, you could <b>permanently lose access to your account</b>.",
+    "Email (optional)": "Email (optional)",
     "Please fill why you're reporting.": "Please fill why you're reporting.",
     "Report Content to Your Homeserver Administrator": "Report Content to Your Homeserver Administrator",
     "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.",
@@ -1808,6 +2279,16 @@
     "A connection error occurred while trying to contact the server.": "A connection error occurred while trying to contact the server.",
     "The server is not configured to indicate what the problem is (CORS).": "The server is not configured to indicate what the problem is (CORS).",
     "Recent changes that have not yet been received": "Recent changes that have not yet been received",
+    "Unable to validate homeserver": "Unable to validate homeserver",
+    "Invalid URL": "Invalid URL",
+    "Specify a homeserver": "Specify a homeserver",
+    "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.",
+    "Sign into your homeserver": "Sign into your homeserver",
+    "We call the places where you can host your account ‘homeservers’.": "We call the places where you can host your account ‘homeservers’.",
+    "Other homeserver": "Other homeserver",
+    "Use your preferred Matrix homeserver if you have one, or host your own.": "Use your preferred Matrix homeserver if you have one, or host your own.",
+    "Learn more": "Learn more",
+    "About homeservers": "About homeservers",
     "Sign out and remove encryption keys?": "Sign out and remove encryption keys?",
     "Clear Storage and Sign Out": "Clear Storage and Sign Out",
     "Send Logs": "Send Logs",
@@ -1827,6 +2308,14 @@
     "Link to selected message": "Link to selected message",
     "Copy": "Copy",
     "Command Help": "Command Help",
+    "Failed to save space settings.": "Failed to save space settings.",
+    "Space settings": "Space settings",
+    "Edit settings relating to your space.": "Edit settings relating to your space.",
+    "Make this space private": "Make this space private",
+    "Leave Space": "Leave Space",
+    "View dev tools": "View dev tools",
+    "Saving...": "Saving...",
+    "Save Changes": "Save Changes",
     "To help us prevent this in future, please <a>send us logs</a>.": "To help us prevent this in future, please <a>send us logs</a>.",
     "Missing session data": "Missing session data",
     "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.",
@@ -1835,7 +2324,6 @@
     "Find others by phone or email": "Find others by phone or email",
     "Be found by phone or email": "Be found by phone or email",
     "Use bots, bridges, widgets and sticker packs": "Use bots, bridges, widgets and sticker packs",
-    "Terms of Service": "Terms of Service",
     "To continue you need to accept the terms of this service.": "To continue you need to accept the terms of this service.",
     "Service": "Service",
     "Summary": "Summary",
@@ -1853,17 +2341,20 @@
     "Upload Error": "Upload Error",
     "Verify other session": "Verify other session",
     "Verification Request": "Verification Request",
-    "A widget would like to verify your identity": "A widget would like to verify your identity",
-    "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 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.",
+    "Approve widget permissions": "Approve widget permissions",
+    "This widget would like to:": "This widget would like to:",
+    "Approve": "Approve",
+    "Decline All": "Decline All",
     "Remember my selection for this widget": "Remember my selection for this widget",
-    "Allow": "Allow",
-    "Deny": "Deny",
+    "Allow this widget to verify your identity": "Allow this widget to verify your identity",
+    "The widget will verify your user ID, but won't be able to perform actions for you:": "The widget will verify your user ID, but won't be able to perform actions for you:",
+    "Remember this": "Remember this",
     "Wrong file type": "Wrong file type",
     "Looks good!": "Looks good!",
-    "Wrong Recovery Key": "Wrong Recovery Key",
-    "Invalid Recovery Key": "Invalid Recovery Key",
+    "Wrong Security Key": "Wrong Security Key",
+    "Invalid Security Key": "Invalid Security Key",
     "Security Phrase": "Security Phrase",
-    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.",
+    "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "Unable to access secret storage. Please verify that you entered the correct Security Phrase.",
     "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "Enter your Security Phrase or <button>Use your Security Key</button> to continue.",
     "Security Key": "Security Key",
     "Use your Security Key to continue.": "Use your Security Key to continue.",
@@ -1878,25 +2369,27 @@
     "Fetching keys from server...": "Fetching keys from server...",
     "%(completed)s of %(total)s keys restored": "%(completed)s of %(total)s keys restored",
     "Unable to load backup status": "Unable to load backup status",
-    "Recovery key mismatch": "Recovery key mismatch",
-    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.",
-    "Incorrect recovery passphrase": "Incorrect recovery passphrase",
-    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.",
+    "Security Key mismatch": "Security Key mismatch",
+    "Backup could not be decrypted with this Security Key: please verify that you entered the correct Security Key.": "Backup could not be decrypted with this Security Key: please verify that you entered the correct Security Key.",
+    "Incorrect Security Phrase": "Incorrect Security Phrase",
+    "Backup could not be decrypted with this Security Phrase: please verify that you entered the correct Security Phrase.": "Backup could not be decrypted with this Security Phrase: please verify that you entered the correct Security Phrase.",
     "Unable to restore backup": "Unable to restore backup",
     "No backup found!": "No backup found!",
     "Keys restored": "Keys restored",
     "Failed to decrypt %(failedCount)s sessions!": "Failed to decrypt %(failedCount)s sessions!",
     "Successfully restored %(sessionCount)s keys": "Successfully restored %(sessionCount)s keys",
-    "Enter recovery passphrase": "Enter recovery passphrase",
+    "Enter Security Phrase": "Enter Security Phrase",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Warning</b>: you should only set up key backup from a trusted computer.",
-    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "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>": "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>",
-    "Enter recovery key": "Enter recovery key",
-    "This looks like a valid recovery key!": "This looks like a valid recovery key!",
-    "Not a valid recovery key": "Not a valid recovery key",
+    "Access your secure message history and set up secure messaging by entering your Security Phrase.": "Access your secure message history and set up secure messaging by entering your Security Phrase.",
+    "If you've forgotten your Security Phrase you can <button1>use your Security Key</button1> or <button2>set up new recovery options</button2>": "If you've forgotten your Security Phrase you can <button1>use your Security Key</button1> or <button2>set up new recovery options</button2>",
+    "Enter Security Key": "Enter Security Key",
+    "This looks like a valid Security Key!": "This looks like a valid Security Key!",
+    "Not a valid Security Key": "Not a valid Security Key",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Warning</b>: You should only set up key backup from a trusted computer.",
-    "Access your secure message history and set up secure messaging by entering your recovery key.": "Access your secure message history and set up secure messaging by entering your recovery key.",
-    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "If you've forgotten your recovery key you can <button>set up new recovery options</button>",
+    "Access your secure message history and set up secure messaging by entering your Security Key.": "Access your secure message history and set up secure messaging by entering your Security Key.",
+    "If you've forgotten your Security Key you can <button>set up new recovery options</button>": "If you've forgotten your Security Key you can <button>set up new recovery options</button>",
+    "Resume": "Resume",
+    "Hold": "Hold",
     "Reject invitation": "Reject invitation",
     "Are you sure you want to reject the invitation?": "Are you sure you want to reject the invitation?",
     "Unable to reject invite": "Unable to reject invite",
@@ -1918,77 +2411,58 @@
     "Set status": "Set status",
     "Set a new status...": "Set a new status...",
     "View Community": "View Community",
-    "Unpin": "Unpin",
-    "Reload": "Reload",
-    "Take picture": "Take picture",
+    "Take a picture": "Take a picture",
+    "Delete Widget": "Delete Widget",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?",
+    "Delete widget": "Delete widget",
+    "Remove for everyone": "Remove for everyone",
+    "Revoke permissions": "Revoke permissions",
+    "Move left": "Move left",
+    "Move right": "Move right",
     "This room is public": "This room is public",
     "Away": "Away",
     "User Status": "User Status",
     "powered by Matrix": "powered by Matrix",
     "This homeserver would like to make sure you are not a robot.": "This homeserver would like to make sure you are not a robot.",
     "Country Dropdown": "Country Dropdown",
-    "Custom Server Options": "Custom Server Options",
-    "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.": "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.",
     "Confirm your identity by entering your account password below.": "Confirm your identity by entering your account password below.",
     "Password": "Password",
     "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:",
     "Code": "Code",
     "Submit": "Submit",
+    "Something went wrong in confirming your identity. Cancel and try again.": "Something went wrong in confirming your identity. Cancel and try again.",
     "Start authentication": "Start authentication",
-    "Unable to validate homeserver/identity server": "Unable to validate homeserver/identity server",
-    "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>.": "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>.",
-    "Server Name": "Server Name",
     "Enter password": "Enter password",
     "Nice, strong password!": "Nice, strong password!",
     "Password is allowed, but unsafe": "Password is allowed, but unsafe",
     "Keep going...": "Keep going...",
-    "The email field must not be blank.": "The email field must not be blank.",
-    "The username field must not be blank.": "The username field must not be blank.",
-    "The phone number field must not be blank.": "The phone number field must not be blank.",
-    "The password field must not be blank.": "The password field must not be blank.",
+    "Enter username": "Enter username",
+    "Enter email address": "Enter email address",
+    "Enter phone number": "Enter phone number",
+    "That phone number doesn't look quite right, please check and try again": "That phone number doesn't look quite right, please check and try again",
     "Email": "Email",
     "Username": "Username",
     "Phone": "Phone",
-    "Not sure of your password? <a>Set a new one</a>": "Not sure of your password? <a>Set a new one</a>",
+    "Forgot password?": "Forgot password?",
     "Sign in with": "Sign in with",
     "Sign in": "Sign in",
-    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "No identity server is configured so you cannot add an email address in order to reset your password in the future.",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "If you don't specify an email address, you won't be able to reset your password. Are you sure?",
     "Use an email address to recover your account": "Use an email address to recover your account",
     "Enter email address (required on this homeserver)": "Enter email address (required on this homeserver)",
-    "Doesn't look like a valid email address": "Doesn't look like a valid email address",
-    "Passwords don't match": "Passwords don't match",
     "Other users can invite you to rooms using your contact details": "Other users can invite you to rooms using your contact details",
     "Enter phone number (required on this homeserver)": "Enter phone number (required on this homeserver)",
-    "Doesn't look like a valid phone number": "Doesn't look like a valid phone number",
     "Use lowercase letters, numbers, dashes and underscores only": "Use lowercase letters, numbers, dashes and underscores only",
-    "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.",
-    "Enter your custom homeserver URL <a>What does this mean?</a>": "Enter your custom homeserver URL <a>What does this mean?</a>",
-    "Homeserver URL": "Homeserver URL",
-    "Enter your custom identity server URL <a>What does this mean?</a>": "Enter your custom identity server URL <a>What does this mean?</a>",
-    "Identity Server URL": "Identity Server URL",
-    "Other servers": "Other servers",
-    "Free": "Free",
-    "Join millions for free on the largest public server": "Join millions for free on the largest public server",
-    "Premium": "Premium",
-    "Premium hosting for organisations <a>Learn more</a>": "Premium hosting for organisations <a>Learn more</a>",
-    "Find other public servers or use a custom server": "Find other public servers or use a custom server",
-    "Sign in to your Matrix account on %(serverName)s": "Sign in to your Matrix account on %(serverName)s",
-    "Sign in to your Matrix account on <underlinedServerName />": "Sign in to your Matrix account on <underlinedServerName />",
+    "Add an email to be able to reset your password.": "Add an email to be able to reset your password.",
+    "Use email or phone to optionally be discoverable by existing contacts.": "Use email or phone to optionally be discoverable by existing contacts.",
+    "Use email to optionally be discoverable by existing contacts.": "Use email to optionally be discoverable by existing contacts.",
     "Sign in with SSO": "Sign in with SSO",
     "Couldn't load page": "Couldn't load page",
     "You must <a>register</a> to use this functionality": "You must <a>register</a> to use this functionality",
@@ -1997,7 +2471,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",
@@ -2036,20 +2510,25 @@
     "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!": "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!",
     "Long Description (HTML)": "Long Description (HTML)",
     "Upload avatar": "Upload avatar",
-    "Description": "Description",
     "Community %(groupId)s not found": "Community %(groupId)s not found",
     "This homeserver does not support communities": "This homeserver does not support communities",
     "Failed to load %(groupId)s": "Failed to load %(groupId)s",
+    "Great, that'll help people know it's you": "Great, that'll help people know it's you",
+    "Add a photo so people know it's you.": "Add a photo so people know it's you.",
+    "Welcome %(name)s": "Welcome %(name)s",
+    "Now, let's help you get started": "Now, let's help you get started",
     "Welcome to %(appName)s": "Welcome to %(appName)s",
     "Liberate your communication": "Liberate your communication",
     "Send a Direct Message": "Send a Direct Message",
     "Explore Public Rooms": "Explore Public Rooms",
     "Create a Group Chat": "Create a Group Chat",
-    "Explore rooms": "Explore rooms",
+    "Upgrade to %(hostSignupBrand)s": "Upgrade to %(hostSignupBrand)s",
     "Failed to reject invitation": "Failed to reject invitation",
     "Cannot create rooms in this community": "Cannot create rooms in this community",
     "You do not have permission to create rooms in this community.": "You do not have permission to create rooms in this community.",
+    "This space is not public. You will not be able to rejoin without an invite.": "This space is not public. You will not be able to rejoin without an invite.",
     "This room is not public. You will not be able to rejoin without an invite.": "This room is not public. You will not be able to rejoin without an invite.",
+    "Are you sure you want to leave the space '%(spaceName)s'?": "Are you sure you want to leave the space '%(spaceName)s'?",
     "Are you sure you want to leave the room '%(roomName)s'?": "Are you sure you want to leave the room '%(roomName)s'?",
     "Failed to forget room %(errCode)s": "Failed to forget room %(errCode)s",
     "Signed Out": "Signed Out",
@@ -2061,6 +2540,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!",
@@ -2069,7 +2549,7 @@
     "Create a new community": "Create a new community",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.",
     "You’re all caught up": "You’re all caught up",
-    "You have no visible notifications in this room.": "You have no visible notifications in this room.",
+    "You have no visible notifications.": "You have no visible notifications.",
     "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.",
     "%(brand)s failed to get the public room list.": "%(brand)s failed to get the public room list.",
     "The homeserver may be unavailable or overloaded.": "The homeserver may be unavailable or overloaded.",
@@ -2091,8 +2571,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.",
@@ -2100,13 +2581,8 @@
     "%(count)s of your messages have not been sent.|one": "Your message was not sent.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Resend message</resendText> or <cancelText>cancel message</cancelText> now.",
-    "Calling...": "Calling...",
-    "Call connecting...": "Call connecting...",
-    "Starting camera...": "Starting camera...",
-    "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",
@@ -2116,11 +2592,49 @@
     "Failed to reject invite": "Failed to reject invite",
     "You have %(count)s unread notifications in a prior version of this room.|other": "You have %(count)s unread notifications in a prior version of this room.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "You have %(count)s unread notification in a prior version of this room.",
-    "Fill screen": "Fill screen",
-    "Click to unmute video": "Click to unmute video",
-    "Click to mute video": "Click to mute video",
-    "Click to unmute audio": "Click to unmute audio",
-    "Click to mute audio": "Click to mute audio",
+    "Unnamed Space": "Unnamed Space",
+    "Undo": "Undo",
+    "Remove from Space": "Remove from Space",
+    "No permissions": "No permissions",
+    "You're in this space": "You're in this space",
+    "You're in this room": "You're in this room",
+    "Save changes": "Save changes",
+    "All users join by default": "All users join by default",
+    "Manage rooms": "Manage rooms",
+    "Find a room...": "Find a room...",
+    "Accept Invite": "Accept Invite",
+    "Add existing rooms & spaces": "Add existing rooms & spaces",
+    "Default Rooms": "Default Rooms",
+    "Your server does not support showing space hierarchies.": "Your server does not support showing space hierarchies.",
+    "%(count)s members|other": "%(count)s members",
+    "%(count)s members|one": "%(count)s member",
+    "<inviter/> invited you to <name/>": "<inviter/> invited you to <name/>",
+    "You have been invited to <name/>": "You have been invited to <name/>",
+    "Your public space <name/>": "Your public space <name/>",
+    "Your private space <name/>": "Your private space <name/>",
+    "Welcome to <name/>": "Welcome to <name/>",
+    "Random": "Random",
+    "Support": "Support",
+    "Room name": "Room name",
+    "Failed to create initial space rooms": "Failed to create initial space rooms",
+    "Skip for now": "Skip for now",
+    "Creating rooms...": "Creating rooms...",
+    "At the moment only you can see it.": "At the moment only you can see it.",
+    "Finish": "Finish",
+    "Who are you working with?": "Who are you working with?",
+    "Ensure the right people have access to the space.": "Ensure the right people have access to the space.",
+    "Just Me": "Just Me",
+    "A private space just for you": "A private space just for you",
+    "Me and my teammates": "Me and my teammates",
+    "A private space for you and your teammates": "A private space for you and your teammates",
+    "Failed to invite the following users to your space: %(csvUsers)s": "Failed to invite the following users to your space: %(csvUsers)s",
+    "Invite your teammates": "Invite your teammates",
+    "Invite by username": "Invite by username",
+    "Inviting...": "Inviting...",
+    "What discussions do you want to have?": "What discussions do you want to have?",
+    "We'll create rooms for each topic.": "We'll create rooms for each topic.",
+    "What projects are you working on?": "What projects are you working on?",
+    "We'll create rooms for each of them. You can add existing rooms after setup.": "We'll create rooms for each of them. You can add existing rooms after setup.",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Tried to load a specific point in this room's timeline, but was unable to find it.",
     "Failed to load timeline position": "Failed to load timeline position",
@@ -2128,7 +2642,8 @@
     "Uploading %(filename)s and %(count)s others|zero": "Uploading %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Uploading %(filename)s and %(count)s other",
     "Failed to find the general chat for this community": "Failed to find the general chat for this community",
-    "Feedback": "Feedback",
+    "Got an account? <a>Sign in</a>": "Got an account? <a>Sign in</a>",
+    "New here? <a>Create an account</a>": "New here? <a>Create an account</a>",
     "Notification settings": "Notification settings",
     "Security & privacy": "Security & privacy",
     "All settings": "All settings",
@@ -2147,12 +2662,10 @@
     "A new password must be entered.": "A new password must be entered.",
     "New passwords must match each other.": "New passwords must match each other.",
     "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.",
-    "Your Matrix account on %(serverName)s": "Your Matrix account on %(serverName)s",
-    "Your Matrix account on <underlinedServerName />": "Your Matrix account on <underlinedServerName />",
-    "No identity server is configured: add one in server settings to reset your password.": "No identity server is configured: add one in server settings to reset your password.",
-    "Sign in instead": "Sign in instead",
+    "New Password": "New Password",
     "A verification email will be sent to your inbox to confirm setting your new password.": "A verification email will be sent to your inbox to confirm setting your new password.",
     "Send Reset Email": "Send Reset Email",
+    "Sign in instead": "Sign in instead",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.",
     "I have verified my email address": "I have verified my email address",
     "Your password has been reset.": "Your password has been reset.",
@@ -2173,29 +2686,31 @@
     "Incorrect username and/or password.": "Incorrect username and/or password.",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Please note you are logging into the %(hs)s server, not matrix.org.",
     "Failed to perform homeserver discovery": "Failed to perform homeserver discovery",
-    "The phone number entered looks invalid": "The phone number entered looks invalid",
     "This homeserver doesn't offer any login flows which are supported by this client.": "This homeserver doesn't offer any login flows which are supported by this client.",
-    "Error: Problem communicating with the given homeserver.": "Error: Problem communicating with the given homeserver.",
+    "There was a problem communicating with the homeserver, please try again later.": "There was a problem communicating with the homeserver, please try again later.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.",
     "Syncing...": "Syncing...",
     "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:",
+    "New? <a>Create account</a>": "New? <a>Create account</a>",
     "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.",
+    "That username already exists, please try another.": "That username already exists, please try another.",
+    "Continue with %(ssoButtons)s": "Continue with %(ssoButtons)s",
+    "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s Or %(usernamePassword)s",
+    "Already have an account? <a>Sign in here</a>": "Already have an account? <a>Sign in here</a>",
     "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).",
     "Continue with previous account": "Continue with previous account",
     "<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 account": "Create your account",
-    "Use Recovery Key or Passphrase": "Use Recovery Key or Passphrase",
-    "Use Recovery Key": "Use Recovery Key",
+    "Create account": "Create account",
+    "Host account on": "Host account on",
+    "Decide where your account is hosted": "Decide where your account is hosted",
+    "Use Security Key or Phrase": "Use Security Key or Phrase",
+    "Use Security Key": "Use Security Key",
     "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.",
     "This requires the latest %(brand)s on your other devices:": "This requires the latest %(brand)s on your other devices:",
     "%(brand)s Web": "%(brand)s Web",
@@ -2230,39 +2745,38 @@
     "Room Autocomplete": "Room Autocomplete",
     "Users": "Users",
     "User Autocomplete": "User Autocomplete",
-    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.",
     "For maximum security, this should be different from your account password.": "For maximum security, this should be different from your account password.",
-    "Enter a recovery passphrase": "Enter a recovery passphrase",
-    "Great! This recovery passphrase looks strong enough.": "Great! This recovery passphrase looks strong enough.",
-    "Set up with a recovery key": "Set up with a recovery key",
+    "Enter a Security Phrase": "Enter a Security Phrase",
+    "Great! This Security Phrase looks strong enough.": "Great! This Security Phrase looks strong enough.",
+    "Set up with a Security Key": "Set up with a Security Key",
     "That matches!": "That matches!",
     "Use a different passphrase?": "Use a different passphrase?",
     "That doesn't match.": "That doesn't match.",
     "Go back to set it again.": "Go back to set it again.",
-    "Please enter your recovery passphrase a second time to confirm.": "Please enter your recovery passphrase a second time to confirm.",
-    "Repeat your recovery passphrase...": "Repeat your recovery passphrase...",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.",
+    "Please enter your Security Phrase a second time to confirm.": "Please enter your Security Phrase a second time to confirm.",
+    "Repeat your Security Phrase...": "Repeat your Security Phrase...",
+    "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Keep a copy of it somewhere secure, like a password manager or even a safe.",
-    "Your recovery key": "Your recovery key",
+    "Your Security Key": "Your Security Key",
     "Download": "Download",
-    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Your recovery key has been <b>copied to your clipboard</b>, paste it to:",
-    "Your recovery key is in your <b>Downloads</b> folder.": "Your recovery key is in your <b>Downloads</b> folder.",
+    "Your Security Key has been <b>copied to your clipboard</b>, paste it to:": "Your Security Key has been <b>copied to your clipboard</b>, paste it to:",
+    "Your Security Key is in your <b>Downloads</b> folder.": "Your Security Key is in your <b>Downloads</b> folder.",
     "<b>Print it</b> and store it somewhere safe": "<b>Print it</b> and store it somewhere safe",
     "<b>Save it</b> on a USB key or backup drive": "<b>Save it</b> on a USB key or backup drive",
     "<b>Copy it</b> to your personal cloud storage": "<b>Copy it</b> to your personal cloud storage",
     "Your keys are being backed up (the first backup could take a few minutes).": "Your keys are being backed up (the first backup could take a few minutes).",
     "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.": "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.",
     "Set up Secure Message Recovery": "Set up Secure Message Recovery",
-    "Secure your backup with a recovery passphrase": "Secure your backup with a recovery passphrase",
-    "Confirm your recovery passphrase": "Confirm your recovery passphrase",
-    "Make a copy of your recovery key": "Make a copy of your recovery key",
+    "Secure your backup with a Security Phrase": "Secure your backup with a Security Phrase",
+    "Confirm your Security Phrase": "Confirm your Security Phrase",
+    "Make a copy of your Security Key": "Make a copy of your Security Key",
     "Starting backup...": "Starting backup...",
     "Success!": "Success!",
     "Create key backup": "Create key backup",
     "Unable to create key backup": "Unable to create key backup",
     "Generate a Security Key": "Generate a Security Key",
     "We’ll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": "We’ll generate a Security Key for you to store somewhere safe, like a password manager or a safe.",
-    "Enter a Security Phrase": "Enter a Security Phrase",
     "Use a secret phrase only you know, and optionally save a Security Key to use for backup.": "Use a secret phrase only you know, and optionally save a Security Key to use for backup.",
     "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.",
     "Enter your account password to confirm the upgrade:": "Enter your account password to confirm the upgrade:",
@@ -2272,6 +2786,7 @@
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.",
     "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.": "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.",
     "Enter your recovery passphrase a second time to confirm it.": "Enter your recovery passphrase a second time to confirm it.",
+    "Confirm your recovery passphrase": "Confirm your recovery passphrase",
     "Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.": "Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.",
     "Unable to query secret storage status": "Unable to query secret storage status",
     "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.",
@@ -2296,13 +2811,13 @@
     "File to import": "File to import",
     "Import": "Import",
     "New Recovery Method": "New Recovery Method",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "A new recovery passphrase and key for Secure Messages have been detected.",
+    "A new Security Phrase and key for Secure Messages have been detected.": "A new Security Phrase and key for Secure Messages have been detected.",
     "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.": "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.",
     "This session is encrypting history using the new recovery method.": "This session is encrypting history using the new recovery method.",
     "Go to Settings": "Go to Settings",
     "Set up Secure Messages": "Set up Secure Messages",
     "Recovery Method Removed": "Recovery Method Removed",
-    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "This session has detected that your recovery passphrase and key for Secure Messages have been removed.",
+    "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "This session has detected that your Security Phrase and key for Secure Messages have been removed.",
     "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.": "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.",
     "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.": "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.",
     "If disabled, messages from encrypted rooms won't appear in search results.": "If disabled, messages from encrypted rooms won't appear in search results.",
@@ -2341,6 +2856,7 @@
     "Dismiss read marker and jump to bottom": "Dismiss read marker and jump to bottom",
     "Jump to oldest unread message": "Jump to oldest unread message",
     "Upload a file": "Upload a file",
+    "Search (must be enabled)": "Search (must be enabled)",
     "Jump to room search": "Jump to room search",
     "Navigate up/down in the room list": "Navigate up/down in the room list",
     "Select room from the room list": "Select room from the room list",
@@ -2354,6 +2870,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",
diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index aec575b8b4..3f99a68187 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -1,7 +1,7 @@
 {
     "This email address is already in use": "Tiu ĉi retpoŝtadreso jam estas uzata",
     "This phone number is already in use": "Tiu ĉi telefonnumero jam estas uzata",
-    "Failed to verify email address: make sure you clicked the link in the email": "Kontrolo de via retpoŝtadreso malsukcesis: certigu, ke vi alklakis la ligilon en la retmesaĝo",
+    "Failed to verify email address: make sure you clicked the link in the email": "Kontrolo de via retpoŝtadreso malsukcesis: certigu, ke vi klakis la ligilon en la retmesaĝo",
     "Call Timeout": "Voka tempolimo",
     "The remote side failed to pick up": "La defora flanko malsukcesis respondi",
     "Unable to capture screen": "Ne povas registri ekranon",
@@ -278,7 +278,7 @@
     "Only people who have been invited": "Nur invititaj uzantoj",
     "Anyone who knows the room's link, apart from guests": "Iu ajn kun la ligilo, krom gastoj",
     "Anyone who knows the room's link, including guests": "Iu ajn kun la ligilo, inkluzive gastojn",
-    "Publish this room to the public in %(domain)s's room directory?": "Ĉu publikigi ĉi tiun ĉambron al la publika listo de ĉambroj de %(domain)s?",
+    "Publish this room to the public in %(domain)s's room directory?": "Ĉu publikigi ĉi tiun ĉambron per la katalogo de ĉambroj de %(domain)s?",
     "Who can read history?": "Kiu povas legi la historion?",
     "Anyone": "Iu ajn",
     "Members only (since the point in time of selecting this option)": "Nur ĉambranoj (ekde ĉi tiu elekto)",
@@ -365,15 +365,15 @@
     "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s%(count)s-foje foriris",
     "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)sforiris",
     "%(oneUser)sleft %(count)s times|other": "%(oneUser)s%(count)s-foje foriris",
-    "%(oneUser)sleft %(count)s times|one": "%(oneUser)sforiris",
+    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s foriris",
     "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s%(count)s-foje aliĝis kaj foriris",
     "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)saliĝis kaj foriris",
     "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s%(count)s-foje aliĝis kaj foriris",
     "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)saliĝis kaj foriris",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s%(count)s-foje foriris kaj realiĝis",
-    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)sforiris kaj realiĝis",
-    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s%(count)s-foje foriris kaj realiĝis",
-    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)sforiris kaj realiĝis",
+    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s%(count)s-foje foriris kaj re-aliĝis",
+    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s foriris kaj re-aliĝis",
+    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s %(count)s-foje foriris kaj re-aliĝis",
+    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s foriris kaj re-aliĝis",
     "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s%(count)s-foje rifuzis inviton",
     "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)srifuzis inviton",
     "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s%(count)s-foje rifuzis inviton",
@@ -412,7 +412,7 @@
     "collapse": "maletendi",
     "expand": "etendi",
     "Custom level": "Propra nivelo",
-    "Room directory": "Listo de ĉambroj",
+    "Room directory": "Katalogo de ĉambroj",
     "Username not available": "Uzantonomo ne disponeblas",
     "Username invalid: %(errMessage)s": "Uzantonomo ne validas: %(errMessage)s",
     "Username available": "Uzantonomo disponeblas",
@@ -448,7 +448,7 @@
     "Invalid Email Address": "Malvalida retpoŝtadreso",
     "This doesn't appear to be a valid email address": "Tio ĉi ne ŝajnas esti valida retpoŝtadreso",
     "Verification Pending": "Atendante kontrolon",
-    "Please check your email and click on the link it contains. Once this is done, click continue.": "Bonvolu kontroli vian retpoŝton, kaj alklaki la ligilon enhavatan en la sendita mesaĝo. Farinte tion, klaku je 'daŭrigi'.",
+    "Please check your email and click on the link it contains. Once this is done, click continue.": "Bonvolu kontroli vian retpoŝton, kaj klaki la ligilon enhavatan en la sendita mesaĝo. Farinte tion, klaku je «daŭrigi».",
     "Unable to add email address": "Ne povas aldoni retpoŝtadreson",
     "Unable to verify email address.": "Retpoŝtadreso ne kontroleblas.",
     "This will allow you to reset your password and receive notifications.": "Tio ĉi permesos al vi restarigi vian pasvorton kaj ricevi sciigojn.",
@@ -484,7 +484,7 @@
     "Leave Community": "Forlasi komunumon",
     "Leave %(groupName)s?": "Ĉu foriri el %(groupName)s?",
     "Community Settings": "Komunumaj agordoj",
-    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Tiuj ĉi ĉambroj montriĝas al komunumanoj sur la paĝo de la komunumo. Ili povas aliĝi al la ĉambroj per alklakoj.",
+    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Ĉi tiuj ĉambroj montriĝas al komunumanoj sur la paĝo de la komunumo. Komunumanoj povas klaki ĉambrojn por aliĝi.",
     "Featured Rooms:": "Elstarigitaj ĉambroj:",
     "Featured Users:": "Elstarigitaj uzantoj:",
     "%(inviter)s has invited you to join this community": "%(inviter)s invitis vin al tiu ĉi komunumo",
@@ -640,7 +640,7 @@
     "Friday": "Vendredo",
     "Update": "Ĝisdatigi",
     "What's New": "Kio novas",
-    "On": "Ek",
+    "On": "Jes",
     "Changelog": "Protokolo de ŝanĝoj",
     "Waiting for response from server": "Atendante respondon el la servilo",
     "Send Custom Event": "Sendi propran okazon",
@@ -649,15 +649,15 @@
     "You cannot delete this image. (%(code)s)": "Vi ne povas forigi tiun ĉi bildon. (%(code)s)",
     "Cancel Sending": "Nuligi sendon",
     "This Room": "Ĉi tiu ĉambro",
-    "Noisy": "Brua",
+    "Noisy": "Brue",
     "Room not found": "Ĉambro ne troviĝis",
     "Messages containing my display name": "Mesaĝoj enhavantaj mian vidigan nomon",
     "Messages in one-to-one chats": "Mesaĝoj en duopaj babiloj",
     "Unavailable": "Nedisponebla",
     "View Decrypted Source": "Vidi malĉifritan fonton",
-    "Failed to update keywords": "Malsukcesis ĝisdatigi la ŝlosilvortojn",
-    "remove %(name)s from the directory.": "forigi %(name)s de la ujo.",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "La sciigoj de la jenaj ŝlosilvortoj sekvas regulojn kiuj ne povas esti montrataj ĉi tie:",
+    "Failed to update keywords": "Malsukcesis ĝisdatigi la ĉefvortojn",
+    "remove %(name)s from the directory.": "forigi %(name)s de la katalogo.",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "La sciigoj de la jenaj ĉefvortoj obeas regulojn kiuj ne povas esti montrataj ĉi tie:",
     "Please set a password!": "Bonvolu agordi pasvorton!",
     "You have successfully set a password!": "Vi sukcese agordis pasvorton!",
     "An error occurred whilst saving your email notification preferences.": "Konservo de agordoj pri retpoŝtaj sciigoj eraris.",
@@ -671,13 +671,13 @@
     "Collecting app version information": "Kolektante informon pri versio de la aplikaĵo",
     "Enable notifications for this account": "Ŝalti sciigojn por tiu ĉi konto",
     "Invite to this community": "Inviti al tiu ĉi komunumo",
-    "Messages containing <span>keywords</span>": "Mesaĝoj enhavantaj <span>ŝlosilovortojn</span>",
+    "Messages containing <span>keywords</span>": "Mesaĝoj enhavantaj <span>ĉefvortojn</span>",
     "Error saving email notification preferences": "Konservo de preferoj pri retpoŝtaj sciigoj eraris",
     "Tuesday": "Mardo",
-    "Enter keywords separated by a comma:": "Entajpu ŝlosilvortojn apartigitajn per komoj:",
+    "Enter keywords separated by a comma:": "Entajpu ĉefvortojn apartigitajn per komoj:",
     "Search…": "Serĉi…",
     "You have successfully set a password and an email address!": "Vi sukcese agordis pasvorton kaj retpoŝtadreson!",
-    "Remove %(name)s from the directory?": "Ĉu forigi %(name)s de la ujo?",
+    "Remove %(name)s from the directory?": "Ĉu forigi %(name)s de la katalogo?",
     "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s uzas multajn specialajn funkciojn, el kiuj kelkaj ne disponeblas aŭ estas eksperimentaj en via nuna foliumilo.",
     "Event sent!": "Okazo sendiĝis!",
     "Explore Account Data": "Esplori kontajn datumojn",
@@ -689,7 +689,7 @@
     "Reject": "Rifuzi",
     "Failed to set Direct Message status of room": "Malsukcesis agordi staton de rekteco al la ĉambro",
     "Monday": "Lundo",
-    "Remove from Directory": "Forigi de ujo",
+    "Remove from Directory": "Forigi de katalogo",
     "Enable them now": "Ŝalti ilin nun",
     "Toolbox": "Ilaro",
     "Collecting logs": "Kolektante protokolon",
@@ -708,7 +708,7 @@
     "What's new?": "Kio novas?",
     "Notify me for anything else": "Sciigu min pri ĉio alia",
     "When I'm invited to a room": "Kiam mi estas invitita al ĉambro",
-    "Keywords": "Ŝlosilvortoj",
+    "Keywords": "Ĉefvortoj",
     "Can't update user notification settings": "Agordoj de sciigoj al uzanto ne ĝisdatigeblas",
     "Notify for all other messages/rooms": "Sciigu min por ĉiuj aliaj mesaĝoj/ĉambroj",
     "Unable to look up room ID from server": "Ne povas akiri ĉambran identigilon de la servilo",
@@ -730,7 +730,7 @@
     "Low Priority": "Malalta prioritato",
     "Unable to fetch notification target list": "Ne povas akiri la liston de celoj por sciigoj",
     "Set Password": "Agordi pasvorton",
-    "Off": "For",
+    "Off": "Ne",
     "%(brand)s does not know how to join a room on this network": "%(brand)s ne scias aliĝi al ĉambroj en tiu ĉi reto",
     "Mentions only": "Nur mencioj",
     "Failed to remove tag %(tagName)s from room": "Malsukcesis forigi etikedon %(tagName)s el la ĉambro",
@@ -771,7 +771,7 @@
     "This homeserver has hit its Monthly Active User limit.": "Tiu ĉi hejmservilo atingis sian monatan limon de aktivaj uzantoj.",
     "This homeserver has exceeded one of its resource limits.": "Tiu ĉi hejmservilo superis je unu el siaj risurcaj limoj.",
     "Unable to connect to Homeserver. Retrying...": "Ne povas konektiĝi al hejmservilo. Reprovante…",
-    "You do not have permission to invite people to this room.": "Vi ne havas permeson inviti homojn al la ĉambro.",
+    "You do not have permission to invite people to this room.": "Vi ne havas permeson inviti personojn al la ĉambro.",
     "User %(user_id)s does not exist": "Uzanto %(user_id)s ne ekzistas",
     "Unknown server error": "Nekonata servila eraro",
     "Use a few words, avoid common phrases": "Uzu malmultajn vortojn, kaj evitu oftajn frazojn",
@@ -888,8 +888,8 @@
     "Phone numbers": "Telefonnumeroj",
     "Legal": "Jura",
     "Credits": "Dankoj",
-    "For help with using %(brand)s, click <a>here</a>.": "Por helpo kun uzo de %(brand)s, alklaku <a>ĉi tie</a>.",
-    "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "Por helpo kun uzo de %(brand)s, alklaku <a>ĉi tie</a> aŭ komencu babilon kun nia roboto uzante la butonon sube.",
+    "For help with using %(brand)s, click <a>here</a>.": "Por helpo pri uzado de %(brand)s, klaku <a>ĉi tien</a>.",
+    "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "Por helpo pri uzado de %(brand)s, klaku <a>ĉi tien</a> aŭ komencu babilon kun nia roboto per la butono sube.",
     "Chat with %(brand)s Bot": "Babilu kun la roboto %(brand)s Bot",
     "Help & About": "Helpo kaj Prio",
     "Bug reporting": "Cim-raportado",
@@ -1081,10 +1081,10 @@
     "Account management": "Administrado de kontoj",
     "This event could not be displayed": "Ĉi tiu okazo ne povis montriĝi",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Bonvolu instali foliumilon <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, aŭ <safariLink>Safari</safariLink>, por la plej bona sperto.",
-    "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Vi estas administranto de tiu ĉi komunumo. Sen invito de alia administranto vi ne povos realiĝi.",
+    "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Vi estas administranto de tiu ĉi komunumo. Sen invito de alia administranto vi ne povos re-aliĝi.",
     "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Ŝanĝoj al viaj komunumaj <bold1>nomo</bold1> kaj <bold2>profilbildo</bold2> eble ne montriĝos al aliaj uzantoj ĝis 30 minutoj.",
     "Who can join this community?": "Kiu povas aliĝi al tiu ĉi komunumo?",
-    "This room is not public. You will not be able to rejoin without an invite.": "Ĉi tiu ĉambro ne estas publika. Vi ne povos realiĝi sen invito.",
+    "This room is not public. You will not be able to rejoin without an invite.": "Ĉi tiu ĉambro ne estas publika. Vi ne povos re-aliĝi sen invito.",
     "Can't leave Server Notices room": "Ne eblas eliri el ĉambro « Server Notices »",
     "Revoke invite": "Nuligi inviton",
     "Invited by %(sender)s": "Invitita de %(sender)s",
@@ -1159,7 +1159,7 @@
     "Create a new room with the same name, description and avatar": "Kreos novan ĉàmbron kun la sama nomo, priskribo, kaj profilbildo",
     "Update any local room aliases to point to the new room": "Religos ĉiujn lokajn kromnomojn al la nova ĉambro",
     "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Haltigos parolojn al la malnova versio de al ĉambro, kaj konsilos uzantojn pri la nova per mesaĝo",
-    "Put a link back to the old room at the start of the new room so people can see old messages": "Metos en la novan ĉambron ligilon al la malnova, por ke homoj povu rigardi la malnovajn mesaĝojn",
+    "Put a link back to the old room at the start of the new room so people can see old messages": "Metos en la novan ĉambron ligilon al la malnova, por ke oni povu rigardi la malnovajn mesaĝojn",
     "Sign out and remove encryption keys?": "Ĉu adiaŭi kaj forigi ĉifrajn ŝlosilojn?",
     "Send Logs": "Sendi protokolon",
     "A username can only contain lower case letters, numbers and '=_-./'": "Uzantonomo povas enhavi nur minusklojn, numerojn, kaj la signojn: =_-./",
@@ -1342,7 +1342,7 @@
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Por daŭre uzadi la hejmservilon %(homeserverDomain)s, vi devas tralegi kaj konsenti niajn uzokondiĉojn.",
     "Review terms and conditions": "Tralegi uzokondiĉojn",
     "Did you know: you can use communities to filter your %(brand)s experience!": "Ĉu vi sciis: vi povas uzi komunumojn por filtri vian sperton de %(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.": "Por agordi filtrilon, tiru komunuman profilbildon sur la filtran panelon je la maldekstra flanko. Vi povas klaki sur profilbildon en la filtra panelo iam ajn, por vidi nur ĉambrojn kaj homojn ligitaj al ties komunumo.",
+    "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.": "Por agordi filtrilon, tiru komunuman profilbildon sur la filtran panelon je la maldekstra flanko. Vi povas klaki profilbildon en la filtra panelo iam ajn, por vidi nur ĉambrojn kaj personojn ligitajn al ties komunumo.",
     "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s malsukcesis akiri liston de protokoloj de la hejmservilo. Eble la hejmservilo estas tro malnova por subteni eksterajn retojn.",
     "%(brand)s failed to get the public room list.": "%(brand)s malsukcesis akiri la liston de publikaj ĉambroj.",
     "The homeserver may be unavailable or overloaded.": "La hejmservilo eble estas neatingebla aŭ troŝarĝita.",
@@ -1407,7 +1407,7 @@
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Bonvolu peti la administranton de via hejmservilo (<code>%(homeserverDomain)s</code>) agordi TURN-servilon, por ke vokoj funkciu dependeble.",
     "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.": "Alternative, vi povas prove uzi la publikan servilon je <code>turn.matrix.org</code>, sed tio ne estas same dependebla, kaj ĝi havigos vian IP-adreson al tiu servilo. Vi povas administri tion ankaŭ en Agordoj.",
     "Try using turn.matrix.org": "Provu uzi servilon turn.matrix.org",
-    "Sends a message as plain text, without interpreting it as markdown": "Sendas mesaĝon kiel platan tekston, sen interpreto al MarkDown",
+    "Sends a message as plain text, without interpreting it as markdown": "Sendas mesaĝon kiel platan tekston, sen interpreto al Markdown",
     "You do not have the required permissions to use this command.": "Vi ne havas sufiĉajn permesojn por uzi ĉi tiun komandon.",
     "Changes the avatar of the current room": "Ŝanĝas la profilbildon de la nuna ĉambro",
     "Use an identity server": "Uzi identigan servilon",
@@ -1595,7 +1595,7 @@
     "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s metis voĉvokon. (mankas subteno en ĉi tiu foliumilo)",
     "%(senderName)s placed a video call.": "%(senderName)s metis vidvokon.",
     "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s metis vidvokon. (mankas subteno en ĉi tiu foliumilo)",
-    "Try out new ways to ignore people (experimental)": "Elprovi novajn manierojn malatenti homojn (eksperimente)",
+    "Try out new ways to ignore people (experimental)": "Elprovi novajn manierojn malatenti personojn (eksperimente)",
     "Match system theme": "Similiĝi la sisteman haŭton",
     "My Ban List": "Mia listo de forbaroj",
     "This is your list of users/servers you have blocked - don't leave the room!": "Ĉi tio estas la listo de uzantoj/serviloj, kiujn vi blokis – ne eliru el la ĉambro!",
@@ -1675,7 +1675,7 @@
     "Automatically invite users": "Memage inviti uzantojn",
     "Upgrade private room": "Gradaltigi privatan ĉambron",
     "Upgrade public room": "Gradaltigi publikan ĉambron",
-    "Notification settings": "Sciigaj agordoj",
+    "Notification settings": "Agordoj pri sciigoj",
     "Take picture": "Foti",
     "Start": "Komenci",
     "Done": "Fini",
@@ -1827,7 +1827,7 @@
     "Server rules": "Servilaj reguloj",
     "User rules": "Uzantulaj reguloj",
     "You are currently ignoring:": "Vi nun malatentas:",
-    "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.": "Malatento de homoj okazas per listoj de forbaroj, kiuj enhavas regulojn pri tio, kiun forbari. Abono de listo de forbaroj signifas, ke la uzantoj/serviloj blokataj de la listo estos kaŝitaj de vi.",
+    "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.": "Malatentado de personoj okazas per listoj de forbaroj, kiuj enhavas regulojn pri tio, kiun forbari. Abonado de listo de forbaroj signifas, ke la uzantoj/serviloj blokataj de la listo estos kaŝitaj de vi.",
     "Personal ban list": "Persona listo de forbaroj",
     "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.": "Via persona listo de forbaroj tenas ĉiujn uzantojn/servilojn, kies mesaĝoj vi persone ne volas vidi. Post via unua malatento, nova ĉambro aperos en via listo de ĉambroj, nomita «Mia listo de forbaroj» – restu en ĝi por efikigi la liston de forbaroj.",
     "Server or user ID to ignore": "Malatentota servilo aŭ identigilo de uzanto",
@@ -1838,7 +1838,7 @@
     "Session key:": "Ŝlosilo de salutaĵo:",
     "Message search": "Serĉado de mesaĝoj",
     "Cross-signing": "Delegaj subskriboj",
-    "A session's public name is visible to people you communicate with": "Publika nomo de salutaĵo estas videbla al homoj, kun kiuj vi komunikas",
+    "A session's public name is visible to people you communicate with": "Publika nomo de salutaĵo estas videbla al personoj, kun kiuj vi komunikas",
     "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Ĉi tiu ĉambro transpontigas mesaĝojn al la jenaj platformoj. <a>Eksciu plion.</a>",
     "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Ĉi tiu ĉambro transpontigas mesaĝojn al neniu platformo. <a>Eksciu plion.</a>",
     "Bridges": "Pontoj",
@@ -1939,7 +1939,7 @@
     "Incorrect recovery passphrase": "Malĝusta rehava pasfrazo",
     "Enter recovery passphrase": "Enigu la rehavan pasfrazon",
     "Enter recovery key": "Enigu la rehavan ŝlosilon",
-    "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Averto</b>: savkopiadon de ŝlosiloj vi starigu nur el fidata komputilo.",
+    "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Averto</b>: savkopiadon de ŝlosiloj vi starigu nur per fidata komputilo.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Se vi forgesis vian rehavan ŝlosilon, vi povas <button>reagordi rehavon</button>",
     "Reload": "Relegi",
     "Remove for everyone": "Forigi por ĉiuj",
@@ -2025,7 +2025,7 @@
     "Confirm by comparing the following with the User Settings in your other session:": "Konfirmu per komparo de la sekva kun la agardoj de uzanto en via alia salutaĵo:",
     "Confirm this user's session by comparing the following with their User Settings:": "Konfirmu la salutaĵon de ĉi tiu uzanto per komparo de la sekva kun ĝiaj agordoj de uzanto:",
     "If they don't match, the security of your communication may be compromised.": "Se ili ne akordas, la sekureco de via komunikado eble estas rompita.",
-    "Navigation": "Navigado",
+    "Navigation": "Navigacio",
     "Calls": "Vokoj",
     "Room List": "Listo de ĉambroj",
     "Autocomplete": "Memkompletigo",
@@ -2038,13 +2038,13 @@
     "Toggle Italics": "Ŝalti kursivon",
     "Toggle Quote": "Ŝalti citaĵon",
     "New line": "Nova linio",
-    "Navigate recent messages to edit": "Navigi freŝajn mesaĝojn redaktotajn",
+    "Navigate recent messages to edit": "Trairi freŝajn mesaĝojn redaktotajn",
     "Jump to start/end of the composer": "Salti al komenco/fino de la komponilo",
-    "Navigate composer history": "Navigi historion de la komponilo",
+    "Navigate composer history": "Trairi historion de la komponilo",
     "Toggle microphone mute": "Baskuligi silentigon de mikrofono",
     "Toggle video on/off": "Baskuligi filmojn",
     "Jump to room search": "Salti al serĉo de ĉambroj",
-    "Navigate up/down in the room list": "Navigi supren/malsupren en la listo de ĉambroj",
+    "Navigate up/down in the room list": "Iri supren/malsupren en la listo de ĉambroj",
     "Select room from the room list": "Elekti ĉambron el la listo de ĉambroj",
     "Collapse room list section": "Maletendi parton kun listo de ĉambroj",
     "Expand room list section": "Etendi parton kun listo de ĉambroj",
@@ -2072,7 +2072,7 @@
     "Invalid theme schema.": "Nevalida skemo de haŭto.",
     "Mod": "Reguligisto",
     "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "En ĉifritaj ĉambroj, viaj mesaĝoj estas sekurigitaj, kaj nur vi kaj la ricevanto havas la unikajn malĉifrajn ŝlosilojn.",
-    "Verify all users in a room to ensure it's secure.": "Kontroli ĉiujn uzantojn en ĉambro por certigi, ke ĝi sekuras.",
+    "Verify all users in a room to ensure it's secure.": "Kontrolu ĉiujn uzantojn en ĉambro por certigi, ke ĝi sekuras.",
     "In encrypted rooms, verify all users to ensure it’s secure.": "En ĉifritaj ĉambroj, kontroli ĉiujn uzantojn por certigi, ke ili sekuras.",
     "Verified": "Kontrolita",
     "Verification cancelled": "Kontrolo nuliĝis",
@@ -2089,7 +2089,7 @@
     "Review where you’re logged in": "Kontrolu, kie vi salutis",
     "New login. Was this you?": "Nova saluto. Ĉu tio estis vi?",
     "%(name)s is requesting verification": "%(name)s petas kontrolon",
-    "Sends a message as html, without interpreting it as markdown": "Sendas mesaĝon kiel HTML, ne interpretante ĝin kiel MarkDown",
+    "Sends a message as html, without interpreting it as markdown": "Sendas mesaĝon kiel HTML, ne interpretante ĝin kiel Markdown",
     "Failed to set topic": "Malsukcesis agordi temon",
     "Command failed": "Komando malsukcesis",
     "Could not find user in room": "Ne povis trovi uzanton en ĉambro",
@@ -2214,7 +2214,7 @@
     "Set a room address to easily share your room with other people.": "Agordu adreson de ĉambro por facile konigi la ĉambron al aliuloj.",
     "You've previously used a newer version of %(brand)s with this session. To use this version again with end to end encryption, you will need to sign out and back in again.": "Vi antaŭe uzis pli novan version de %(brand)s kun tiu ĉi salutaĵo. Por ree uzi ĉi tiun version kun tutvoja ĉifrado, vi devos adiaŭi kaj resaluti.",
     "Address (optional)": "Adreso (malnepra)",
-    "Delete the room address %(alias)s and remove %(name)s from the directory?": "Ĉu forigi la adreson de ĉambro %(alias)s kaj forigi %(name)s de la listo?",
+    "Delete the room address %(alias)s and remove %(name)s from the directory?": "Ĉu forigi la adreson de ĉambro %(alias)s kaj forigi %(name)s de la katalogo?",
     "delete the address.": "forigi la adreson.",
     "Use a different passphrase?": "Ĉu uzi alian pasfrazon?",
     "Help us improve %(brand)s": "Helpu al ni plibonigi %(brand)son",
@@ -2317,7 +2317,7 @@
     "Low priority rooms show up at the bottom of your room list in a dedicated section at the bottom of your room list": "Ĉambroj kun malalta prioritato montriĝas en aparta sekcio, en la suba parto de via ĉambrobreto,",
     "The authenticity of this encrypted message can't be guaranteed on this device.": "La aŭtentikeco de ĉi tiu ĉifrita mesaĝo ne povas esti garantiita sur ĉi tiu aparato.",
     "No recently visited rooms": "Neniuj freŝdate vizititaj ĉambroj",
-    "People": "Homoj",
+    "People": "Personoj",
     "Unread rooms": "Nelegitaj ĉambroj",
     "Always show first": "Ĉiam montri unuaj",
     "Show": "Montri",
@@ -2329,7 +2329,7 @@
     "Show %(count)s more|other": "Montri %(count)s pliajn",
     "Show %(count)s more|one": "Montri %(count)s plian",
     "Use default": "Uzi implicitan",
-    "Mentions & Keywords": "Mencioj kaj ŝlosilvortoj",
+    "Mentions & Keywords": "Mencioj kaj ĉefvortoj",
     "Notification options": "Elektebloj pri sciigoj",
     "Favourited": "Elstarigita",
     "Leave Room": "Foriri de ĉambro",
@@ -2407,5 +2407,604 @@
     "Recent changes that have not yet been received": "Freŝaj ŝanĝoj ankoraŭ ne ricevitaj",
     "No files visible in this room": "Neniuj dosieroj videblas en ĉi tiu ĉambro",
     "You have no visible notifications in this room.": "Vi havas neniujn videblajn sciigojn en ĉi tiu ĉambro.",
-    "%(brand)s Android": "%(brand)s por Android"
+    "%(brand)s Android": "%(brand)s por Android",
+    "Community and user menu": "Menuo de komunumo kaj uzanto",
+    "User settings": "Agordoj de uzanto",
+    "Community settings": "Agordoj de komunumo",
+    "Failed to find the general chat for this community": "Malsukcesis trovi la ĝeneralan babilejon por ĉi tiu komunumo",
+    "Starting camera...": "Pretigante filmilon…",
+    "Starting microphone...": "Pretigante mikrofonon…",
+    "Call connecting...": "Konektante vokon…",
+    "Calling...": "Vokante…",
+    "Explore rooms in %(communityName)s": "Esploru ĉambrojn en %(communityName)s",
+    "You do not have permission to create rooms in this community.": "Vi ne havas permeson krei ĉambrojn en ĉi tiu komunumo.",
+    "Cannot create rooms in this community": "Ne povas krei ĉambrojn en ĉi tiu komunumo",
+    "Create community": "Krei komunumon",
+    "Attach files from chat or just drag and drop them anywhere in a room.": "Kunsendu dosierojn per la babilujo, aŭ trenu ilin kien ajn en ĉambro vi volas.",
+    "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>.": "Enigu la lokon de via hejmservilo de «Element Matrix Services». Ĝi povas uzi vian propran retnomon aŭ esti subretnomo de <a>element.io</a>.",
+    "Move right": "Movi dekstren",
+    "Move left": "Movi maldekstren",
+    "Revoke permissions": "Nuligi permesojn",
+    "Take a picture": "Foti",
+    "Unable to set up keys": "Ne povas agordi ŝlosilojn",
+    "You're all caught up.": "Sen sciigoj.",
+    "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.": "Invitu iun per ĝia nomo, uzantonomo (kiel <userId/>), aŭ <a>diskonigu la ĉambron</a>.",
+    "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>": "Ĉi tio ne invitos ĝin al %(communityName)s. Por inviti iun al %(communityName)s, klaku <a>ĉi tien</a>",
+    "Start a conversation with someone using their name or username (like <userId/>).": "Komencu interparolon kun iu per ĝia nomo aŭ uzantonomo (kiel <userId/>).",
+    "May include members not in %(communityName)s": "Povas inkluzivi anojn ekster %(communityName)s",
+    "Update community": "Ĝisdatigi komunumon",
+    "There was an error updating your community. The server is unable to process your request.": "Eraris ĝisdatigo de via komunumo. La servilo ne povas trakti vian peton.",
+    "Block anyone not part of %(serverName)s from ever joining this room.": "Bloki de la ĉambro ĉiun ekster %(serverName)s.",
+    "Create a room in %(communityName)s": "Krei ĉambron en %(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.": "Vi povas malŝalti ĉi tion se la ĉambro estos uzata por kunlaborado kun eksteraj skipoj, kun iliaj propraj hejmserviloj. Ĝi ne povas ŝanĝiĝi poste.",
+    "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Vi povus ŝalti ĉi tion se la ĉambro estus uzota nur por kunlaborado de internaj skipoj je via hejmservilo. Ĝi ne ŝanĝeblas poste.",
+    "Your server requires encryption to be enabled in private rooms.": "Via servilo postulas ŝaltitan ĉifradon en privataj ĉambroj.",
+    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Privataj ĉambroj povas esti trovitaj kaj aliĝitaj nur per invito. Publikaj ĉambroj povas esti trovitaj kaj aliĝitaj de iu ajn en ĉi tiu komunumo.",
+    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Privataj ĉambroj povas esti trovitaj kaj aliĝitaj nur per invito. Publikaj ĉambroj povas esti trovitaj kaj aliĝitaj de iu ajn.",
+    "An image will help people identify your community.": "Bildo helpos al aliuloj rekoni vian komunumon.",
+    "Add image (optional)": "Aldonu bildon (se vi volas)",
+    "Enter name": "Enigu nomon",
+    "What's the name of your community or team?": "Kio estas la nomo de via komunumo aŭ skipo?",
+    "You can change this later if needed.": "Vi povas ŝanĝi ĉi tion poste, laŭbezone.",
+    "Use this when referencing your community to others. The community ID cannot be changed.": "Uzu ĉi tion kiam vi montras vian komunumon al aliuloj. La identigilo ne povas ŝanĝiĝi.",
+    "Community ID: +<localpart />:%(domain)s": "Identigilo de komunumo: +<localpart />:%(domain)s",
+    "There was an error creating your community. The name may be taken or the server is unable to process your request.": "Eraris kreado de via komunumo. Eble la nomo jam estas prenita, aŭ la servilo ne povas trakti vian peton.",
+    "Invite people to join %(communityName)s": "Inviti personojn al komunumo %(communityName)s",
+    "Send %(count)s invites|one": "Sendi %(count)s inviton",
+    "Send %(count)s invites|other": "Sendi %(count)s invitojn",
+    "People you know on %(brand)s": "Personoj, kiujn vi scias je %(brand)s",
+    "Add another email": "Aldoni alian retpoŝtadreson",
+    "Preparing to download logs": "Preparante elŝuton de protokolo",
+    "Download logs": "Elŝuti protokolon",
+    "Information": "Informoj",
+    "This version of %(brand)s does not support searching encrypted messages": "Ĉi tiu versio de %(brand)s ne subtenas serĉadon de ĉifritaj mesaĝoj",
+    "This version of %(brand)s does not support viewing some encrypted files": "Ĉi tiu versio de %(brand)s ne subtenas montradon de iuj ĉifritaj dosieroj",
+    "Use the <a>Desktop app</a> to search encrypted messages": "Uzu la <a>labortablan aplikaĵon</a> por serĉi ĉifritajn mesaĝojn",
+    "Use the <a>Desktop app</a> to see all encrypted files": "Uzu la <a>labortablan aplikaĵon</a> por vidi ĉiujn ĉifritajn dosierojn",
+    "Video conference started by %(senderName)s": "Grupan vidvokon komencis %(senderName)s",
+    "Video conference updated by %(senderName)s": "Grupan vidvokon ĝisdatigis %(senderName)s",
+    "Video conference ended by %(senderName)s": "Grupan vidvokon finis %(senderName)s",
+    "Join the conference from the room information card on the right": "Aliĝu al la grupa voko per la dekstraflanka karto kun informoj pri ĉambro",
+    "Join the conference at the top of this room": "Aliĝu al la grupa voko supre je la ĉambro",
+    "Ignored attempt to disable encryption": "Malatentis provon malŝalti ĉifradon",
+    "Room settings": "Agordoj de ĉambro",
+    "Show files": "Montri dosierojn",
+    "%(count)s people|one": "%(count)s persono",
+    "%(count)s people|other": "%(count)s personoj",
+    "About": "Prio",
+    "Not encrypted": "Neĉifrita",
+    "Add widgets, bridges & bots": "Aldonu fenestraĵojn, pontojn, kaj robotojn",
+    "Edit widgets, bridges & bots": "Redakti fenestraĵojn, pontojn, kaj robotojn",
+    "Widgets": "Fenestraĵoj",
+    "Unpin a widget to view it in this panel": "Malfiksu fenestraĵon por vidi ĝin sur ĉi tiu breto",
+    "Unpin": "Malfiksi",
+    "You can only pin up to %(count)s widgets|other": "Vi povas fiksi maksimume %(count)s fenestraĵojn",
+    "Room Info": "Informoj pri ĉambro",
+    "%(count)s results|one": "%(count)s rezulto",
+    "%(count)s results|other": "%(count)s rezultoj",
+    "Explore all public rooms": "Esplori ĉiujn publiajn ĉambrojn",
+    "Can't see what you’re looking for?": "Ĉu vi ne sukcesas trovi la serĉaton?",
+    "Explore public rooms": "Esplori publikajn ĉambrojn",
+    "Explore community rooms": "Esplori komunumajn ĉambrojn",
+    "Show Widgets": "Montri fenestraĵojn",
+    "Hide Widgets": "Kaŝi fenestraĵojn",
+    "Remove messages sent by others": "Forigi mesaĝojn senditajn de aliaj",
+    "Privacy": "Privateco",
+    "Secure Backup": "Sekura savkopiado",
+    "not ready": "neprete",
+    "ready": "prete",
+    "Secret storage:": "Sekreta deponejo:",
+    "Backup key cached:": "Kaŝmemorita Savkopia ŝlosilo:",
+    "Backup key stored:": "Deponita Savkopia ŝlosilo:",
+    "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.": "Savkopiu viajn ĉifrajn ŝlosilojn kun la datumoj de via konto, pro eblo ke vi perdus aliron al viaj salutaĵoj. Viaj ŝlosiloj estos sekurigitaj per unika Rehava ŝlosilo.",
+    "Algorithm:": "Algoritmo:",
+    "Backup version:": "Repaŝa versio:",
+    "The operation could not be completed": "La ago ne povis finiĝi",
+    "Failed to save your profile": "Malsukcesis konservi vian profilon",
+    "Master private key:": "Ĉefa privata ŝlosilo:",
+    "not found in storage": "netrovite en deponejo",
+    "Cross-signing is not set up.": "Delegaj subskriboj ne estas agorditaj.",
+    "Cross-signing is ready for use.": "Delegaj subskriboj estas pretaj por uzado.",
+    "Downloading logs": "Elŝutante protokolon",
+    "Uploading logs": "Alŝutante protokolon",
+    "Safeguard against losing access to encrypted messages & data": "Malhelpu perdon de aliro al ĉifritaj mesaĝoj kaj datumoj",
+    "Set up Secure Backup": "Agordi Sekuran savkopiadon",
+    "Unknown App": "Nekonata aplikaĵo",
+    "Error leaving room": "Eraro dum foriro de la ĉambro",
+    "Unexpected server error trying to leave the room": "Neatendita servila eraro dum foriro de ĉambro",
+    "%(senderName)s declined the call.": "%(senderName)s rifuzis la vokon.",
+    "(an error occurred)": "(okazis eraro)",
+    "(their device couldn't start the camera / microphone)": "(ĝia aparato ne povis funkciigi la filmilon / mikrofonon)",
+    "(connection failed)": "(konekto malsukcesis)",
+    "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Ĉiuj serviloj estas forbaritaj de partoprenado! La ĉambro ne plu povas esti uzata.",
+    "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Antaŭmetas ( ͡° ͜ʖ ͡°) al platteksta mesaĝo",
+    "This will end the conference for everyone. Continue?": "Ĉi tio finos la grupan vokon por ĉiuj. Ĉu daŭrigi?",
+    "End conference": "Fini grupan vokon",
+    "The call was answered on another device.": "La voko estis respondita per alia aparato.",
+    "Answered Elsewhere": "Respondita aliloke",
+    "The call could not be established": "Ne povis meti la vokon",
+    "The other party declined the call.": "La alia persono rifuzis la vokon.",
+    "Call Declined": "Voko rifuziĝis",
+    "Rate %(brand)s": "Taksu pri %(brand)s",
+    "Feedback sent": "Prikomentoj sendiĝis",
+    "You’re all caught up": "Vi nenion preterpasis",
+    "Data on this screen is shared with %(widgetDomain)s": "Datumoj sur tiu ĉi ekrano estas havigataj al %(widgetDomain)s",
+    "Send feedback": "Prikomenti",
+    "PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> to help us track down the problem.": "KONSILO: Kiam vi raportas eraron, bonvolu kunsendi <debugLogsLink>erarserĉan protokolon</debugLogsLink>, por ke ni povu pli facile trovi la problemon.",
+    "Please view <existingIssuesLink>existing bugs on Github</existingIssuesLink> first. No match? <newIssueLink>Start a new one</newIssueLink>.": "Bonvolu unue vidi <existingIssuesLink>jamajn erarojn en GitHub</existingIssuesLink>. Ĉu neniu akordas la vian? <newIssueLink>Raportu novan</newIssueLink>.",
+    "Report a bug": "Raporti eraron",
+    "There are two ways you can provide feedback and help us improve %(brand)s.": "Ekzistas du manieroj, kiel vi povas prikomenti kaj helpi nin plibonigi la programon %(brand)s.",
+    "Comment": "Komento",
+    "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.",
+    "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",
+    "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",
+    "%(name)s on hold": "%(name)s estas paŭzigita",
+    "Return to call": "Reveni al voko",
+    "Fill Screen": "Plenigi ekranon",
+    "Voice Call": "Voĉvoko",
+    "Video Call": "Vidvoko",
+    "%(peerName)s held the call": "%(peerName)s paŭzigis la vokon",
+    "You held the call <a>Resume</a>": "Vi paŭzigis la vokon <a>Daŭrigi</a>",
+    "You held the call <a>Switch</a>": "Vi paŭzigis la vokon <a>Baskuli</a>",
+    "Render LaTeX maths in messages": "Bildigi matematikon de Lateĥo en mesaĝoj",
+    "%(senderName)s ended the call": "%(senderName)s finis la vokon",
+    "You ended the call": "Vi finis la vokon",
+    "New version of %(brand)s is available": "Nova versio de %(brand)s disponeblas",
+    "Update %(brand)s": "Ĝisdatigi %(brand)s",
+    "Enable desktop notifications": "Ŝalti labortablajn sciigojn",
+    "See <b>%(msgtype)s</b> messages posted to your active room": "Vidi mesaĝojn de speco <b>%(msgtype)s</b> afiŝitajn al via aktiva ĉambro",
+    "See <b>%(msgtype)s</b> messages posted to this room": "Vidi mesaĝojn de speco <b>%(msgtype)s</b> afiŝitajn al ĉi tiu ĉambro",
+    "Send <b>%(msgtype)s</b> messages as you in your active room": "Sendi mesaĝojn de speco <b>%(msgtype)s</b> kiel vi en via aktiva ĉambro",
+    "Send <b>%(msgtype)s</b> messages as you in this room": "Sendi mesaĝojn de speco <b>%(msgtype)s</b> kiel vi en ĉi tiu ĉambro",
+    "See general files posted to your active room": "Sendi ĝeneralajn dosierojn afiŝitajn al via aktiva ĉambro",
+    "See general files posted to this room": "Sendi ĝeneralajn dosierojn afiŝitajn al ĉi tiu ĉambro",
+    "Send general files as you in your active room": "Sendi ĝeneralajn dosierojn kiel vi en via aktiva ĉambro",
+    "Send general files as you in this room": "Sendi ĝeneralajn dosierojn kiel vi en ĉi tiu ĉambro",
+    "See videos posted to your active room": "Vidi filmojn afiŝitajn al via aktiva ĉambro",
+    "See videos posted to this room": "Vidi filmojn afiŝitajn al ĉi tiu ĉambro",
+    "Send videos as you in your active room": "Sendi filmojn kiel vi en via aktiva ĉambro",
+    "Send videos as you in this room": "Sendi filmojn kiel vi en ĉi tiu ĉambro",
+    "See images posted to your active room": "Vidi bildojn afiŝitajn al via aktiva ĉambro",
+    "See images posted to this room": "Vidi bildojn afiŝitajn al ĉi tiu ĉambro",
+    "Send images as you in your active room": "Sendi bildojn kiel vi en via aktiva ĉambro",
+    "Send images as you in this room": "Sendi bildojn kiel vi en ĉi tiu ĉambro",
+    "The <b>%(capability)s</b> capability": "La kapablo <b>%(capability)s</b>",
+    "See <b>%(eventType)s</b> events posted to your active room": "Vidi eventojn de speco <b>%(eventType)s</b> afiŝitajn al via aktiva ĉambro",
+    "Send <b>%(eventType)s</b> events as you in your active room": "Sendi eventojn de speco <b>%(eventType)s</b> kiel vi en via aktiva ĉambro",
+    "See <b>%(eventType)s</b> events posted to this room": "Vidi eventojn de speco <b>%(eventType)s</b> afiŝitajn al ĉi tiu ĉambro",
+    "Send <b>%(eventType)s</b> events as you in this room": "Sendi eventojn de speco <b>%(eventType)s</b> kiel vi en ĉi tiu ĉambro",
+    "See messages posted to your active room": "Vidi mesaĝojn senditajn al via aktiva ĉambro",
+    "See messages posted to this room": "Vidi mesaĝojn senditajn al ĉi tiu ĉambro",
+    "Send messages as you in your active room": "Sendi mesaĝojn kiel vi en via aktiva ĉambro",
+    "Send messages as you in this room": "Sendi mesaĝojn kiel vi en ĉi tiu ĉambro",
+    "See when anyone posts a sticker to your active room": "Vidi ies ajn afiŝojn de glumarkoj al via aktiva ĉambro",
+    "Send stickers to your active room as you": "Sendi glumarkojn al via aktiva ĉambro kiel vi",
+    "See when a sticker is posted in this room": "Vidi afiŝojn de glumarkoj en ĉi tiu ĉambro",
+    "Send stickers to this room as you": "Sendi glumarkojn al ĉi tiu ĉambro kiel vi",
+    "See when the avatar changes in your active room": "Vidi ŝanĝojn de bildo de ĉambro en via aktiva ĉambro",
+    "Change the avatar of your active room": "Ŝanĝi la bildon de via aktiva ĉambro",
+    "See when the avatar changes in this room": "Vidi ŝanĝojn de bildo de ĉambro en ĉi tiu ĉambro",
+    "Change the avatar of this room": "Ŝanĝi la bildon de ĉi tiu ĉambro",
+    "See when the name changes in your active room": "Vidi ŝanĝojn de nomo en via aktiva ĉambro",
+    "Change the name of your active room": "Ŝanĝi la nomon de via aktiva ĉambro",
+    "See when the name changes in this room": "Vidi ŝanĝojn de nomo en ĉi tiu ĉambro",
+    "Change the name of this room": "Ŝanĝi la nomon de ĉi tiu ĉambro",
+    "See when the topic changes in your active room": "Vidi ŝanĝojn de temo en via aktiva ĉambro",
+    "Change the topic of your active room": "Ŝanĝi la temon de via aktiva ĉambro",
+    "See when the topic changes in this room": "Vidi ŝanĝojn de temo en ĉi tiu ĉambro",
+    "Change the topic of this room": "Ŝanĝi la temon de ĉi tiu ĉambro",
+    "Change which room you're viewing": "Ŝanĝi la vidatan ĉambron",
+    "Send stickers into your active room": "Sendi glumarkojn al via aktiva ĉambro",
+    "Send stickers into this room": "Sendi glumarkojn al ĉi tiu ĉambro",
+    "Takes the call in the current room off hold": "Malpaŭzigas la vokon en la nuna ĉambro",
+    "Places the call in the current room on hold": "Paŭzigas la vokon en la nuna ĉambro",
+    "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "Antaŭmetas ┬──┬ ノ( ゜-゜ノ) al platteksta mesaĝo",
+    "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "Antaŭmetas (╯°□°）╯︵ ┻━┻ al platteksta mesaĝo",
+    "Effects": "Efektoj",
+    "Zimbabwe": "Zimbabvo",
+    "Zambia": "Zambio",
+    "Yemen": "Jemeno",
+    "Western Sahara": "Okcidenta Saharo",
+    "Wallis & Futuna": "Valiso kaj Futuno",
+    "Vietnam": "Vjetnamujo",
+    "Venezuela": "Venezuelo",
+    "Vatican City": "Vatikano",
+    "Vanuatu": "Vanuatuo",
+    "Uruguay": "Urugvajo",
+    "U.S. Virgin Islands": "Usonaj Virgulininsuloj",
+    "Tuvalu": "Tuvalo",
+    "Turks & Caicos Islands": "Turkoj kaj Kajkoj",
+    "Turkmenistan": "Turkmenujo",
+    "Trinidad & Tobago": "Trinidado kaj Tobago",
+    "Switzerland": "Svisujo",
+    "Sweden": "Svedujo",
+    "Swaziland": "Svaziujo",
+    "Svalbard & Jan Mayen": "Svalbardo kaj Janmajeno",
+    "Suriname": "Surinamo",
+    "Sudan": "Sudano",
+    "St. Vincent & Grenadines": "Sankt-Vincento kaj Grenadinoj",
+    "St. Pierre & Miquelon": "Sankt-Pjero kaj Mikelono",
+    "St. Martin": "Sankt-Marteno",
+    "St. Lucia": "Sankt-Lucio",
+    "St. Kitts & Nevis": "Sankt-Kito kaj Neviso",
+    "St. Barthélemy": "Sankt-Bartolomeo",
+    "St. Helena": "Sankt-Heleno",
+    "South Sudan": "Sud-Sudano",
+    "South Georgia & South Sandwich Islands": "Sud-Georgio kaj Sud-Sandviĉinsuloj",
+    "Sint Maarten": "Sint-Marteno",
+    "Réunion": "Reunio",
+    "Pitcairn Islands": "Pitkernaj insuloj",
+    "Northern Mariana Islands": "Nord-Marianoj",
+    "Norfolk Island": "Norfolkinsulo",
+    "Nicaragua": "Nikaragvo",
+    "Mongolia": "Mongolujo",
+    "Monaco": "Monako",
+    "Moldova": "Moldavujo",
+    "Micronesia": "Mikronezio",
+    "Mexico": "Meksiko",
+    "Mayotte": "Majoto",
+    "Mauritius": "Maŭricio",
+    "Mauritania": "Maŭritanio",
+    "Martinique": "Martiniko",
+    "Marshall Islands": "Marŝaloj",
+    "Malawi": "Malavio",
+    "Madagascar": "Madagaskaro",
+    "Macedonia": "Makedonujo",
+    "Macau": "Makao",
+    "Libya": "Libio",
+    "Liberia": "Liberio",
+    "Lesotho": "Lesoto",
+    "Lebanon": "Libano",
+    "Kuwait": "Kuvajto",
+    "Kiribati": "Kiribato",
+    "Jordan": "Jordanio",
+    "Jersey": "Ĵerzejo",
+    "Heard & McDonald Islands": "Insuloj de Herdo kaj Makdonaldo",
+    "Guyana": "Gujano",
+    "Guinea-Bissau": "Gvineo-Bisaŭo",
+    "Guinea": "Gvineo",
+    "Guernsey": "Gernezejo",
+    "Guam": "Gvamo",
+    "Guadeloupe": "Gvadelupo",
+    "Ghana": "Ganao",
+    "Georgia": "Kartvelujo",
+    "Gambia": "Gambio",
+    "Gabon": "Gabono",
+    "French Southern Territories": "Francaj sudaj teritorioj",
+    "French Polynesia": "Franca Polinezio",
+    "Congo - Kinshasa": "Demokratia respubliko Kongo (Kinŝasa)",
+    "Congo - Brazzaville": "Respubliko Kongo (Brazavila)",
+    "British Indian Ocean Territory": "Brita hindoceana teritorio",
+    "Tonga": "Tongo",
+    "Tokelau": "Tokelao",
+    "Togo": "Togolando",
+    "Timor-Leste": "Orienta Timoro",
+    "Thailand": "Tajujo",
+    "Tanzania": "Tanzanio",
+    "Taiwan": "Tajvano",
+    "São Tomé & Príncipe": "Santomeo kaj Principeo",
+    "Syria": "Sirio",
+    "French Guiana": "Franca Gujano",
+    "Faroe Islands": "Ferooj",
+    "Falkland Islands": "Falklandoj",
+    "Djibouti": "Ĝibutio",
+    "Curaçao": "Kuracao",
+    "Cocos (Keeling) Islands": "Kokosinsuloj",
+    "Cayman Islands": "Kajmaninsuloj",
+    "You've reached the maximum number of simultaneous calls.": "Vi atingis la maksimuman nombron de samtempaj vokoj.",
+    "Too Many Calls": "Tro multaj vokoj",
+    "No other application is using the webcam": "Neniu alia aplikaĵo uzas la retfilmilon",
+    "Permission is granted to use the webcam": "Permeso uzi la retfilmilon estas donita",
+    "A microphone and webcam are plugged in and set up correctly": "Mikrofono kaj retfilmilo estas ĝuste konektitaj kaj agorditaj",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "Voko malsukcesis, ĉar retfilmilo aŭ mikrofono ne povis uziĝi. Kontrolu, ke:",
+    "Unable to access webcam / microphone": "Ne povas aliri retfilmilon / mikrofonon",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Voko malsukcesis, ĉar mikrofono ne estis uzebla. Kontrolu, ĉu mikrofono estas ĝuste konektita kaj agordita.",
+    "Unable to access microphone": "Ne povas aliri mikrofonon",
+    "Invite by email": "Inviti per retpoŝto",
+    "Minimize dialog": "Minimumigi interagujon",
+    "Maximize dialog": "Maksimumigi interagujon",
+    "Privacy Policy": "Politiko pri privateco",
+    "Cookie Policy": "Politiko pri kuketoj",
+    "There was an error finding this widget.": "Eraris serĉado de tiu ĉi fenestraĵo.",
+    "Active Widgets": "Aktivaj fenestraĵoj",
+    "Reason (optional)": "Kialo (malnepra)",
+    "Continue with %(provider)s": "Daŭrigi per %(provider)s",
+    "Homeserver": "Hejmservilo",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Element with an existing Matrix account on a different homeserver.": "Vi povas uzi la proprajn elekteblojn de servilo por saluti aliajn servilojn de Matrix, specifigante la URL-on de alia hejmservilo. Tio ebligas uzi Elementon kun jama konto de Matrix ĉe alia hejmservilo.",
+    "Server Options": "Elektebloj de servilo",
+    "Windows": "Fenestroj",
+    "Screens": "Ekranoj",
+    "Share your screen": "Vidigu vian ekranon",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Sekure kaŝmemori ĉifritajn mesaĝojn loke por ke ili aperu inter serĉrezultoj, uzante %(size)s por deponi mesaĝojn el %(rooms)s ĉambroj.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Sekure kaŝmemori ĉifritajn mesaĝojn loke por ke ili aperu inter serĉrezultoj, uzante %(size)s por deponi mesaĝojn el %(rooms)s ĉambroj.",
+    "Channel: <channelLink/>": "Kanalo: <channelLink/>",
+    "Remain on your screen while running": "Resti sur via ekrano rulante",
+    "Remain on your screen when viewing another room, when running": "Resti sur via ekrano rulante, dum rigardo al alia ĉambro",
+    "Go to Home View": "Iri al ĉefpaĝo",
+    "Search (must be enabled)": "Serĉi (devas esti ŝaltita)",
+    "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "Tiu ĉi salutaĵo trovis, ke viaj Sekureca frazo kaj ŝlosilo por Sekuraj mesaĝoj foriĝis.",
+    "A new Security Phrase and key for Secure Messages have been detected.": "Novaj Sekureca frazo kaj ŝlosilo por Sekuraj mesaĝoj troviĝis.",
+    "Make a copy of your Security Key": "Faru kopion de via Sekureca ŝlosilo",
+    "Confirm your Security Phrase": "Konfirmu vian Sekurecan frazon",
+    "Secure your backup with a Security Phrase": "Sekurigu vian savkopion per Sekureca frazo",
+    "Your Security Key is in your <b>Downloads</b> folder.": "Via Sekureca ŝlosilo estas en via dosierujo kun <b>Elŝutoj</b>.",
+    "Your Security Key has been <b>copied to your clipboard</b>, paste it to:": "Via Sekureca ŝlosilo <b>kopiiĝis al via tondujo</b>, algluu ĝin al:",
+    "Your Security Key": "Via Sekureca ŝlosilo",
+    "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "Via Sekureca ŝlosilo estas speco de asekuro – vi povas uzi ĝin por rehavi aliron al viaj ĉifritaj mesaĝoj, se vi forgesas vian Sekurecan frazon.",
+    "Repeat your Security Phrase...": "Ripetu vian Sekurecan frazon…",
+    "Please enter your Security Phrase a second time to confirm.": "Bonvolu enigi vian Sekurecan frazon je dua fojo por konfirmi.",
+    "Set up with a Security Key": "Agordi per Sekureca ŝlosilo",
+    "Great! This Security Phrase looks strong enough.": "Bonege! La Sekureca frazo ŝajnas sufiĉe forta.",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "Ni konservos ĉifritan kopion de viaj ŝlosiloj en nia servilo. Sekurigu vian savkopion per Sekureca frazo.",
+    "Use Security Key": "Uzi Sekurecan ŝlosilon",
+    "Use Security Key or Phrase": "Uzu Sekurecan ŝlosilon aŭ frazon",
+    "Decide where your account is hosted": "Decidu, kie via konto gastiĝos",
+    "Host account on": "Gastigi konton ĉe",
+    "Already have an account? <a>Sign in here</a>": "Ĉu vi jam havas konton? <a>Salutu tie ĉi</a>",
+    "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s aŭ %(usernamePassword)s",
+    "Continue with %(ssoButtons)s": "Daŭrigi per %(ssoButtons)s",
+    "That username already exists, please try another.": "Tiu uzantonomo jam ekzistas, bonvolu provi alian.",
+    "New? <a>Create account</a>": "Ĉu vi novas? <a>Kreu konton</a>",
+    "There was a problem communicating with the homeserver, please try again later.": "Eraris komunikado kun la hejmservilo, bonvolu reprovi poste.",
+    "New here? <a>Create an account</a>": "Ĉu vi novas? <a>Kreu konton</a>",
+    "Got an account? <a>Sign in</a>": "Ĉu vi havas konton? <a>Salutu</a>",
+    "Filter rooms and people": "Filtri ĉambrojn kaj personojn",
+    "You have no visible notifications.": "Vi havas neniujn videblajn sciigojn.",
+    "Upgrade to pro": "Gradaltigu al profesionala versio",
+    "Now, let's help you get started": "Nun, ni helpos al vi komenci",
+    "Welcome %(name)s": "Bonvenu, %(name)s",
+    "Add a photo so people know it's you.": "Aldonu foton, por ke oni vin rekonu.",
+    "Great, that'll help people know it's you": "Bonege, tio helpos al aliuloj scii, ke temas pri vi",
+    "Use email to optionally be discoverable by existing contacts.": "Uzu retpoŝtadreson por laŭplaĉe esti trovebla de jamaj kontaktoj.",
+    "Use email or phone to optionally be discoverable by existing contacts.": "Uzu retpoŝtadreson aŭ telefonnumeron por laŭplaĉe esti trovebla de jamaj kontaktoj.",
+    "Add an email to be able to reset your password.": "Aldonu retpoŝtadreson por ebligi rehavon de via pasvorto.",
+    "Forgot password?": "Ĉu forgesis pasvorton?",
+    "That phone number doesn't look quite right, please check and try again": "Tiu telefonnumero ne ŝajnas ĝusta, bonvolu kontroli kaj reprovi",
+    "Enter phone number": "Enigu telefonnumeron",
+    "Enter email address": "Enigu retpoŝtadreson",
+    "Something went wrong in confirming your identity. Cancel and try again.": "Io misokazis dum konfirmado de via identeco. Nuligu kaj reprovu.",
+    "Open the link in the email to continue registration.": "Por daŭrigi la registriĝon, malfermu la ligilon senditan en la retletero.",
+    "A confirmation email has been sent to %(emailAddress)s": "Konfirma retletero sendiĝis al %(emailAddress)s",
+    "Hold": "Paŭzigi",
+    "Resume": "Daŭrigi",
+    "If you've forgotten your Security Key you can <button>set up new recovery options</button>": "Se vi forgesis vian Sekurecan ŝlosilon, vi povas <button>agordi novajn elekteblojn de rehavo</button>",
+    "Access your secure message history and set up secure messaging by entering your Security Key.": "Aliru vian historion de sekuraj mesaĝoj kaj agordu sekurajn mesaĝojn per enigo de via Sekureca ŝlosio.",
+    "Not a valid Security Key": "Tio ne estas valida Sekureca ŝlosilo",
+    "This looks like a valid Security Key!": "Tio ĉi ŝajnas esti valida Sekureca ŝlosilo!",
+    "Enter Security Key": "Enigu Sekurecan ŝlosilon",
+    "If you've forgotten your Security Phrase you can <button1>use your Security Key</button1> or <button2>set up new recovery options</button2>": "Se vi forgesis vian Sekurecan frazon, vi povas <button1>uzi vian Sekurecan ŝlosilon</button1> aŭ <button2>agordi novajn elekteblojn de rehavo</button2>",
+    "Access your secure message history and set up secure messaging by entering your Security Phrase.": "Aliru vian historion de sekuraj mesaĝoj kaj agordu sekurigitajn mesaĝojn per enigo de via Sekureca frazo.",
+    "Enter Security Phrase": "Enigu Sekurecan frazon",
+    "Backup could not be decrypted with this Security Phrase: please verify that you entered the correct Security Phrase.": "Ne povis malĉifri savkopion per ĉi tiu Sekureca frazo: bonvolu kontroli, ĉu vi enigis la ĝustan Sekurecan frazon.",
+    "Incorrect Security Phrase": "Malĝusta Sekureca frazo",
+    "Backup could not be decrypted with this Security Key: please verify that you entered the correct Security Key.": "Ne povis malĉifri savkopion per ĉi tiu Sekureca ŝlosilo: bonvolu kontroli, ĉu vi enigis la ĝustan Sekurecan ŝlosilon.",
+    "Security Key mismatch": "Malakordo de Sekureca ŝlosilo",
+    "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "Ne povas akiri sekretandeponejon. Bonvolu kontroli, ĉu vi enigis la ĝustan Sekurecan frazon.",
+    "Invalid Security Key": "Nevalida Sekureca ŝlosilo",
+    "Wrong Security Key": "Malĝusta Sekureca ŝlosilo",
+    "Remember this": "Memoru ĉi tion",
+    "The widget will verify your user ID, but won't be able to perform actions for you:": "Ĉi tiu fenestraĵo kontrolos vian identigilon de uzanto, sed ne povos fari agojn por vi:",
+    "Allow this widget to verify your identity": "Permesu al ĉi tiu fenestraĵo kontroli vian identecon",
+    "Decline All": "Rifuzi ĉion",
+    "Approve": "Aprobi",
+    "This widget would like to:": "Ĉi tiu fenestraĵo volas:",
+    "Approve widget permissions": "Aprobi rajtojn de fenestraĵo",
+    "About homeservers": "Pri hejmserviloj",
+    "Learn more": "Ekscii plion",
+    "Use your preferred Matrix homeserver if you have one, or host your own.": "Uzu vian preferatan hejmservilon de Matrix se vi havas iun, aŭ gastigu vian propran.",
+    "Other homeserver": "Alia hejmservilo",
+    "We call the places where you can host your account ‘homeservers’.": "La lokojn, kie via konto povas gastiĝi, ni nomas «hejmserviloj».",
+    "Sign into your homeserver": "Salutu vian hejmservilon",
+    "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "Matrix.org estas la plej granda publika hejmservilo en la mondo, kaj estas do bona loko por multaj.",
+    "Specify a homeserver": "Specifu hejmservilon",
+    "%(hostSignupBrand)s Setup": "Agordoj de %(hostSignupBrand)s",
+    "You should know": "Vi sciu",
+    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Mesaĝoj en ĉi tiu ĉambro estas tutvoje ĉifrataj. Kiam oni aliĝas, vi povas kontroli ĝin per ĝia profilo; simple tuŝetu ĝian profilbildon.",
+    "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Mesaĝoj ĉi tie estas tutvoje ĉifritaj. Kontrolu uzanton %(displayName)s per ĝia profilo – tuŝetu ĝian profilbildon.",
+    "Role": "Rolo",
+    "Use the + to make a new room or explore existing ones below": "Uzu la simbolon + por krei novan ĉambron aŭ esplori jam ekzistantajn sube",
+    "Start a new chat": "Komenci novan babilon",
+    "Start a Conversation": "Komenci interparolon",
+    "Recently visited rooms": "Freŝe vizititiaj ĉambroj",
+    "This is the start of <roomName/>.": "Jen la komenco de <roomName/>.",
+    "Add a photo, so people can easily spot your room.": "Aldonu foton, por ke oni facile trovu vian ĉambron.",
+    "%(displayName)s created this room.": "%(displayName)s kreis ĉi tiun ĉambron.",
+    "You created this room.": "Vi kreis ĉi tiun ĉambron.",
+    "<a>Add a topic</a> to help people know what it is about.": "<a>Aldonu temon</a>, por ke oni sciu, pri kio temas.",
+    "Topic: %(topic)s ": "Temo: %(topic)s ",
+    "Topic: %(topic)s (<a>edit</a>)": "Temo: %(topic)s (<a>redakti</a>)",
+    "This is the beginning of your direct message history with <displayName/>.": "Jen la komenco de historio de viaj rektaj mesaĝoj kun <displayName/>.",
+    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Nur vi du partoprenas ĉi tiun interparolon, se neniu el vi invitos aliulon.",
+    "There was an error looking up the phone number": "Eraris trovado de la telefonnumero",
+    "Unable to look up phone number": "Ne povas trovi telefonnumeron",
+    "sends snowfall": "sendas neĝadon",
+    "Sends the given message with snowfall": "Sendas la mesaĝon kun neĝado",
+    "sends fireworks": "sendas artfajraĵon",
+    "Sends the given message with fireworks": "Sendas la mesaĝon kun artfajraĵo",
+    "sends confetti": "sendas konfetojn",
+    "Sends the given message with confetti": "Sendas la mesaĝon kun konfetoj",
+    "Show chat effects": "Montri efektojn de babilujo",
+    "Show line numbers in code blocks": "Montri numerojn de linioj en kodujoj",
+    "Expand code blocks by default": "Implicite etendi kodujojn",
+    "Show stickers button": "Butono por montri glumarkojn",
+    "Use app": "Uzu aplikaĵon",
+    "Use app for a better experience": "Uzu aplikaĵon por pli bona sperto",
+    "Don't miss a reply": "Ne preterpasu respondon",
+    "See emotes posted to your active room": "Vidi mienojn afiŝitajn al via aktiva ĉambro",
+    "See emotes posted to this room": "Vidi mienojn afiŝitajn al ĉi tiu ĉambro",
+    "Send emotes as you in your active room": "Sendi mienon kiel vi en via aktiva ĉambro",
+    "Send emotes as you in this room": "Sendi mienon kiel vi en ĉi tiu ĉambro",
+    "See text messages posted to your active room": "Vidi tekstajn mesaĝojn afiŝitajn al via aktiva ĉambro",
+    "See text messages posted to this room": "Vidi tekstajn mesaĝojn afiŝitajn al ĉi tiu ĉambro",
+    "Send text messages as you in your active room": "Sendi tekstajn mesaĝojn kiel vi en via aktiva ĉambro",
+    "Send text messages as you in this room": "Sendi tekstajn mesaĝojn kiel vi en ĉi tiu ĉambro",
+    "Change which room, message, or user you're viewing": "Ŝanĝu, kiun ĉambron, mesaĝon, aŭ uzanton vi rigardas",
+    "%(senderName)s has updated the widget layout": "%(senderName)s ĝisdatigis la aranĝon de la fenestrajoj",
+    "Converts the DM to a room": "Igas la ĉambron nerekta",
+    "Converts the room to a DM": "Igas la ĉambron rekta",
+    "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "Via hejmservilo rifuzis vian saluton. Eble tio okazis, ĉar ĝi simple daŭris tro longe. Bonvolu reprovi. Se tio daŭros, bonvolu kontakti la administranton de via hejmservilo.",
+    "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "Via hejmservilo estis neatingebla kaj ne povis vin salutigi. Bonvolu reprovi. Se tio daŭros, bonvolu kontakti la administranton de via hejmservilo.",
+    "Try again": "Reprovu",
+    "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "Ni petis la foliumilon memori, kiun hejmservilon vi uzas por saluti, sed domaĝe, via foliumilo forgesis. Iru al la saluta paĝo kaj reprovu.",
+    "We couldn't log you in": "Ni ne povis salutigi vin"
 }
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 34c40800f7..cbe7e0a223 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -3,7 +3,7 @@
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s aceptó la invitación para %(displayName)s.",
     "Account": "Cuenta",
     "Access Token:": "Token de Acceso:",
-    "Admin": "Administrador",
+    "Admin": "Admin",
     "Advanced": "Avanzado",
     "Always show message timestamps": "Siempre mostrar las marcas temporales de mensajes",
     "Authentication": "Autenticación",
@@ -13,8 +13,8 @@
     "A new password must be entered.": "Debes ingresar una contraseña nueva.",
     "%(senderName)s answered the call.": "%(senderName)s contestó la llamada.",
     "An error has occurred.": "Un error ha ocurrido.",
-    "Anyone who knows the room's link, apart from guests": "Cualquier persona que conozca el enlace a esta sala, excepto huéspedes",
-    "Anyone who knows the room's link, including guests": "Cualquier persona que conozca el enlace a esta sala, incluyendo huéspedes",
+    "Anyone who knows the room's link, apart from guests": "Cualquier persona que conozca el enlace a esta sala, pero excluir a la gente sin cuenta",
+    "Anyone who knows the room's link, including guests": "Cualquier persona que conozca el enlace a esta sala, incluyendo gente sin cuenta",
     "Are you sure?": "¿Estás seguro?",
     "Are you sure you want to reject the invitation?": "¿Estás seguro que quieres rechazar la invitación?",
     "Attachment": "Adjunto",
@@ -24,8 +24,8 @@
     "Banned users": "Usuarios vetados",
     "Bans user with given id": "Veta al usuario con la ID dada",
     "Call Timeout": "Tiempo de Espera de Llamada",
-    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "No se puede conectar al servidor doméstico via HTTP, cuando es necesario un enlace HTTPS en la barra de direcciones de tu navegador. Ya sea usando HTTPS o <a>habilitando los scripts inseguros</a>.",
-    "Change Password": "Cambiar Contraseña",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "No se ha podido conectar al servidor base a través de HTTP, cuando es necesario un enlace HTTPS en la barra de direcciones de tu navegador. Ya sea usando HTTPS o <a>activando los scripts inseguros</a>.",
+    "Change Password": "Cambiar contraseña",
     "%(senderName)s changed their profile picture.": "%(senderName)s cambió su imagen de perfil.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ha cambiado el nivel de acceso de %(powerLevelDiffText)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s cambió el nombre de la sala a %(roomName)s.",
@@ -41,14 +41,14 @@
     "Commands": "Comandos",
     "Confirm password": "Confirmar contraseña",
     "Continue": "Continuar",
-    "Create Room": "Crear Sala",
+    "Create Room": "Crear sala",
     "Cryptography": "Criptografía",
     "Current password": "Contraseña actual",
     "/ddg is not a command": "/ddg no es un comando",
     "Deactivate Account": "Desactivar Cuenta",
     "Decrypt %(text)s": "Descifrar %(text)s",
-    "Deops user with given id": "Degrada al usuario con la ID dada",
-    "Default": "Por Defecto",
+    "Deops user with given id": "Quita el poder de operador al usuario con la ID dada",
+    "Default": "Por defecto",
     "Disinvite": "Deshacer invitación",
     "Displays action": "Hacer una acción",
     "Download %(text)s": "Descargar %(text)s",
@@ -61,7 +61,7 @@
     "Existing Call": "Llamada Existente",
     "Export E2E room keys": "Exportar claves de salas con Cifrado de Extremo a Extremo",
     "Failed to ban user": "Bloqueo del usuario falló",
-    "Failed to change password. Is your password correct?": "No se pudo cambiar la contraseña. ¿Estás usando la correcta?",
+    "Failed to change password. Is your password correct?": "No se ha podido cambiar la contraseña. ¿Has escrito tu contraseña actual correctamente?",
     "Failed to change power level": "Falló al cambiar de nivel de acceso",
     "Failed to forget room %(errCode)s": "No se pudo olvidar la sala %(errCode)s",
     "Failed to join room": "No se pudo unir a la sala",
@@ -77,7 +77,7 @@
     "Failed to unban": "No se pudo quitar veto",
     "Failed to verify email address: make sure you clicked the link in the email": "No se pudo verificar la dirección de correo electrónico: asegúrate de hacer clic en el enlace del correo electrónico",
     "Failure to create room": "No se pudo crear sala",
-    "Favourite": "Agregar a Favoritos",
+    "Favourite": "Añadir a favoritos",
     "Favourites": "Favoritos",
     "Fill screen": "Llenar pantalla",
     "Filter room members": "Filtrar miembros de la sala",
@@ -86,8 +86,8 @@
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s a %(toPowerLevel)s",
     "Guests cannot join this room even if explicitly invited.": "Invitados no pueden unirse a esta sala aun cuando han sido invitados explícitamente.",
     "Hangup": "Colgar",
-    "Historical": "Histórico",
-    "Homeserver is": "El Servidor Doméstico es",
+    "Historical": "Historial",
+    "Homeserver is": "El servidor base es",
     "Identity Server is": "El Servidor de Identidad es",
     "I have verified my email address": "He verificado mi dirección de correo electrónico",
     "Import E2E room keys": "Importar claves de salas con Cifrado de Extremo a Extremo",
@@ -106,13 +106,13 @@
     "Labs": "Laboratorios",
     "Leave room": "Salir de la sala",
     "%(targetName)s left the room.": "%(targetName)s salió de la sala.",
-    "Logout": "Cerrar Sesión",
+    "Logout": "Cerrar sesión",
     "Low priority": "Prioridad baja",
     "Accept": "Aceptar",
     "Add": "Añadir",
     "Admin Tools": "Herramientas de administración",
-    "No Microphones detected": "No se ha detectado micrófono",
-    "No Webcams detected": "No se ha detectado cámara",
+    "No Microphones detected": "No se ha detectado un micrófono",
+    "No Webcams detected": "No se ha detectado una cámara",
     "Default Device": "Dispositivo por defecto",
     "Microphone": "Micrófono",
     "Camera": "Cámara",
@@ -121,7 +121,7 @@
     "Custom": "Personalizado",
     "Custom level": "Nivel personalizado",
     "Decline": "Rechazar",
-    "Enter passphrase": "Ingresar frase de contraseña",
+    "Enter passphrase": "Introducir frase de contraseña",
     "Error: Problem communicating with the given homeserver.": "Error: No es posible comunicar con el servidor doméstico indicado.",
     "Export": "Exportar",
     "Failed to fetch avatar URL": "Fallo al obtener la URL del avatar",
@@ -144,8 +144,8 @@
     "Please select the destination room for this message": "Por favor, seleccione la sala destino para este mensaje",
     "Create new room": "Crear nueva sala",
     "Start chat": "Iniciar conversación",
-    "New Password": "Contraseña Nueva",
-    "Analytics": "Análisis de Estadísticas",
+    "New Password": "Contraseña nueva",
+    "Analytics": "Analítica de datos",
     "Options": "Opciones",
     "Passphrases must match": "Las contraseñas deben coincidir",
     "Passphrase must not be empty": "La contraseña no puede estar en blanco",
@@ -192,8 +192,8 @@
     "Add a topic": "Añadir un tema",
     "No media permissions": "Sin permisos para el medio",
     "You may need to manually permit %(brand)s to access your microphone/webcam": "Probablemente necesite dar permisos manualmente a %(brand)s para su micrófono/cámara",
-    "Are you sure you want to leave the room '%(roomName)s'?": "¿Está seguro de que desea abandonar la sala '%(roomName)s'?",
-    "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "No se puede conectar al servidor doméstico - compruebe su conexión, asegúrese de que el <a>certificado SSL del servidor</a> es de confiaza, y compruebe que no hay extensiones del navegador bloqueando las peticiones.",
+    "Are you sure you want to leave the room '%(roomName)s'?": "¿Seguro que quieres salir de la sala '%(roomName)s'?",
+    "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "No se puede conectar al servidor base. Por favor, comprueba tu conexión, asegúrate de que el <a>certificado SSL del servidor</a> es de confiaza, y comprueba que no haya extensiones de navegador bloqueando las peticiones.",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s eliminó el nombre de la sala.",
     "Drop File Here": "Deje el fichero aquí",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Unirse con <voiceText>voz</voiceText> o <videoText>vídeo</videoText>.",
@@ -213,9 +213,9 @@
     "No more results": "No hay más resultados",
     "No results": "No hay resultados",
     "No users have specific privileges in this room": "Ningún usuario tiene permisos específicos en esta sala",
-    "OK": "Correcto",
+    "OK": "Vale",
     "olm version:": "versión de olm:",
-    "Only people who have been invited": "Solo personas que han sido invitadas",
+    "Only people who have been invited": "Solo las personas que hayan sido invitadas",
     "Operation failed": "Falló la operación",
     "Password": "Contraseña",
     "Passwords can't be empty": "Las contraseñas no pueden estar en blanco",
@@ -239,7 +239,7 @@
     "Return to login screen": "Regresar a la pantalla de inicio de sesión",
     "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s no tiene permiso para enviarte notificaciones - por favor, comprueba los ajustes de tu navegador",
     "%(brand)s was not given permission to send notifications - please try again": "No se le dio permiso a %(brand)s para enviar notificaciones - por favor, inténtalo nuevamente",
-    "%(brand)s version:": "versión de %(brand)s:",
+    "%(brand)s version:": "Versión de %(brand)s:",
     "Room %(roomId)s not visible": "La sala %(roomId)s no está visible",
     "Searches DuckDuckGo for results": "Busca resultados en DuckDuckGo",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Mostrar marcas temporales en formato de 12 horas (ej. 2:30pm)",
@@ -278,7 +278,7 @@
     "Unable to verify email address.": "No es posible verificar la dirección de correo electrónico.",
     "Unban": "Quitar Veto",
     "Unable to capture screen": "No es posible capturar la pantalla",
-    "Unable to enable Notifications": "No es posible habilitar las Notificaciones",
+    "Unable to enable Notifications": "No se han podido activar las notificaciones",
     "unknown caller": "Persona que llama desconocida",
     "Unnamed Room": "Sala sin nombre",
     "Uploading %(filename)s and %(count)s others|zero": "Subiendo %(filename)s",
@@ -310,23 +310,23 @@
     "You do not have permission to do that in this room.": "No tienes permiso para realizar esa acción en esta sala.",
     "You cannot place a call with yourself.": "No puedes realizar una llamada contigo mismo.",
     "Cannot add any more widgets": "no es posible agregar mas widgets",
-    "Publish this room to the public in %(domain)s's room directory?": "Desea publicar esta sala al publico en el directorio de salas de %(domain)s?",
+    "Publish this room to the public in %(domain)s's room directory?": "¿Quieres que esta sala aparezca en el directorio de salas de %(domain)s?",
     "AM": "AM",
     "PM": "PM",
     "The maximum permitted number of widgets have already been added to this room.": "La cantidad máxima de widgets permitida ha sido alcanzada en esta sala.",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Para utilizarlo, tan solo espera a que se carguen los resultados de autocompletar y navega entre ellos.",
+    "To use it, just wait for autocomplete results to load and tab through them.": "Para usarlo, tan solo espera a que se carguen los resultados de autocompletar y navega entre ellos.",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s le quitó el veto a %(targetName)s.",
     "Unmute": "Dejar de silenciar",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (nivel de permisos %(powerLevelNumber)s)",
     "You cannot place VoIP calls in this browser.": "No puedes realizar llamadas VoIP en este navegador.",
     "You do not have permission to post to this room": "No tienes permiso para publicar en esta sala",
-    "You have <a>disabled</a> URL previews by default.": "Ha <a>deshabilitado</a> la vista previa de URL por defecto.",
-    "You have <a>enabled</a> URL previews by default.": "Ha <a>habilitado</a> vista previa de URL por defecto.",
+    "You have <a>disabled</a> URL previews by default.": "Has <a>desactivado</a> la vista previa de URLs por defecto.",
+    "You have <a>enabled</a> URL previews by default.": "Has <a>activado</a> las vista previa de URLs por defecto.",
     "You have no visible notifications": "No tiene notificaciones visibles",
     "You must <a>register</a> to use this functionality": "Usted debe ser un <a>registrar</a> para usar esta funcionalidad",
     "You need to be able to invite users to do that.": "Debes ser capaz de invitar usuarios para realizar esa acción.",
     "You need to be logged in.": "Necesitas haber iniciado sesión.",
-    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Tu dirección de correo electrónico no parece estar asociada a una ID de Matrix en este Servidor Doméstico.",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Tu dirección de correo electrónico no parece estar asociada a una ID de Matrix en este servidor base.",
     "You seem to be in a call, are you sure you want to quit?": "Parece estar en medio de una llamada, ¿esta seguro que desea salir?",
     "You seem to be uploading files, are you sure you want to quit?": "Pareces estar subiendo archivos, ¿seguro que quieres salir?",
     "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 deshacer este cambio porque estás promoviendo al usuario para tener el mismo nivel de autoridad que tú.",
@@ -358,7 +358,7 @@
     "The platform you're on": "La plataforma en la que te encuentras",
     "The version of %(brand)s": "La version de %(brand)s",
     "Your language of choice": "El idioma de tu elección",
-    "Your homeserver's URL": "La URL de tu servidor doméstico",
+    "Your homeserver's URL": "La URL de tu servidor base",
     "The information being sent to us to help make %(brand)s better includes:": "La información que se nos envía para ayudarnos a mejorar %(brand)s incluye:",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Estés utilizando o no el modo de Texto Enriquecido del Editor de Texto Enriquecido",
     "Who would you like to add to this community?": "¿A quién te gustaría añadir a esta comunidad?",
@@ -374,7 +374,7 @@
     "Sunday": "Domingo",
     "Guests can join": "Los invitados se pueden unir",
     "Failed to add tag %(tagName)s to room": "Error al añadir la etiqueta %(tagName)s a la sala",
-    "Notification targets": "Objetivos de notificación",
+    "Notification targets": "Destinos de notificaciones",
     "Failed to set direct chat tag": "Error al establecer la etiqueta de conversación directa",
     "Today": "Hoy",
     "Files": "Archivos",
@@ -388,7 +388,7 @@
     "Leave": "Salir",
     "Uploaded on %(date)s by %(user)s": "Subido el %(date)s por %(user)s",
     "Send Custom Event": "Enviar evento personalizado",
-    "All notifications are currently disabled for all targets.": "Las notificaciones están deshabilitadas para todos los objetivos.",
+    "All notifications are currently disabled for all targets.": "Las notificaciones están desactivadas para todos los objetivos.",
     "Failed to send logs: ": "Error al enviar registros: ",
     "Forget": "Olvidar",
     "World readable": "Legible por todo el mundo",
@@ -400,7 +400,7 @@
     "Messages containing my display name": "Mensajes que contengan mi nombre público",
     "Messages in one-to-one chats": "Mensajes en conversaciones uno a uno",
     "Unavailable": "No disponible",
-    "View Decrypted Source": "Ver Fuente Descifrada",
+    "View Decrypted Source": "Ver fuente descifrada",
     "Failed to update keywords": "Error al actualizar las palabras clave",
     "remove %(name)s from the directory.": "eliminar a %(name)s del directorio.",
     "Notifications on the following keywords follow rules which can’t be displayed here:": "Las notificaciones de las siguientes palabras clave siguen reglas que no se pueden mostrar aquí:",
@@ -409,19 +409,19 @@
     "An error occurred whilst saving your email notification preferences.": "Se ha producido un error al guardar las preferencias de notificación por email.",
     "Explore Room State": "Explorar Estado de la Sala",
     "Source URL": "URL de Origen",
-    "Messages sent by bot": "Mensajes enviados por bot",
+    "Messages sent by bot": "Mensajes enviados por bots",
     "Filter results": "Filtrar resultados",
     "Members": "Miembros",
     "No update available.": "No hay actualizaciones disponibles.",
-    "Noisy": "Ruidoso",
+    "Noisy": "Sonoro",
     "Collecting app version information": "Recolectando información de la versión de la aplicación",
     "Keywords": "Palabras clave",
-    "Enable notifications for this account": "Habilitar notificaciones para esta cuenta",
+    "Enable notifications for this account": "Activar notificaciones para esta cuenta",
     "Invite to this community": "Invitar a esta comunidad",
     "Messages containing <span>keywords</span>": "Mensajes que contienen <span>palabras clave</span>",
     "Error saving email notification preferences": "Error al guardar las preferencias de notificación por email",
     "Tuesday": "Martes",
-    "Enter keywords separated by a comma:": "Introduzca palabras clave separadas por una coma:",
+    "Enter keywords separated by a comma:": "Escribe palabras clave separadas por una coma:",
     "Search…": "Buscar…",
     "You have successfully set a password and an email address!": "¡Has establecido una nueva contraseña y dirección de correo electrónico!",
     "Remove %(name)s from the directory?": "¿Eliminar a %(name)s del directorio?",
@@ -448,42 +448,42 @@
     "Send": "Enviar",
     "Send logs": "Enviar registros",
     "All messages": "Todos los mensajes",
-    "Call invitation": "Invitación a la llamada",
+    "Call invitation": "Cuando me inviten a una llamada",
     "Thank you!": "¡Gracias!",
     "Downloading update...": "Descargando actualizaciones...",
     "State Key": "Clave de estado",
     "Failed to send custom event.": "Ha fallado el envio del evento personalizado.",
     "What's new?": "¿Qué hay de nuevo?",
     "Notify me for anything else": "Notificarme para cualquier otra cosa",
-    "When I'm invited to a room": "Cuando soy invitado a una sala",
+    "When I'm invited to a room": "Cuando me inviten a una sala",
     "Can't update user notification settings": "No se puede actualizar los ajustes de notificaciones del usuario",
     "Notify for all other messages/rooms": "Notificar para todos los demás mensajes/salas",
     "Unable to look up room ID from server": "No se puede buscar el ID de la sala desde el servidor",
     "Couldn't find a matching Matrix room": "No se encontró una sala Matrix que coincida",
-    "All Rooms": "Todas las Salas",
+    "All Rooms": "Todas las salas",
     "You cannot delete this message. (%(code)s)": "No puedes eliminar este mensaje. (%(code)s)",
     "Thursday": "Jueves",
-    "Forward Message": "Reenviar Mensaje",
+    "Forward Message": "Reenviar mensaje",
     "Logs sent": "Registros enviados",
     "Back": "Atrás",
     "Reply": "Responder",
     "Show message in desktop notification": "Mostrar mensaje en la notificación del escritorio",
     "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.": "Los registros de depuración contienen datos de uso de la aplicación como nombre de usuario, ID o alias de las salas o grupos que hayas visitado (y nombres de usuario de otros usuarios). No contienen mensajes.",
-    "Unhide Preview": "Mostrar Vista Previa",
+    "Unhide Preview": "Mostrar vista previa",
     "Unable to join network": "No se puede unir a la red",
     "Sorry, your browser is <b>not</b> able to run %(brand)s.": "¡Lo sentimos! Su navegador <b>no puede</b> ejecutar %(brand)s.",
     "Messages in group chats": "Mensajes en conversaciones grupales",
     "Yesterday": "Ayer",
     "Error encountered (%(errorDetail)s).": "Error encontrado (%(errorDetail)s).",
-    "Low Priority": "Prioridad Baja",
+    "Low Priority": "Prioridad baja",
     "%(brand)s does not know how to join a room on this network": "%(brand)s no sabe cómo unirse a una sala en esta red",
     "Set Password": "Establecer contraseña",
-    "Off": "Desactivado",
+    "Off": "Apagado",
     "Mentions only": "Solo menciones",
     "Failed to remove tag %(tagName)s from room": "Error al eliminar la etiqueta %(tagName)s de la sala",
     "Wednesday": "Miércoles",
     "You can now return to your account after signing out, and sign in on other devices.": "Ahora puedes regresar a tu cuenta después de cerrar tu sesión, e iniciar sesión en otros dispositivos.",
-    "Enable email notifications": "Habilitar notificaciones por email",
+    "Enable email notifications": "Activar notificaciones por correo",
     "Event Type": "Tipo de Evento",
     "No rooms to show": "No hay salas para mostrar",
     "Download this file": "Descargar este archivo",
@@ -491,9 +491,9 @@
     "Failed to change settings": "Error al cambiar los ajustes",
     "View Community": "Ver la comunidad",
     "Developer Tools": "Herramientas de desarrollo",
-    "View Source": "Ver Fuente",
+    "View Source": "Ver fuente",
     "Event Content": "Contenido del Evento",
-    "Unable to fetch notification target list": "No se puede obtener la lista de objetivos de notificación",
+    "Unable to fetch notification target list": "No se puede obtener la lista de destinos de notificación",
     "Quote": "Citar",
     "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!": "En su navegador actual, la apariencia y comportamiento de la aplicación puede ser completamente incorrecta, y algunas de las características podrían no funcionar. Si aún desea probarlo puede continuar, pero ¡no podremos ofrecer soporte por cualquier problema que pudiese tener!",
     "Checking for an update...": "Comprobando actualizaciones...",
@@ -508,10 +508,10 @@
     "A call is already in progress!": "¡Ya hay una llamada en curso!",
     "Permission Required": "Permiso Requerido",
     "You do not have permission to start a conference call in this room": "No tienes permiso para iniciar una llamada de conferencia en esta sala",
-    "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
-    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(time)s",
-    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
-    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
+    "%(weekDayName)s %(time)s": "%(weekDayName)s a las %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s %(day)s de %(monthName)s a las %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s %(day)s de %(monthName)s del %(fullYear)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s %(day)s de %(monthName)s del %(fullYear)s a las %(time)s",
     "Show these rooms to non-members on the community page and room list?": "¿Mostrar estas salas a los que no son miembros en la página de la comunidad y la lista de salas?",
     "Add rooms to the community": "Añadir salas a la comunidad",
     "Add to community": "Añadir a la comunidad",
@@ -523,10 +523,10 @@
     "Missing roomId.": "Falta el Id de sala.",
     "Ignores a user, hiding their messages from you": "Ignora a un usuario, ocultando sus mensajes",
     "Ignored user": "Usuario ignorado",
-    "You are now ignoring %(userId)s": "Ahora está ignorando a %(userId)s",
-    "Stops ignoring a user, showing their messages going forward": "Deja de ignorar a un usuario, mostrando en adelante sus mensajes",
+    "You are now ignoring %(userId)s": "Ahora ignoras a %(userId)s",
+    "Stops ignoring a user, showing their messages going forward": "Deja de ignorar a un usuario, mostrando sus mensajes a partir de ahora",
     "Unignored user": "Usuario no ignorado",
-    "You are no longer ignoring %(userId)s": "Ya no está ignorando a %(userId)s",
+    "You are no longer ignoring %(userId)s": "Ya no ignoras a %(userId)s",
     "Opens the Developer Tools dialog": "Abre el diálogo de Herramientas de Desarrollador",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s cambió su nombre público a %(displayName)s.",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s cambió los mensajes con chincheta en la sala.",
@@ -540,8 +540,8 @@
     "Automatically replace plain text Emoji": "Reemplazar automáticamente texto por Emojis",
     "Mirror local video feed": "Clonar transmisión de video local",
     "Send analytics data": "Enviar datos de análisis de estadísticas",
-    "Enable inline URL previews by default": "Habilitar vistas previas de URL en línea por defecto",
-    "Enable URL previews for this room (only affects you)": "Activar vista previa de URL en esta sala (sólo le afecta a ud.)",
+    "Enable inline URL previews by default": "Activar vistas previas de URLs en línea por defecto",
+    "Enable URL previews for this room (only affects you)": "Activar vista previa de URL en esta sala (te afecta a ti)",
     "Enable URL previews by default for participants in this room": "Activar vista previa de URL por defecto para los participantes en esta sala",
     "Enable widget screenshots on supported widgets": "Activar capturas de pantalla de widget en los widgets soportados",
     "Drop file here to upload": "Soltar aquí el fichero a subir",
@@ -564,7 +564,7 @@
     "Jump to read receipt": "Saltar a recibo leído",
     "Mention": "Mencionar",
     "Invite": "Invitar",
-    "Share Link to User": "Compartir Enlace al Usuario",
+    "Share Link to User": "Compartir enlace al usuario",
     "Send an encrypted reply…": "Enviar una respuesta cifrada…",
     "Send an encrypted message…": "Enviar un mensaje cifrado…",
     "Jump to message": "Ir a mensaje",
@@ -589,25 +589,25 @@
     "Share room": "Compartir sala",
     "Community Invites": "Invitaciones a comunidades",
     "Banned by %(displayName)s": "Vetado por %(displayName)s",
-    "Muted Users": "Usuarios Silenciados",
+    "Muted Users": "Usuarios silenciados",
     "Members only (since the point in time of selecting this option)": "Solo miembros (desde el momento en que se selecciona esta opción)",
     "Members only (since they were invited)": "Solo miembros (desde que fueron invitados)",
     "Members only (since they joined)": "Solo miembros (desde que se unieron)",
-    "You don't currently have any stickerpacks enabled": "Actualmente no tienes ningún paquete de pegatinas habilitado",
+    "You don't currently have any stickerpacks enabled": "Actualmente no tienes ningún paquete de pegatinas activado",
     "Stickerpack": "Paquete de pegatinas",
     "Hide Stickers": "Ocultar Pegatinas",
     "Show Stickers": "Mostrar Pegatinas",
     "Invalid community ID": "ID de comunidad inválida",
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s' no es una ID de comunidad válida",
     "Flair": "Insignia",
-    "Showing flair for these communities:": "Mostrar insignias de estas comunidades:",
+    "Showing flair for these communities:": "Mostrar insignias de las siguientes comunidades:",
     "This room is not showing flair for any communities": "Esta sala no está mostrando insignias para ninguna comunidad",
     "New community ID (e.g. +foo:%(localDomain)s)": "Nueva ID de comunidad (ej. +foo:%(localDomain)s)",
     "URL previews are enabled by default for participants in this room.": "La vista previa de URL se activa por defecto en los participantes de esta sala.",
     "URL previews are disabled by default for participants in this room.": "La vista previa se desactiva por defecto para los participantes de esta sala.",
-    "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.": "En salas cifradas, como ésta, la vista previa de la URL se desactivan por defecto para asegurar que el servidor doméstico (donde se generan) no puede recopilar información de los enlaces que vea en esta sala.",
+    "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.": "En salas cifradas como ésta, la vista previa de las URL se desactiva por defecto para asegurar que el servidor base (donde se generan) no puede recopilar información de los enlaces que veas en esta sala.",
     "URL Previews": "Vista previa de URL",
-    "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.": "Cuando alguien pone una URL en su mensaje, una vista previa se mostrará para ofrecer información sobre el enlace, tal como título, descripción, y una imagen del sitio Web.",
+    "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.": "Cuando alguien incluye una URL en su mensaje, se mostrará una vista previa para ofrecer información sobre el enlace, que incluirá el título, descripción, y una imagen del sitio web.",
     "Error decrypting audio": "Error al descifrar el sonido",
     "Error decrypting image": "Error al descifrar imagen",
     "Error decrypting video": "Error al descifrar video",
@@ -645,7 +645,7 @@
     "Filter community rooms": "Filtrar salas de la comunidad",
     "Something went wrong when trying to get your communities.": "Algo fue mal cuando se intentó obtener sus comunidades.",
     "Display your community flair in rooms configured to show it.": "Muestra la insignia de su comunidad en las salas configuradas a tal efecto.",
-    "You're not currently a member of any communities.": "Actualmente no es miembro de una comunidad.",
+    "You're not currently a member of any communities.": "Actualmente no formas parte de ninguna comunidad.",
     "Unknown Address": "Dirección desconocida",
     "Delete Widget": "Eliminar Componente",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Al borrar un widget se elimina para todos usuarios de la sala. ¿Está seguro?",
@@ -732,8 +732,8 @@
     "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.": "Desactivar tu cuenta <b>no hace que por defecto olvidemos los mensajes que has enviado.</b> Si quieres que olvidemos tus mensajes, por favor marca la casilla a continuación.",
     "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 visibilidad de mensajes en Matrix es similar a la del correo electrónico. Que olvidemos tus mensajes implica que los mensajes que hayas enviado no se compartirán con ningún usuario nuevo o no registrado, pero aquellos usuarios registrados que ya tengan acceso a estos mensajes seguirán teniendo acceso a su 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)": "Por favor, olvida todos los mensajes enviados al desactivar mi cuenta. (<b>Advertencia:</b> esto provocará que los usuarios futuros vean conversaciones incompletas)",
-    "To continue, please enter your password:": "Para continuar, ingresa tu contraseña por favor:",
-    "Clear Storage and Sign Out": "Borrar Almacenamiento y Cerrar Sesión",
+    "To continue, please enter your password:": "Para continuar, introduce tu contraseña, por favor:",
+    "Clear Storage and Sign Out": "Borrar almacenamiento y cerrar sesión",
     "Send Logs": "Enviar Registros",
     "Refresh": "Refrescar",
     "We encountered an error trying to restore your previous session.": "Encontramos un error al intentar restaurar su sesión anterior.",
@@ -788,19 +788,19 @@
     "You are a member of this community": "Usted es un miembro de esta comunidad",
     "Who can join this community?": "¿Quién puede unirse a esta comunidad?",
     "Everyone": "Todo el mundo",
-    "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!": "Su comunidad no tiene una descripción larga, una página HTML para mostrar a sus miembros.<br />Pulse aquí para abrir los ajustes y definirla",
+    "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!": "Tu comunidad no tiene una descripción larga, una página HTML para mostrar a sus miembros.<br />Pulsa aquí para abrir los ajustes y definirla.",
     "Long Description (HTML)": "Descripción Larga (HTML)",
     "Description": "Descripción",
     "Community %(groupId)s not found": "No se encontraron %(groupId)s de la comunidad",
     "Failed to load %(groupId)s": "Falló la carga de %(groupId)s",
     "This room is not public. You will not be able to rejoin without an invite.": "Esta sala no es pública. No podrá volver a unirse sin una invitación.",
-    "Can't leave Server Notices room": "No puede abandonar la sala Avisos del Servidor",
-    "This room is used for important messages from the Homeserver, so you cannot leave it.": "La sala se usa para mensajes importantes del Servidor Doméstico, así que no puede abandonarla.",
+    "Can't leave Server Notices room": "No se puede salir de la sala de avisos del servidor",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "La sala se usa para mensajes importantes del servidor base, así que no puedes abandonarla.",
     "Terms and Conditions": "Términos y condiciones",
-    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Para continuar usando el servidor doméstico %(homeserverDomain)s debe revisar y estar de acuerdo con nuestros términos y condiciones.",
+    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Para continuar usando el servidor base %(homeserverDomain)s, debes revisar y estar de acuerdo con nuestros términos y condiciones.",
     "Review terms and conditions": "Revisar términos y condiciones",
     "Old cryptography data detected": "Se detectó información de criptografía antigua",
-    "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.": "Se detectó una versión más antigua de %(brand)s. Esto habrá provocado que la criptografía de extremo a extremo funcione incorrectamente en la versión más antigua. Los mensajes cifrados de extremo a extremo intercambiados recientemente mientras usaba la versión más antigua puede que no sean descifrables con esta versión. Esto también puede hacer que  fallen con la más reciente. Si experimenta problemas, desconecte y vuelva a ingresar. Para conservar el historial de mensajes, exporte y vuelva a importar sus claves.",
+    "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.": "Se detectó una versión más antigua de %(brand)s. Esto habrá provocado que la criptografía de extremo a extremo funcione incorrectamente en la versión más antigua. Los mensajes cifrados de extremo a extremo intercambiados recientemente mientras usaba la versión más antigua puede que no sean descifrables con esta versión. Esto también puede hacer que fallen con la más reciente. Si experimenta problemas, desconecte y vuelva a ingresar. Para conservar el historial de mensajes, exporte y vuelva a importar sus claves.",
     "Your Communities": "Sus Comunidades",
     "Did you know: you can use communities to filter your %(brand)s experience!": "Sabía que: puede usar comunidades para filtrar su experiencia con %(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 configurar un filtro, arrastre un avatar de comunidad sobre el panel de filtro en la parte izquierda de la pantalla. Puede pulsar sobre un avatar en el panel de filtro en cualquier momento para ver solo las salas y personas asociadas con esa comunidad.",
@@ -812,22 +812,22 @@
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Reenviar todo</resendText> o <cancelText>cancelar todo</cancelText> ahora. También puedes seleccionar mensajes individuales para reenviar o cancelar.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Reenviar mensaje</resendText> o <cancelText>cancelar mensaje</cancelText> ahora.",
     "Connectivity to the server has been lost.": "Se perdió la conexión con el servidor.",
-    "Sent messages will be stored until your connection has returned.": "Los mensajes enviados se almacenarán hasta que vuelva su conexión.",
+    "Sent messages will be stored until your connection has returned.": "Los mensajes enviados se almacenarán hasta que vuelva la conexión.",
     "Active call": "Llamada activa",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "¡No hay nadie aquí! ¿Le gustaría <inviteText>invitar a otros</inviteText> o <nowarnText>dejar de advertir sobre la sala vacía</nowarnText>?",
     "Room": "Sala",
     "Clear filter": "Borrar filtro",
     "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.": "Si has enviado un error a GitHub, estos registros pueden ayudar a localizar el problema. Contienen información de uso de la aplicación, incluido el nombre de usuario, IDs o alias de las salas o grupos visitados y los nombres de otros usuarios. No contienen mensajes.",
     "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s recopila análisis de estadísticas anónimas para permitirnos mejorar la aplicación.",
-    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "La privacidad es importante, por lo que no se recopila información personal o identificable en los análisis de estadísticas.",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "La privacidad es importante para nosotros, por lo que no se recopila información personal o identificable en los análisis de estadísticas.",
     "Learn more about how we use analytics.": "Más información sobre el uso de los análisis de estadísticas.",
     "Check for update": "Comprobar actualizaciones",
     "Start automatically after system login": "Ejecutar automáticamente después de iniciar sesión en el sistema",
     "No Audio Outputs detected": "No se detectaron Salidas de Sonido",
     "Audio Output": "Salida de Sonido",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Se envió un correo electrónico a %(emailAddress)s. Una vez hayas seguido el enlace que contiene, haz clic a continuación.",
-    "Please note you are logging into the %(hs)s server, not matrix.org.": "Por favor, tenga en cuenta que está ingresando en el servidor %(hs)s, no en matrix.org.",
-    "This homeserver doesn't offer any login flows which are supported by this client.": "Este servidor doméstico no ofrece flujos de ingreso soportados por este cliente.",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Por favor, ten en cuenta que estás iniciando sesión en el servidor %(hs)s, y no en matrix.org.",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Este servidor base no ofrece ningún flujo de inicio de sesión soportado por este cliente.",
     "Set a display name:": "Establece un nombre público:",
     "Upload an avatar:": "Subir un avatar:",
     "This server does not support authentication with a phone number.": "Este servidor no es compatible con autenticación mediante número telefónico.",
@@ -839,20 +839,20 @@
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "El archivo exportado estará protegido con una contraseña. Deberías ingresar la contraseña aquí para descifrar el archivo.",
     "Only room administrators will see this warning": "Sólo los administradores de la sala verán esta advertencia",
     "Please <a>contact your service administrator</a> to continue using the service.": "Por favor, <a>contacta al administrador de tu servicio</a> para continuar utilizando el servicio.",
-    "This homeserver has hit its Monthly Active User limit.": "Este servidor doméstico ha alcanzado su límite Mensual de Usuarios Activos.",
-    "This homeserver has exceeded one of its resource limits.": "Este servidor doméstico ha excedido uno de sus límites de recursos.",
+    "This homeserver has hit its Monthly Active User limit.": "Este servidor base ha alcanzado su límite mensual de usuarios activos.",
+    "This homeserver has exceeded one of its resource limits.": "Este servidor base ha excedido uno de sus límites de recursos.",
     "Upgrade Room Version": "Actualizar Versión de la Sala",
     "Create a new room with the same name, description and avatar": "Crear una sala nueva con el mismo nombre, descripción y avatar",
     "Update any local room aliases to point to the new room": "Actualizar los alias locales de la sala para que apunten a la nueva",
     "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Impedir a los usuarios que conversen en la versión antigua de la sala, y publicar un mensaje aconsejándoles que se muden a la nueva",
     "Put a link back to the old room at the start of the new room so people can see old messages": "Poner un enlace de retorno a la sala antigua al principio de la nueva de modo que se puedan ver los mensajes viejos",
-    "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.": "Tu mensaje no se envió porque este servidor doméstico ha alcanzado su Límite Mensual de Usuarios Activos. Por favor, <a>contacta al administrador de tu servicio</a> para continuar utilizando el servicio.",
-    "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.": "Su mensaje no se envió porque este servidor doméstico ha excedido un límite de recursos. Por favor <a>contacta al administrador de tu servicio</a> para continuar utilizando el servicio.",
+    "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.": "Tu mensaje no se ha enviado porque este servidor base ha alcanzado su límite mensual de usuarios activos. Por favor, <a>contacta con el administrador de tu servicio</a> para continuar utilizándolo.",
+    "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.": "Tu mensaje no se ha enviado porque este servidor base ha excedido un límite de recursos. Por favor <a>contacta con el administrador de tu servicio</a> para continuar utilizándolo.",
     "Please <a>contact your service administrator</a> to continue using this service.": "Por favor, <a>contacta al administrador de tu servicio</a> para continuar utilizando este servicio.",
     "System Alerts": "Alertas de Sistema",
     "Forces the current outbound group session in an encrypted room to be discarded": "Obliga a que la sesión de salida grupal actual en una sala cifrada se descarte",
-    "Sorry, your homeserver is too old to participate in this room.": "Lo sentimos, tu servidor doméstico es demasiado antiguo para participar en esta sala.",
-    "Please contact your homeserver administrator.": "Por favor contacta al administrador de tu servidor doméstico.",
+    "Sorry, your homeserver is too old to participate in this room.": "Lo sentimos, tu servidor base tiene una versión demasiado antigua como para participar en esta sala.",
+    "Please contact your homeserver administrator.": "Por favor, contacta con la administración de tu servidor base.",
     "This room has been replaced and is no longer active.": "Esta sala ha sido reemplazada y ya no está activa.",
     "The conversation continues here.": "La conversación continúa aquí.",
     "This room is a continuation of another conversation.": "Esta sala es una continuación de otra conversación.",
@@ -861,7 +861,7 @@
     "The room upgrade could not be completed": "La actualización de la sala no pudo ser completada",
     "Upgrade this room to version %(version)s": "Actualiza esta sala a la versión %(version)s",
     "Legal": "Legal",
-    "Unable to connect to Homeserver. Retrying...": "No es posible conectarse al Servidor Doméstico. Volviendo a intentar...",
+    "Unable to connect to Homeserver. Retrying...": "No ha sido posible conectarse al servidor base. Volviendo a intentar...",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s estableció la dirección principal para esta sala como %(address)s.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s eliminó la dirección principal para esta sala.",
     "%(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!": "%(brand)s ahora utiliza de 3 a 5 veces menos memoria, porque solo carga información sobre otros usuarios cuando es necesario. Por favor, ¡aguarda mientras volvemos a sincronizar con el servidor!",
@@ -872,7 +872,7 @@
     "Room information": "Información de la sala",
     "Room Topic": "Tema de la sala",
     "Theme": "Tema",
-    "Voice & Video": "Voz y video",
+    "Voice & Video": "Voz y vídeo",
     "Gets or sets the room topic": "Obtiene o establece el tema de la sala",
     "This room has no topic.": "Esta sala no tiene tema.",
     "Sets the room name": "Establece el nombre de la sala",
@@ -927,14 +927,14 @@
     "Custom user status messages": "Mensajes de estado de usuario personalizados",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Agrupa y filtra salas por etiquetas personalizadas (refresca para aplicar cambios)",
     "Render simple counters in room header": "Muestra contadores simples en la cabecera de la sala",
-    "Enable Emoji suggestions while typing": "Habilitar sugerencia de Emojis mientras se teclea",
+    "Enable Emoji suggestions while typing": "Activar sugerencias de emojis al escribir",
     "Show a placeholder for removed messages": "Mostrar una marca para los mensaje borrados",
     "Show join/leave messages (invites/kicks/bans unaffected)": "Mostrar mensajes de entrada/salida (no afecta a invitaciones/expulsiones/baneos)",
     "Show avatar changes": "Mostrar cambios de avatar",
     "Show display name changes": "Muestra cambios en los nombres",
     "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Mostrar un recordatorio para habilitar 'Recuperación Segura de Mensajes' en sala cifradas",
     "Show avatars in user and room mentions": "Mostrar avatares en menciones a usuarios y salas",
-    "Enable big emoji in chat": "Habilitar emojis grandes en el chat",
+    "Enable big emoji in chat": "Activar emojis grandes en el chat",
     "Send typing notifications": "Enviar notificaciones de tecleo",
     "Allow Peer-to-Peer for 1:1 calls": "Permitir conexión de pares en llamadas individuales",
     "Prompt before sending invites to potentially invalid matrix IDs": "Pedir confirmación antes de enviar invitaciones a IDs de matrix que parezcan inválidas",
@@ -1033,7 +1033,7 @@
     "Profile picture": "Foto de perfil",
     "Display Name": "Nombre a mostrar",
     "Internal room ID:": "ID de Sala Interna:",
-    "Open Devtools": "Abrir Devtools",
+    "Open Devtools": "Abrir devtools",
     "General": "General",
     "Room Addresses": "Direcciones de sala",
     "Set a new account password...": "Establecer una nueva contraseña para la cuenta...",
@@ -1043,18 +1043,18 @@
     "For help with using %(brand)s, click <a>here</a>.": "Si necesitas ayuda usando %(brand)s, haz clic <a>aquí</a>.",
     "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "Si necesitas ayuda usando %(brand)s, haz clic <a>aquí</a> o abre un chat con nuestro bot usando el botón de abajo.",
     "Chat with %(brand)s Bot": "Hablar con %(brand)s Bot",
-    "Help & About": "Ayuda & Acerca de",
-    "Bug reporting": "Reportar error",
-    "FAQ": "FAQ",
+    "Help & About": "Ayuda y acerca de",
+    "Bug reporting": "Informar de un fallo",
+    "FAQ": "Preguntas frecuentes",
     "Versions": "Versiones",
     "Preferences": "Opciones",
     "Room list": "Lista de salas",
     "Autocomplete delay (ms)": "Retardo autocompletado (ms)",
-    "Roles & Permissions": "Roles & Permisos",
+    "Roles & Permissions": "Roles y permisos",
     "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Los cambios que se hagan sobre quien puede leer el historial se aplicarán solo a nuevos mensajes en esta sala. La visibilidad del historial actual no cambiará.",
     "Security & Privacy": "Seguridad y privacidad",
     "Encryption": "Cifrado",
-    "Once enabled, encryption cannot be disabled.": "Después de activarlo, el cifrado no se puede desactivar.",
+    "Once enabled, encryption cannot be disabled.": "Una vez activado, el cifrado no se puede desactivar.",
     "Encrypted": "Cifrado",
     "Ignored users": "Usuarios ignorados",
     "Bulk options": "Opciones generales",
@@ -1088,7 +1088,7 @@
     "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s cambió la regla para unirse a %(rule)s",
     "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s cambió el acceso para invitados a %(rule)s",
     "Use a longer keyboard pattern with more turns": "Usa un patrón de tecleo largo con más vueltas",
-    "Enable Community Filter Panel": "Habilitar el Panel de Filtro de Comunidad",
+    "Enable Community Filter Panel": "Activar el panel de filtro de comunidad",
     "Verify this user by confirming the following emoji appear on their screen.": "Verifica este usuario confirmando que los siguientes emojis aparecen en su pantalla.",
     "Your %(brand)s is misconfigured": "Tu %(brand)s tiene un error de configuración",
     "Whether or not you're logged in (we don't record your username)": "Hayas o no iniciado sesión (no guardamos tu nombre de usuario)",
@@ -1107,9 +1107,9 @@
     "%(senderName)s made no change.": "%(senderName)s no hizo ningún cambio.",
     "Sends the given message coloured as a rainbow": "Envía el mensaje coloreado como un arcoiris",
     "Sends the given emote coloured as a rainbow": "Envía el emoji coloreado como un arcoiris",
-    "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s ha habilitado las insignias para %(groups)s en esta sala.",
-    "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s ha deshabilitado las insignias para %(groups)s en esta sala.",
-    "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s ha habilitado las insignias para %(newGroups)s y las ha deshabilitado para %(oldGroups)s en esta sala.",
+    "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s ha activado las insignias para %(groups)s en esta sala.",
+    "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s ha desactivado las insignias para %(groups)s en esta sala.",
+    "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s ha activado las insignias para %(newGroups)s y las ha desactivado para %(oldGroups)s en esta sala.",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s ha revocado la invitación para que %(targetDisplayName)s se una a la sala.",
     "Cannot reach homeserver": "No se puede conectar con el servidor",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Asegúrate de tener conexión a internet, o contacta con el administrador del servidor",
@@ -1130,8 +1130,8 @@
     "Got It": "Entendido",
     "Scissors": "Tijeras",
     "Call failed due to misconfigured server": "Llamada fallida debido a la mala configuración del servidor",
-    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Por favor pídele al administrador de tu servidor doméstico (<code>%(homeserverDomain)s</code>) que configure un servidor TURN para que las llamadas funcionen correctamente.",
-    "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.": "Alternativamente, puedes tratar de usar el servidor público en <code>turn.matrix.org</code>, pero éste no será igual de confiable, y compartirá tu dirección IP con ese servidor. También puedes administrar esto en Ajustes.",
+    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Por favor, pídele al administrador de tu servidor base (<code>%(homeserverDomain)s</code>) que configure un servidor TURN para que las llamadas funcionen correctamente.",
+    "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.": "Como alternativa, puedes intentar usar el servidor público <code>turn.matrix.org</code>, pero éste no será igual de confiable, y compartirá tu dirección IP con ese servidor. También puedes configurar esto en ajustes.",
     "Try using turn.matrix.org": "Trata de usar turn.matrix.org",
     "Messages": "Mensajes",
     "Actions": "Acciones",
@@ -1141,7 +1141,7 @@
     "Changes the avatar of the current room": "Cambia el ávatar de la sala actual",
     "Use an identity server": "Usar un servidor de identidad",
     "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Usar un servidor de identidad para invitar por correo. Presiona continuar par usar el servidor de identidad por defecto (%(defaultIdentityServerName)s) o adminístralo en Ajustes.",
-    "Use an identity server to invite by email. Manage in Settings.": "Usar un servidor de identidad para invitar por correo. Administrar en Ajustes.",
+    "Use an identity server to invite by email. Manage in Settings.": "Usar un servidor de identidad para invitar por correo. Gestiónalo en ajustes.",
     "Adds a custom widget by URL to the room": "Añade un widget personalizado por URL a la sala",
     "Please supply a https:// or http:// widget URL": "Por favor provisiona un URL de widget de http:// o https://",
     "You cannot modify widgets in this room.": "No puedes modificar widgets en esta sala.",
@@ -1162,7 +1162,7 @@
     "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s hizo una llamada de vídeo (no soportada por este navegador)",
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
     "Try out new ways to ignore people (experimental)": "Pruebe nuevas formas de ignorar a usuarios (experimental)",
-    "Match system theme": "Utilizar el mismo tema del sistema",
+    "Match system theme": "Usar el mismo tema que el sistema",
     "Show previews/thumbnails for images": "Mostrar vistas previas para las imágenes",
     "When rooms are upgraded": "Cuando las salas son actualizadas",
     "My Ban List": "Mi lista de baneos",
@@ -1170,7 +1170,7 @@
     "Decline (%(counter)s)": "Declinar (%(counter)s)",
     "Accept <policyLink /> to continue:": "Aceptar <policyLink /> para continuar:",
     "ID": "Identificación",
-    "Public Name": "Nombre Público",
+    "Public Name": "Nombre público",
     "Connecting to integration manager...": "Conectando al gestor de integraciones...",
     "Cannot connect to integration manager": "No se puede conectar al gestor de integraciones",
     "The integration manager is offline or it cannot reach your homeserver.": "El gestor de integraciones está desconectado o no puede conectar con su servidor.",
@@ -1185,7 +1185,7 @@
     "You have %(count)s unread notifications in a prior version of this room.|one": "Tiene %(count)s notificaciones sin leer en una versión anterior de esta sala.",
     "Setting up keys": "Configurando claves",
     "Verify this session": "Verificar esta sesión",
-    "Encryption upgrade available": "Mejora de encriptación disponible",
+    "Encryption upgrade available": "Mejora de cifrado disponible",
     "Set up encryption": "Configurar la encriptación",
     "Verifies a user, session, and pubkey tuple": "Verifica a un usuario, sesión y tupla de clave pública",
     "Unknown (user, session) pair:": "Par (usuario, sesión) desconocido:",
@@ -1213,7 +1213,7 @@
     "Channel: %(channelName)s": "Canal: %(channelName)s",
     "Show less": "Mostrar menos",
     "Show more": "Mostrar más",
-    "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.": "Cambiar la contraseña reiniciará cualquier clave de encriptación end-to-end en todas las sesiones, haciendo el historial de conversaciones encriptado ilegible, a no ser que primero exportes tus claves de sala y después las reimportes. En un futuro esto será mejorado.",
+    "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.": "Cambiar la contraseña reiniciará cualquier clave de cifrado end-to-end en todas las sesiones, haciendo el historial de conversaciones encriptado ilegible, a no ser que primero exportes tus claves de sala y después las reimportes. En un futuro esto será mejorado.",
     "in memory": "en memoria",
     "not found": "no encontrado",
     "Identity Server (%(server)s)": "Servidor de Identidad %(server)s",
@@ -1226,7 +1226,7 @@
     "Do not use an identity server": "No usar un servidor de identidad",
     "Enter a new identity server": "Introducir un servidor de identidad nuevo",
     "Change": "Cambiar",
-    "Manage integrations": "Administrar integraciones",
+    "Manage integrations": "Gestionar integraciones",
     "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Los administradores de integración reciben datos de configuración, y pueden modificar widgets, enviar invitaciones de sala, y establecer niveles de poder en tu nombre.",
     "Something went wrong trying to invite the users.": "Algo salió mal al intentar invitar a los usuarios.",
     "We couldn't invite those users. Please check the users you want to invite and try again.": "No se pudo invitar a esos usuarios. Por favor, revisa los usuarios que quieres invitar e inténtalo de nuevo.",
@@ -1236,23 +1236,23 @@
     "Suggestions": "Sugerencias",
     "Recently Direct Messaged": "Enviado Mensaje Directo recientemente",
     "Go": "Ir",
-    "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.": "Has usado %(brand)s anteriormente en %(host)s con carga diferida de usuarios habilitada. En esta versión la carga diferida está deshabilitada. Como el caché local no es compatible entre estas dos configuraciones, %(brand)s necesita resincronizar tu cuenta.",
-    "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.": "Si la otra versión de %(brand)s esta todavía abierta en otra pestaña, por favor, ciérrala, ya que usar %(brand)s en el mismo host con la opción de carga diferida habilitada y deshabilitada simultáneamente causará problemas.",
+    "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.": "Has usado %(brand)s anteriormente en %(host)s con carga diferida de usuarios activada. En esta versión la carga diferida está desactivada. Como el caché local no es compatible entre estas dos configuraciones, %(brand)s tiene que resincronizar tu cuenta.",
+    "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.": "Si la otra versión de %(brand)s esta todavía abierta en otra pestaña, por favor, ciérrala, ya que usar %(brand)s en el mismo host con la opción de carga diferida activada y desactivada simultáneamente causará problemas.",
     "Incompatible local cache": "Caché local incompatible",
     "Clear cache and resync": "Limpiar la caché y resincronizar",
     "I don't want my encrypted messages": "No quiero mis mensajes cifrados",
     "Manually export keys": "Exportar claves manualmente",
-    "You'll lose access to your encrypted messages": "Perderás acceso a tus mensajes encriptados",
+    "You'll lose access to your encrypted messages": "Perderás acceso a tus mensajes cifrados",
     "Are you sure you want to sign out?": "¿Estás seguro de que quieres salir?",
     "Message edits": "Ediciones del mensaje",
     "New session": "Nueva sesión",
-    "Use this session to verify your new one, granting it access to encrypted messages:": "Usa esta sesión para verificar tu nueva sesión, dándole acceso a mensajes encriptados:",
+    "Use this session to verify your new one, granting it access to encrypted messages:": "Usa esta sesión para verificar la nueva, dándole acceso a mensajes cifrados:",
     "If you didn’t sign in to this session, your account may be compromised.": "Si no te conectaste a esta sesión, es posible que tu cuenta haya sido comprometida.",
     "This wasn't me": "No fui yo",
     "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Si encuentras algún error o quieres compartir una opinión, por favor, contacta con nosotros en GitHub.",
     "Report bugs & give feedback": "Reportar errores y compartir mi opinión",
     "Please fill why you're reporting.": "Por favor, explica por qué estás reportando.",
-    "Report Content to Your Homeserver Administrator": "Reportar contenido a tu administrador del Servidor Doméstico",
+    "Report Content to Your Homeserver Administrator": "Reportar contenido al administrador de tu servidor base",
     "Send report": "Enviar reporte",
     "Room Settings - %(roomName)s": "Configuración de la sala - %(roomName)s",
     "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:": "Actualizar esta sala requiere cerrar la instancia actual de esta sala y crear una nueva sala en su lugar. Para dar a los miembros de la sala la mejor experiencia, haremos lo siguiente:",
@@ -1262,13 +1262,13 @@
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Actualizar una sala es una acción avanzada y es normalmente recomendada cuando una sala es inestable debido a fallos, funcionalidades no disponibles y vulnerabilidades.",
     "This usually only affects how the room is processed on the server. If you're having problems with your %(brand)s, please <a>report a bug</a>.": "Esto solo afecta a como la sala es procesada en el servidor. Si estás teniendo problemas con tu %(brand)s, por favor<a>reporta un fallo</a>.",
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Actualizarás esta sala de <oldVersion /> a <newVersion />.",
-    "Sign out and remove encryption keys?": "¿Salir y borrar las claves de encriptación?",
+    "Sign out and remove encryption keys?": "¿Salir y borrar las claves de cifrado?",
     "A username can only contain lower case letters, numbers and '=_-./'": "Un nombre de usuario solo puede contener letras minúsculas, números y '=_-./'",
     "Checking...": "Comprobando...",
     "This will allow you to return to your account after signing out, and sign in on other sessions.": "Esto te permitirá volver a tu cuenta después de desconectarte, y conectarte en otras sesiones.",
     "To help us prevent this in future, please <a>send us logs</a>.": "Para ayudarnos a prevenir esto en el futuro, por favor, <a>envíanos logs</a>.",
     "Missing session data": "Faltan datos de sesión",
-    "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Algunos datos de sesión, incluyendo claves de mensaje encriptadas, no se encuentran. Desconéctate y vuelve a conectarte para solucionarlo, reestableciendo las claves desde el backup.",
+    "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Algunos datos de sesión, incluyendo claves de mensajes cifrados, no se encuentran. Desconéctate y vuelve a conectarte para solucionarlo, restableciendo las claves desde la copia de seguridad.",
     "Your browser likely removed this data when running low on disk space.": "Tu navegador probablemente borró estos datos cuando tenía poco espacio de disco.",
     "Find others by phone or email": "Encontrar a otros por teléfono o email",
     "Be found by phone or email": "Ser encontrado por teléfono o email",
@@ -1279,7 +1279,7 @@
     "Summary": "Resumen",
     "Document": "Documento",
     "Next": "Siguiente",
-    "Upload files (%(current)s of %(total)s)": "Subir archivos  (%(current)s de %(total)s)",
+    "Upload files (%(current)s of %(total)s)": "Subir archivos (%(current)s de %(total)s)",
     "Upload files": "Subir archivos",
     "Upload all": "Subir todo",
     "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Este archivo es <b> demasiado grande</b> para subirse. El limite de tamaño de archivo es %(limit)s pero el archivo es %(sizeOfThisFile)s.",
@@ -1348,7 +1348,7 @@
     "Show typing notifications": "Mostrar notificaciones de escritura",
     "Never send encrypted messages to unverified sessions from this session": "No enviar nunca mensajes cifrados a sesiones sin verificar desde esta sesión",
     "Never send encrypted messages to unverified sessions in this room from this session": "No enviar nunca mensajes cifrados a sesiones sin verificar en esta sala desde esta sesión",
-    "Enable message search in encrypted rooms": "Habilitar la búsqueda de mensajes en salas cifradas",
+    "Enable message search in encrypted rooms": "Activar la búsqueda de mensajes en salas cifradas",
     "How fast should messages be downloaded.": "Con qué rapidez deben ser descargados los mensajes.",
     "Verify this session by completing one of the following:": "Verifica esta sesión completando uno de los siguientes:",
     "Scan this unique code": "Escanea este código único",
@@ -1365,18 +1365,18 @@
     "Delete %(count)s sessions|other": "Borrar %(count)s sesiones",
     "Delete %(count)s sessions|one": "Borrar %(count)s sesión",
     "rooms.": "salas.",
-    "Manage": "Administrar",
+    "Manage": "Gestionar",
     "Enable": "Activar",
     "This session is backing up your keys. ": "Esta sesión está haciendo una copia de seguridad de tus claves. ",
     "not stored": "no almacenado",
-    "Message search": "Busqueda de mensajes",
+    "Message search": "Búsqueda de mensajes",
     "Upgrade this room to the recommended room version": "Actualizar esta sala a la versión de sala recomendada",
     "this room": "esta sala",
     "View older messages in %(roomName)s.": "Ver mensajes más antiguos en %(roomName)s.",
     "Sounds": "Sonidos",
     "Notification sound": "Sonido de notificación",
     "Set a new custom sound": "Usar un nuevo sonido personalizado",
-    "Browse": "Navegar",
+    "Browse": "Seleccionar",
     "Change room avatar": "Cambiar avatar de sala",
     "Change room name": "Cambiar nombre de sala",
     "Change main address for the room": "Cambiar la dirección principal para la sala",
@@ -1400,7 +1400,7 @@
     "Notify everyone": "Notificar a todos",
     "Send %(eventType)s events": "Enviar eventos %(eventType)s",
     "Select the roles required to change various parts of the room": "Selecciona los roles requeridos para cambiar varias partes de la sala",
-    "Enable encryption?": "¿Habilitar cifrado?",
+    "Enable encryption?": "¿Activar cifrado?",
     "Your email address hasn't been verified yet": "Tu dirección de email no ha sido verificada",
     "Verify the link in your inbox": "Verifica el enlace en tu bandeja de entrada",
     "Complete": "Completar",
@@ -1411,8 +1411,8 @@
     "Backup key stored: ": "Clave de seguridad almacenada: ",
     "Your keys are <b>not being backed up from this session</b>.": "<b>No se está haciendo una copia de seguridad de tus claves en esta sesión</b>.",
     "Clear notifications": "Limpiar notificaciones",
-    "Enable desktop notifications for this session": "Habilitar notificaciones de escritorio para esta sesión",
-    "Enable audible notifications for this session": "Habilitar notificaciones sonoras para esta sesión",
+    "Enable desktop notifications for this session": "Activar notificaciones de escritorio para esta sesión",
+    "Enable audible notifications for this session": "Activar notificaciones sonoras para esta sesión",
     "Checking server": "Comprobando servidor",
     "Change identity server": "Cambiar servidor de identidad",
     "Disconnect from the identity server <current /> and connect to <new /> instead?": "¿Desconectarse del servidor de identidad <current /> y conectarse a <new/>?",
@@ -1435,7 +1435,7 @@
     "Whether you're using %(brand)s as an installed Progressive Web App": "Si estás usando %(brand)s como una Aplicación Web Progresiva instalada",
     "If you cancel now, you won't complete your operation.": "Si cancela ahora, no completará la operación.",
     "Review where you’re logged in": "Revise dónde hizo su registro",
-    "New login. Was this you?": "Nuevo registro. ¿Fuiste tú?",
+    "New login. Was this you?": "Nuevo inicio de sesión. ¿Has sido tú?",
     "%(name)s is requesting verification": "%(name)s solicita verificación",
     "Sign In or Create Account": "Iniciar sesión o Crear una cuenta",
     "Use your account or create a new one to continue.": "Usa tu cuenta existente o crea una nueva para continuar.",
@@ -1444,7 +1444,7 @@
     "Sends a message as html, without interpreting it as markdown": "Envía un mensaje como html, sin interpretarlo en markdown",
     "Failed to set topic": "No se ha podido establecer el tema",
     "Command failed": "El comando falló",
-    "Could not find user in room": "No pude encontrar el usuario en la sala",
+    "Could not find user in room": "No se ha encontrado el usuario en la sala",
     "Please supply a widget URL or embed code": "Por favor, proporcione una URL del widget o un código de incrustación",
     "Displays information about a user": "Muestra información sobre un usuario",
     "Send a bug report with logs": "Envíe un informe de errores con los registros",
@@ -1469,7 +1469,7 @@
     "Order rooms by name": "Ordenar las salas por nombre",
     "Show rooms with unread notifications first": "Mostrar primero las salas con notificaciones no leídas",
     "Show shortcuts to recently viewed rooms above the room list": "Mostrar atajos a las salas recientemente vistas por encima de la lista de salas",
-    "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Permitir el servidor de respaldo de asistencia de llamadas turn.matrix.org cuando su servidor doméstico no lo ofrece (su dirección IP se compartiría durante una llamada)",
+    "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Permitir el servidor de respaldo de asistencia de llamadas turn.matrix.org cuando tu servidor base no lo ofrezca (tu dirección IP se compartiría durante una llamada)",
     "Send read receipts for messages (requires compatible homeserver to disable)": "Enviar recibos de lectura de mensajes (requiere un servidor local compatible para desactivarlo)",
     "Manually verify all remote sessions": "Verificar manualmente todas las sesiones remotas",
     "Confirm the emoji below are displayed on both sessions, in the same order:": "Confirma que los emoji de abajo se muestran en el mismo orden en ambas sesiones:",
@@ -1478,11 +1478,11 @@
     "Cancelling…": "Anulando…",
     "Verify all your sessions to ensure your account & messages are safe": "Verifica todas tus sesiones abiertas para asegurarte de que tu cuenta y tus mensajes estén seguros",
     "Set up": "Configurar",
-    "Verify the new login accessing your account: %(name)s": "Verifique el nuevo ingreso que está accediendo a su cuenta: %(name)s",
+    "Verify the new login accessing your account: %(name)s": "Verifica el nuevo inicio de sesión que está accediendo a tu cuenta: %(name)s",
     "From %(deviceName)s (%(deviceId)s)": "De %(deviceName)s (%(deviceId)s)",
     "This bridge was provisioned by <user />.": "Este puente fue aportado por <user />.",
     "This bridge is managed by <user />.": "Este puente es administrado por <user />.",
-    "Your homeserver does not support cross-signing.": "Tu servidor doméstico no soporta las firmas cruzadas.",
+    "Your homeserver does not support cross-signing.": "Tu servidor base no soporta las firmas cruzadas.",
     "Cross-signing and secret storage are enabled.": "La firma cruzada y el almacenamiento secreto están activados.",
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Su cuenta tiene una identidad de firma cruzada en un almacenamiento secreto, pero aún no es confiada en esta sesión.",
     "Cross-signing and secret storage are not yet set up.": "Las firmas cruzadas y el almacenamiento secreto aún no han sido configurados.",
@@ -1515,20 +1515,20 @@
     "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 sesión no <b> ha creado una copia de seguridad de tus llaves</b>, pero tienes una copia de seguridad existente de la que puedes restaurar y añadir para proceder.",
     "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Conecte esta sesión a la copia de seguridad de las claves antes de firmar y así evitar perder las claves que sólo existen en esta sesión.",
     "Connect this session to Key Backup": "Conecte esta sesión a la copia de respaldo de tu clave",
-    "Backup has a <validity>valid</validity> signature from this user": "La copia de seguridad tiene una  firma de <validity>valido</validity> de este usuario",
+    "Backup has a <validity>valid</validity> signature from this user": "La copia de seguridad tiene una firma de <validity>valido</validity> de este usuario",
     "Backup has a <validity>invalid</validity> signature from this user": "La copia de seguridad tiene una firma de <validity>no_valida</validity> de este usuario",
     "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "La copia de seguridad tiene una firma de <verify>desconocido</verify> del usuario con ID %(deviceId)s",
     "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "La copia de seguridad tiene una firma de <verify>desconocido</verify> de la sesión con ID %(deviceId)s",
     "Backup has a <validity>valid</validity> signature from this session": "La copia de seguridad tiene una firma <validity>válida</validity> de esta sesión",
     "Backup has an <validity>invalid</validity> signature from this session": "La copia de seguridad tiene una firma <validity>no_válida</validity> de esta sesión",
-    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "La copia de seguridad tiene una firma  <validity>válida</validity> de <verify>verificada</verify> sesión <device></device>",
-    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "La copia de seguridad tiene una firma de <validity>válida</validity> de sesión  <verify>no verificada</verify> <device></device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "La copia de seguridad tiene una firma de <validity>no válida</validity> de sesión  <verify>verificada</verify> <device></device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "La copia de seguridad tiene una firma de <validity>no válida</validity> de sesión  <verify>no verificada</verify> <device></device>",
-    "<a>Upgrade</a> to your own domain": "<a>Actualizar</a> a su propio dominio",
+    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "La copia de seguridad tiene una firma <validity>válida</validity> de <verify>verificada</verify> sesión <device></device>",
+    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "La copia de seguridad tiene una firma de <validity>válida</validity> de sesión <verify>no verificada</verify> <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "La copia de seguridad tiene una firma de <validity>no válida</validity> de sesión <verify>verificada</verify> <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "La copia de seguridad tiene una firma de <validity>no válida</validity> de sesión <verify>no verificada</verify> <device></device>",
+    "<a>Upgrade</a> to your own domain": "<a>Contratar</a> el uso de un dominio personalizado",
     "Identity Server URL must be HTTPS": "La URL del servidor de identidad debe ser tipo HTTPS",
     "Not a valid Identity Server (status code %(code)s)": "No es un servidor de identidad válido (código de estado %(code)s)",
-    "Could not connect to Identity Server": "No se pudo conectar al Servidor de Identidad",
+    "Could not connect to Identity Server": "No se ha podido conectar al servidor de identidad",
     "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.": "Usted debe <b> eliminar sus datos personales </b> del servidor de identidad <idserver /> antes de desconectarse. Desafortunadamente, el servidor de identidad <idserver /> está actualmente desconectado o es imposible comunicarse con él por otra razón.",
     "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "comprueba los complementos (plugins) de tu navegador para ver si hay algo que pueda bloquear el servidor de identidad (como p.ej. Privacy Badger)",
     "contact the administrators of identity server <idserver />": "contactar con los administradores del servidor de identidad <idserver />",
@@ -1537,14 +1537,14 @@
     "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Usted todavía está <b> compartiendo sus datos personales</b> en el servidor de identidad <idserver />.",
     "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Le recomendamos que elimine sus direcciones de correo electrónico y números de teléfono del servidor de identidad antes de desconectarse.",
     "Go back": "Atrás",
-    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Usar un Administrador de Integración <b>(%(serverName)s)</b>  para manejar los bots, los widgets y los paquetes de pegatinas.",
+    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Usar un gestor de integraciones <b>(%(serverName)s)</b> para manejar los bots, widgets y paquetes de pegatinas.",
     "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Utiliza un Administrador de Integración para gestionar los bots, los widgets y los paquetes de pegatinas.",
     "Invalid theme schema.": "Esquema de tema inválido.",
     "Error downloading theme information.": "Error al descargar la información del tema.",
     "Theme added!": "¡Se añadió el tema!",
     "Custom theme URL": "URL de tema personalizado",
     "Add theme": "Añadir tema",
-    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Para informar de un problema de seguridad relacionado con Matrix, por favor lea  <a>Security Disclosure Policy</a> de Matrix.or.",
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Para informar de un problema de seguridad relacionado con Matrix, por favor lea <a>Security Disclosure Policy</a> de Matrix.or.",
     "Keyboard Shortcuts": "Atajos de teclado",
     "Customise your experience with experimental labs features. <a>Learn more</a>.": "Personaliza tu experiencia con las funciones de los laboratorios experimentales. <a>Learn more</a>.",
     "Something went wrong. Please try again or view your console for hints.": "Algo salió mal. Por favor, inténtalo de nuevo o mira tu consola para encontrar pistas.",
@@ -1559,15 +1559,15 @@
     "Subscribe": "Suscribir",
     "Always show the window menu bar": "Siempre mostrar la barra de menú de la ventana",
     "Show tray icon and minimize window to it on close": "Mostrar el icono en el Área de Notificación y minimizar la ventana al cerrarla",
-    "Composer": "Compositor",
+    "Composer": "Editor",
     "Timeline": "Línea de tiempo",
     "Read Marker lifetime (ms)": "Permanencia del marcador de lectura (en ms)",
-    "Read Marker off-screen lifetime (ms)": "Permanencia  del marcador de lectura fuera de la pantalla (en ms)",
+    "Read Marker off-screen lifetime (ms)": "Permanencia del marcador de lectura fuera de la pantalla (en ms)",
     "Session ID:": "Identidad (ID) de sesión:",
     "Session key:": "Código de sesión:",
     "Accept all %(invitedRooms)s invites": "Aceptar todas las invitaciones de %(invitedRooms)s",
-    "Cross-signing": "Firmar cruzada",
-    "Where you’re logged in": "En el lugar de ingreso (registro)",
+    "Cross-signing": "Firma cruzada",
+    "Where you’re logged in": "Sesiones",
     "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Administre los nombres de sus sesiones y salga de las sesiones abajo o <a>verifíquelos en su Perfil de Usuario</a>.",
     "A session's public name is visible to people you communicate with": "El nombre público de una sesión es visible para las personas con las que te comunicas",
     "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Esta sala está haciendo puente con las siguientes plataformas. <a>Aprende más.</a>",
@@ -1582,7 +1582,7 @@
     "Discovery options will appear once you have added an email above.": "Las opciones de descubrimiento aparecerán una vez que haya añadido un correo electrónico arriba.",
     "Unable to revoke sharing for phone number": "No se logró revocar el intercambio de un número de teléfono",
     "Unable to share phone number": "No se logró compartir el número de teléfono",
-    "Please enter verification code sent via text.": "Por favor, introduzca el código de verificación enviado  por mensaje de texto.",
+    "Please enter verification code sent via text.": "Por favor, introduce el código de verificación enviado por SMS.",
     "Discovery options will appear once you have added a phone number above.": "Las opciones de descubrimiento aparecerán una vez que haya añadido un número de teléfono arriba.",
     "Remove %(phone)s?": "¿Eliminar %(phone)s?",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Se ha enviado un mensaje de texto a +%(msisdn)s. Por favor, introduzca el código de verificación que contiene.",
@@ -1590,19 +1590,19 @@
     "You have not verified this user.": "No has verificado a este usuario.",
     "You have verified this user. This user has verified all of their sessions.": "Usted ha verificado este usuario. Este usuario ha verificado todas sus sesiones.",
     "Someone is using an unknown session": "Alguien está usando una sesión desconocida",
-    "This room is end-to-end encrypted": "Esta sala usa encriptación de extremo a extremo",
+    "This room is end-to-end encrypted": "Esta sala usa cifrado de extremo a extremo",
     "Everyone in this room is verified": "Todos los participantes en esta sala están verificados",
     "Edit message": "Editar mensaje",
     "Mod": "Mod",
     "Your key share request has been sent - please check your other sessions for key share requests.": "Su solicitud de intercambio de claves ha sido enviada. Por favor, compruebe en sus otras sesiones si hay solicitudes de intercambio de claves.",
     "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.": "Solicitudes para compartir claves son enviadas a sus otras sesiones de forma automática. Si ha rechazado o descartado la solicitud de compartir claves en sus otras sesiones, haga clic aquí para solicitar de nuevo las claves de esta sesión.",
-    "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Si sus otras sesiones no tienen la clave para este mensaje no podrás desencriptarlas.",
+    "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Si tus otras sesiones no tienen la clave para este mensaje no podrán descifrarlo.",
     "Rotate counter-clockwise": "Girar en sentido contrario a las agujas del reloj",
     "Rotate Right": "Girar a la derecha",
     "Rotate clockwise": "Girar en el sentido de las agujas del reloj",
     "Language Dropdown": "Lista selección de idiomas",
     "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s %(count)s veces no efectuarion cambios",
-    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s  no efectuaron cambios",
+    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s no efectuaron cambios",
     "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s %(count)s veces no efectuó cambios",
     "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s no efectuó cambios",
     "Power level": "Nivel de poder",
@@ -1614,7 +1614,7 @@
     "Can't find this server or its room list": "No puedo encontrar este servidor o su lista de salas",
     "All rooms": "Todas las salas",
     "Your server": "Tu",
-    "Are you sure you want to remove <b>%(serverName)s</b>": "¿Está seguro de querer eliminar <b>%(serverName)s</b> ?",
+    "Are you sure you want to remove <b>%(serverName)s</b>": "¿Estás seguro de querer eliminar <b>%(serverName)s</b>?",
     "Remove server": "Quitar servidor",
     "Matrix": "Matrix",
     "Add a new server": "Añadir un nuevo servidor",
@@ -1623,7 +1623,7 @@
     "Add a new server...": "Añade un nuevo servidor ...",
     "%(networkName)s rooms": "%(networkName)s sala",
     "Matrix rooms": "Salas de Matrix",
-    "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Usar un Servidor de Identidad para invitar vía correo electrónico. <default>. Use (%(defaultIdentityServerName)s)</default>o seleccione en <settings>Ajustes</settings>.",
+    "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Usar un servidor de identidad para invitar vía correo electrónico. <default>. Usar (%(defaultIdentityServerName)s)</default>o seleccione en <settings>Ajustes</settings>.",
     "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Utilice un servidor de identidad para invitar por correo electrónico. Gestionar en <settings>Ajustes</settings>.",
     "Close dialog": "Cerrar diálogo",
     "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Por favor, díganos qué salió mal o, mejor aún, cree un reporte de GitHub que describa el problema.",
@@ -1633,21 +1633,21 @@
     "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.": "Si hay algún contexto adicional que ayude a analizar el tema, como por ejemplo lo que estaba haciendo en ese momento, nombre (ID) de sala, nombre (ID)de usuario, etc., por favor incluya esas cosas aquí.",
     "Removing…": "Quitando…",
     "Destroy cross-signing keys?": "¿Destruir las claves de firma cruzada?",
-    "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "La eliminación de claves de firma cruzada es definitiva.  Cualquiera con el que lo hayas verificado verá alertas de seguridad. Es casi seguro que no quieres hacer esto, a menos que hayas perdido todos los dispositivos puedas usar hacer una firma cruzada.",
+    "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "La eliminación de claves de firma cruzada es definitiva. Cualquiera con el que lo hayas verificado verá alertas de seguridad. Es casi seguro que no quieres hacer esto, a menos que hayas perdido todos los dispositivos puedas usar hacer una firma cruzada.",
     "Clear cross-signing keys": "Borrar claves de firma cruzada",
     "Clear all data in this session?": "¿Borrar todos los datos en esta sesión?",
-    "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "La eliminación de todos los datos de esta sesión es definitiva. Los mensajes encriptados se perderán a menos que se haya hecho una copia de seguridad de sus claves.",
+    "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "La eliminación de todos los datos de esta sesión es definitiva. Los mensajes cifrados se perderán, a menos que se haya hecho una copia de seguridad de sus claves.",
     "Clear all data": "Borrar todos los datos",
     "Please enter a name for the room": "Por favor, introduzca un nombre para la sala",
     "This room is private, and can only be joined by invitation.": "Esta sala es privada, y sólo se puede acceder a ella por invitación.",
-    "Enable end-to-end encryption": "Habilitar la encriptación de extremo a extremo",
-    "You can’t disable this later. Bridges & most bots won’t work yet.": "No puedes deshabilitar esto después. Los puentes y la mayoría de los bots no funcionarán todavía.",
+    "Enable end-to-end encryption": "Activar el cifrado de extremo a extremo",
+    "You can’t disable this later. Bridges & most bots won’t work yet.": "No puedes desactivar esto después. Los puentes y la mayoría de los bots no funcionarán todavía.",
     "Create a public room": "Crear una sala pública",
-    "Create a private room": "Crear una sala pública",
+    "Create a private room": "Crear una sala privada",
     "Topic (optional)": "Tema (opcional)",
     "Make this room public": "Convierte esta sala en pública",
-    "Hide advanced": "Ocultar avanzado",
-    "Show advanced": "Mostrar avanzado",
+    "Hide advanced": "Ocultar ajustes avanzados",
+    "Show advanced": "Mostrar ajustes avanzados",
     "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Evitar que usuarios de otros servidores Matrix se unan a esta sala (¡Este ajuste no puede ser cambiada más tarde!)",
     "Server did not require any authentication": "El servidor no requirió ninguna autenticación",
     "Server did not return valid authentication information.": "El servidor no devolvió información de autenticación válida.",
@@ -1662,22 +1662,22 @@
     "Verification Requests": "Solicitudes de verificación",
     "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Verificar que este usuario marcará su sesión como de confianza, y también que marcará su sesión como de confianza para él.",
     "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.": "Verifique este dispositivo para marcarlo como confiable. Confiar en este dispositivo le da a usted y a otros usuarios tranquilidad adicional cuando utilizan mensajes cifrados de extremo a extremo.",
-    "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "La verificación de este dispositivo lo marcará como de confianza.  Los usuarios que dejaron verificarse por usted confiarán en este dispositivo.",
-    "Integrations are disabled": "Las integraciones están deshabilitadas",
-    "Enable 'Manage Integrations' in Settings to do this.": "Habilita 'Gestionar Integraciones' en Ajustes para hacer esto.",
+    "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "La verificación de este dispositivo lo marcará como de confianza. Los usuarios que te han verificado confiarán en este dispositivo.",
+    "Integrations are disabled": "Las integraciones están desactivadas",
+    "Enable 'Manage Integrations' in Settings to do this.": "Activa «Gestionar integraciones» en ajustes para hacer esto.",
     "Integrations not allowed": "Integraciones no están permitidas",
-    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Su %(brand)s no le permite utilizar un \"Administrador de Integración\" para hacer esto. Por favor, contacte con un administrador.",
+    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "%(brand)s no utilizar un \"gestor de integración\" para hacer esto. Por favor, contacta con un administrador.",
     "Failed to invite the following users to chat: %(csvUsers)s": "Error invitando a los siguientes usuarios al chat: %(csvUsers)s",
-    "We couldn't create your DM. Please check the users you want to invite and try again.": "No pudimos crear tu Mensaje Directo  Por favor, marcar los usuarios que quieres invitar e inténtalo de nuevo.",
+    "We couldn't create your DM. Please check the users you want to invite and try again.": "No se ha podido crear el mensaje directo. Por favor, comprueba los usuarios que quieres invitar e inténtalo de nuevo.",
     "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Iniciar una conversación con alguien usando su nombre, nombre de usuario (como <userId/>) o dirección de correo electrónico.",
     "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Invitar a alguien usando su nombre, nombre de usuario (como <userId/>), dirección de correo electrónico o <a> compartir esta sala</a>.",
     "a new master key signature": "una nueva firma de llave maestra",
     "a new cross-signing key signature": "una nueva firma de código de firma cruzada",
-    "a device cross-signing signature": "una firma para la  firma cruzada de dispositivos",
+    "a device cross-signing signature": "una firma para la firma cruzada de dispositivos",
     "a key signature": "un firma de clave",
     "%(brand)s encountered an error during upload of:": "%(brand)s encontró un error durante la carga de:",
     "End": "Fin",
-    "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>": "Una vez habilitado, el cifrado de una sala no puede deshabilitarse. Los mensajes enviados a una sala cifrada no pueden ser vistos por el servidor, sólo lo verán los participantes de la sala. Habilitar el cifrado puede hacer que muchos bots y bridges no funcionen correctamente. <a>Aprende más de cifrado</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>": "Una vez activado, el cifrado de una sala no puede desactivarse. Los mensajes enviados a una sala cifrada no pueden ser vistos por el servidor, solo lo verán los participantes de la sala. Activar el cifrado puede hacer que muchos bots y bridges no funcionen correctamente. <a>Más información sobre el cifrado</a>",
     "Joining room …": "Uniéndose a sala …",
     "Loading …": "Cargando …",
     "Rejecting invite …": "Rechazando invitación …",
@@ -1692,22 +1692,22 @@
     "You can only join it with a working invite.": "Sólo puedes unirte con una invitación que funciona.",
     "Try to join anyway": "Intentar unirse de todas formas",
     "You can still join it because this is a public room.": "Todavía puedes unirte, ya que es una sala pública.",
-    "Join the discussion": "Unirse a la discusión",
+    "Join the discussion": "Unirse a la sala",
     "Do you want to chat with %(user)s?": "¿Quieres chatear con %(user)s?",
     "Do you want to join %(roomName)s?": "¿Quieres unirte a la sala %(roomName)s?",
     "<userName/> invited you": "<userName/> te ha invitado",
     "You're previewing %(roomName)s. Want to join it?": "Estás previsualizando %(roomName)s. ¿Quieres unirte?",
     "%(roomName)s can't be previewed. Do you want to join it?": "La sala %(roomName)s no permite previsualización. ¿Quieres unirte?",
-    "This room doesn't exist. Are you sure you're at the right place?": "Esta sala no existe. ¿Está seguro de estar en el lugar correcto?",
+    "This room doesn't exist. Are you sure you're at the right place?": "Esta sala no existe. ¿Estás seguro de estar en el lugar correcto?",
     "Try again later, or ask a room admin to check if you have access.": "Inténtalo más tarde, o pide que un administrador de la sala compruebe si tienes acceso.",
     "%(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 fue devuelto al intentar acceder a la sala. Si crees que no deberías ver el mensaje, por favor <issueLink>somete un reporte de error</issueLink>.",
-    "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Re-requestLink>Solicite nuevamente claves de encriptación </requestLink> de sus otras sesiones.",
-    "This message cannot be decrypted": "Este mensaje no puede ser desencriptado",
-    "Encrypted by an unverified session": "Encriptado por una sesión no verificada",
-    "Unencrypted": "Sin encriptación",
-    "Encrypted by a deleted session": "Encriptado por una sesión eliminada",
+    "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Solicitar otra vez las claves de cifrado</requestLink> de tus otras sesiones.",
+    "This message cannot be decrypted": "Este mensaje no puede ser descifrado",
+    "Encrypted by an unverified session": "Cifrado por una sesión no verificada",
+    "Unencrypted": "Sin cifrar",
+    "Encrypted by a deleted session": "Cifrado por una sesión eliminada",
     "Invite only": "Sólamente por invitación",
-    "Scroll to most recent messages": "Desplácese a los mensajes más recientes",
+    "Scroll to most recent messages": "Ir a los mensajes más recientes",
     "Close preview": "Cerrar vista previa",
     "No recent messages by %(user)s found": "No se han encontrado mensajes recientes de %(user)s",
     "Try scrolling up in the timeline to see if there are any earlier ones.": "Intente desplazarse hacia arriba en la línea de tiempo para ver si hay alguna anterior.",
@@ -1715,7 +1715,7 @@
     "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "Estás a punto de eliminar %(count)s mensajes de %(user)s. Esto no se puede deshacer. ¿Desea continuar?",
     "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "Estás a punto de eliminar 1 mensaje de %(user)s. Esto no se puede deshacer. ¿Desea continuar?",
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Para una gran cantidad de mensajes, esto podría llevar algún tiempo. Por favor, no refresque a su cliente mientras tanto.",
-    "Remove %(count)s messages|other": "Eliminar %(count)s  mensajes",
+    "Remove %(count)s messages|other": "Eliminar %(count)s mensajes",
     "Remove %(count)s messages|one": "Eliminar 1 mensaje",
     "Deactivate user?": "¿Desactivar usuario?",
     "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?": "Desactivando a este usuario, este será desconectado y no podrá volver a ingresar. Además, saldrá de todas las salas a que se había unido. Esta acción no puede ser revertida. ¿Está seguro de desactivar este usuario?",
@@ -1743,7 +1743,7 @@
     "Reject & Ignore user": "Rechazar e ignorar usuario",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Actualizar esta sala cerrará la instancia actual de la sala y creará una sala actualizada con el mismo nombre.",
     "This room has already been upgraded.": "Esta sala ya ha sido actualizada.",
-    "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Esta sala está ejecutando la versión de sala <roomVersion />, la cual ha sido marcado por este servidor doméstico como <i>unstable</i>.",
+    "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Esta sala está ejecutando la versión de sala <roomVersion />, la cual ha sido marcado por este servidor base como <i>inestable</i>.",
     "Unknown Command": "Comando desconocido",
     "Unrecognised command: %(commandText)s": "Comando no reconocido: %(commandText)s",
     "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Puedes usar <code>/ayuda</code> para listar los comandos disponibles. ¿Querías enviarlo como un mensaje?",
@@ -1762,26 +1762,26 @@
     "Published Addresses": "Direcciones publicadas",
     "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.": "Las direcciones publicadas pueden ser usadas por cualquier usuario en cualquier servidor para unirse a tu salas. Para publicar una dirección, primero hay que establecerla como una dirección local.",
     "Other published addresses:": "Otras direcciones publicadas:",
-    "No other published addresses yet, add one below": "No tiene direcciones publicadas todavía, agregue una más abajo",
+    "No other published addresses yet, add one below": "Todavía no hay direcciones publicadas, puedes añadir una más abajo",
     "New published address (e.g. #alias:server)": "Nueva dirección publicada (p.ej.. #alias:server)",
     "Local Addresses": "Direcciones locales",
-    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Establezca las direcciones de esta sala para que los usuarios puedan encontrarla a través de tu servidor doméstico (%(localDomain)s)",
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Establecer las direcciones de esta sala para que los usuarios puedan encontrarla a través de tu servidor base (%(localDomain)s)",
     "Error updating flair": "Error al actualizar el botón",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Error al actualizar el botón para esta sala. Posiblemente el servidor no lo permita o que se produjo un error temporal.",
     "Waiting for you to accept on your other session…": "Esperando que aceptes en tu otra sesión…",
     "Waiting for %(displayName)s to accept…": "Esperando a que %(displayName)s acepte…",
     "Accepting…": "Aceptando…",
     "Start Verification": "Iniciar verificación",
-    "Messages in this room are end-to-end encrypted.": "Los mensajes en esta sala están encriptados de extremo a extremo.",
+    "Messages in this room are end-to-end encrypted.": "Los mensajes de esta sala están cifrados de extremo a extremo.",
     "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Sus mensajes son seguros y sólo usted y el destinatario tienen las claves únicas para desbloquearlos.",
-    "Messages in this room are not end-to-end encrypted.": "Los mensajes en esta habitación NO están encriptados de extremo a extremo.",
-    "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "En las salas encriptadas, sus mensajes están seguros y sólo usted y el destinatario tienen las claves únicas para desbloquearlos.",
+    "Messages in this room are not end-to-end encrypted.": "Los mensajes en esta sala no están cifrados de extremo a extremo.",
+    "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "En las salas cifradas, tus mensajes están seguros y solo tú y el destinatario tienen las claves únicas para desbloquearlos.",
     "Verify User": "Verificar usuario",
     "For extra security, verify this user by checking a one-time code on both of your devices.": "Para mayor seguridad, verifique este usuario comprobando un código temporal vez en ambos dispositivos.",
     "Your messages are not secure": "Sus mensajes no son seguros",
     "One of the following may be compromised:": "Uno de los siguientes puede estar comprometido:",
-    "Your homeserver": "Su servidor doméstico",
-    "The homeserver the user you’re verifying is connected to": "El servidor doméstico del usuario a que está verificando  está conectado a",
+    "Your homeserver": "Tu servidor base",
+    "The homeserver the user you’re verifying is connected to": "El servidor base del usuario a que está verificando está conectado a",
     "Yours, or the other users’ internet connection": "La conexión a Internet suya, o la de los otros usuarios",
     "Yours, or the other users’ session": "La sesión suya, o la de los otros usuarios",
     "Trusted": "De confianza",
@@ -1805,7 +1805,7 @@
     "Almost there! Is your other session showing the same shield?": "¡Ya casi está! ¿Su otra sesión muestra el mismo escudo?",
     "Almost there! Is %(displayName)s showing the same shield?": "¡Ya casi está! ¿Está %(displayName)s mostrando el mismo escudo?",
     "Verify all users in a room to ensure it's secure.": "Verifica a todos los usuarios de una sala para asegurar que es segura.",
-    "In encrypted rooms, verify all users to ensure it’s secure.": "En las salas encriptadas, verifique a todos los usuarios para asegurarse de son seguros.",
+    "In encrypted rooms, verify all users to ensure it’s secure.": "En las salas cifrar, verificar a todos los usuarios para asegurarse de son seguras.",
     "You've successfully verified %(deviceName)s (%(deviceId)s)!": "¡Has verificado con éxito los %(deviceName)s (%(deviceId)s)!",
     "You've successfully verified %(displayName)s!": "¡Has verificado con éxito los %(displayName)s!",
     "Verified": "Verificado",
@@ -1818,11 +1818,11 @@
     "You cancelled verification.": "Usted canceló la verificación.",
     "Verification cancelled": "Verificación cancelada",
     "Compare emoji": "Comparar emoji",
-    "Encryption enabled": "Encriptación habilitada",
+    "Encryption enabled": "Cifrado activado",
     "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Los mensajes en esta sala están encriptados de extremo a extremo. Aprende más & verifica este usuario en su perfil de usuario.",
-    "Encryption not enabled": "Encriptación no habilitada",
-    "The encryption used by this room isn't supported.": "La encriptación usada por esta sala no es compatible.",
-    "React": "Reaccione",
+    "Encryption not enabled": "Cifrado no activado",
+    "The encryption used by this room isn't supported.": "El cifrado usado por esta sala no es compatible.",
+    "React": "Reaccionar",
     "Message Actions": "Acciones de mensaje",
     "Show image": "Mostrar imagen",
     "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Ha ignorado a este usuario, así que su mensaje se ha ocultado. <a>Mostrar de todos modos.</a>",
@@ -1870,7 +1870,7 @@
     "Widget ID": "Identificación (ID) de widget",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Usar este widget puede resultar en compartir datos <helpIcon /> con %(widgetDomain)s y su Administrador de Integración.",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Usar este widget puede resultar en compartir datos <helpIcon /> con %(widgetDomain)s.",
-    "Widgets do not use message encryption.": "Los widgets no utilizan la encriptación de mensajes.",
+    "Widgets do not use message encryption.": "Los widgets no utilizan el cifrado de mensajes.",
     "Widget added by": "Widget añadido por",
     "This widget may use cookies.": "Este widget posiblemente utilice cookies.",
     "Maximize apps": "Maximizar apps",
@@ -1885,14 +1885,14 @@
     "Confirm by comparing the following with the User Settings in your other session:": "Confirme comparando lo siguiente con los ajustes de usuario de su otra sesión:",
     "Confirm this user's session by comparing the following with their User Settings:": "Confirme la sesión de este usuario comparando lo siguiente con la configuración de usuario de él/ella:",
     "If they don't match, the security of your communication may be compromised.": "Si no coinciden, la seguridad de su comunicación puede estar comprometida.",
-    "Your homeserver doesn't seem to support this feature.": "Tu servidor doméstico no parece soportar esta característica.",
+    "Your homeserver doesn't seem to support this feature.": "Tu servidor base no parece soportar esta funcionalidad.",
     "Your account is not secure": "Su cuenta no es segura",
     "Your password": "Su contraseña",
     "This session, or the other session": "Esta sesión, o la otra sesión",
     "The internet connection either session is using": "La conexión a Internet usado por cualquiera de las dos sesiones",
     "We recommend you change your password and recovery key in Settings immediately": "Le recomendamos que cambie inmediatamente su contraseña y su clave de recuperación en Configuración",
     "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 ayudar a evitar la duplicación de entradas, por favor <existingIssuesLink> ver primero los entradas existentes</existingIssuesLink> (y añadir un +1) o, <newIssueLink> si no lo encuentra, crear una nueva entrada </newIssueLink>.",
-    "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Reportar este mensaje enviará su único 'event ID' al administrador de su servidor doméstico. Si los mensajes en esta sala están encriptados, el administrador de tu servidor no podrá leer el texto del mensaje ni ver ningún archivo o imagen.",
+    "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Reportar este mensaje enviará su único 'event ID' al administrador de tu servidor base. Si los mensajes en esta sala están cifrados, el administrador de tu servidor no podrá leer el texto del mensaje ni ver ningún archivo o imagen.",
     "Command Help": "Ayuda del comando",
     "Integration Manager": "Administrador de integración",
     "Verify other session": "Verifique otra sesión",
@@ -1923,9 +1923,9 @@
     "Access your secure message history and set up secure messaging by entering your recovery key.": "Accede a tu historial de mensajes seguros y configura la mensajería segura introduciendo tu clave de recuperación.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Si has olvidado tu clave de recuperación puedes <button> configurar nuevas opciones de recuperación</button>",
     "Resend edit": "Reenviar la edición",
-    "Resend %(unsentCount)s reaction(s)": "Reenviar %(unsentCount)s  reacción(es)",
+    "Resend %(unsentCount)s reaction(s)": "Reenviar %(unsentCount)s reacción(es)",
     "Resend removal": "Reenviar la eliminación",
-    "Share Permalink": "Compartir Permalink",
+    "Share Permalink": "Compartir enlace",
     "Report Content": "Reportar contenido",
     "Notification settings": "Configuración de notificaciones",
     "Clear status": "Borrar estado",
@@ -1942,9 +1942,9 @@
     "This homeserver would like to make sure you are not a robot.": "A este servidor le gustaría asegurarse de que no eres un robot.",
     "Country Dropdown": "Seleccione país",
     "Confirm your identity by entering your account password below.": "Confirme su identidad introduciendo la contraseña de su cuenta.",
-    "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Falta la clave pública del captcha en la configuración del servidor doméstico. Por favor, informe de esto al administrador del servidor doméstico.",
-    "Please review and accept all of the homeserver's policies": "Por favor, revise y acepte todas las políticas del servidor doméstico",
-    "Please review and accept the policies of this homeserver:": "Por favor revise y acepte las políticas de este servidor doméstico:",
+    "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Falta la clave pública del captcha en la configuración del servidor base. Por favor, informa de esto al administrador de tu servidor base.",
+    "Please review and accept all of the homeserver's policies": "Por favor, revisa y acepta todas las políticas del servidor base",
+    "Please review and accept the policies of this homeserver:": "Por favor, revisa y acepta las políticas de este servidor base:",
     "Unable to validate homeserver/identity server": "No se pudo validar el servidor doméstico/servidor de identidad",
     "Your Modular server": "Su 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>.": "Introduzca la ubicación de su Servidor Modular Doméstico. Este puede usar su propio nombre de dominio o ser un subdominio de <a>modular.im</a>.",
@@ -1962,7 +1962,7 @@
     "Keep going...": "Continúa...",
     "Passwords don't match": "Las contraseñas no coinciden",
     "Other users can invite you to rooms using your contact details": "Otros usuarios pueden invitarte las salas utilizando tus datos de contacto",
-    "Enter phone number (required on this homeserver)": "Ingrese un número de teléfono (requerido en este servidor doméstico)",
+    "Enter phone number (required on this homeserver)": "Introduce un número de teléfono (es obligatorio en este servidor base)",
     "Doesn't look like a valid phone number": "No parece ser un número de teléfono válido",
     "Use lowercase letters, numbers, dashes and underscores only": "Use sólo letras minúsculas, números, guiones y guiones bajos",
     "Enter username": "Introduce nombre de usuario",
@@ -1978,7 +1978,7 @@
     "Identity Server URL": "URL del servidor de identidad",
     "Other servers": "Otros servidores",
     "Free": "Gratis",
-    "Join millions for free on the largest public server": "Únete de forma gratuita a millones de personas  en el servidor público más grande",
+    "Join millions for free on the largest public server": "Únete de forma gratuita a millones de personas en el servidor público más grande",
     "Premium": "Premium",
     "Premium hosting for organisations <a>Learn more</a>": "Alojamiento Premium para organizaciones <a>Aprende más</a>",
     "Find other public servers or use a custom server": "Descubra otros servidores públicos o utilice un servidor personalizado",
@@ -1989,7 +1989,7 @@
     "Couldn't load page": "No pude cargar la página",
     "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Usted es un administrador de esta comunidad. No podrás volver a unirte sin una invitación de otro administrador.",
     "Want more than a community? <a>Get your own server</a>": "¿Quieres más que una comunidad? <a>Obtenga su propio servidor</a>",
-    "This homeserver does not support communities": "Este servidor doméstico no permite las comunidades",
+    "This homeserver does not support communities": "Este servidor base no permite las comunidades",
     "Welcome to %(appName)s": "Bienvenido a %(appName)s",
     "Liberate your communication": "Libere su comunicación",
     "Send a Direct Message": "Envía un mensaje directo",
@@ -2000,14 +2000,14 @@
     "Filter rooms…": "Filtrar salas…",
     "Self-verification request": "Solicitud de auto-verificación",
     "%(creator)s created and configured the room.": "Sala creada y configurada por %(creator)s.",
-    "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s no logró obtener la lista de protocolo del servidor doméstico. El servidor doméstico puede ser demasiado viejo para admitir redes de terceros.",
+    "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s no ha posido obtener la lista de protocolo del servidor base. El servidor base puede ser demasiado viejo para admitir redes de terceros.",
     "%(brand)s failed to get the public room list.": "%(brand)s no logró obtener la lista de salas públicas.",
-    "The homeserver may be unavailable or overloaded.": "Posiblemente el servidor de doméstico no esté disponible o esté sobrecargado.",
-    "Preview": "Vista previa",
-    "View": "Vista",
+    "The homeserver may be unavailable or overloaded.": "Es posible el servidor de base no esté disponible o esté sobrecargado.",
+    "Preview": "Ver",
+    "View": "Ver",
     "Find a room…": "Encuentre una sala…",
-    "Find a room… (e.g. %(exampleRoom)s)": "Encuentre una sala...  (p.ej. %(exampleRoom)s)",
-    "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Si no puedes encontrar la habitación que buscas, solicite una invitación o <a>Crea una nueva sala</a>.",
+    "Find a room… (e.g. %(exampleRoom)s)": "Encuentra una sala... (ej.: %(exampleRoom)s)",
+    "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Si no encuentras la sala que buscas, pide que te inviten a ella o <a>crea una nueva</a>.",
     "Explore rooms": "Explorar salas",
     "Jump to first invite.": "Salte a la primera invitación.",
     "Add room": "Añadir sala",
@@ -2024,16 +2024,16 @@
     "A verification email will be sent to your inbox to confirm setting your new password.": "Se enviará un correo electrónico de verificación a su bandeja de entrada para confirmar la configuración de su nueva contraseña.",
     "Your password has been reset.": "Su contraseña ha sido restablecida.",
     "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.": "Ha cerrado todas las sesiones y ya no recibirá más notificaciones push. Para volver a activar las notificaciones, inicie sesión de nuevo en cada dispositivo.",
-    "Set a new password": "Establezca una nueva contraseña",
-    "Invalid homeserver discovery response": "Respuesta inválida de descubrimiento de servidor doméstico",
+    "Set a new password": "Elegir una nueva contraseña",
+    "Invalid homeserver discovery response": "Respuesta inválida de descubrimiento de servidor base",
     "Failed to get autodiscovery configuration from server": "No se pudo obtener la configuración de autodescubrimiento del servidor",
     "Invalid base_url for m.homeserver": "URL-base inválida para m.homeserver",
-    "Homeserver URL does not appear to be a valid Matrix homeserver": "La URL del servidor doméstico no parece ser un servidor doméstico válido de Matrix",
+    "Homeserver URL does not appear to be a valid Matrix homeserver": "La URL del servidor base no parece ser un servidor válido de Matrix",
     "Invalid identity server discovery response": "Respuesta inválida de descubrimiento de servidor de identidad",
     "Invalid base_url for m.identity_server": "URL_base no válida para m.identity_server",
     "Identity server URL does not appear to be a valid identity server": "La URL del servidor de identidad no parece ser un servidor de identidad válido",
     "General failure": "Error no especificado",
-    "This homeserver does not support login using email address.": "Este servidor doméstico no admite iniciar sesión con una dirección de correo electrónico.",
+    "This homeserver does not support login using email address.": "Este servidor base no admite iniciar sesión con una dirección de correo electrónico.",
     "This account has been deactivated.": "Esta cuenta ha sido desactivada.",
     "Room name or address": "Nombre o dirección de la sala",
     "Address (optional)": "Dirección (opcional)",
@@ -2095,17 +2095,17 @@
     "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
     "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
     "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
-    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Tu nueva sesión se encuentra verificada ahora. Ahora tiene acceso a los mensajes encriptados y otros usuarios verán la sesión como verificada.",
+    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Tu nueva sesión ha sido verificada. Ahora tiene acceso a los mensajes cifrados y otros usuarios la verán como verificada.",
     "Your new session is now verified. Other users will see it as trusted.": "Tu sesión se encuentra ahora verificada. Otros usuarios la verán como confiable.",
-    "This session is encrypting history using the new recovery method.": "Esta sesión se encuentra encriptando el historial usando el nuevo método de verificación.",
+    "This session is encrypting history using the new recovery method.": "Esta sesión está cifrando el historial usando el nuevo método de recuperación.",
     "Change notification settings": "Cambiar los ajustes de notificaciones",
     "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Prototipo de comunidades v2. Requiere un servidor compatible. Altamente experimental - usar con precuación.",
-    "Font size": "Tamaño de la fuente",
-    "Use custom size": "Utilizar un tamaño personalizado",
+    "Font size": "Tamaño del texto",
+    "Use custom size": "Usar un tamaño personalizado",
     "Use a more compact ‘Modern’ layout": "Usar un diseño más 'moderno' y compacto",
-    "Use a system font": "Utilizar una fuente del sistema",
+    "Use a system font": "Usar una fuente del sistema",
     "System font name": "Nombre de la fuente",
-    "Enable experimental, compact IRC style layout": "Activar el diseño de IRC compacto, en prueba",
+    "Enable experimental, compact IRC style layout": "Activar el diseño experimental de IRC compacto",
     "Uploading logs": "Subiendo registros",
     "Downloading logs": "Descargando registro",
     "Incoming voice call": "Llamada de voz entrante",
@@ -2116,27 +2116,27 @@
     "There are advanced notifications which are not shown here.": "Hay configuraciones avanzadas que no se muestran aquí.",
     "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "Puede que las hayas configurado en otro cliente además de %(brand)s. No puedes cambiarlas en %(brand)s pero sus efectos siguen aplicándose.",
     "New version available. <a>Update now.</a>": "Nueva versión disponible. <a>Actualiza ahora.</a>",
-    "Hey you. You're the best!": "Oye tú. ¡Eres el mejor!",
+    "Hey you. You're the best!": "Oye, tú. ¡Eres genial!",
     "Size must be a number": "El tamaño debe ser un dígito",
     "Custom font size can only be between %(min)s pt and %(max)s pt": "El tamaño de la fuente solo puede estar entre los valores %(min)s y %(max)s",
     "Use between %(min)s pt and %(max)s pt": "Utiliza un valor entre %(min)s y %(max)s",
     "Message layout": "Diseño del mensaje",
     "Compact": "Compacto",
     "Modern": "Moderno",
-    "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Inserta el nombre de la fuente instalada en tu sistema y %(brand)s intentara utilizarla.",
-    "Customise your appearance": "Personaliza tu apariencia",
+    "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Introduce el nombre de la fuente instalada en tu sistema y %(brand)s intentará utilizarla.",
+    "Customise your appearance": "Personaliza la apariencia",
     "Appearance Settings only affect this %(brand)s session.": "Cambiar las opciones de apariencia solo afecta esta %(brand)s sesión.",
     "Please verify the room ID or address and try again.": "Por favor, verifica la ID o dirección de esta sala e inténtalo de nuevo.",
-    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "El administrador del servidor domestico ha deshabilitado la encriptación de extremo a extremo en salas privadas y mensajes directos.",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "El administrador del servidor base ha desactivado el cifrado de extremo a extremo en salas privadas y mensajes directos.",
     "To link to this room, please add an address.": "Para vincular esta sala, por favor añade una dirección.",
-    "The authenticity of this encrypted message can't be guaranteed on this device.": "La autenticidad de estos mensajes encriptados no pueden ser garantizados en este dispositivo.",
+    "The authenticity of this encrypted message can't be guaranteed on this device.": "La autenticidad de este mensaje cifrado no puede ser garantizada en este dispositivo.",
     "No recently visited rooms": "No hay salas visitadas recientemente",
     "People": "Gente",
-    "Explore public rooms": "Buscar salas publicas",
+    "Explore public rooms": "Buscar salas públicas",
     "Can't see what you’re looking for?": "¿No encuentras nada de lo que buscas?",
     "Explore all public rooms": "Buscar todas las salas publicas",
     "%(count)s results|other": "%(count)s resultados",
-    "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Antepone ( ͡° ͜ʖ ͡°)  a un mensaje de texto sin formato",
+    "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Antepone ( ͡° ͜ʖ ͡°) a un mensaje de texto",
     "Group call modified by %(senderName)s": "Llamada grupal modificada por %(senderName)s",
     "Group call started by %(senderName)s": "Llamada grupal iniciada por %(senderName)s",
     "Group call ended by %(senderName)s": "Llamada de grupo finalizada por %(senderName)s",
@@ -2144,7 +2144,7 @@
     "New spinner design": "Nuevo diseño de ruleta",
     "Show message previews for reactions in DMs": "Mostrar vistas previas de mensajes para reacciones en DM",
     "Show message previews for reactions in all rooms": "Mostrar vistas previas de mensajes para reacciones en todas las salas",
-    "Enable advanced debugging for the room list": "Habilite la depuración avanzada para la lista de salas",
+    "Enable advanced debugging for the room list": "Activar la depuración avanzada para la lista de salas",
     "IRC display name width": "Ancho del nombre de visualización de IRC",
     "Unknown caller": "Llamador desconocido",
     "Cross-signing is ready for use.": "La firma cruzada está lista para su uso.",
@@ -2159,9 +2159,9 @@
     "Secret storage:": "Almacenamiento secreto:",
     "ready": "Listo",
     "not ready": "no está listo",
-    "Room ID or address of ban list": "ID de habitación o dirección de la lista de prohibición",
+    "Room ID or address of ban list": "ID de sala o dirección de la lista de prohibición",
     "Secure Backup": "Copia de seguridad segura",
-    "Privacy": "Intimidad",
+    "Privacy": "Privacidad",
     "Emoji picker": "Selector de emoji",
     "Explore community rooms": "Explore las salas comunitarias",
     "Custom Tag": "Etiqueta personalizada",
@@ -2175,29 +2175,29 @@
     "List options": "Opciones de lista",
     "Show %(count)s more|other": "Mostrar %(count)s más",
     "Show %(count)s more|one": "Mostrar %(count)s más",
-    "Use default": "Uso por defecto",
+    "Use default": "Usar valor por defecto",
     "Mentions & Keywords": "Menciones y palabras clave",
     "Notification options": "Opciones de notificación",
-    "Forget Room": "Olvidar habitación",
+    "Forget Room": "Olvidar sala",
     "Favourited": "Favorecido",
-    "Leave Room": "Dejar la habitación",
-    "Room options": "Opciones de habitación",
+    "Leave Room": "Salir de la sala",
+    "Room options": "Opciones de la sala",
     "Error creating address": "Error al crear la dirección",
     "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "Hubo un error al crear esa dirección. Es posible que el servidor no lo permita o que haya ocurrido una falla temporal.",
     "You don't have permission to delete the address.": "No tienes permiso para borrar la dirección.",
     "There was an error removing that address. It may no longer exist or a temporary error occurred.": "Se produjo un error al eliminar esa dirección. Puede que ya no exista o se haya producido un error temporal.",
     "Error removing address": "Error al eliminar la dirección",
-    "Room Info": "Información de la habitación",
+    "Room Info": "Información de la sala",
     "Apps": "Aplicaciones",
     "Unpin app": "Desanclar aplicación",
     "Edit apps, bridges & bots": "Edite aplicaciones, puentes y bots",
     "Add apps, bridges & bots": "Agregar aplicaciones, puentes y bots",
-    "Not encrypted": "No encriptado",
+    "Not encrypted": "Sin cifrar",
     "About": "Acerca de",
     "%(count)s people|other": "%(count)s personas",
     "%(count)s people|one": "%(count)s persona",
     "Show files": "Mostrar archivos",
-    "Room settings": "Configuración de la habitación",
+    "Room settings": "Configuración de la sala",
     "You've successfully verified your device!": "¡Ha verificado correctamente su dispositivo!",
     "Take a picture": "Toma una foto",
     "Pin to room": "Anclar a la habitación",
@@ -2208,8 +2208,8 @@
     "Categories": "Categorías",
     "Information": "Información",
     "QR Code": "Código QR",
-    "Room address": "Dirección de la habitación",
-    "Please provide a room address": "Proporcione una dirección de habitación",
+    "Room address": "Dirección de la sala",
+    "Please provide a room address": "Por favor, introduce una dirección de sala",
     "This address is available to use": "Esta dirección está disponible para usar",
     "This address is already in use": "Esta dirección ya está en uso",
     "Preparing to download logs": "Preparándose para descargar registros",
@@ -2220,7 +2220,7 @@
     "Send %(count)s invites|other": "Enviar %(count)s invitaciones",
     "Send %(count)s invites|one": "Enviar invitación a %(count)s",
     "Invite people to join %(communityName)s": "Invita a personas a unirse %(communityName)s",
-    "There was an error creating your community. The name may be taken or the server is unable to process your request.": "Hubo un error al crear tu comunidad. El nombre puede ser tomado o el servidor no puede procesar su solicitud.",
+    "There was an error creating your community. The name may be taken or the server is unable to process your request.": "Ha ocurrido un error al crear la comunidad. El nombre puede que ya esté siendo usado o el servidor no puede procesar la solicitud.",
     "Community ID: +<localpart />:%(domain)s": "ID de comunidad: +<localpart />:%(domain)s",
     "Use this when referencing your community to others. The community ID cannot be changed.": "Use esto cuando haga referencia a su comunidad con otras. La identificación de la comunidad no se puede cambiar.",
     "You can change this later if needed.": "Puede cambiar esto más tarde si es necesario.",
@@ -2230,12 +2230,12 @@
     "An image will help people identify your community.": "Una imagen ayudará a las personas a identificar su comunidad.",
     "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Las salas privadas se pueden encontrar y unirse solo con invitación. Cualquier persona puede encontrar y unirse a las salas públicas.",
     "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Las salas privadas se pueden encontrar y unirse solo con invitación. Cualquier persona de esta comunidad puede encontrar salas públicas y unirse a ellas.",
-    "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Puede habilitar esto si la sala solo se usará para colaborar con equipos internos en su servidor doméstico. Esto no se puede cambiar despué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.": "Puede desactivar esto si la sala se utilizará para colaborar con equipos externos que tengan su propio servidor doméstico. Esto no se puede cambiar después.",
-    "Create a room in %(communityName)s": "Crea una habitación en %(communityName)s",
+    "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Puede activar esto si la sala solo se usará para colaborar con equipos internos en tu servidor base. Esto no se puede cambiar despué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.": "Puedes desactivar esto si la sala se utilizará para colaborar con equipos externos que tengan su propio servidor base. Esto no se puede cambiar después.",
+    "Create a room in %(communityName)s": "Crea una sala en %(communityName)s",
     "Block anyone not part of %(serverName)s from ever joining this room.": "Bloquea a cualquier persona que no sea parte de %(serverName)s para que no se una a esta sala.",
     "You've previously used a newer version of %(brand)s with this session. To use this version again with end to end encryption, you will need to sign out and back in again.": "Anteriormente usaste una versión más nueva de %(brand)s con esta sesión. Para volver a utilizar esta versión con cifrado de extremo a extremo, deberá cerrar sesión y volver a iniciar sesión.",
-    "There was an error updating your community. The server is unable to process your request.": "Hubo un error al actualizar tu comunidad. El servidor no puede procesar su solicitud.",
+    "There was an error updating your community. The server is unable to process your request.": "Ha ocurrido un error al actualizar tu comunidad. El servidor no puede procesar la solicitud.",
     "Update community": "Actualizar comunidad",
     "To continue, use Single Sign On to prove your identity.": "Para continuar, utilice el inicio de sesión único para demostrar su identidad.",
     "Confirm to continue": "Confirmar para continuar",
@@ -2246,10 +2246,10 @@
     "Server isn't responding": "El servidor no responde",
     "Your server isn't responding to some of your requests. Below are some of the most likely reasons.": "Su servidor no responde a algunas de sus solicitudes. A continuación se presentan algunas de las razones más probables.",
     "The server (%(serverName)s) took too long to respond.": "El servidor (%(serverName)s) tardó demasiado en responder.",
-    "Your firewall or anti-virus is blocking the request.": "Su firewall o antivirus está bloqueando la solicitud.",
-    "A browser extension is preventing the request.": "Una extensión del navegador impide la solicitud.",
+    "Your firewall or anti-virus is blocking the request.": "Tu firewall o antivirus está bloqueando la solicitud.",
+    "A browser extension is preventing the request.": "Una extensión del navegador está impidiendo que se haga la solicitud.",
     "The server is offline.": "El servidor está desconectado.",
-    "The server has denied your request.": "El servidor ha denegado su solicitud.",
+    "The server has denied your request.": "El servidor ha rechazado la solicitud.",
     "Your area is experiencing difficulties connecting to the internet.": "Su área está experimentando dificultades para conectarse a Internet.",
     "A connection error occurred while trying to contact the server.": "Se produjo un error de conexión al intentar contactar con el servidor.",
     "The server is not configured to indicate what the problem is (CORS).": "El servidor no está configurado para indicar cuál es el problema (CORS).",
@@ -2274,7 +2274,7 @@
     "You have no visible notifications in this room.": "No tienes notificaciones visibles en esta sala.",
     "Delete the room address %(alias)s and remove %(name)s from the directory?": "¿Eliminar la dirección de la sala %(alias)s y eliminar %(name)s del directorio?",
     "delete the address.": "eliminar la dirección.",
-    "Explore rooms in %(communityName)s": "Explora habitaciones en %(communityName)s",
+    "Explore rooms in %(communityName)s": "Explora salas en %(communityName)s",
     "Search rooms": "Buscar salas",
     "Create community": "Crear comunidad",
     "Failed to find the general chat for this community": "No se pudo encontrar el chat general de esta comunidad",
@@ -2283,22 +2283,22 @@
     "Feedback": "Realimentación",
     "Community settings": "Configuración de la comunidad",
     "User settings": "Ajustes de usuario",
-    "Switch to light mode": "Cambiar al modo de luz",
-    "Switch to dark mode": "Cambiar al modo oscuro",
+    "Switch to light mode": "Cambiar al modo claro",
+    "Switch to dark mode": "Cambiar al tema oscuro",
     "Switch theme": "Cambiar tema",
     "User menu": "Menú del Usuario",
     "Community and user menu": "Menú de comunidad y usuario",
-    "Failed to perform homeserver discovery": "No se pudo realizar el descubrimiento del servidor doméstico",
+    "Failed to perform homeserver discovery": "No se ha podido realizar el descubrimiento del servidor base",
     "Syncing...": "Sincronizando ...",
     "Signing In...": "Iniciando sesión...",
     "If you've joined lots of rooms, this might take a while": "Si se ha unido a muchas salas, esto puede llevar un tiempo",
     "Create account": "Crear una cuenta",
     "Unable to query for supported registration methods.": "No se pueden consultar los métodos de registro admitidos.",
-    "Registration has been disabled on this homeserver.": "El registro ha sido deshabilitado en este servidor doméstico.",
+    "Registration has been disabled on this homeserver.": "Se han desactivado los registros en este servidor base.",
     "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Su nueva cuenta (%(newAccountId)s) está registrada, pero ya inició sesión en una cuenta diferente (%(loggedInUserId)s).",
     "Continue with previous account": "Continuar con la cuenta anterior",
     "<a>Log in</a> to your new account.": "<a>Inicie sesión</a> en su nueva cuenta.",
-    "You can now close this window or <a>log in</a> to your new account.": "Ahora puede cerrar esta ventana o <a>iniciar sesión</a> en su nueva cuenta.",
+    "You can now close this window or <a>log in</a> to your new account.": "Ahora puedes cerrar esta ventana o <a>iniciar sesión</a> en otra cuenta.",
     "Registration Successful": "Registro exitoso",
     "Create your account": "Crea tu cuenta",
     "Use Recovery Key or Passphrase": "Usar clave de recuperación o frase de contraseña",
@@ -2311,13 +2311,13 @@
     "%(brand)s Android": "%(brand)s Android",
     "or another cross-signing capable Matrix client": "u otro cliente Matrix con capacidad de firma cruzada",
     "Without completing security on this session, it won’t have access to encrypted messages.": "Sin completar la seguridad en esta sesión, no tendrá acceso a los mensajes cifrados.",
-    "Failed to re-authenticate due to a homeserver problem": "No se pudo volver a autenticar debido a un problema con el servidor doméstico",
+    "Failed to re-authenticate due to a homeserver problem": "No ha sido posible volver a autenticarse debido a un problema con el servidor base",
     "Failed to re-authenticate": "No se pudo volver a autenticar",
     "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.": "Recupere el acceso a su cuenta y recupere las claves de cifrado almacenadas en esta sesión. Sin ellos, no podrá leer todos sus mensajes seguros en ninguna sesión.",
     "Enter your password to sign in and regain access to your account.": "Ingrese su contraseña para iniciar sesión y recuperar el acceso a su cuenta.",
     "Forgotten your password?": "¿Olvidaste tu contraseña?",
     "Sign in and regain access to your account.": "Inicie sesión y recupere el acceso a su cuenta.",
-    "You cannot sign in to your account. Please contact your homeserver admin for more information.": "No puede iniciar sesión en su cuenta. Comuníquese con el administrador de su servidor doméstico para obtener más información.",
+    "You cannot sign in to your account. Please contact your homeserver admin for more information.": "No puedes iniciar sesión en tu cuenta. Ponte en contacto con el administrador de su servidor base para obtener más información.",
     "You're signed out": "Estás desconectado",
     "Clear personal data": "Borrar datos personales",
     "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.": "Advertencia: sus datos personales (incluidas las claves de cifrado) todavía se almacenan en esta sesión. Bórrelo si terminó de usar esta sesión o si desea iniciar sesión en otra cuenta.",
@@ -2326,7 +2326,7 @@
     "DuckDuckGo Results": "Resultados de DuckDuckGo",
     "Emoji Autocomplete": "Autocompletar Emoji",
     "Notification Autocomplete": "Autocompletar notificación",
-    "Room Autocomplete": "Autocompletar habitación",
+    "Room Autocomplete": "Autocompletar sala",
     "User Autocomplete": "Autocompletar de usuario",
     "Confirm encryption setup": "Confirmar la configuración de cifrado",
     "Click the button below to confirm setting up encryption.": "Haga clic en el botón de abajo para confirmar la configuración del cifrado.",
@@ -2354,7 +2354,7 @@
     "Unable to query secret storage status": "No se puede consultar el estado del almacenamiento secreto",
     "Retry": "Reintentar",
     "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "Si cancela ahora, puede perder mensajes y datos cifrados si pierde el acceso a sus inicios de sesión.",
-    "You can also set up Secure Backup & manage your keys in Settings.": "También puede configurar la Copia de seguridad segura y administrar sus claves en Configuración.",
+    "You can also set up Secure Backup & manage your keys in Settings.": "También puedes configurar la copia de seguridad segura y gestionar sus claves en configuración.",
     "Set up Secure Backup": "Configurar copia de seguridad segura",
     "Upgrade your encryption": "Actualice su cifrado",
     "Set a Security Phrase": "Establecer una frase de seguridad",
@@ -2375,7 +2375,7 @@
     "<b>Save it</b> on a USB key or backup drive": "<b>Guárdelo</b> en una llave USB o unidad de respaldo",
     "<b>Copy it</b> to your personal cloud storage": "<b>Cópielo</b> a su almacenamiento personal en la nube",
     "Your keys are being backed up (the first backup could take a few minutes).": "Se está realizando una copia de seguridad de sus claves (la primera copia de seguridad puede tardar unos minutos).",
-    "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.": "Sin configurar Secure Message Recovery, no podrá restaurar su historial de mensajes encriptados si cierra sesión o usa otra sesión.",
+    "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.": "Sin configurar Secure Message Recovery, no podrás restaurar tu historial de mensajes encriptados si cierras sesión o usas otra sesión.",
     "Set up Secure Message Recovery": "Configurar la recuperación segura de mensajes",
     "Secure your backup with a recovery passphrase": "Asegure su copia de seguridad con una frase de contraseña de recuperación",
     "Make a copy of your recovery key": "Haz una copia de tu clave de recuperación",
@@ -2396,7 +2396,7 @@
     "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.": "Si hizo esto accidentalmente, puede configurar Mensajes seguros en esta sesión que volverá a cifrar el historial de mensajes de esta sesión con un nuevo método de recuperación.",
     "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 eliminó el método de recuperación, es posible que un atacante esté intentando acceder a su cuenta. Cambie la contraseña de su cuenta y configure un nuevo método de recuperación inmediatamente en Configuración.",
     "If disabled, messages from encrypted rooms won't appear in search results.": "Si está desactivado, los mensajes de las salas cifradas no aparecerán en los resultados de búsqueda.",
-    "Disable": "Inhabilitar",
+    "Disable": "Desactivar",
     "Not currently indexing messages for any room.": "Actualmente no indexa mensajes para ninguna sala.",
     "Currently indexing: %(currentRoom)s": "Actualmente indexando: %(currentRoom)s",
     "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "%(brand)s está almacenando en caché de forma segura los mensajes cifrados localmente para que aparezcan en los resultados de búsqueda:",
@@ -2407,20 +2407,20 @@
     "Message downloading sleep time(ms)": "Tiempo de suspensión de descarga de mensajes(ms)",
     "Navigation": "Navegación",
     "Calls": "Llamadas",
-    "Room List": "Lista de habitaciones",
+    "Room List": "Lista de salas",
     "Autocomplete": "Autocompletar",
     "Alt": "Alt",
     "Alt Gr": "Alt Gr",
     "Shift": "Shift",
-    "Super": "Super",
+    "Super": "Súper",
     "Ctrl": "Ctrl",
     "Toggle Bold": "Alternar negrita",
     "Toggle Italics": "Alternar cursiva",
     "Toggle Quote": "Alternar Entrecomillar",
     "New line": "Nueva línea",
     "Navigate recent messages to edit": "Navegar por mensajes recientes para editar",
-    "Jump to start/end of the composer": "Saltar al inicio / final del compositor",
-    "Navigate composer history": "Navegar por el historial del compositor",
+    "Jump to start/end of the composer": "Saltar al inicio o final del editor",
+    "Navigate composer history": "Navegar por el historial del editor",
     "Cancel replying to a message": "Cancelar la respuesta a un mensaje",
     "Toggle microphone mute": "Alternar silencio del micrófono",
     "Toggle video on/off": "Activar/desactivar video",
@@ -2447,5 +2447,501 @@
     "Page Down": "Página abajo",
     "Esc": "Esc",
     "Enter": "Enter",
-    "Space": "Espacio"
+    "Space": "Espacio",
+    "Your server requires encryption to be enabled in private rooms.": "Tu servidor obliga a usar cifrado en las salas privadas.",
+    "This version of %(brand)s does not support searching encrypted messages": "Esta versión de %(brand)s no puede buscar mensajes cifrados",
+    "Video conference ended by %(senderName)s": "Videoconferencia terminada por %(senderName)s",
+    "Join the conference from the room information card on the right": "Únete a la conferencia desde el panel de información de la sala de la derecha",
+    "Join the conference at the top of this room": "Unirse a la conferencia en la parte de arriba de la sala",
+    "Ignored attempt to disable encryption": "Se ha ignorado un intento de desactivar el cifrado",
+    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Los mensajes en esta sala están cifrados de extremo a extremo. Cuando alguien se una podrás verificarle en su perfil, tan solo pulsa en su imagen.",
+    "Add widgets, bridges & bots": "Añadir widgets, puentes y bots",
+    "Edit widgets, bridges & bots": "Editar widgets, puentes y bots",
+    "Widgets": "Widgets",
+    "Set my room layout for everyone": "Hacer que todo el mundo use mi disposición de sala",
+    "Unpin a widget to view it in this panel": "Desancla un widget para verlo en este panel",
+    "You can only pin up to %(count)s widgets|other": "Solo puedes anclar hasta %(count)s widgets",
+    "Use the + to make a new room or explore existing ones below": "Usa el + para crear una sala nueva o explora una de las existentes más abajo",
+    "Hide Widgets": "Ocultar widgets",
+    "Show Widgets": "Mostrar widgets",
+    "Send general files as you in this room": "Enviar archivos en tu nombre a esta sala",
+    "See videos posted to this room": "Ver los vídeos que se van publicando en esta sala",
+    "Send videos as you in this room": "Enviar vídeos en tu nombre a esta sala",
+    "See images posted to this room": "Ver las imágenes que se vayan publicando en esta sala",
+    "Send images as you in this room": "Enviar imágenes en tu nombre a esta sala",
+    "Send <b>%(eventType)s</b> events as you in your active room": "Enviar eventos de tipo <b>%(eventType)s</b> en tu nombre a la sala en la que estés activo",
+    "See when anyone posts a sticker to your active room": "Ver cuándo se mandan pegatinas a tu sala activa",
+    "Workspace: <networkLink/>": "Entorno de trabajo: <networkLink/>",
+    "There was an error looking up the phone number": "Ha ocurrido un error al buscar el número de teléfono",
+    "Unable to look up phone number": "No se ha podido buscar el número de teléfono",
+    "Fill Screen": "Llenar pantalla",
+    "Show stickers button": "Mostrar botón de pegatinas",
+    "See emotes posted to this room": "Ver los emoticonos publicados en esta sala",
+    "Send emotes as you in this room": "Enviar emoticonos en tu nombre a esta sala",
+    "Send messages as you in this room": "Enviar mensajes en tu nombre a esta sala",
+    "The <b>%(capability)s</b> capability": "La capacidad de <b>%(capability)s</b>",
+    "See <b>%(eventType)s</b> events posted to this room": "Ver los eventos de tipo <b>%(eventType)s</b> publicados en esta sala",
+    "Send <b>%(eventType)s</b> events as you in this room": "Enviar eventos de tipo <b>%(eventType)s</b> en tu nombre",
+    "See when a sticker is posted in this room": "Ver cuándo se envían pegatinas a esta sala",
+    "Send stickers to this room as you": "Enviar pegatinas en tu nombre a esta sala",
+    "See when the avatar changes in your active room": "Ver cuándo cambia la imagen de la sala actual",
+    "Change which room, message, or user you're viewing": "Cambiar qué sala, mensaje o usuario estás viendo",
+    "Change which room you're viewing": "Cambiar qué sala estás viendo",
+    "Send stickers into your active room": "Enviar pegatinas a la sala en la que estés activamente",
+    "Send stickers into this room": "Enviar pegatunas a esta sala",
+    "Remain on your screen while running": "Permanecer en tu pantalla mientras se esté ejecutando",
+    "Remain on your screen when viewing another room, when running": "Permanecer en la pantalla cuando estés viendo otra sala, mientras se esté ejecutando",
+    "%(senderName)s has updated the widget layout": "%(senderName)s ha actualizado la disposición de los widgets",
+    "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 No puede participar ningún servidor. Esta sala ya no se puede usar más.",
+    "This looks like a valid Security Key!": "¡Parece que es una clave de seguridad válida!",
+    "Not a valid Security Key": "No es una clave de seguridad válida",
+    "That phone number doesn't look quite right, please check and try again": "Ese número de teléfono no parece ser correcto, compruébalo e inténtalo de nuevo",
+    "Great, that'll help people know it's you": "Genial, ayudará a que la gente sepa que eres tú",
+    "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s o %(usernamePassword)s",
+    "Please enter your Security Phrase a second time to confirm.": "Por favor, escribe tu frase de seguridad una segunda vez para confirmarla.",
+    "Repeat your Security Phrase...": "Repite tu frase de seguridad...",
+    "Your Security Key": "Tu clave de seguridad",
+    "Your Security Key has been <b>copied to your clipboard</b>, paste it to:": "Tu clave de seguridad ha sido <b>copiada a tu portapapeles</b>, pégala en:",
+    "Your Security Key is in your <b>Downloads</b> folder.": "Tu clave de seguridad está en tu carpeta de <b>Descargas</b>.",
+    "Secure your backup with a Security Phrase": "Haz tu copia de seguridad más segura con una frase de seguridad",
+    "Confirm your Security Phrase": "Confirma tu frase de seguridad",
+    "Make a copy of your Security Key": "Haz una copia de tu clave de seguridad",
+    "A new Security Phrase and key for Secure Messages have been detected.": "Se ha detectado una nueva frase de seguridad y clave para mensajes seguros.",
+    "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "Esta sesión ha detectado que tu frase de seguridad y clave para mensajes seguros ha sido eliminada.",
+    "Search (must be enabled)": "Buscar (debe estar activado)",
+    "Zimbabwe": "Zimbabue",
+    "Yemen": "Yemen",
+    "Wallis & Futuna": "Wallis y Futuna",
+    "Vanuatu": "Vanuatu",
+    "Uzbekistan": "Uzbekistán",
+    "U.S. Virgin Islands": "Islas Vírgenes de los Estados Unidos",
+    "Tuvalu": "Tuvalu",
+    "Turks & Caicos Islands": "Islas Turcas y Caicos",
+    "Turkmenistan": "Turkmenistán",
+    "Tokelau": "Tokelau",
+    "Timor-Leste": "Timor Oriental",
+    "Tajikistan": "Tayikistán",
+    "São Tomé & Príncipe": "Santo Tomé y Príncipe",
+    "Swaziland": "Suazilandia",
+    "Svalbard & Jan Mayen": "Svalbard y Jan Mayen",
+    "Suriname": "Surinam",
+    "St. Vincent & Grenadines": "San Vicente y las Granadinas",
+    "St. Pierre & Miquelon": "San Pedro y Miquelón",
+    "St. Kitts & Nevis": "San Cristóbal y Nieves",
+    "St. Helena": "Isla Santa Elena",
+    "St. Barthélemy": "San Bartolomé",
+    "South Georgia & South Sandwich Islands": "Islas Georgias del Sur y Sandwich del Sur",
+    "Solomon Islands": "Islas Salomón",
+    "Seychelles": "Seychelles",
+    "Rwanda": "Ruanda",
+    "Pitcairn Islands": "Islas Pitcairn",
+    "Palau": "Palaos",
+    "Oman": "Omán",
+    "Northern Mariana Islands": "Islas Marianas del Norte",
+    "Norfolk Island": "Isla Norfolk",
+    "Niue": "Niue",
+    "with state key %(stateKey)s": "con la clave de estado %(stateKey)s",
+    "Zambia": "Zambia",
+    "Western Sahara": "Sáhara Occidental",
+    "Vietnam": "Vietnam",
+    "Venezuela": "Venezuela",
+    "Vatican City": "Ciudad del Vaticano",
+    "Uruguay": "Uruguay",
+    "United Arab Emirates": "Estados Árabes Unidos",
+    "Ukraine": "Ucrania",
+    "Uganda": "Uganda",
+    "Turkey": "Turquía",
+    "Tunisia": "Túnez",
+    "Trinidad & Tobago": "Trinidad y Tobago",
+    "Tonga": "Tonga",
+    "Togo": "Togo",
+    "Thailand": "Tailandia",
+    "Tanzania": "Tanzania",
+    "Taiwan": "Taiwán",
+    "Syria": "Siria",
+    "Switzerland": "Suiza",
+    "Sweden": "Suecia",
+    "Sudan": "Sudán",
+    "St. Martin": "San Martín",
+    "St. Lucia": "Santa Lucía",
+    "Sri Lanka": "Sri Lanka",
+    "Spain": "España",
+    "South Sudan": "Sudán del Sur",
+    "South Korea": "Corea del Sur",
+    "South Africa": "Sudáfrica",
+    "Somalia": "Somalia",
+    "Slovenia": "Eslovenia",
+    "Slovakia": "Eslovaquia",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Element with an existing Matrix account on a different homeserver.": "Puedes usar la opción de editar el servidor para iniciar sesión en otros servidores de Matrix indicando una URL de servidor base diferente. Esto te permitirá usar Element con una cuenta de Matrix que ye exista en un servidor base diferente.",
+    "We call the places where you can host your account ‘homeservers’.": "Llamamos a los sitios donde puedes alojar tu cuenta «servidores base».",
+    "Use email to optionally be discoverable by existing contacts.": "También puedes usarlo para que tus contactos te encuentren fácilmente.",
+    "Add an email to be able to reset your password.": "Añade un correo para poder restablecer tu contraseña si te olvidas.",
+    "Continue with %(ssoButtons)s": "Continuar con %(ssoButtons)s",
+    "Continue with %(provider)s": "Continuar con %(provider)s",
+    "Channel: <channelLink/>": "Canal: <channelLink/>",
+    "Update %(brand)s": "Actualizar %(brand)s",
+    "This will end the conference for everyone. Continue?": "Esto terminará la conferencia para todo el mundo. ¿Continuar?",
+    "Nigeria": "Nigeria",
+    "Niger": "Níger",
+    "Nicaragua": "Nicaragua",
+    "New Zealand": "Nueva Zelanda",
+    "New Caledonia": "Nueva Caledonia",
+    "Netherlands": "Países Bajos",
+    "Nepal": "Nepal",
+    "Nauru": "Nauru",
+    "Namibia": "Namibia",
+    "Myanmar": "Birmania",
+    "Mozambique": "Mozambique",
+    "Morocco": "Marruecos",
+    "Montserrat": "Mongolia",
+    "Monaco": "Mónaco",
+    "Moldova": "Moldavia",
+    "Micronesia": "Micronesia",
+    "Mexico": "México",
+    "Mayotte": "Mayotte",
+    "Mauritius": "Mauricio",
+    "Mauritania": "Mauritania",
+    "Martinique": "Martinica",
+    "Marshall Islands": "Islas Marshall",
+    "Malta": "Malta",
+    "Mali": "Malí",
+    "Maldives": "Maldivas",
+    "Malaysia": "Malasia",
+    "Malawi": "Malaui",
+    "Madagascar": "Madagascar",
+    "Macedonia": "Macedonia del Norte",
+    "Macau": "Macao",
+    "Luxembourg": "Luxemburgo",
+    "Lithuania": "Lituania",
+    "Liechtenstein": "Liechtenstein",
+    "Libya": "Libia",
+    "Liberia": "Liberia",
+    "Lesotho": "Lesoto",
+    "Lebanon": "Líbano",
+    "Latvia": "Letonia",
+    "Laos": "Laos",
+    "Kyrgyzstan": "Kirguistán",
+    "Kuwait": "Kuwait",
+    "Kosovo": "Kosovo",
+    "Kiribati": "Kiribati",
+    "Kenya": "Kenia",
+    "Kazakhstan": "Kazajistán",
+    "Jordan": "Jordania",
+    "Jersey": "Jersey",
+    "Isle of Man": "Isla de Man",
+    "Heard & McDonald Islands": "Islas Heard y McDonald",
+    "Haiti": "Haití",
+    "Guyana": "Guyana",
+    "Guinea-Bissau": "Guinea-Bisáu",
+    "Guernsey": "Guernsey",
+    "Guam": "Guam",
+    "Guadeloupe": "Guadalupe",
+    "Grenada": "Granada",
+    "Ghana": "Ghana",
+    "Georgia": "Georgia",
+    "Gambia": "Gambia",
+    "French Southern Territories": "Tierras Australes y Antárticas Francesas",
+    "French Polynesia": "Polinesia Francesa",
+    "French Guiana": "Guayana Francesa",
+    "Fiji": "Fiyi",
+    "Faroe Islands": "Islas Feroe",
+    "Eritrea": "Eritrea",
+    "Dominica": "Dominica",
+    "Djibouti": "Yibuti",
+    "Curaçao": "Curazao",
+    "Cook Islands": "Islas Cook",
+    "Congo - Kinshasa": "República Democrática del Congo",
+    "Congo - Brazzaville": "República del Congo",
+    "Comoros": "Comoras",
+    "Cocos (Keeling) Islands": "Islas Cocos",
+    "Christmas Island": "Kiritimati",
+    "Chad": "Chad",
+    "Central African Republic": "República Centroafricana",
+    "Caribbean Netherlands": "Caribe Neerlandés",
+    "Burundi": "Burundi",
+    "Burkina Faso": "Burkina Faso",
+    "Brunei": "Brunéi",
+    "British Virgin Islands": "Islas Vírgenes Británicas",
+    "British Indian Ocean Territory": "Territorio Británico del Océano Índico",
+    "Bouvet Island": "Isla Bouvet",
+    "Botswana": "Botsuana",
+    "Bosnia": "Bosnia y Herzegovina",
+    "Bhutan": "Bután",
+    "Bermuda": "Bermudas",
+    "Benin": "Benín",
+    "Belize": "Belice",
+    "Barbados": "Barbados",
+    "Bangladesh": "Bangladés",
+    "Bahrain": "Baréin",
+    "Azerbaijan": "Azerbaiyán",
+    "Aruba": "Aruba",
+    "Anguilla": "Anguila",
+    "Angola": "Angola",
+    "American Samoa": "Samoa Americana",
+    "Algeria": "Argelia",
+    "Åland Islands": "Åland",
+    "Go to Home View": "Ir a la vista de inicio",
+    "Great! This Security Phrase looks strong enough.": "¡Genial! Esta frase de seguridad parece lo suficientemente segura.",
+    "Use Security Key": "Usar clave de seguridad",
+    "Use Security Key or Phrase": "Usar clave de seguridad o frase",
+    "Decide where your account is hosted": "Decide dónde quieres alojar tu cuenta",
+    "Host account on": "Alojar cuenta en",
+    "Already have an account? <a>Sign in here</a>": "¿Ya tienes una cuenta? <a>Inicia sesión aquí</a>",
+    "That username already exists, please try another.": "Ese nombre de usuario ya está en uso, escoge otro.",
+    "New? <a>Create account</a>": "¿Primera vez? <a>Crea una cuenta</a>",
+    "There was a problem communicating with the homeserver, please try again later.": "Ha ocurrido un error al conectarse a tu servidor base, inténtalo de nuevo más tarde.",
+    "New here? <a>Create an account</a>": "¿Primera vez? <a>Crea una cuenta</a>",
+    "Got an account? <a>Sign in</a>": "¿Ya tienes una cuenta? <a>Iniciar sesión</a>",
+    "Filter rooms and people": "Filtrar salas y personas",
+    "You have no visible notifications.": "No tienes notificaciones visibles.",
+    "%(creator)s created this DM.": "%(creator)s creó este mensaje directo.",
+    "You do not have permission to create rooms in this community.": "No tienes permisos para crear salas en esta comunidad.",
+    "Cannot create rooms in this community": "No puedes crear salas en esta comunidad",
+    "Now, let's help you get started": "Vamos a empezar",
+    "Welcome %(name)s": "Te damos la bienvenida, %(name)s",
+    "Add a photo so people know it's you.": "Añade una imagen para que la gente sepa que eres tú.",
+    "Forgot password?": "¿Has olvidado tu contraseña?",
+    "Enter phone number": "Escribe tu teléfono móvil",
+    "Enter email address": "Escribe tu dirección de correo electrónico",
+    "Something went wrong in confirming your identity. Cancel and try again.": "Ha ocurrido un error al confirmar tu identidad. Cancela e inténtalo de nuevo.",
+    "Open the link in the email to continue registration.": "Abre el enlace en el mensaje para seguir con el registro.",
+    "A confirmation email has been sent to %(emailAddress)s": "Se ha enviado un correo de confirmación a %(emailAddress)s",
+    "Move right": "Mover a la derecha",
+    "Move left": "Mover a la izquierda",
+    "Revoke permissions": "Quitar permisos",
+    "Hold": "Poner en espera",
+    "Resume": "Recuperar",
+    "Enter Security Phrase": "Introducir la frase de seguridad",
+    "Incorrect Security Phrase": "Frase de seguridad incorrecta",
+    "Unable to set up keys": "No se han podido configurar las claves",
+    "Invalid Security Key": "Clave de seguridad inválida",
+    "Wrong Security Key": "Clave de seguridad incorrecta",
+    "Remember this": "Recordar",
+    "The widget will verify your user ID, but won't be able to perform actions for you:": "Este widget verificará tu ID de usuario, pero no podrá actuar acciones en tu nombre:",
+    "Allow this widget to verify your identity": "Permitir a este widget verificar tu identidad",
+    "Decline All": "Rechazar todo",
+    "Approve": "Aprobar",
+    "This widget would like to:": "A este widget le gustaría:",
+    "Approve widget permissions": "Aprobar permisos de widget",
+    "About homeservers": "Sobre los servidores base",
+    "Learn more": "Más información",
+    "Use your preferred Matrix homeserver if you have one, or host your own.": "Usa tu servidor base de Matrix de confianza o aloja el tuyo propio.",
+    "Other homeserver": "Otro servidor base",
+    "Sign into your homeserver": "Iniciar sesión en tu servidor base",
+    "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "Matrix.org es el mayor servidor base del mundo, por lo que es un buen sitio para muchos.",
+    "Specify a homeserver": "Especificar un servidor base",
+    "Invalid URL": "URL inválida",
+    "Unable to validate homeserver": "No se ha podido validar el servidor base",
+    "Data on this screen is shared with %(widgetDomain)s": "Los datos en esta ventana se comparten con %(widgetDomain)s",
+    "Continuing without email": "Continuar sin correo electrónico",
+    "Modal Widget": "Widget emergente",
+    "Transfer": "Transferir",
+    "Failed to transfer call": "No se ha podido transferir la llamada",
+    "A call can only be transferred to a single user.": "Una llamada solo puede transferirse a un usuario.",
+    "Invite by email": "Invitar a través de correo electrónico",
+    "Send feedback": "Enviar comentarios",
+    "Report a bug": "Informar de un fallo",
+    "There are two ways you can provide feedback and help us improve %(brand)s.": "Hay dos maneras en las que nos puedes hacer llegar tus comentarios para ayudarnos a mejorar %(brand)s.",
+    "Comment": "Comentario",
+    "Add comment": "Añadir comentario",
+    "Please go into as much detail as you like, so we can track down the problem.": "Incluye todos los detalles que quieras, para que podamos investigar el problema.",
+    "Tell us below how you feel about %(brand)s so far.": "Cuéntanos qué te está pareciendo %(brand)s.",
+    "Rate %(brand)s": "Valora %(brand)s",
+    "Feedback sent": "Comentarios enviados",
+    "There was an error finding this widget.": "Ha ocurrido un error al buscar este widget.",
+    "Active Widgets": "Widgets activos",
+    "This version of %(brand)s does not support viewing some encrypted files": "Esta versión de %(brand)s no permite ver algunos archivos cifrados",
+    "Use the <a>Desktop app</a> to search encrypted messages": "Usa la <a>aplicación de ordenador</a> para buscar en los mensajes cifrados",
+    "Use the <a>Desktop app</a> to see all encrypted files": "Usar la <a>aplicación de ordenador</a> para ver todos los archivos cifrados",
+    "Video conference started by %(senderName)s": "Videoconferencia iniciada por %(senderName)s",
+    "Video conference updated by %(senderName)s": "Videoconferencia actualizada por %(senderName)s",
+    "You held the call <a>Resume</a>": "Has puesto la llamada en espera <a>Recuperar</a>",
+    "You held the call <a>Switch</a>": "Has puesto la llamada en espera <a>Cambiar</a>",
+    "Reason (optional)": "Motivo (opcional)",
+    "Homeserver": "Servidor base",
+    "Server Options": "Opciones del servidor",
+    "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Estos mensajes se cifran de extremo a extremo. Verifica a %(displayName)s en su perfil - toca su imagen.",
+    "Role": "Rol",
+    "Start a new chat": "Empezar una nueva conversación",
+    "Open dial pad": "Abrir teclado numérico",
+    "Start a Conversation": "Empezar una conversación",
+    "This is the start of <roomName/>.": "Este es el inicio de <roomName/>.",
+    "Add a photo, so people can easily spot your room.": "Añade una imagen para que la gente reconozca la sala fácilmente.",
+    "%(displayName)s created this room.": "%(displayName)s creó esta sala.",
+    "You created this room.": "Creaste esta sala.",
+    "<a>Add a topic</a> to help people know what it is about.": "<a>Añade un tema</a> para que la gente sepa de qué va esta sala.",
+    "Topic: %(topic)s ": "Tema: %(topic)s ",
+    "Topic: %(topic)s (<a>edit</a>)": "Tema: %(topic)s (<a>cambiar</a>)",
+    "Remove messages sent by others": "Eliminar mensajes mandados por otros",
+    "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 Security Key.": "Haz una copia de seguridad de tus claves de cifrado con los datos de tu cuenta por si pierdes acceso a tus sesiones. Las clave serán aseguradas con una clave de seguridad única.",
+    "The operation could not be completed": "No se ha podido completar la operación",
+    "Failed to save your profile": "No se ha podido guardar tu perfil",
+    "not found in storage": "no se ha encontrado en la memoria",
+    "Dial pad": "Teclado numérico",
+    "%(name)s on hold": "%(name)s está en espera",
+    "Return to call": "Volver a la llamada",
+    "Voice Call": "Llamada de voz",
+    "Video Call": "Videollamada",
+    "%(peerName)s held the call": "%(peerName)s ha puesto la llamada en espera",
+    "sends snowfall": "envía copos de nieve",
+    "Sends the given message with snowfall": "Envía el mensaje con copos de nieve",
+    "sends fireworks": "envía fuegos artificiales",
+    "Sends the given message with fireworks": "Envía el mensaje con fuegos artificiales",
+    "sends confetti": "envía confeti",
+    "Sends the given message with confetti": "Envía el mensaje con confeti",
+    "Show chat effects": "Ver efectos",
+    "Use Ctrl + Enter to send a message": "Usa Control + Intro para enviar un mensaje",
+    "Use Command + Enter to send a message": "Usa Comando + Intro para enviar un mensje",
+    "Use Ctrl + F to search": "Usa Control + F para buscar",
+    "Use Command + F to search": "Usa comando + F para buscar",
+    "Render LaTeX maths in messages": "Mostrar matemáticas en los mensajes usando LaTeX",
+    "%(senderName)s ended the call": "%(senderName)s ha terminado la llamada",
+    "You ended the call": "Has terminado la llamada",
+    "New version of %(brand)s is available": "Hay una nueva versión de %(brand)s disponible",
+    "Safeguard against losing access to encrypted messages & data": "Evita perder acceso a datos y mensajes cifrados",
+    "Use app": "Usar la aplicación",
+    "Use app for a better experience": "Usa la aplicación para una experiencia mejor",
+    "Enable desktop notifications": "Activar notificaciones de escritorio",
+    "Don't miss a reply": "No te pierdas ninguna respuesta",
+    "Send messages as you in your active room": "Enviar mensajes en tu sala activa",
+    "See messages posted to your active room": "Ver los mensajes publicados en tu sala activa",
+    "See text messages posted to your active room": "Ver mensajes de texto publicados a tu sala activa",
+    "See text messages posted to this room": "Ver mensajes de texto publicados en esta sala",
+    "Send text messages as you in your active room": "Enviar mensajes de texto en tu nombre a tu sala actual",
+    "Send text messages as you in this room": "Enviar mensajes de texto en tu nombre a esta sala",
+    "See messages posted to this room": "Ver los mensajes publicados en esta sala",
+    "with an empty state key": "con una clave de estado vacía",
+    "Change the avatar of your active room": "Cambiar la foto de tu sala actual",
+    "See when the avatar changes in this room": "Ver cuándo cambia la imagen de esta sala",
+    "Change the avatar of this room": "Cambiar la imagen de esta sala",
+    "See when the name changes in your active room": "Ver cuándo cambia el tema de tu sala actual",
+    "Change the name of your active room": "Cambiar el nombre de tu sala actual",
+    "See when the name changes in this room": "Ver cuándo cambia el tema de esta sala",
+    "Change the name of this room": "Cambiar el tema de esta sala",
+    "Sint Maarten": "San Martín",
+    "Singapore": "Singapur",
+    "Sierra Leone": "Sierra Leona",
+    "Serbia": "Serbia",
+    "Senegal": "Senegal",
+    "Saudi Arabia": "Arabia Saudí",
+    "San Marino": "San Marino",
+    "Samoa": "Samoa",
+    "Réunion": "Reunión",
+    "Russia": "Rusia",
+    "Romania": "Rumanía",
+    "Qatar": "Catar",
+    "Puerto Rico": "Puerto Rico",
+    "Portugal": "Portugal",
+    "Poland": "Polonia",
+    "Philippines": "Filipinas",
+    "Peru": "Perú",
+    "Paraguay": "Paraguay",
+    "Papua New Guinea": "Papúa-Nueva Guinea",
+    "Panama": "Panamá",
+    "Palestine": "Palestina",
+    "Pakistan": "Pakistán",
+    "Norway": "Noruega",
+    "North Korea": "Corea del Norte",
+    "Mongolia": "Mongolia",
+    "Montenegro": "Montenegro",
+    "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Element Web en móviles es un experimento. Para una mejor experiencia y las últimas funcionalidades, usa nuestra aplicación nativa gratuita.",
+    "See when the topic changes in your active room": "Ver cuándo cambia el tema de tu sala actual",
+    "Change the topic of your active room": "Cambiar el tema de tu sala actual",
+    "See when the topic changes in this room": "Ver cuándo cambia el tema de esta sala",
+    "Change the topic of this room": "Cambiar el tema de esta sala",
+    "%(senderName)s declined the call.": "%(senderName)s ha rechazado la llamada.",
+    "(an error occurred)": "(ha ocurrido un error)",
+    "(their device couldn't start the camera / microphone)": "(su dispositivo no ha podido acceder a la cámara o micrófono)",
+    "(connection failed)": "(conexión fallida)",
+    "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s ha cambiado los permisos de la sala.",
+    "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s ha establecido los permisos de la sala.",
+    "Converts the DM to a room": "Convierte el mensaje directo a sala",
+    "Converts the room to a DM": "Convierte la sala a un mensaje directo",
+    "Takes the call in the current room off hold": "Quita la llamada de la sala actual de espera",
+    "Places the call in the current room on hold": "Pone la llamada de la sala actual en espera",
+    "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "Pone «(╯°□°）╯︵ ┻━┻» delante de un mensaje de texto",
+    "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "Pone «┬──┬ ノ( ゜-゜ノ)» después de un mensaje de texto",
+    "Effects": "Efectos",
+    "Japan": "Japón",
+    "Jamaica": "Jamaica",
+    "Italy": "Italia",
+    "Israel": "Israel",
+    "Ireland": "Irlanda",
+    "Iraq": "Iraq",
+    "Iran": "Irán",
+    "Indonesia": "Indonesia",
+    "India": "India",
+    "Iceland": "Islandia",
+    "Hungary": "Hungría",
+    "Hong Kong": "Hong Kong",
+    "Honduras": "Honduras",
+    "Guinea": "Guinea",
+    "Guatemala": "Guatemala",
+    "Greenland": "Groenlandia",
+    "Greece": "Grecia",
+    "Gibraltar": "Gibraltar",
+    "Germany": "Alemania",
+    "Gabon": "Gabón",
+    "France": "Francia",
+    "Finland": "Finlandia",
+    "Falkland Islands": "Islas Malvinas",
+    "Ethiopia": "Etiopía",
+    "Estonia": "Estonia",
+    "Equatorial Guinea": "Guinea Ecuatorial",
+    "El Salvador": "El Salvador",
+    "Egypt": "Egipto",
+    "Ecuador": "Ecuador",
+    "Dominican Republic": "República Dominicana",
+    "Denmark": "Dinamarca",
+    "Côte d’Ivoire": "Costa de Marfil",
+    "Czech Republic": "República Checa",
+    "Cyprus": "Chipre",
+    "Cuba": "Cuba",
+    "Croatia": "Croacia",
+    "Costa Rica": "Costa Rica",
+    "Colombia": "Colombia",
+    "China": "China",
+    "Chile": "Chile",
+    "Cayman Islands": "Islas Caimán",
+    "Cape Verde": "Cabo Verde",
+    "Canada": "Canadá",
+    "Cameroon": "Camerún",
+    "Cambodia": "Cambodia",
+    "Bulgaria": "Bulgaria",
+    "Brazil": "Brasil",
+    "Bolivia": "Bolivia",
+    "Belgium": "Bélgica",
+    "Belarus": "Bielorrusia",
+    "Bahamas": "Bahamas",
+    "Austria": "Austria",
+    "Australia": "Australia",
+    "Armenia": "Armenia",
+    "Argentina": "Argentina",
+    "Antigua & Barbuda": "Antigua y Barbuda",
+    "Antarctica": "Antártica",
+    "Andorra": "Andorra",
+    "Albania": "Albania",
+    "Afghanistan": "Afganistán",
+    "United States": "Estados Unidos",
+    "United Kingdom": "Reino Unido",
+    "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "Tu servidor base está rechazando tu intento de inicio de sesión. Puede que sea porque el proceso esté llevando demasiado. Por favor, inténtalo de nuevo. Si esto sigue ocurriendo, ponte en contacto con la administración de tu servidor base.",
+    "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "No se ha podido establecer la conexión con tu servidor base, por lo que no se ha podido iniciar tu sesión. Por favor, inténtalo de nuevo. Si sigue ocurriendo, contacta con la administración de tu servidor base.",
+    "Try again": "Intentarlo de nuevo",
+    "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "Le hemos preguntado a tu navegador qué servidor base usar para iniciar tu sesión, pero parece que no lo recuerda. Vuelve a la página de inicio de sesión e inténtalo de nuevo.",
+    "We couldn't log you in": "No hemos podido iniciar tu sesión",
+    "End conference": "Terminar conferencia",
+    "You've reached the maximum number of simultaneous calls.": "Has llegado al límite de llamadas simultáneas.",
+    "Too Many Calls": "Demasiadas llamadas",
+    "No other application is using the webcam": "No hay otra aplicación usando la cámara",
+    "Permission is granted to use the webcam": "Se ha dado permiso al programa para acceder a ellos",
+    "A microphone and webcam are plugged in and set up correctly": "El micrófono y cámara están enchufados y bien configurados",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "La llamada ha fallado porque no se ha podido acceder a la cámara o al micrófono. Comprueba que:",
+    "Unable to access webcam / microphone": "No se ha podido acceder a la cámara o micrófono",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "La llamada ha fallado porque no se ha podido acceder al micrófono. Comprueba que tengas uno enchufado y configurado correctamente.",
+    "Unable to access microphone": "No se ha podido acceder al micrófono",
+    "The call was answered on another device.": "Esta llamada fue respondida en otro dispositivo.",
+    "Answered Elsewhere": "Respondida en otra parte",
+    "The call could not be established": "No se ha podido establecer la llamada",
+    "The other party declined the call.": "La otra persona ha rechazado la llamada.",
+    "Call Declined": "Llamada rechazada"
 }
diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 7d820b4fce..7769cf61c8 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -45,7 +45,7 @@
     "Failed to add the following rooms to %(groupId)s:": "Järgnevate jututubade lisamine %(groupId)s kogukonda ebaõnnestus:",
     "Changes your avatar in all rooms": "Muuda oma tunnuspilti kõikides jututubades",
     "Ask this user to verify their session, or manually verify it below.": "Palu nimetatud kasutajal verifitseerida see sessioon või tee seda alljärgnevas käsitsi.",
-    "Manually Verify by Text": "Verifitseeri  käsitsi etteantud teksti abil",
+    "Manually Verify by Text": "Verifitseeri käsitsi etteantud teksti abil",
     "Interactively verify by Emoji": "Verifitseeri interaktiivselt Emoji abil",
     "Enable big emoji in chat": "Kasuta vestlustes suuri emoji'sid",
     "Order rooms by name": "Järjesta jututoad nime alusel",
@@ -62,7 +62,7 @@
     "Voice call": "Häälkõne",
     "Video call": "Videokõne",
     "Hangup": "Katkesta kõne",
-    "Upload file": "Lae fail üles",
+    "Upload file": "Laadi fail üles",
     "Send an encrypted reply…": "Saada krüptitud vastus…",
     "Send a reply…": "Saada vastus…",
     "Send an encrypted message…": "Saada krüptitud sõnum…",
@@ -105,7 +105,7 @@
     "expand": "laienda",
     "Communities": "Kogukonnad",
     "You cannot delete this image. (%(code)s)": "Sa ei saa seda pilti eemaldada, (%(code)s)",
-    "Uploaded on %(date)s by %(user)s": "Üles laetud %(date)s %(user)s poolt",
+    "Uploaded on %(date)s by %(user)s": "Üles laaditud %(date)s %(user)s poolt",
     "Rotate Left": "Pööra vasakule",
     "Rotate counter-clockwise": "Pööra vastupäeva",
     "Rotate Right": "Pööra paremale",
@@ -157,7 +157,7 @@
     "Remove from community": "Eemalda kogukonnast",
     "Remove this user from community?": "Kas eemaldan selle kasutaja kogukonnast?",
     "Failed to remove user from community": "Kasutaja eemaldamine kogukonnast ebaõnnestus",
-    "Failed to load group members": "Grupi liikmete laadimine ebaõnnestus",
+    "Failed to load group members": "Grupi liikmete laadimine ei õnnestunud",
     "Filter community members": "Filtreeri kogukonna liikmeid",
     "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Kas sa soovid eemaldada %(roomName)s jututoa %(groupId)s kogukonnast?",
     "Removing a room from the community will also remove it from the community page.": "Eemaldades jututoa kogukonnast eemaldad selle ka kogukonna lehelt.",
@@ -172,11 +172,11 @@
     "%(networkName)s rooms": "%(networkName)s jututoad",
     "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.": "Kas sa oled kindel et soovid eemaldada (kustutada) seda sündmust? Pane tähele, et see muutus võib tagasi pöörduda, kui muudad hiljem jututoa nime või teema nime.",
     "Sign out and remove encryption keys?": "Logi välja ja eemalda krüptimisvõtmed?",
-    "Upload files (%(current)s of %(total)s)": "Lae failid üles (%(current)s / %(total)s)",
-    "Upload files": "Lae failid üles",
+    "Upload files (%(current)s of %(total)s)": "Laadin faile üles (%(current)s / %(total)s)",
+    "Upload files": "Laadi failid üles",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Need failid on üleslaadimiseks <b>liiga suured</b>. Failisuuruse piir on %(limit)s.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Mõned failid on üleslaadimiseks <b>liiga suured</b>. Failisuuruse piir on %(limit)s.",
-    "Upload %(count)s other files|other": "Lae üles %(count)s muud faili",
+    "Upload %(count)s other files|other": "Laadi üles %(count)s muud faili",
     "Unable to reject invite": "Ei õnnestu kutset tagasi lükata",
     "Resend": "Saada uuesti",
     "Resend edit": "Saada muudetud sõnum uuesti",
@@ -222,7 +222,7 @@
     "Remove %(name)s from the directory?": "Eemalda %(name)s kataloogist?",
     "Remove from Directory": "Eemalda kataloogist",
     "remove %(name)s from the directory.": "eemalda %(name)s kataloogist.",
-    "You seem to be uploading files, are you sure you want to quit?": "Tundub, et sa parasjagu laed faile üles. Kas sa kindlasti soovid väljuda?",
+    "You seem to be uploading files, are you sure you want to quit?": "Tundub, et sa parasjagu laadid faile üles. Kas sa kindlasti soovid väljuda?",
     "Failed to set direct chat tag": "Otsevestluse sildi lisamine ei õnnestunud",
     "Failed to remove tag %(tagName)s from room": "Sildi %(tagName)s eemaldamine jututoast ebaõnnestus",
     "Calls": "Kõned",
@@ -306,7 +306,7 @@
     "Use your account or create a new one to continue.": "Jätkamaks kasuta oma kontot või loo uus konto.",
     "Anyone": "Kõik kasutajad",
     "Encryption": "Krüptimine",
-    "Once enabled, encryption cannot be disabled.": "Kui krüptimine on  juba kasutusele võetud, siis ei saa seda enam eemaldada.",
+    "Once enabled, encryption cannot be disabled.": "Kui krüptimine on juba kasutusele võetud, siis ei saa seda enam eemaldada.",
     "Encrypted": "Krüptitud",
     "Who can access this room?": "Kes pääsevad ligi siia jututuppa?",
     "Who can read history?": "Kes võivad lugeda ajalugu?",
@@ -322,7 +322,7 @@
     "Attachment": "Manus",
     "Error decrypting attachment": "Viga manuse dekrüptimisel",
     "Decrypt %(text)s": "Dekrüpti %(text)s",
-    "Download %(text)s": "Lae alla %(text)s",
+    "Download %(text)s": "Laadi alla %(text)s",
     "Invalid file%(extra)s": "Vigane fail %(extra)s",
     "Error decrypting image": "Viga pildi dekrüptimisel",
     "Show image": "Näita pilti",
@@ -416,7 +416,7 @@
     "System Alerts": "Süsteemi teated",
     "This room": "See jututuba",
     "Joining room …": "Liitun jututoaga …",
-    "Loading …": "Laen …",
+    "Loading …": "Laadin …",
     "e.g. %(exampleValue)s": "näiteks %(exampleValue)s",
     "Could not find user in room": "Jututoast ei leidnud kasutajat",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Näita ajatempleid 12-tunnises vormingus (näiteks 2:30pl)",
@@ -443,7 +443,7 @@
     "Sat": "Laupäev",
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
-    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)s  %(fullYear)s %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s %(time)s",
     "Encryption upgrade available": "Krüptimise uuendus on saadaval",
     "Set up encryption": "Seadista krüptimine",
     "Review where you’re logged in": "Vaata üle, kust sa oled Matrix'i võrku loginud",
@@ -468,7 +468,7 @@
     "Search…": "Otsi…",
     "Cancel search": "Tühista otsing",
     "Search failed": "Otsing ebaõnnestus",
-    "Server may be unavailable, overloaded, or search timed out :(": "Server kas pole leitav, on üle koormatud või otsing aegus :(",
+    "Server may be unavailable, overloaded, or search timed out :(": "Server kas pole leitav, on ülekoormatud või otsing aegus :(",
     "No more results": "Rohkem otsingutulemusi pole",
     "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "Otsingus kasutamiseks %(brand)s puhverdab turvaliselt kohalikku arvutisse krüptitud sõnumeid:",
     "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s'il puudub luba sulle teavituste kuvamiseks - palun kontrolli oma brauseri seadistusi",
@@ -526,7 +526,7 @@
     "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s eemaldas täiendava aadressi %(addresses)s sellelt jututoalt.",
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s muutis selle jututoa täiendavat aadressi.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s muutis selle jututoa põhiaadressi ja täiendavat aadressi.",
-    "%(senderName)s changed the addresses for this room.": "%(senderName)s muutis selle jututoa aadressid.",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s muutis selle jututoa aadresse.",
     "Someone": "Keegi",
     "(not supported by this browser)": "(ei ole toetatud selles brauseris)",
     "(could not connect media)": "(ühendus teise osapoolega ei õnnestunud)",
@@ -584,10 +584,10 @@
     "You have verified this user. This user has verified all of their sessions.": "Sa oled selle kasutaja verifitseerinud. See kasutaja on verifitseerinud kõik nende sessioonid.",
     "Someone is using an unknown session": "Keegi kasutab tundmatut sessiooni",
     "This event could not be displayed": "Seda sündmust ei õnnestunud kuvada",
-    "Downloading update...": "Laen alla uuendust...",
-    "Download this file": "Lae see fail alla",
+    "Downloading update...": "Laadin alla uuendust...",
+    "Download this file": "Laadi see fail alla",
     "You can now close this window or <a>log in</a> to your new account.": "Sa võid nüüd sulgeda selle akna või <a>logida sisse</a> oma uuele kontole.",
-    "Download": "Lae alla",
+    "Download": "Laadi alla",
     "Your recovery key is in your <b>Downloads</b> folder.": "Sinu taastevõti on sinu <b>Allalaadimised</b> kasutas.",
     "Disable": "Lülita välja",
     "Not currently indexing messages for any room.": "Mitte ainsamagi jututoa sõnumeid hetkel ei indekseerita.",
@@ -619,7 +619,7 @@
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s muutis jututoa vana nime %(oldRoomName)s uueks nimeks %(newRoomName)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s muutis jututoa nimeks %(roomName)s.",
     "Show info about bridges in room settings": "Näita jututoa seadistustes teavet sõnumisildade kohta",
-    "Upload": "Lae üles",
+    "Upload": "Laadi üles",
     "Save": "Salvesta",
     "General": "Üldist",
     "Notifications": "Teavitused",
@@ -701,7 +701,7 @@
     "Show display name changes": "Näita kuvatava nime muutusi",
     "Match system theme": "Kasuta süsteemset teemat",
     "Messages containing my display name": "Sõnumid, mis sisaldavad minu kuvatavat nime",
-    "Failed to upload profile picture!": "Profiilipildi üleslaadimine ebaõnnestus!",
+    "Failed to upload profile picture!": "Profiilipildi üleslaadimine ei õnnestunud!",
     "No display name": "Kuvatav nimi puudub",
     "New passwords don't match": "Uued salasõnad ei klapi",
     "Passwords can't be empty": "Salasõna ei saa olla tühi",
@@ -806,7 +806,7 @@
     "Cancelling…": "Tühistan…",
     "They match": "Nad klapivad",
     "They don't match": "Nad ei klapi",
-    "To be secure, do this in person or use a trusted way to communicate.": "Turvalisuse mõttes on oluline, et teed seda nii, et kas olete  üheskoos või kasutate suhtluskanalit, mida mõlemad usaldate.",
+    "To be secure, do this in person or use a trusted way to communicate.": "Turvalisuse mõttes on oluline, et teed seda nii, et kas olete üheskoos või kasutate suhtluskanalit, mida mõlemad usaldate.",
     "Dog": "Koer",
     "Cat": "Kass",
     "Lion": "Lõvi",
@@ -920,9 +920,9 @@
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Üritasin laadida teatud hetke selle jututoa ajajoonelt, kuid sul ei ole õigusi selle sõnumi nägemiseks.",
     "Failed to load timeline position": "Asukoha laadimine ajajoonel ei õnnestunud",
     "Guest": "Külaline",
-    "Uploading %(filename)s and %(count)s others|other": "Laen üles %(filename)s ning %(count)s muud faili",
-    "Uploading %(filename)s and %(count)s others|zero": "Laen üles %(filename)s",
-    "Uploading %(filename)s and %(count)s others|one": "Laen üles %(filename)s ning veel %(count)s faili",
+    "Uploading %(filename)s and %(count)s others|other": "Laadin üles %(filename)s ning %(count)s muud faili",
+    "Uploading %(filename)s and %(count)s others|zero": "Laadin üles %(filename)s",
+    "Uploading %(filename)s and %(count)s others|one": "Laadin üles %(filename)s ning veel %(count)s faili",
     "Verify this login": "Verifitseeri see sisselogimissessioon",
     "Session verified": "Sessioon on verifitseeritud",
     "Failed to send email": "E-kirja saatmine ebaõnnestus",
@@ -942,7 +942,7 @@
     "This homeserver doesn't offer any login flows which are supported by this client.": "See koduserver ei paku ühtegi sisselogimislahendust, mida see klient toetab.",
     "Error: Problem communicating with the given homeserver.": "Viga: Suhtlusel koduserveriga tekkis probleem.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Kui aadressiribal on HTTPS-aadress, siis HTTP-protokolli kasutades ei saa ühendust koduserveriga. Palun pruugi HTTPS-protokolli või <a>luba brauseris ebaturvaliste skriptide kasutamine</a>.",
-    "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Ei sa ühendust koduserveriga. Palun  kontrolli, et sinu <a>koduserveri SSL sertifikaat</a> oleks usaldusväärne ning mõni brauseri lisamoodul ei blokeeri päringuid.",
+    "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Ei sa ühendust koduserveriga. Palun kontrolli, et sinu <a>koduserveri SSL sertifikaat</a> oleks usaldusväärne ning mõni brauseri lisamoodul ei blokeeri päringuid.",
     "Syncing...": "Sünkroniseerin...",
     "Signing In...": "Login sisse...",
     "Create account": "Loo kasutajakonto",
@@ -974,7 +974,7 @@
     "You have no visible notifications": "Sul ei ole nähtavaid teavitusi",
     "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s'il ei õnnestunud koduserverist laadida toetatud protokollide loendit. Toetamaks kolmandate osapoolte võrke võib koduserver olla liiga vana.",
     "%(brand)s failed to get the public room list.": "%(brand)s'il ei õnnestunud laadida avalike jututubade loendit.",
-    "The homeserver may be unavailable or overloaded.": "Koduserver pole kas saadaval või on üle koormatud.",
+    "The homeserver may be unavailable or overloaded.": "Koduserver pole kas saadaval või on ülekoormatud.",
     "Room not found": "Jututuba ei leidunud",
     "Preview": "Eelvaade",
     "View": "Näita",
@@ -999,7 +999,7 @@
     "Leave %(groupName)s?": "Lahku %(groupName)s kogukonnast?",
     "Unable to leave community": "Kogukonnast lahkumine ei õnnestunud",
     "Community Settings": "Kogukonna seadistused",
-    "Want more than a community? <a>Get your own server</a>": "Soovid enamat  kui  kogukond? <a>Pane üles oma server</a>",
+    "Want more than a community? <a>Get your own server</a>": "Soovid enamat kui kogukond? <a>Pane üles oma server</a>",
     "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Oma kogukonnas tehtud <bold1>nime</bold1> ja <bold2>avatari</bold2> muudatused ei pruugi teistele näha olla kuni 30 minuti jooksul.",
     "Featured Users:": "Esiletõstetud kasutajad:",
     "%(inviter)s has invited you to join this community": "%(inviter)s on kutsunud sind kogukonna liikmeks",
@@ -1011,12 +1011,12 @@
     "Everyone": "Kes iganes soovib",
     "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!": "Sinu kogukonnal on puudu pikk kirjeldus, mis pole muud, kui lihtne HTML-leht, mida kuvatakse liikmetele.<br />Klõpsi siia ja loo selline leht!",
     "Long Description (HTML)": "Pikk kirjeldus (HTML)",
-    "Upload avatar": "Lae üles profiilipilt ehk avatar",
+    "Upload avatar": "Laadi üles profiilipilt ehk avatar",
     "Description": "Kirjeldus",
     "Community %(groupId)s not found": "%(groupId)s kogukonda ei leidunud",
     "This homeserver does not support communities": "See koduserver ei toeta kogukondade funktsionaalsust",
     "Failed to load %(groupId)s": "%(groupId)s kogukonna laadimine ei õnnestunud",
-    "Welcome to %(appName)s": "Tere tulemast %(appName)s kasutajaks",
+    "Welcome to %(appName)s": "Tere tulemast suhtlusrakenduse %(appName)s kasutajaks",
     "Liberate your communication": "Vabasta oma suhtlus",
     "Send a Direct Message": "Saada otsesõnum",
     "Are you sure you want to leave the room '%(roomName)s'?": "Kas oled kindel, et soovid lahkuda jututoast '%(roomName)s'?",
@@ -1030,7 +1030,7 @@
     "Click here to fix": "Parandamiseks klõpsi siia",
     "Server error": "Serveri viga",
     "Command error": "Käsu viga",
-    "Server unavailable, overloaded, or something else went wrong.": "Kas server pole saadaval, on üle koormatud või midagi muud läks viltu.",
+    "Server unavailable, overloaded, or something else went wrong.": "Server pole kas saadaval, on ülekoormatud või midagi muud läks viltu.",
     "Unknown Command": "Tundmatu käsk",
     "Unrecognised command: %(commandText)s": "Tundmatu käsk: %(commandText)s",
     "Send as message": "Saada sõnumina",
@@ -1054,7 +1054,7 @@
     "Rejecting invite …": "Hülgan kutset …",
     "Join the conversation with an account": "Liitu vestlusega kasutades oma kontot",
     "Sign Up": "Registreeru",
-    "Loading room preview": "Laen jututoa eelvaadet",
+    "Loading room preview": "Laadin jututoa eelvaadet",
     "You were kicked from %(roomName)s by %(memberName)s": "%(memberName)s müksas sind välja jututoast %(roomName)s",
     "Reason: %(reason)s": "Põhjus: %(reason)s",
     "Forget this room": "Unusta see jututuba",
@@ -1177,13 +1177,13 @@
     "Recently Direct Messaged": "Viimased otsesõnumite saajad",
     "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Kutsu kedagi tema nime, kasutajanime (nagu <userId/>), e-posti aadressi alusel või <a>jaga seda jututuba</a>.",
     "Upload completed": "Üleslaadimine valmis",
-    "%(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!": "%(brand)s kasutab varasemaga võrreldes 3-5 korda vähem mälu, sest  laeb teavet kasutajate kohta vaid siis, kui vaja. Palun oota hetke, kuni sünkroniseerime andmeid serveriga!",
+    "%(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!": "%(brand)s kasutab varasemaga võrreldes 3-5 korda vähem mälu, sest laadib teavet kasutajate kohta vaid siis, kui vaja. Palun oota hetke, kuni sünkroniseerime andmeid serveriga!",
     "Updating %(brand)s": "Uuendan rakendust %(brand)s",
     "I don't want my encrypted messages": "Ma ei soovi oma krüptitud sõnumeid",
     "Manually export keys": "Ekspordi võtmed käsitsi",
     "You'll lose access to your encrypted messages": "Sa kaotad ligipääsu oma krüptitud sõnumitele",
     "Are you sure you want to sign out?": "Kas sa oled kindel, et soovid välja logida?",
-    "Upload %(count)s other files|one": "Lae üles %(count)s muu fail",
+    "Upload %(count)s other files|one": "Laadi üles %(count)s muu fail",
     "Cancel All": "Tühista kõik",
     "Upload Error": "Üleslaadimise viga",
     "Verify other session": "Verifitseeri teine sessioon",
@@ -1268,14 +1268,14 @@
     "Fill screen": "Täida ekraan",
     "No identity server is configured: add one in server settings to reset your password.": "Ühtegi isikutuvastusserverit pole seadistatud: salasõna taastamiseks määra see serveri sätetes.",
     "Sign in instead": "Pigem logi sisse",
-    "A verification email will be sent to your inbox to confirm setting your new password.": "Kontrollimaks, et just sina sina ise sisestasid uue salasõna, siis saadame sulle kinnituskirja.",
+    "A verification email will be sent to your inbox to confirm setting your new password.": "Kontrollimaks, et just sina ise sisestasid uue salasõna, saadame sulle kinnituskirja.",
     "Send Reset Email": "Saada salasõna taastamise e-kiri",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Saatsime kirja %(emailAddress)s aadressile. Kui sa oled klõpsinud kirjas olnud linki, siis jätka alljärgnevaga.",
     "I have verified my email address": "Ma olen teinud läbi oma e-posti aadressi kontrolli",
     "Your password has been reset.": "Sinu salasõna on muudetud.",
     "Dismiss read marker and jump to bottom": "Ära arvesta loetud sõnumite järjehoidjat ning mine kõige lõppu",
     "Jump to oldest unread message": "Mine vanima lugemata sõnumi juurde",
-    "Upload a file": "Lae fail üles",
+    "Upload a file": "Laadi fail üles",
     "Read Marker lifetime (ms)": "Lugemise markeri iga (ms)",
     "Unignore": "Lõpeta eiramine",
     "<not supported>": "<ei ole toetatud>",
@@ -1289,7 +1289,7 @@
     "Key backup": "Võtmete varundus",
     "Cross-signing": "Risttunnustamine",
     "<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>Hoiatus</b>: Jututoa versiooni uuendamine <i>ei koli jututoa liikmeid automaatselt uude jututoa olekusse.</i> Vanas jututoa versioonis saab olema viide uuele versioonile ning kõik liikmed peavad seda viidet klõpsama.",
-    "Uploaded sound": "Üleslaetud heli",
+    "Uploaded sound": "Üleslaaditud heli",
     "Sounds": "Helid",
     "Notification sound": "Teavitusheli",
     "Reset": "Taasta algolek",
@@ -1326,7 +1326,7 @@
     "The file '%(fileName)s' failed to upload.": "Faili '%(fileName)s' üleslaadimine ei õnnestunud.",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Faili '%(fileName)s' suurus ületab serveris seadistatud üleslaadimise piiri",
     "Upload Failed": "Üleslaadimine ei õnnestunud",
-    "Server may be unavailable, overloaded, or you hit a bug.": "Server kas pole võrgus või on üle koormatud, aga võib-olla oled komistanud süsteemivea otsa.",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Server kas pole võrgus või on ülekoormatud, aga võib-olla oled hoopis komistanud süsteemivea otsa.",
     "The server does not support the room version specified.": "See server ei toeta antud jututoa versiooni.",
     "Failure to create room": "Jututoa loomine ei õnnestunud",
     "If you cancel now, you won't complete verifying the other user.": "Kui sa katkestad nüüd, siis sul jääb teise kasutaja verifitseerimine lõpetamata.",
@@ -1370,7 +1370,7 @@
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Palun kontrolli, kas sul on toimiv internetiühendus ning kui on, siis küsi abi koduserveri haldajalt",
     "Your %(brand)s is misconfigured": "Sinu %(brand)s'i seadistused on paigast ära",
     "Your homeserver does not support session management.": "Sinu koduserver ei toeta sessioonide haldust.",
-    "Unable to load session list": "Sessioonide laadimine ei õnnestunud",
+    "Unable to load session list": "Sessioonide loendi laadimine ei õnnestunud",
     "Identity server URL does not appear to be a valid identity server": "Isikutuvastusserveri aadress ei tundu viitama kehtivale isikutuvastusserverile",
     "Looks good!": "Tundub õige!",
     "Use Recovery Key or Passphrase": "Kasuta taastevõtit või paroolifraasi",
@@ -1579,8 +1579,8 @@
     "You can now return to your account after signing out, and sign in on other devices.": "Nüüd sa saad peale väljalogimist pöörduda tagasi oma konto juurde või logida sisse muudest seadmetest.",
     "Remember, you can always set an email address in user settings if you change your mind.": "Jäta meelde, et sa saad alati hiljem määrata kasutajaseadetest oma e-posti aadressi.",
     "Use bots, bridges, widgets and sticker packs": "Kasuta roboteid, sõnumisildu, vidinaid või kleepsupakke",
-    "Upload all": "Lae kõik üles",
-    "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "See fail on üleslaadimiseks <b>liiga suur</b>. Üleslaetavate failide mahupiir on %(limit)s, kuid selle faili suurus on %(sizeOfThisFile)s.",
+    "Upload all": "Laadi kõik üles",
+    "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "See fail on üleslaadimiseks <b>liiga suur</b>. Üleslaaditavate failide mahupiir on %(limit)s, kuid selle faili suurus on %(sizeOfThisFile)s.",
     "Appearance": "Välimus",
     "Enter recovery passphrase": "Sisesta taastamise paroolifraas",
     "For security, this session has been signed out. Please sign in again.": "Turvalisusega seotud põhjustel on see sessioon välja logitud. Palun logi uuesti sisse.",
@@ -1594,11 +1594,11 @@
     "All settings": "Kõik seadistused",
     "Feedback": "Tagasiside",
     "Use Single Sign On to continue": "Jätkamiseks kasuta ühekordset sisselogimist",
-    "Confirm adding this email address by using Single Sign On to prove your identity.": "Kinnita selle e-posti aadressi lisamine kasutades ühekordset sisselogimist oma isiku tuvastamiseks.",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Kinnita selle e-posti aadress kasutades oma isiku tuvastamiseks ühekordset sisselogimist (Single Sign On).",
     "Single Sign On": "SSO Ühekordne sisselogimine",
     "Confirm adding email": "Kinnita e-posti aadressi lisamine",
     "Click the button below to confirm adding this email address.": "Klõpsi järgnevat nuppu e-posti aadressi lisamise kinnitamiseks.",
-    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Kinnita selle telefoninumbri lisamine kasutades ühekordset sisselogimist oma isiku tuvastamiseks.",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Kinnita selle telefoninumbri lisamine kasutades oma isiku tuvastamiseks ühekordset sisselogimist (Single Sign On).",
     "Confirm adding phone number": "Kinnita telefoninumbri lisamine",
     "Click the button below to confirm adding this phone number.": "Klõpsi järgnevat nuppu telefoninumbri lisamise kinnitamiseks.",
     "Add Phone Number": "Lisa telefoninumber",
@@ -1751,7 +1751,7 @@
     "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s lahkusid ja liitusid uuesti",
     "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s lahkus ja liitus uuesti %(count)s korda",
     "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s lahkus ja liitus uuesti",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Selle kasutamiseks oota, kuni automaatne sõnalõpetus laeb kõik valikud ja sa saad nad läbi lapata.",
+    "To use it, just wait for autocomplete results to load and tab through them.": "Selle kasutamiseks oota, kuni automaatne sõnalõpetus laadib kõik valikud ja sa saad nad läbi lapata.",
     "Bans user with given id": "Keela ligipääs antud tunnusega kasutajale",
     "Unbans user with given ID": "Taasta ligipääs antud tunnusega kasutajale",
     "Ignores a user, hiding their messages from you": "Eirab kasutajat peites kõik tema sõnumid sinu eest",
@@ -1806,7 +1806,7 @@
     "This bridge is managed by <user />.": "Seda võrgusilda haldab <user />.",
     "Workspace: %(networkName)s": "Tööruum: %(networkName)s",
     "Channel: %(channelName)s": "Kanal: %(channelName)s",
-    "Upload new:": "Lae üles uus:",
+    "Upload new:": "Laadi üles uus:",
     "Export E2E room keys": "Ekspordi jututubade läbiva krüptimise võtmed",
     "Your homeserver does not support cross-signing.": "Sinu koduserver ei toeta risttunnustamist.",
     "Cross-signing and secret storage are enabled.": "Risttunnustamine ja turvahoidla on kasutusel.",
@@ -1843,7 +1843,7 @@
     "Legal": "Juriidiline teave",
     "Credits": "Tänuavaldused",
     "Bug reporting": "Vigadest teatamine",
-    "Clear cache and reload": "Tühjenda puhver ja lae uuesti",
+    "Clear cache and reload": "Tühjenda puhver ja laadi uuesti",
     "FAQ": "Korduma kippuvad küsimused",
     "Versions": "Versioonid",
     "%(brand)s version:": "%(brand)s'i versioon:",
@@ -1876,7 +1876,7 @@
     "⚠ These settings are meant for advanced users.": "⚠ Need seadistused on mõeldud kogenud kasutajatele.",
     "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.": "Kasutajate eiramine toimub ligipääsukeelu reeglite loendite alusel ning seal on kirjas blokeeritavad kasutajad, jututoad või serverid. Sellise loendi kasutusele võtmine tähendab et blokeeritud kasutajad või serverid ei ole sulle nähtavad.",
     "Personal ban list": "Minu isiklik ligipääsukeelu reeglite loend",
-    "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.": "Sinu isiklikus ligipääsukeelu reeglite loendis on kasutajad ja serverid, kellelt sa ei soovi sõnumeid saada. Peale esimese kasutaja või serveri blokeerimist tekib sinu  jututubade loendisse uus jututuba „Minu isiklik ligipääsukeelu reeglite loend“ ning selle jõustamiseks ära logi nimetatud jututoast välja.",
+    "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.": "Sinu isiklikus ligipääsukeelu reeglite loendis on kasutajad ja serverid, kellelt sa ei soovi sõnumeid saada. Peale esimese kasutaja või serveri blokeerimist tekib sinu jututubade loendisse uus jututuba „Minu isiklik ligipääsukeelu reeglite loend“ ning selle jõustamiseks ära logi nimetatud jututoast välja.",
     "Subscribing to a ban list will cause you to join it!": "Ligipääsukeelu reeglite loendi tellimine tähendab sellega liitumist!",
     "Room ID or address of ban list": "Ligipääsukeelu reeglite loendi jututoa tunnus või aadress",
     "Show tray icon and minimize window to it on close": "Näita süsteemisalve ikooni ja Element'i akna sulgemisel minimeeri ta salve",
@@ -1905,7 +1905,7 @@
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (õigused %(powerLevelNumber)s)",
     "Emoji picker": "Emoji'de valija",
     "No pinned messages.": "Klammerdatud sõnumeid ei ole.",
-    "Loading...": "Laen...",
+    "Loading...": "Laadin...",
     "Pinned Messages": "Klammerdatud sõnumid",
     "Unpin Message": "Eemalda sõnumi klammerdus",
     "No recently visited rooms": "Hiljuti külastatud jututubasid ei leidu",
@@ -2239,7 +2239,7 @@
     "Away": "Eemal",
     "Room avatar": "Jututoa tunnuspilt ehk avatar",
     "Publish this room to the public in %(domain)s's room directory?": "Kas avaldame selle jututoa %(domain)s jututubade loendis?",
-    "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.": "Kui keegi lisab oma sõnumisse URL'i, siis võidakse näidata selle URL'i eelvaadet,  mis annab lisateavet tema kohta, nagu näiteks pealkiri, kirjeldus ja kuidas ta välja näeb.",
+    "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.": "Kui keegi lisab oma sõnumisse URL'i, siis võidakse näidata selle URL'i eelvaadet, mis annab lisateavet tema kohta, nagu näiteks pealkiri, kirjeldus ja kuidas ta välja näeb.",
     "Waiting for you to accept on your other session…": "Ootan, et sa nõustuksid teises sessioonis…",
     "Waiting for %(displayName)s to accept…": "Ootan, et %(displayName)s nõustuks…",
     "Accepting…": "Nõustun …",
@@ -2399,7 +2399,7 @@
     "A connection error occurred while trying to contact the server.": "Serveriga ühenduse algatamisel tekkis viga.",
     "The server is not configured to indicate what the problem is (CORS).": "Server on seadistatud varjama tegelikke veapõhjuseid (CORS).",
     "No files visible in this room": "Selles jututoas pole nähtavaid faile",
-    "Attach files from chat or just drag and drop them anywhere in a room.": "Faile saad manueks lisada kas vastava nupu alt vestlusest või sikutades neid jututoa aknasse.",
+    "Attach files from chat or just drag and drop them anywhere in a room.": "Faile saad manuseks lisada kas vastava nupu alt vestlusest või sikutades neid jututoa aknasse.",
     "You have no visible notifications in this room.": "Jututoas pole nähtavaid teavitusi.",
     "You're all caught up.": "Ei tea... kõik vist on nüüd tehtud.",
     "You’re all caught up": "Ei tea... kõik vist on nüüd tehtud",
@@ -2414,13 +2414,13 @@
     "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.": "Kui %(brand)s teine versioon on mõnel teisel vahekaardil endiselt avatud, palun sulge see. %(brand)s kasutamine samal serveril põhjustab vigu olukorras, kus laisk laadimine on samal ajal lubatud ja keelatud.",
     "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.": "%(brand)s vanema versiooni andmed on tuvastatud. See kindlasti põhjustab läbiva krüptimise tõrke vanemas versioonis. Läbivalt krüptitud sõnumid, mida on vanema versiooni kasutamise ajal hiljuti vahetatud, ei pruugi selles versioonis olla dekrüptitavad. See võib põhjustada vigu ka selle versiooniga saadetud sõnumite lugemisel. Kui teil tekib probleeme, logige välja ja uuesti sisse. Sõnumite ajaloo säilitamiseks eksportige ja uuesti importige oma krüptovõtmed.",
     "Navigation": "Navigeerimine",
-    "Uploading logs": "Laen üles logisid",
-    "Downloading logs": "Laen alla logisid",
+    "Uploading logs": "Laadin logisid üles",
+    "Downloading logs": "Laadin logisid alla",
     "Can't see what you’re looking for?": "Kas sa ei leia seda, mida otsisid?",
     "Explore all public rooms": "Sirvi kõiki avalikke jututubasid",
     "%(count)s results|other": "%(count)s tulemust",
     "Preparing to download logs": "Valmistun logikirjete allalaadimiseks",
-    "Download logs": "Lae logikirjed alla",
+    "Download logs": "Laadi logikirjed alla",
     "Unexpected server error trying to leave the room": "Jututoast lahkumisel tekkis serveris ootamatu viga",
     "Error leaving room": "Viga jututoast lahkumisel",
     "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Kogukondade v2 prototüüp. Eeldab, et koduserver toetab sellist funktsionaalsust. Lahendus on esialgne ja katseline - kui kasutad, siis väga ettevaatlikult.",
@@ -2432,7 +2432,7 @@
     "Send %(count)s invites|other": "Saada %(count)s kutset",
     "Send %(count)s invites|one": "Saada %(count)s kutse",
     "Invite people to join %(communityName)s": "Kutsu kasutajaid %(communityName)s kogukonna liikmeks",
-    "There was an error creating your community. The name may be taken or the server is unable to process your request.": "Kogukonna loomisel tekkis viga. Selline nimi kas on  juba kasutusel või server ei saa hetkel seda päringut töödelda.",
+    "There was an error creating your community. The name may be taken or the server is unable to process your request.": "Kogukonna loomisel tekkis viga. Selline nimi kas on juba kasutusel või server ei saa hetkel seda päringut töödelda.",
     "Community ID: +<localpart />:%(domain)s": "Kogukonna tunnus: +<localpart />:%(domain)s",
     "Use this when referencing your community to others. The community ID cannot be changed.": "Viidates kogukonnale kasuta seda tunnust. Kogukonna tunnust ei ole võimalik muuta.",
     "You can change this later if needed.": "Kui vaja, siis sa saad seda hiljem muuta.",
@@ -2524,5 +2524,547 @@
     "Offline encrypted messaging using dehydrated devices": "Võrguühenduseta kasutamiseks mõeldud krüptitud sõnumid dehydrated teenuse abil",
     "Remove messages sent by others": "Kustuta teiste saadetud sõnumid",
     "Failed to save your profile": "Sinu profiili salvestamine ei õnnestunud",
-    "The operation could not be completed": "Toimingut ei õnnestunud lõpetada"
+    "The operation could not be completed": "Toimingut ei õnnestunud lõpetada",
+    "Calling...": "Helistan...",
+    "Call connecting...": "Kõne on ühendamisel...",
+    "Starting camera...": "Käivitan kaamerat...",
+    "Starting microphone...": "Lülitan mikrofoni sisse...",
+    "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s muutis seda jututuba teenindavate koduserverite loendit.",
+    "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s seadistas seda jututuba teenindavate koduserverite loendi.",
+    "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Kõikidel serveritel on keeld seda jututuba teenindada! Seega seda jututuba ei saa enam kasutada.",
+    "(an error occurred)": "(tekkis viga)",
+    "(their device couldn't start the camera / microphone)": "(teise osapoole seadmes ei õnnestunud sisse lülitada kaamerat või mikrofoni)",
+    "(connection failed)": "(ühendus ebaõnnestus)",
+    "The call could not be established": "Kõnet ei saa korraldada",
+    "%(senderName)s declined the call.": "%(senderName)s ei võtnud kõnet vastu.",
+    "The other party declined the call.": "Teine osapool ei võtnud kõnet vastu.",
+    "Call Declined": "Kõne on tagasilükatud",
+    "Move right": "Liigu paremale",
+    "Move left": "Liigu vasakule",
+    "Revoke permissions": "Tühista õigused",
+    "Unpin a widget to view it in this panel": "Sellel paneelil kuvamiseks eemaldage vidin lemmikutest",
+    "You can only pin up to %(count)s widgets|other": "Sa saad kinnitada kuni %(count)s vidinat",
+    "Show Widgets": "Näita vidinaid",
+    "Hide Widgets": "Peida vidinad",
+    "The call was answered on another device.": "Kõnele vastati teises seadmes.",
+    "Answered Elsewhere": "Vastatud mujal",
+    "Data on this screen is shared with %(widgetDomain)s": "Andmeid selles vaates jagatakse %(widgetDomain)s serveriga",
+    "Modal Widget": "Modaalne vidin",
+    "PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> to help us track down the problem.": "SOOVITUS: Kui sa koostad uut veateadet, siis meil on lihtsam vea põhjuseni leida, kui sa lisad juurde ka <debugLogsLink>silumislogid</debugLogsLink>.",
+    "Send feedback": "Saada tagasiside",
+    "Please view <existingIssuesLink>existing bugs on Github</existingIssuesLink> first. No match? <newIssueLink>Start a new one</newIssueLink>.": "Palun esmalt vaata, kas <existingIssuesLink>Githubis on selline viga juba kirjeldatud</existingIssuesLink>. Sa ei leidnud midagi? <newIssueLink>Siis saada uus veateade</newIssueLink>.",
+    "Report a bug": "Teata veast",
+    "There are two ways you can provide feedback and help us improve %(brand)s.": "On olemas kaks viisi, kuidas sa saad meile tagasisidet jagada ning aidata teha %(brand)s rakendust paremaks.",
+    "Comment": "Kommentaar",
+    "Add comment": "Lisa kommentaar",
+    "Please go into as much detail as you like, so we can track down the problem.": "Selleks, et saaksime probleemi põhjuse leida, lisa nii palju lisateavet kui soovid.",
+    "Tell us below how you feel about %(brand)s so far.": "Kirjelda meile, mis mulje sulle on %(brand)s rakendusest seni jäänud.",
+    "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",
+    "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",
+    "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",
+    "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",
+    "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",
+    "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.",
+    "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",
+    "<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>Sinu kogukonna lehe HTML'i näidis - see on pealkiri</h1>\n<p>\n     Tutvustamaks uutele liikmetele kogukonda, kasuta seda pikka kirjeldust\n     või jaga olulist teavet <a href=\"foo\">viidetena</a>\n</p>\n<p>\n     Pildite lisaminseks võid sa isegi kasutada img-märgendit Matrix'i url'idega <img src=\"mxc://url\" />\n</p>\n",
+    "Go to Home View": "Avalehele",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Selleks, et sisu saaks otsingus kasutada, puhverda krüptitud sõnumid kohalikus seadmes turvaliselt. %(rooms)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 %(rooms)s rooms.|other": "Selleks, et sisu saaks otsingus kasutada, puhverda krüptitud sõnumid kohalikus seadmes turvaliselt. %(rooms)s jututoa andmete salvestamiseks kulub hetkel %(size)s.",
+    "This widget would like to:": "See vidin sooviks:",
+    "Approve widget permissions": "Anna vidinale õigused",
+    "Use Ctrl + Enter to send a message": "Sõnumi saatmiseks vajuta Ctrl + Enter",
+    "Decline All": "Keeldu kõigist",
+    "Approve": "Nõustu",
+    "Remain on your screen when viewing another room, when running": "Kui vaatad mõnda teist jututuba, siis jää oma ekraanivaate juurde",
+    "Remain on your screen while running": "Jää oma ekraanivaate juurde",
+    "Send <b>%(eventType)s</b> events as you in this room": "Saada enda nimel <b>%(eventType)s</b> sündmusi siia jututuppa",
+    "with state key %(stateKey)s": "olekuvõtmega %(stateKey)s",
+    "with an empty state key": "tühja olekuvõtmega",
+    "See when anyone posts a sticker to your active room": "Vaata kui keegi on saatnud kleepse aktiivsesse jututuppa",
+    "Send stickers to your active room as you": "Saada enda nimel kleepse hetkel aktiivsesse jututuppa",
+    "See when a sticker is posted in this room": "Vaata kui uus kleeps on siia jututuppa lisatud",
+    "Send stickers to this room as you": "Saada sellesse jututuppa kleepse iseendana",
+    "See when the avatar changes in your active room": "Vaata kui hetkel aktiivse jututoa tunnuspilt muutub",
+    "Change the avatar of your active room": "Muuda oma aktiivse jututoa tunnuspilti",
+    "See when the avatar changes in this room": "Vaata kui selle jututoa tunnuspilt muutub",
+    "Change the avatar of this room": "Muuda selle jututoa tunnuspilti",
+    "See when the name changes in your active room": "Vaata kui hetkel aktiivse jututoa nimi muutub",
+    "Change the name of your active room": "Muuda oma aktiivse jututoa nime",
+    "See when the name changes in this room": "Vaata kui selle jututoa nimi muutub",
+    "Change the name of this room": "Muuda selle jututoa nime",
+    "See when the topic changes in your active room": "Vaata kui hetkel aktiivse jututoa teema muutub",
+    "See when the topic changes in this room": "Vaata kui selle jututoa teema muutub",
+    "Change the topic of your active room": "Muuda oma aktiivse jututoa teemat",
+    "Change the topic of this room": "Muuda selle jututoa teemat",
+    "Change which room you're viewing": "Vaheta vaadatavat jututuba",
+    "Send stickers into your active room": "Saada kleepse hetkel aktiivsesse jututuppa",
+    "Send stickers into this room": "Saada kleepse siia jututuppa",
+    "See text messages posted to this room": "Vaata selle jututoa tekstisõnumeid",
+    "Send text messages as you in your active room": "Saada oma aktiivses jututoas enda nimel tekstisõnumeid",
+    "Send text messages as you in this room": "Saada selles jututoas oma nimel tekstisõnumeid",
+    "See messages posted to your active room": "Vaata sõnumeid oma aktiivses jututoas",
+    "See messages posted to this room": "Vaata selle jututoa sõnumeid",
+    "Send messages as you in your active room": "Saada oma aktiivses jututoas enda nimel sõnumeid",
+    "Send messages as you in this room": "Saada selles jututoas oma nimel sõnumeid",
+    "The <b>%(capability)s</b> capability": "<b>%(capability)s</b> võimekus",
+    "See <b>%(eventType)s</b> events posted to your active room": "Vaata oma aktiivsesse jututuppa saadetud <b>%(eventType)s</b> sündmusi",
+    "Send <b>%(eventType)s</b> events as you in your active room": "Saada oma nimel oma aktiivses jututoas <b>%(eventType)s</b> sündmusi",
+    "See <b>%(eventType)s</b> events posted to this room": "Vaata siia jututuppa saadetud <b>%(eventType)s</b> sündmusi",
+    "Enter phone number": "Sisesta telefoninumber",
+    "Enter email address": "Sisesta e-posti aadress",
+    "Return to call": "Pöördu tagasi kõne juurde",
+    "Fill Screen": "Täida ekraan",
+    "Voice Call": "Häälkõne",
+    "Video Call": "Videokõne",
+    "Use Command + Enter to send a message": "Sõnumi saatmiseks vajuta Command + Enter klahve",
+    "See <b>%(msgtype)s</b> messages posted to your active room": "Näha sinu aktiivsesse jututuppa saadetud <b>%(msgtype)s</b> sõnumeid",
+    "See <b>%(msgtype)s</b> messages posted to this room": "Näha sellesse jututuppa saadetud <b>%(msgtype)s</b> sõnumeid",
+    "Send <b>%(msgtype)s</b> messages as you in your active room": "Saata sinu nimel <b>%(msgtype)s</b> sõnumeid sinu aktiivsesse jututuppa",
+    "Send <b>%(msgtype)s</b> messages as you in this room": "Saata sinu nimel <b>%(msgtype)s</b> sõnumeid siia jututuppa",
+    "See general files posted to your active room": "Näha sinu aktiivsesse jututuppa lisatud muid faile",
+    "See general files posted to this room": "Näha sellesse jututuppa lisatud muid faile",
+    "Send general files as you in your active room": "Saata sinu nimel muid faile sinu aktiivsesse jututuppa",
+    "Send general files as you in this room": "Saata sinu nimel muid faile siia jututuppa",
+    "See videos posted to your active room": "Näha videosid sinu aktiivses jututoas",
+    "See videos posted to this room": "Näha siia jututuppa lisatud videosid",
+    "Send videos as you in your active room": "Saata sinu nimel videosid sinu aktiivsesse jututuppa",
+    "Send videos as you in this room": "Saata sinu nimel videosid siia jututuppa",
+    "See images posted to your active room": "Näha sinu aktiivsesse jututuppa lisatud pilte",
+    "See images posted to this room": "Näha siia jututuppa lisatud pilte",
+    "Send images as you in your active room": "Saata sinu nimel pilte sinu aktiivsesse jututuppa",
+    "Send images as you in this room": "Saata sinu nimel pilte siia jututuppa",
+    "See emotes posted to your active room": "Näha emotesid sinu aktiivses jututoas",
+    "See emotes posted to this room": "Vaata selle jututoa emotesid",
+    "Send emotes as you in your active room": "Saada oma aktiivses jututoas enda nimel emotesid",
+    "Send emotes as you in this room": "Saada selles jututoas oma nimel emotesid",
+    "See text messages posted to your active room": "Vaata tekstisõnumeid oma aktiivses jututoas",
+    "New here? <a>Create an account</a>": "Täitsa uus asi sinu jaoks? <a>Loo omale kasutajakonto</a>",
+    "Got an account? <a>Sign in</a>": "Sul on kasutajakonto olemas? <a>Siis logi sisse</a>",
+    "Render LaTeX maths in messages": "Sõnumites visualiseeri LaTeX-vormingus matemaatikat",
+    "No other application is using the webcam": "Ainsamgi muu rakendus ei kasuta veebikaamerat",
+    "Permission is granted to use the webcam": "Rakendusel õigus veebikaamerat kasutada",
+    "A microphone and webcam are plugged in and set up correctly": "Veebikaamera ja mikrofon oleks ühendatud ja seadistatud",
+    "Call failed because no webcam or microphone could not be accessed. Check that:": "Kuna veebikaamerat või mikrofoni kasutada ei saanud, siis kõne ei õnnestunud. Palun kontrolli, et:",
+    "Unable to access webcam / microphone": "Puudub ligipääs veebikaamerale ja mikrofonile",
+    "Call failed because no microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Kuna mikrofoni kasutada ei saanud, siis kõne ei õnnestunud. Palun kontrolli, et mikrofon oleks ühendatud ja seadistatud.",
+    "Unable to access microphone": "Puudub ligipääs mikrofonile",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Element with an existing Matrix account on a different homeserver.": "Serveri seadistusi muutes võid teise koduserveri aadressi sisestamisel logida sisse muudesse Matrix'i serveritesse. See võimaldab sul vestlusrakenduses Element kasutada olemasolevat kasutajakontot teises koduserveris.",
+    "Continuing without email": "Jätka ilma e-posti aadressi seadistamiseta",
+    "Continue with %(provider)s": "Jätka %(provider)s kasutamist",
+    "Homeserver": "Koduserver",
+    "Server Options": "Serveri seadistused",
+    "Host account on": "Sinu kasutajakontot teenindab",
+    "Decide where your account is hosted": "Vali kes võiks sinu kasutajakontot teenindada",
+    "Already have an account? <a>Sign in here</a>": "Sul juba on kasutajakonto olemas? <a>Logi siin sisse</a>",
+    "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s või %(usernamePassword)s",
+    "Continue with %(ssoButtons)s": "Jätkamiseks kasuta %(ssoButtons)s teenuseid",
+    "That username already exists, please try another.": "Selline kasutajanimi on juba olemas, palun vali midagi muud.",
+    "New? <a>Create account</a>": "Täitsa uus asi sinu jaoks? <a>Loo omale kasutajakonto</a>",
+    "There was a problem communicating with the homeserver, please try again later.": "Serveriühenduses tekkis viga. Palun proovi mõne aja pärast uuesti.",
+    "Use email to optionally be discoverable by existing contacts.": "Kui soovid, et teised kasutajad saaksid sind leida, siis palun lisa oma e-posti aadress.",
+    "Use email or phone to optionally be discoverable by existing contacts.": "Kui soovid, et teised kasutajad saaksid sind leida, siis palun lisa oma e-posti aadress või telefoninumber.",
+    "Add an email to be able to reset your password.": "Selleks et saaksid vajadusel oma salasõna muuta, palun lisa oma e-posti aadress.",
+    "Forgot password?": "Kas unustasid oma salasõna?",
+    "That phone number doesn't look quite right, please check and try again": "See telefoninumber ei tundu õige olema, palun kontrolli ta üle ja proovi uuesti",
+    "About homeservers": "Teave koduserverite kohta",
+    "Learn more": "Loe veel",
+    "Use your preferred Matrix homeserver if you have one, or host your own.": "Kui sul on oma koduserveri eelistus olemas, siis kasuta seda. Samuti võid soovi korral oma enda koduserveri püsti panna.",
+    "Other homeserver": "Muu koduserver",
+    "We call the places you where you can host your account ‘homeservers’.": "Me nimetame „koduserveriks“ sellist serverit, mis haldab sinu kasutajakontot.",
+    "Sign into your homeserver": "Logi sisse oma koduserverisse",
+    "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "Matrix.org on maailma suurim avalik koduserver ja see sobib paljude jaoks.",
+    "Specify a homeserver": "Sisesta koduserver",
+    "Just a heads up, if you don't add an email and forget your password, you could <b>permanently lose access to your account</b>.": "Lihtsalt hoiatame, et kui sa ei lisa e-posti aadressi ning unustad oma konto salasõna, siis sa võid <b>püsivalt kaotada ligipääsu oma kontole</b>.",
+    "Reason (optional)": "Põhjus (kui soovid lisada)",
+    "We call the places where you can host your account ‘homeservers’.": "Me nimetame „koduserveriks“ sellist serverit, mis haldab sinu kasutajakontot.",
+    "Invalid URL": "Vigane aadress",
+    "Unable to validate homeserver": "Koduserveri õigsust ei õnnestunud kontrollida",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "Kuna veebikaamerat või mikrofoni kasutada ei saanud, siis kõne ei õnnestunud. Palun kontrolli, et:",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Kuna mikrofoni kasutada ei saanud, siis kõne ei õnnestunud. Palun kontrolli, et mikrofon oleks ühendatud ja seadistatud.",
+    "sends confetti": "saatis serpentiine",
+    "Sends the given message with confetti": "Lisab sellele sõnumile serpentiine",
+    "Show chat effects": "Näita vestlustes efekte",
+    "Effects": "Vahvad täiendused",
+    "Hold": "Pane ootele",
+    "Resume": "Jätka",
+    "%(peerName)s held the call": "%(peerName)s pani kõne ootele",
+    "You held the call <a>Resume</a>": "Sa panid kõne ootele. <a>Jätka kõnet</a>",
+    "You've reached the maximum number of simultaneous calls.": "Oled jõudnud suurima lubatud samaaegsete kõnede arvuni.",
+    "%(name)s paused": "%(name)s peatas ajutiselt kõne",
+    "Too Many Calls": "Liiga palju kõnesid",
+    "sends fireworks": "saadab ilutulestiku",
+    "Sends the given message with fireworks": "Lisab sellele sõnumile ilutulestiku",
+    "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "Lisab vormindamata sõnumi ette ┬──┬ ノ( ゜-゜ノ)",
+    "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "Lisab vormindamata sõnumi ette (╯°□°）╯︵ ┻━┻",
+    "You held the call <a>Switch</a>": "Sa panid kõne ootele <a>Lülita tagasi</a>",
+    "%(name)s on hold": "%(name)s on ootel",
+    "sends snowfall": "saadab lumesaju",
+    "Sends the given message with snowfall": "Saadab antud sõnumi koos lumesajuga",
+    "You have no visible notifications.": "Sul pole nähtavaid teavitusi.",
+    "Transfer": "Suuna kõne edasi",
+    "Failed to transfer call": "Kõne edasisuunamine ei õnnestunud",
+    "A call can only be transferred to a single user.": "Kõnet on võimalik edasi suunata vaid ühele kasutajale.",
+    "There was an error finding this widget.": "Selle vidina leidmisel tekkis viga.",
+    "Active Widgets": "Kasutusel vidinad",
+    "Open dial pad": "Ava numbriklahvistik",
+    "Start a Conversation": "Alusta vestlust",
+    "Dial pad": "Numbriklahvistik",
+    "There was an error looking up the phone number": "Telefoninumbri otsimisel tekkis viga",
+    "Unable to look up phone number": "Telefoninumbrit ei õnnestu leida",
+    "Channel: <channelLink/>": "Kanal: <channelLink/>",
+    "Workspace: <networkLink/>": "Tööruum: <networkLink/>",
+    "Change which room, message, or user you're viewing": "Muuda jututuba, sõnumit või kasutajat, mida hetkel vaatad",
+    "Use Security Key": "Kasuta turvavõtit",
+    "Use Security Key or Phrase": "Kasuta turvavõtit või turvafraasi",
+    "If you've forgotten your Security Key you can <button>set up new recovery options</button>": "Kui sa oled unustanud oma turvavõtme, siis sa võid <button>seadistada uued taastamise võimalused</button>",
+    "Access your secure message history and set up secure messaging by entering your Security Key.": "Sisestades turvavõtme pääsed ligi oma turvatud sõnumitele ning sätid tööle krüptitud sõnumivahetuse.",
+    "Not a valid Security Key": "Vigane turvavõti",
+    "This looks like a valid Security Key!": "See tundub olema õige turvavõti!",
+    "Enter Security Key": "Sisesta turvavõti",
+    "If you've forgotten your Security Phrase you can <button1>use your Security Key</button1> or <button2>set up new recovery options</button2>": "Kui sa oled unustanud turvafraasi, siis sa saad <button1>kasutada oma turvavõtit</button1> või <button2>seadistada uued taastamise võimalused</button2>",
+    "Access your secure message history and set up secure messaging by entering your Security Phrase.": "Sisestades turvafraasi, saad ligipääsu oma turvatud sõnumitele ning sätid toimima krüptitud sõnumivahetuse.",
+    "Enter Security Phrase": "Sisesta turvafraas",
+    "Backup could not be decrypted with this Security Phrase: please verify that you entered the correct Security Phrase.": "Selle turvafraasiga ei õnnestunud varundust dekrüptida: palun kontrolli, kas sa kasutad õiget turvafraasi.",
+    "Incorrect Security Phrase": "Vigane turvafraas",
+    "Backup could not be decrypted with this Security Key: please verify that you entered the correct Security Key.": "Selle turvavõtmega ei õnnestunud varundust dekrüptida: palun kontrolli, kas sa kasutad õiget turvavõtit.",
+    "Security Key mismatch": "Turvavõtmed ei klapi",
+    "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "Ei õnnestu saada ligipääsu turvahoidlale. Palun kontrolli, et sa oleksid sisestanud õige turvafraasi.",
+    "Invalid Security Key": "Vigane turvavõti",
+    "Wrong Security Key": "Vale turvavõti",
+    "We recommend you change your password and Security Key in Settings immediately": "Me soovitame, et vaheta Seadistuste lehelt koheselt oma salasõna ja turvavõti",
+    "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 Security Key.": "Selleks puhuks, kui sa kaotad ligipääsu kõikidele oma sessioonidele, tee varukoopia oma krüptovõtmetest ja kasutajakonto seadistustest. Unikaalse turvavõtmega tagad selle, et sinu varukoopia on kaitstud.",
+    "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "Oleme tuvastanud, et selles sessioonis ei leidu turvafraasi ega krüptitud sõnumite turvavõtit.",
+    "A new Security Phrase and key for Secure Messages have been detected.": "Tuvastasin krüptitud sõnumite uue turvafraasi ja turvavõtme.",
+    "Make a copy of your Security Key": "Tee oma turvavõtmest koopia",
+    "Confirm your Security Phrase": "Kinnita oma turvafraasi",
+    "Secure your backup with a Security Phrase": "Krüpti oma varukoopia turvafraasiga",
+    "Your Security Key is in your <b>Downloads</b> folder.": "Sinu turvavõti asub sinu kaustas <b>Allalaadimised</b>.",
+    "Your Security Key has been <b>copied to your clipboard</b>, paste it to:": "Sinu turvavõti on <b>kopeeritud lõikelauale</b>, aseta ta:",
+    "Your Security Key": "Sinu turvavõti",
+    "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "Sinu turvavõti toimib julgestusena - juhul, kui sa unustad turvafraasi, siis sa saad seda kasutada taastamaks ligipääsu krüptitud sõnumitele.",
+    "Repeat your Security Phrase...": "Korda oma turvafraasi...",
+    "Please enter your Security Phrase a second time to confirm.": "Kinnitamiseks palun sisesta turvafraas teist korda.",
+    "Set up with a Security Key": "Võta kasutusele turvavõti",
+    "Great! This Security Phrase looks strong enough.": "Suurepärane! Turvafraas on piisavalt kange.",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "Me salvestame krüptitud koopia sinu krüptovõtmetest oma serveris. Selle koopia krüptimisel kasutame sinu turvafraasi.",
+    "Set my room layout for everyone": "Kasuta minu jututoa paigutust kõigi jaoks",
+    "%(senderName)s has updated the widget layout": "%(senderName)s on uuendanud vidinate paigutust",
+    "Search (must be enabled)": "Otsing (peab olema lubatud)",
+    "Remember this": "Jäta see meelde",
+    "The widget will verify your user ID, but won't be able to perform actions for you:": "See vidin verifitseerib sinu kasutajatunnuse, kuid ta ei saa sinu nimel toiminguid teha:",
+    "Allow this widget to verify your identity": "Luba sellel vidinal sinu isikut verifitseerida",
+    "Use Ctrl + F to search": "Otsimiseks vajuta Ctrl + F klahve",
+    "Use Command + F to search": "Otsimiseks vajuta Cmd + F klahve",
+    "Converts the DM to a room": "Muuda otsevestlus jututoaks",
+    "Converts the room to a DM": "Muuda jututuba otsevestluseks",
+    "Use app for a better experience": "Rakendusega saad Matrix'is suhelda parimal viisil",
+    "Something went wrong in confirming your identity. Cancel and try again.": "Midagi läks sinu isiku tuvastamisel viltu. Tühista viimane toiming ja proovi uuesti.",
+    "Use app": "Kasuta rakendust",
+    "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Brauseripõhine Element toimib mobiiltelefonis mööndustega. Meie rakendusega saad parema kasutajakogemuse ja uusimad funktsionaalsused.",
+    "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "Sinu koduserver ei võimaldanud sul sisse logida. Võib-olla juhtus nii, kuna sisselogimine kestis liiga kaua. Palun proovi mõne hetke pärast uuesti. Kui olukord ikkagi ei muutu, siis palun küsi lisateavet oma koduserveri haldajalt.",
+    "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "Sinu koduserver ei olnud kättesaadav ning me ei saanud sind sisse logida. Palun proovi mõne hetke pärast uuesti. Kui olukord ikkagi ei muutu, siis palun küsi lisateavet oma koduserveri haldajalt.",
+    "Try again": "Proovi uuesti",
+    "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "Me sättisime nii, et sinu veebibrauser jätaks järgmiseks sisselogimiseks meelde sinu koduserveri, kuid kahjuks on ta selle unustanud. Palun mine sisselogimise lehele ja proovi uuesti.",
+    "We couldn't log you in": "Meil ei õnnestunud sind sisse logida",
+    "Show stickers button": "Näita kleepsude nuppu",
+    "Windows": "Aknad",
+    "Screens": "Ekraanid",
+    "Share your screen": "Jaga oma ekraani",
+    "Show line numbers in code blocks": "Näita koodiblokkides reanumbreid",
+    "Expand code blocks by default": "Vaikimisi kuva koodiblokid tervikuna",
+    "Recently visited rooms": "Hiljuti külastatud jututoad",
+    "Continuing temporarily allows the %(hostSignupBrand)s setup process to access your account to fetch verified email addresses. This data is not stored.": "Jätkates ajutistel alustel, on sul võimalik %(hostSignupBrand)s seadistamisega edasi minna ning kontole ligipääsuka laadida verifitseeritud e-posti aadress. Seda teavet ei salvestata.",
+    "Abort": "Katkesta",
+    "Are you sure you wish to abort creation of the host? The process cannot be continued.": "Kas sa oled kindel, et soovid katkestada seoste loomise? Sel juhul me edasi ei jätka.",
+    "Confirm abort of host creation": "Kinnita seoste loomise katkestamine",
+    "Upgrade to pro": "Võta kasutusele tasuline teenus",
+    "Minimize dialog": "Tee aken väikeseks",
+    "Maximize dialog": "Tee aken suureks",
+    "%(hostSignupBrand)s Setup": "%(hostSignupBrand)s seadistus",
+    "You should know": "Sa peaksid teadma",
+    "Privacy Policy": "Privaatsuspoliitika",
+    "Cookie Policy": "Küpsiste kasutamine",
+    "Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.": "Lisateavet leiad <privacyPolicyLink />, <termsOfServiceLink /> ja <cookiePolicyLink /> lehtedelt.",
+    "Failed to connect to your homeserver. Please close this dialog and try again.": "Ei õnnestunud ühendada koduserveriga. Palun sulge see aken ja proovi uuesti."
 }
diff --git a/src/i18n/strings/fa.json b/src/i18n/strings/fa.json
index 6dd523cec6..b16700ead6 100644
--- a/src/i18n/strings/fa.json
+++ b/src/i18n/strings/fa.json
@@ -36,7 +36,7 @@
     "Unavailable": "غیرقابل‌دسترسی",
     "View Decrypted Source": "دیدن منبع رمزگشایی شده",
     "Failed to update keywords": "به‌روزرسانی کلیدواژه‌ها موفقیت‌آمیز نبود",
-    "remove %(name)s from the directory.": "%(name)s را از فهرست گپ‌ها حذف کن",
+    "remove %(name)s from the directory.": "برداشتن %(name)s از فهرست گپ‌ها.",
     "Please set a password!": "لطفا یک پسورد اختیار کنید!",
     "powered by Matrix": "قدرت‌یافته از ماتریکس",
     "You have successfully set a password!": "شما با موفقیت رمزتان را انتخاب کردید!",
@@ -71,7 +71,7 @@
     "Collecting logs": "درحال جمع‌آوری گزارش‌ها",
     "Search": "جستجو",
     "(HTTP status %(httpStatus)s)": "(HTTP وضعیت %(httpStatus)s)",
-    "Failed to forget room %(errCode)s": "فراموش کردن گپ‌گاه  %(errCode)s موفقیت‌آمیز نبود",
+    "Failed to forget room %(errCode)s": "فراموش کردن اتاق با خطا مواجه شد %(errCode)s",
     "Wednesday": "چهارشنبه",
     "Quote": "گفتآورد",
     "Send": "ارسال",
@@ -149,5 +149,78 @@
     "Restart": "شروع دوباره",
     "Upgrade your %(brand)s": "ارتقای %(brand)s تان",
     "A new version of %(brand)s is available!": "نگارشی جدید از %(brand)s موجود است!",
-    "Guest": "مهمان"
+    "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.": "برای تأیید افزودن این نشانی رایانامه، دکمهٔ زیر را بزنید.",
+    "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": "خطا در تائید آدرس ایمیل: مطمئن شوید که بر روی لینک موجود در ایمیل کلیک کرده اید",
+    "Forget room": "فراموش کردن اتاق",
+    "Filter room members": "فیلتر کردن اعضای اتاق",
+    "Failure to create room": "ایجاد اتاق با خطا مواجه شد",
+    "Failed to upload profile picture!": "آپلود عکس پروفایل با خطا مواجه شد!",
+    "Failed to unban": "رفع مسدودیت با خطا مواجه شد",
+    "Failed to set display name": "تنظیم نام نمایشی با خطا مواجه شد",
+    "Failed to send request.": "ارسال درخواست با خطا مواجه شد.",
+    "Failed to send email": "ارسال ایمیل با خطا مواجه شد",
+    "Failed to join room": "پیوستن به اتاق انجام نشد",
+    "Failed to ban user": "کاربر مسدود نشد",
+    "Error decrypting attachment": "خطا در رمزگشایی پیوست",
+    "%(senderName)s ended the call.": "%(senderName)s به تماس پایان داد.",
+    "Emoji": "شکلک",
+    "Email address": "آدرس ایمیل",
+    "Email": "ایمیل",
+    "Drop File Here": "پرونده را اینجا رها کنید",
+    "Download %(text)s": "دانلود 2%(text)s",
+    "Disinvite": "پس‌گرفتن دعوت",
+    "Default": "پیشفرض",
+    "Deops user with given id": "کاربر را با شناسه داده شده را از بین می برد",
+    "Decrypt %(text)s": "رمزگشایی %(text)s",
+    "Deactivate Account": "غیرفعال کردن حساب",
+    "/ddg is not a command": "/ddg یک فرمان نیست",
+    "Current password": "گذرواژه فعلی",
+    "Cryptography": "رمزنگاری",
+    "Create Room": "ایجاد اتاق",
+    "Confirm password": "تأیید گذرواژه",
+    "Commands": "فرمان‌ها",
+    "Command error": "خطای فرمان",
+    "Click here to fix": "برای رفع مشکل اینجا کلیک کنید",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s نام اتاق را حذف کرد.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s عکس پروفایل خود را تغییر داد.",
+    "Change Password": "تغییر گذواژه",
+    "Banned users": "کاربران مسدود شده",
+    "Autoplay GIFs and videos": "پخش خودکار GIF و فیلم",
+    "Attachment": "پیوست",
+    "Are you sure you want to reject the invitation?": "آیا مطمئن هستید که می خواهید دعوت را رد کنید؟",
+    "Are you sure you want to leave the room '%(roomName)s'?": "آیا مطمئن هستید که می خواهید از اتاق '2%(roomName)s' خارج شوید؟",
+    "Are you sure?": "مطمئنی؟",
+    "Anyone who knows the room's link, including guests": "هرکسی که لینک اتاق را می داند و کاربران مهمان",
+    "Anyone who knows the room's link, apart from guests": "هرکسی که لینک اتاق را می‌داند، غیر از کاربران مهمان",
+    "Anyone": "هر کس",
+    "An error has occurred.": "خطایی رخ داده است.",
+    "%(senderName)s answered the call.": "%(senderName)s تماس را پاسخ داد.",
+    "A new password must be entered.": "گذواژه جدید باید وارد شود.",
+    "Authentication": "احراز هویت",
+    "Always show message timestamps": "همیشه مهر زمان‌های پیام را نشان بده",
+    "Advanced": "پیشرفته",
+    "Camera": "دوربین",
+    "Microphone": "میکروفون",
+    "Default Device": "دستگاه پیشفرض",
+    "No media permissions": "عدم مجوز رسانه",
+    "No Webcams detected": "هیچ وبکمی شناسایی نشد",
+    "No Microphones detected": "هیچ میکروفونی شناسایی نشد",
+    "Admin": "ادمین",
+    "Add": "افزودن",
+    "Access Token:": "توکن دسترسی:",
+    "Account": "حساب کابری",
+    "Incorrect verification code": "کد فعال‌سازی اشتباه است",
+    "Incorrect username and/or password.": "نام کاربری و یا گذرواژه اشتباه است.",
+    "I have verified my email address": "ایمیل خود را تأید کردم",
+    "Home": "خانه",
+    "Hangup": "قطع",
+    "For security, this session has been signed out. Please sign in again.": "برای امنیت، این نشست نامعتبر شده است. لطفاً دوباره وارد سیستم شوید."
 }
diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index c6abfc0de7..74fd5f5a9a 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -26,9 +26,9 @@
     "Admin": "Ylläpitäjä",
     "Allow": "Salli",
     "No Microphones detected": "Mikrofonia ei löytynyt",
-    "No Webcams detected": "Webkameraa ei löytynyt",
+    "No Webcams detected": "Kameroita ei löytynyt",
     "No media permissions": "Ei mediaoikeuksia",
-    "You may need to manually permit %(brand)s to access your microphone/webcam": "Voit joutua antamaan %(brand)sille luvan mikrofonin/webkameran käyttöön",
+    "You may need to manually permit %(brand)s to access your microphone/webcam": "Voit joutua antamaan %(brand)sille luvan mikrofonin/kameran käyttöön",
     "Default Device": "Oletuslaite",
     "Microphone": "Mikrofoni",
     "Camera": "Kamera",
@@ -76,7 +76,7 @@
     "Custom": "Mukautettu",
     "Custom level": "Mukautettu taso",
     "/ddg is not a command": "/ddg ei ole komento",
-    "Deactivate Account": "Deaktivoi tili",
+    "Deactivate Account": "Poista tili pysyvästi",
     "Decline": "Hylkää",
     "Default": "Oletus",
     "Disinvite": "Peru kutsu",
@@ -103,7 +103,7 @@
     "Failed to send request.": "Pyynnön lähettäminen epäonnistui.",
     "Failed to set display name": "Näyttönimen asettaminen epäonnistui",
     "Failed to unban": "Porttikiellon poistaminen epäonnistui",
-    "Failed to upload profile picture!": "Profiilikuvan lataaminen epäonnistui!",
+    "Failed to upload profile picture!": "Profiilikuvan lähetys epäonnistui!",
     "Failed to verify email address: make sure you clicked the link in the email": "Sähköpostin vahvistus epäonnistui: varmista, että klikkasit sähköpostissa olevaa linkkiä",
     "Failure to create room": "Huoneen luominen epäonnistui",
     "Favourites": "Suosikit",
@@ -136,7 +136,7 @@
     "Logout": "Kirjaudu ulos",
     "Low priority": "Matala prioriteetti",
     "Manage Integrations": "Hallinnoi integraatioita",
-    "Moderator": "Moderaattori",
+    "Moderator": "Valvoja",
     "Name": "Nimi",
     "New passwords don't match": "Uudet salasanat eivät täsmää",
     "New passwords must match each other.": "Uusien salasanojen on vastattava toisiaan.",
@@ -186,8 +186,8 @@
     "unknown caller": "tuntematon soittaja",
     "Unmute": "Poista mykistys",
     "Unnamed Room": "Nimeämätön huone",
-    "Uploading %(filename)s and %(count)s others|zero": "Ladataan %(filename)s",
-    "Uploading %(filename)s and %(count)s others|one": "Ladataan %(filename)s ja %(count)s muuta",
+    "Uploading %(filename)s and %(count)s others|zero": "Lähetetään %(filename)s",
+    "Uploading %(filename)s and %(count)s others|one": "Lähetetään %(filename)s ja %(count)s muuta",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s vaihtoi huoneen nimeksi %(roomName)s.",
     "Enable automatic language detection for syntax highlighting": "Ota automaattinen kielentunnistus käyttöön syntaksikorostusta varten",
     "%(senderName)s ended the call.": "%(senderName)s lopetti puhelun.",
@@ -302,10 +302,10 @@
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s poisti porttikiellon käyttäjältä %(targetName)s.",
     "Unable to capture screen": "Ruudun kaappaus epäonnistui",
     "Unable to enable Notifications": "Ilmoitusten käyttöönotto epäonnistui",
-    "Uploading %(filename)s and %(count)s others|other": "Ladataan %(filename)s ja %(count)s muuta",
-    "Upload Failed": "Lataus epäonnistui",
-    "Upload file": "Lataa tiedosto",
-    "Upload new:": "Lataa uusi:",
+    "Uploading %(filename)s and %(count)s others|other": "Lähetetään %(filename)s ja %(count)s muuta",
+    "Upload Failed": "Lähetys epäonnistui",
+    "Upload file": "Lähetä tiedostoja",
+    "Upload new:": "Lähetä uusi:",
     "Usage": "Käyttö",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s vaihtoi aiheeksi \"%(topic)s\".",
     "Define the power level of a user": "Määritä käyttäjän oikeustaso",
@@ -325,7 +325,7 @@
     "(could not connect media)": "(mediaa ei voitu yhdistää)",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s veti takaisin käyttäjän %(targetName)s kutsun.",
     "You seem to be in a call, are you sure you want to quit?": "Sinulla näyttää olevan puhelu kesken. Haluatko varmasti lopettaa?",
-    "You seem to be uploading files, are you sure you want to quit?": "Näytät lataavan tiedostoja. Oletko varma että haluat lopettaa?",
+    "You seem to be uploading files, are you sure you want to quit?": "Näytät lähettävän tiedostoja. Oletko varma että haluat lopettaa?",
     "Jan": "tammi",
     "Feb": "helmi",
     "Mar": "maalis",
@@ -348,7 +348,7 @@
     "Error decrypting video": "Virhe purettaessa videon salausta",
     "Add an Integration": "Lisää integraatio",
     "URL Previews": "URL-esikatselut",
-    "Drop file here to upload": "Pudota tiedosto tähän ladataksesi sen palvelimelle",
+    "Drop file here to upload": "Pudota tiedosto tähän lähettääksesi sen palvelimelle",
     " (unsupported)": " (ei tuettu)",
     "Check for update": "Tarkista päivitykset",
     "Username available": "Käyttäjätunnus saatavilla",
@@ -364,7 +364,7 @@
     "Skip": "Ohita",
     "Example": "Esimerkki",
     "Create": "Luo",
-    "Failed to upload image": "Kuvan lataaminen epäonnistui",
+    "Failed to upload image": "Kuvan lähetys epäonnistui",
     "Add a widget": "Lisää sovelma",
     "Cannot add any more widgets": "Enempää sovelmia ei voida lisätä",
     "Delete widget": "Poista sovelma",
@@ -375,7 +375,7 @@
     "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.": "Viedyn tiedoston avulla kuka tahansa pystyy purkamaan kaikki salatut viestit jotka voit nähdä, joten sinun täytyy säilyttää sitä huolellisesti. Helpottaaksesi tätä, syötä alle salasana jonka avulla viedyt tiedot salataan. Voit myöhemmin tuoda tiedot ainoastaan samalla salasanalla.",
     "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.": "Tämä prosessi mahdollistaa aiemmin tallennettujen salausavainten tuominen toiseen Matrix-asiakasohjelmaan. Tämän jälkeen voit purkaa kaikki salatut viestit jotka toinen asiakasohjelma pystyisi purkamaan.",
     "Who would you like to add to this community?": "Kenet haluaisit lisätä tähän yhteisöön?",
-    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Varoitus: henkilöt, jotka lisäät yhteisöön, näkyvät kaikille jotka tietävät yhteisön tunnisteen",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Varoitus: kaikki yhteisöön lisätyt henkilöt näkyvät kaikille, jotka tietävät yhteisön tunnuksen",
     "Invite new community members": "Kutsu uusia jäseniä yhteisöön",
     "Invite to Community": "Kutsu yhteisöön",
     "Which rooms would you like to add to this community?": "Mitkä huoneet haluaisit lisätä tähän yhteisöön?",
@@ -391,7 +391,7 @@
     "You are no longer ignoring %(userId)s": "Huomioit jälleen käyttäjän %(userId)s",
     "%(senderName)s removed their profile picture.": "%(senderName)s poisti profiilikuvansa.",
     "%(senderName)s set a profile picture.": "%(senderName)s asetti profiilikuvan.",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s muutti tulevat viestit näkyviksi kaikille huoneen jäsenille, alkaen kutsusta huoneeseen.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s muutti tulevan huonehistorian näkyväksi kaikille huoneen jäsenille heidän kutsumisestaan alkaen.",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s teki tulevan huonehistorian näkyväksi kaikille huoneen jäsenille, heidän liittymisestään alkaen.",
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s teki tulevan huonehistorian näkyväksi kaikille huoneen jäsenille.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s teki tulevan huonehistorian näkyväksi kaikille.",
@@ -405,13 +405,13 @@
     "Enable URL previews by default for participants in this room": "Ota linkkien esikatselu käyttöön kaikille huoneen jäsenille",
     "%(senderName)s sent an image": "%(senderName)s lähetti kuvan",
     "%(senderName)s sent a video": "%(senderName)s lähetti videon",
-    "%(senderName)s uploaded a file": "%(senderName)s latasi tiedoston",
+    "%(senderName)s uploaded a file": "%(senderName)s lähetti tiedoston",
     "Disinvite this user?": "Peru tämän käyttäjän kutsu?",
     "Kick this user?": "Poista tämä käyttäjä?",
     "Unban this user?": "Poista tämän käyttäjän porttikielto?",
     "Ban this user?": "Anna porttikielto tälle käyttäjälle?",
     "Unignore": "Huomioi käyttäjä jälleen",
-    "Ignore": "Jätä käyttäjä huomioimatta",
+    "Ignore": "Sivuuta",
     "Jump to read receipt": "Hyppää lukukuittaukseen",
     "Mention": "Mainitse",
     "Invite": "Kutsu",
@@ -425,16 +425,16 @@
     "World readable": "Täysin julkinen",
     "Guests can join": "Vierailijat voivat liittyä",
     "No rooms to show": "Ei näytettäviä huoneita",
-    "Upload avatar": "Lataa profiilikuva",
+    "Upload avatar": "Lähetä profiilikuva",
     "Community Invites": "Yhteisökutsut",
     "Banned by %(displayName)s": "%(displayName)s antoi porttikiellon",
     "Privileged Users": "Etuoikeutetut käyttäjät",
     "Members only (since the point in time of selecting this option)": "Vain jäsenet (tämän valinnan tekemisestä lähtien)",
     "Members only (since they were invited)": "Vain jäsenet (kutsumisestaan lähtien)",
     "Members only (since they joined)": "Vain jäsenet (liittymisestään lähtien)",
-    "Invalid community ID": "Virheellinen yhteisötunniste",
-    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' on virheellinen yhteisötunniste",
-    "New community ID (e.g. +foo:%(localDomain)s)": "Uusi yhteisötunniste (esim. +foo:%(localDomain)s)",
+    "Invalid community ID": "Virheellinen yhteisön tunnus",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' on virheellinen yhteisön tunnus",
+    "New community ID (e.g. +foo:%(localDomain)s)": "Uusi yhteisön tunnus (esim. +foo:%(localDomain)s)",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s vaihtoi huoneen %(roomName)s kuvan",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s poisti huoneen kuvan.",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s vaihtoi huoneen kuvaksi <img/>",
@@ -467,11 +467,11 @@
     "Try using one of the following valid address types: %(validTypesList)s.": "Kokeile käyttää yhtä näistä kelvollisista osoitetyypeistä: %(validTypesList)s.",
     "You have entered an invalid address.": "Olet syöttänyt virheellisen sähköpostiosoitteen.",
     "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.": "Oletko varma että haluat poistaa tämän tapahtuman? Huomaa että jos poistat huoneen nimen tai aiheen muutoksen, saattaa muutos kumoutua.",
-    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Yhteisötunnisteet voivat sisältää vain merkkejä a-z, 0-9 tai '=_-/'",
+    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Yhteisön tunnukset voivat sisältää vain merkkejä a-z, 0-9 tai '=_-/'",
     "Something went wrong whilst creating your community": "Jokin meni pieleen yhteisön luomisessa",
     "Create Community": "Luo yhteisö",
     "Community Name": "Yhteisön nimi",
-    "Community ID": "Yhteisötunniste",
+    "Community ID": "Yhteisön tunnus",
     "example": "esimerkki",
     "Add rooms to the community summary": "Lisää huoneita yhteisön yhteenvetoon",
     "Which rooms would you like to add to this summary?": "Mitkä huoneet haluaisit lisätä tähän yhteenvetoon?",
@@ -512,7 +512,7 @@
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Huomaa että olet kirjautumassa palvelimelle %(hs)s, etkä palvelimelle matrix.org.",
     "Upload an avatar:": "Lataa profiilikuva:",
     "Deops user with given id": "Poistaa tunnuksen mukaiselta käyttäjältä ylläpito-oikeudet",
-    "Ignores a user, hiding their messages from you": "Jättää käyttäjän huomioimatta, jotta hänen viestejään ei näytetä sinulle",
+    "Ignores a user, hiding their messages from you": "Sivuuttaa käyttäjän, eli hänen viestejään ei näytetä sinulle",
     "Stops ignoring a user, showing their messages going forward": "Lopettaa käyttäjän huomiotta jättämisen, jotta hänen viestinsä näytetään sinulle",
     "Notify the whole room": "Ilmoita koko huoneelle",
     "Room Notification": "Huoneilmoitus",
@@ -521,13 +521,13 @@
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s %(day)s. %(monthName)s %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s %(day)s. %(monthName)s %(fullYear)s %(time)s",
-    "Ignored user": "Estetty käyttäjä",
+    "Ignored user": "Sivuutettu käyttäjä",
     "Unignored user": "Sallittu käyttäjä",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s tasolta %(fromPowerLevel)s tasolle %(toPowerLevel)s",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s muutti %(powerLevelDiffText)s:n oikeustasoa.",
-    "%(widgetName)s widget modified by %(senderName)s": "%(senderName)s muutti pienoisohjelmaa %(widgetName)s",
-    "%(widgetName)s widget added by %(senderName)s": "%(senderName)s lisäsi pienoisohjelman %(widgetName)s",
-    "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s poisti pienoisohjelman %(widgetName)s",
+    "%(widgetName)s widget modified by %(senderName)s": "%(senderName)s muokkasi sovelmaa %(widgetName)s",
+    "%(widgetName)s widget added by %(senderName)s": "%(senderName)s lisäsi sovelman %(widgetName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s poisti sovelman %(widgetName)s",
     "Send": "Lähetä",
     "Ongoing conference call%(supportedText)s.": "Menossa oleva ryhmäpuhelu %(supportedText)s.",
     "%(duration)ss": "%(duration)s s",
@@ -549,7 +549,7 @@
     "URL previews are disabled by default for participants in this room.": "URL-esikatselut ovat oletuksena pois päältä tämän huoneen jäsenillä.",
     "Token incorrect": "Väärä tunniste",
     "Something went wrong when trying to get your communities.": "Jokin meni pieleen yhteisöjäsi haettaessa.",
-    "Delete Widget": "Poista pienoisohjelma",
+    "Delete Widget": "Poista sovelma",
     "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s liittyivät",
     "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s liittyi %(count)s kertaa",
     "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s liittyi",
@@ -591,7 +591,7 @@
     "expand": "laajenna",
     "collapse": "supista",
     "Display your community flair in rooms configured to show it.": "Näytä yhteisötyylisi huoneissa joissa ominaisuus on päällä.",
-    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Pienoisohjelman poistaminen poistaa sen kaikilta huoneen käyttäjiltä. Oletko varma että haluat poistaa pienoisohjelman?",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Sovelman poistaminen poistaa sen kaikilta huoneen käyttäjiltä. Haluatko varmasti poistaa tämän sovelman?",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s liittyivät %(count)s kertaa",
     "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s vaihtoivat nimensä %(count)s kertaa",
     "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s vaihtoivat nimensä",
@@ -626,7 +626,7 @@
     "Send Custom Event": "Lähetä mukautettu tapahtuma",
     "Advanced notification settings": "Lisäasetukset ilmoituksille",
     "Forget": "Unohda",
-    "You cannot delete this image. (%(code)s)": "Et voi poistaa tätä kuvaa.  (%(code)s)",
+    "You cannot delete this image. (%(code)s)": "Et voi poistaa tätä kuvaa. (%(code)s)",
     "Cancel Sending": "Peruuta lähetys",
     "This Room": "Tämä huone",
     "Noisy": "Äänekäs",
@@ -701,8 +701,8 @@
     "Unhide Preview": "Näytä esikatselu",
     "Unable to join network": "Verkkoon liittyminen epäonnistui",
     "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Valitettavasti %(brand)s <b>ei</b> toimi selaimessasi.",
-    "Uploaded on %(date)s by %(user)s": "Ladattu %(date)s käyttäjän %(user)s toimesta",
-    "Messages in group chats": "Viestit ryhmäkeskusteluissa",
+    "Uploaded on %(date)s by %(user)s": "Lähetetty %(date)s käyttäjän %(user)s toimesta",
+    "Messages in group chats": "Viestit ryhmissä",
     "Yesterday": "Eilen",
     "Error encountered (%(errorDetail)s).": "Virhe: %(errorDetail)s.",
     "Low Priority": "Matala prioriteetti",
@@ -743,7 +743,7 @@
     "Every page you use in the app": "Jokainen sivu, jota käytät sovelluksessa",
     "e.g. <CurrentPageURL>": "esim. <CurrentPageURL>",
     "Your device resolution": "Laitteesi näytön tarkkuus",
-    "You do not have permission to start a conference call in this room": "Sinulla ei ole oikeutta aloittaa konferenssipuhelua tässä huoneessa",
+    "You do not have permission to start a conference call in this room": "Sinulla ei ole oikeutta aloittaa ryhmäpuhelua tässä huoneessa",
     "Upgrades a room to a new version": "Päivittää huoneen uuteen versioon",
     "Gets or sets the room topic": "Hakee tai asettaa huoneen aiheen",
     "This room has no topic.": "Tässä huoneessa ei ole aihetta.",
@@ -765,7 +765,7 @@
     "Show join/leave messages (invites/kicks/bans unaffected)": "Näytä liittymisten ja poistumisten viestit (ei vaikuta kutsuihin, huoneesta poistamisiin ja porttikieltoihin)",
     "Show developer tools": "Näytä kehitystyökalut",
     "Encrypted messages in one-to-one chats": "Salatut viestit kahdenkeskisissä keskusteluissa",
-    "Encrypted messages in group chats": "Salatut viestit ryhmäkeskusteluissa",
+    "Encrypted messages in group chats": "Salatut viestit ryhmissä",
     "The other party cancelled the verification.": "Toinen osapuoli perui varmennuksen.",
     "Verified!": "Varmennettu!",
     "You've successfully verified this user.": "Olet varmentanut tämän käyttäjän.",
@@ -798,7 +798,7 @@
     "Apple": "Omena",
     "Strawberry": "Mansikka",
     "Corn": "Maissi",
-    "Pizza": "Pizza",
+    "Pizza": "Pitsa",
     "Cake": "Kakku",
     "Heart": "Sydän",
     "Smiley": "Hymiö",
@@ -834,7 +834,7 @@
     "Pin": "Nuppineula",
     "Call in Progress": "Puhelu meneillään",
     "General": "Yleiset",
-    "Security & Privacy": "Tietoturva ja -suoja",
+    "Security & Privacy": "Tietoturva ja yksityisyys",
     "Roles & Permissions": "Roolit ja oikeudet",
     "Room Name": "Huoneen nimi",
     "Room Topic": "Huoneen aihe",
@@ -863,7 +863,7 @@
     "You don't currently have any stickerpacks enabled": "Sinulla ei ole tarrapaketteja käytössä",
     "Stickerpack": "Tarrapaketti",
     "Hide Stickers": "Piilota tarrat",
-    "Show Stickers": "Näytä tarrat",
+    "Show Stickers": "Tarrat",
     "Profile picture": "Profiilikuva",
     "Set a new account password...": "Aseta uusi salasana tilille...",
     "Set a new status...": "Aseta uusi tila...",
@@ -1030,7 +1030,7 @@
     "Thumbs up": "Peukut ylös",
     "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Lähetimme sinulle sähköpostin osoitteesi vahvistamiseksi. Noudata sähköpostissa olevia ohjeita, ja klikkaa sen jälkeen alla olevaa painiketta.",
     "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Oletko varma? Et voi lukea salattuja viestejäsi, mikäli avaimesi eivät ole kunnolla varmuuskopioituna.",
-    "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Salatut viestit turvataan kahdenkeskisellä salauksella. Vain sinä ja viestien vastaanottaja(t) omaavat avaimet näiden viestien lukemiseen.",
+    "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Salatut viestit turvataan päästä päähän -salauksella. Vain sinä ja viestien vastaanottaja(t) omaavat avaimet näiden viestien lukemiseen.",
     "Unable to load key backup status": "Avainten varmuuskopionnin tilan lukeminen epäonnistui",
     "Back up your keys before signing out to avoid losing them.": "Varmuuskopioi avaimesi ennen kuin kirjaudut ulos välttääksesi avainten menetyksen.",
     "Backing up %(sessionsRemaining)s keys...": "Varmuuskopioidaan %(sessionsRemaining)s avainta…",
@@ -1047,7 +1047,7 @@
     "Bug reporting": "Virheiden raportointi",
     "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.": "Jos olet ilmoittanut virheestä Githubin kautta, debug-lokit voivat auttaa meitä ongelman jäljittämisessä. Debug-lokit sisältävät sovelluksen käyttödataa sisältäen käyttäjätunnuksen, vierailemiesi huoneiden tai ryhmien tunnukset tai aliakset ja muiden käyttäjien käyttäjätunnukset. Debug-lokit eivät sisällä viestejä.",
     "Autocomplete delay (ms)": "Automaattisen täydennyksen viive (ms)",
-    "Ignored users": "Hiljennetyt käyttäjät",
+    "Ignored users": "Sivuutetut käyttäjät",
     "Bulk options": "Massatoimintoasetukset",
     "Key backup": "Avainvarmuuskopio",
     "Missing media permissions, click the button below to request.": "Mediaoikeuksia puuttuu. Klikkaa painikkeesta pyytääksesi oikeuksia.",
@@ -1096,10 +1096,10 @@
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Huoneen tyylin päivittämisessä tapahtui virhe. Palvelin ei välttämättä salli sitä tai kyseessä on tilapäinen virhe.",
     "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.": "Salatuissa huoneissa, kuten tässä, osoitteiden esikatselut ovat oletuksena pois käytöstä, jotta kotipalvelimesi (missä osoitteiden esikatselut luodaan) ei voi kerätä tietoa siitä, mitä linkkejä näet tässä huoneessa.",
     "Failed to remove widget": "Sovelman poisto epäonnistui",
-    "An error ocurred whilst trying to remove the widget from the room": "Sovelman poistossa huoneesta tapahtui virhe",
+    "An error ocurred whilst trying to remove the widget from the room": "Poistaessa sovelmaa huoneesta tapahtui virhe",
     "Minimize apps": "Pienennä sovellukset",
     "Popout widget": "Avaa sovelma omassa ikkunassaan",
-    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Lisää ”¯\\_(ツ)_/¯” viestin alkuun",
+    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Lisää ¯\\_(ツ)_/¯ viestin alkuun",
     "User %(userId)s is already in the room": "Käyttäjä %(userId)s on jo huoneessa",
     "The user must be unbanned before they can be invited.": "Käyttäjän porttikielto täytyy poistaa ennen kutsumista.",
     "<a>Upgrade</a> to your own domain": "<a>Päivitä</a> omaan verkkotunnukseen",
@@ -1130,13 +1130,13 @@
     "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.": "Debug-lokit sisältävät sovelluksen käyttödataa, kuten käyttäjätunnuksesi, vierailemiesi huoneiden ja ryhmien tunnukset tai aliakset, sekä muiden käyttäjien käyttäjätunnukset. Ne eivät sisällä viestejä.",
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Ennen lokien lähettämistä sinun täytyy <a>luoda Githubiin issue (kysymys/ongelma)</a>, joka sisältää kuvauksen ongelmastasi.",
     "Unable to load commit detail: %(msg)s": "Commitin tietojen hakeminen epäonnistui: %(msg)s",
-    "Community IDs cannot be empty.": "Yhteisön ID:t eivät voi olla tyhjänä.",
+    "Community IDs cannot be empty.": "Yhteisön tunnukset eivät voi olla tyhjänä.",
     "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of %(brand)s to do this": "Jotta et menetä keskusteluhistoriaasi, sinun täytyy tallentaa huoneen avaimet ennen kuin kirjaudut ulos. Joudut käyttämään uudempaa %(brand)sin versiota tätä varten",
     "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>": "Tämä tekee tilistäsi lopullisesti käyttökelvottoman. Et voi kirjautua sisään, eikä kukaan voi rekisteröidä samaa käyttäjätunnusta. Tilisi poistuu kaikista huoneista, joihin se on liittynyt, ja tilisi tiedot poistetaan identiteettipalvelimeltasi. <b>Tämä toimenpidettä ei voi kumota.</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.": "Tilisi poistaminen käytöstä <b>ei oletuksena saa meitä unohtamaan lähettämiäsi viestejä.</b> Jos haluaisit meidän unohtavan viestisi, rastita alla oleva ruutu.",
     "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.": "Viestien näkyvyys Matrixissa on samantapainen kuin sähköpostissa. Vaikka se, että unohdamme viestisi, tarkoittaa, ettei viestejäsi jaeta enää uusille tai rekisteröitymättömille käyttäjille, käyttäjät, jotka ovat jo saaneet viestisi pystyvät lukemaan jatkossakin omaa kopiotaan viesteistäsi.",
-    "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)": "Unohda kaikki viestit, jotka olen lähettänyt, kun tilini on poistettu käytöstä (b>Varoitus:</b> tästä seuraa, että tulevat käyttäjät näkevät epätäydellisen version keskusteluista)",
-    "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Varmenna tämä käyttäjä merkitäksesi hänet luotetuksi. Käyttäjiin luottaminen antaa sinulle ylimääräistä mielenrauhaa käyttäessäsi osapuolten välistä salausta.",
+    "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)": "Unohda kaikki viestit, jotka olen lähettänyt, kun tilini poistetaan (<b>Varoitus:</b> tämä saa tulevat käyttäjät näkemään epätäydellisen version keskusteluista)",
+    "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Varmenna tämä käyttäjä merkitäksesi hänet luotetuksi. Käyttäjiin luottaminen antaa sinulle ylimääräistä mielenrauhaa käyttäessäsi päästä päähän -salausta.",
     "Waiting for partner to confirm...": "Odotetaan, että toinen osapuoli varmistaa...",
     "Incoming Verification Request": "Saapuva varmennuspyyntö",
     "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.": "Olet aikaisemmin käytttänyt %(brand)sia laitteella %(host)s, jossa oli jäsenten laiska lataus käytössä. Tässä versiossa laiska lataus on pois käytöstä. Koska paikallinen välimuisti ei ole yhteensopiva näiden kahden asetuksen välillä, %(brand)sin täytyy synkronoida tilisi tiedot uudelleen.",
@@ -1232,7 +1232,7 @@
     "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.": "Sovelma osoitteessa %(widgetUrl)s haluaisi todentaa henkilöllisyytesi. Jos sallit tämän, sovelma pystyy todentamaan käyttäjätunnuksesi, muttei voi toimia nimissäsi.",
     "Remember my selection for this widget": "Muista valintani tälle sovelmalle",
     "Deny": "Kiellä",
-    "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.": "Tunnistimme dataa, joka on lähtöisin vanhasta %(brand)sin versiosta. Tämä aiheuttaa toimintahäiriöitä osapuolten välisessä salauksessa vanhassa versiossa. Viestejä, jotka on salattu osapuolten välisellä salauksella vanhalla versiolla, ei välttämättä voida purkaa tällä versiolla. Tämä voi myös aiheuttaa epäonnistumisia viestien välityksessä tämän version kanssa. Jos kohtaat ongelmia, kirjaudu ulos ja takaisin sisään. Säilyttääksesi viestihistoriasi, vie salausavaimesi ja tuo ne uudelleen.",
+    "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.": "Tunnistimme dataa, joka on lähtöisin vanhasta %(brand)sin versiosta. Tämä aiheuttaa toimintahäiriöitä päästä päähän -salauksessa vanhassa versiossa. Viestejä, jotka on salattu päästä päähän -salauksella vanhalla versiolla, ei välttämättä voida purkaa tällä versiolla. Tämä voi myös aiheuttaa epäonnistumisia viestien välityksessä tämän version kanssa. Jos kohtaat ongelmia, kirjaudu ulos ja takaisin sisään. Säilyttääksesi viestihistoriasi, vie salausavaimesi ja tuo ne uudelleen.",
     "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s epäonnistui protokollalistan hakemisessa kotipalvelimelta. Kotipalvelin saattaa olla liian vanha tukeakseen kolmannen osapuolen verkkoja.",
     "%(brand)s failed to get the public room list.": "%(brand)s ei onnistunut hakemaan julkista huoneluetteloa.",
     "The homeserver may be unavailable or overloaded.": "Kotipalvelin saattaa olla saavuttamattomissa tai ylikuormitettuna.",
@@ -1250,15 +1250,15 @@
     "If you don't want to set this up now, you can later in Settings.": "Jos et halua ottaa tätä käyttöön nyt, voit tehdä sen myöhemmin asetuksissa.",
     "Set up": "Ota käyttöön",
     "New Recovery Method": "Uusi palautustapa",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "Uusi palautuksen salalause ja avain salatuille viesteille on löydetty.",
+    "A new recovery passphrase and key for Secure Messages have been detected.": "Uusi palautuksen salasana ja avain salatuille viesteille on löydetty.",
     "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.": "Jos et ottanut käyttöön uutta palautustapaa, hyökkääjä saattaa yrittää käyttää tiliäsi. Vaihda tilisi salasana ja aseta uusi palautustapa asetuksissa välittömästi.",
     "Set up Secure Messages": "Ota käyttöön salatut viestit",
     "Recovery Method Removed": "Palautustapa poistettu",
     "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.": "Jos et poistanut palautustapaa, hyökkääjä saattaa yrittää käyttää tiliäsi. Vaihda tilisi salasana ja aseta uusi palautustapa asetuksissa välittömästi.",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Käytätkö 'leivänmuruja' (kuvia huoneluettelon yläpuolella) vai et",
     "Replying With Files": "Tiedostoilla vastaaminen",
-    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Tiedostolla vastaaminen ei onnistu tällä erää. Haluatko ladata tiedoston vastaamatta?",
-    "The file '%(fileName)s' failed to upload.": "Tiedoston '%(fileName)s' lataaminen ei onnistunut.",
+    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Tiedostolla vastaaminen ei ole mahdollista tällä kertaa. Haluatko lähettää tiedoston vastaamatta?",
+    "The file '%(fileName)s' failed to upload.": "Tiedoston '%(fileName)s' lähettäminen ei onnistunut.",
     "The server does not support the room version specified.": "Palvelin ei tue määritettyä huoneversiota.",
     "Changes your avatar in this current room only": "Vaihtaa kuvasi vain nykyisessä huoneessa",
     "Sends the given message coloured as a rainbow": "Lähettää viestin sateenkaaren väreissä",
@@ -1296,14 +1296,14 @@
     "Missing session data": "Istunnon dataa puuttuu",
     "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Istunnon dataa, mukaan lukien salausavaimia, puuttuu. Kirjaudu ulos ja sisään, jolloin avaimet palautetaan varmuuskopiosta.",
     "Your browser likely removed this data when running low on disk space.": "Selaimesi luultavasti poisti tämän datan, kun levytila oli vähissä.",
-    "Upload files (%(current)s of %(total)s)": "Lataa tiedostot (%(current)s / %(total)s)",
-    "Upload files": "Lataa tiedostot",
-    "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Tiedostot ovat <b>liian isoja</b> ladattaviksi. Tiedoston kokoraja on %(limit)s.",
-    "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Osa tiedostoista on <b>liian isoja</b> ladattaviksi. Tiedoston kokoraja on %(limit)s.",
-    "Upload %(count)s other files|other": "Lataa %(count)s muuta tiedostoa",
-    "Upload %(count)s other files|one": "Lataa %(count)s muu tiedosto",
+    "Upload files (%(current)s of %(total)s)": "Lähettää tiedostoa (%(current)s / %(total)s)",
+    "Upload files": "Lähetä tiedostot",
+    "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Tiedostot ovat <b>liian isoja</b> lähetettäväksi. Tiedoston kokoraja on %(limit)s.",
+    "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Osa tiedostoista on <b>liian isoja</b> lähetettäväksi. Tiedoston kokoraja on %(limit)s.",
+    "Upload %(count)s other files|other": "Lähetä %(count)s muuta tiedostoa",
+    "Upload %(count)s other files|one": "Lähetä %(count)s muu tiedosto",
     "Cancel All": "Peruuta kaikki",
-    "Upload Error": "Latausvirhe",
+    "Upload Error": "Lähetysvirhe",
     "Use an email address to recover your account": "Voit palauttaa tilisi sähköpostiosoitteen avulla",
     "Enter email address (required on this homeserver)": "Syötä sähköpostiosoite (vaaditaan tällä kotipalvelimella)",
     "Doesn't look like a valid email address": "Ei näytä kelvolliselta sähköpostiosoitteelta",
@@ -1324,7 +1324,7 @@
     "edited": "muokattu",
     "To help us prevent this in future, please <a>send us logs</a>.": "Voit auttaa meitä estämään tämän toistumisen <a>lähettämällä meille lokeja</a>.",
     "Name or Matrix ID": "Nimi tai Matrix-tunnus",
-    "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Tiedosto on <b>liian iso</b> ladattavaksi. Tiedostojen kokoraja on %(limit)s mutta tämä tiedosto on %(sizeOfThisFile)s.",
+    "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Tiedosto on <b>liian iso</b> lähetettäväksi. Tiedostojen kokoraja on %(limit)s mutta tämä tiedosto on %(sizeOfThisFile)s.",
     "Unbans user with given ID": "Poistaa porttikiellon tunnuksen mukaiselta käyttäjältä",
     "No homeserver URL provided": "Kotipalvelimen osoite puuttuu",
     "Unexpected error resolving homeserver configuration": "Odottamaton virhe selvitettäessä kotipalvelimen asetuksia",
@@ -1349,7 +1349,7 @@
     "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.": "Voit kirjautua, mutta osa toiminnoista on pois käytöstä kunnes identiteettipalvelin on jälleen toiminnassa. Jos tämä varoitus toistuu, tarkista asetuksesi tai ota yhteyttä palvelimen ylläpitäjään.",
     "Unexpected error resolving identity server configuration": "Odottamaton virhe selvitettäessä identiteettipalvelimen asetuksia",
     "Low bandwidth mode": "Matalan kaistanleveyden tila",
-    "Uploaded sound": "Ladattu ääni",
+    "Uploaded sound": "Asetettu ääni",
     "Sounds": "Äänet",
     "Notification sound": "Ilmoitusääni",
     "Reset": "Palauta alkutilaan",
@@ -1367,7 +1367,7 @@
     "Edited at %(date)s. Click to view edits.": "Muokattu %(date)s. Klikkaa nähdäksesi muokkaukset.",
     "Message edits": "Viestin muokkaukset",
     "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:": "Tämän huoneen päivittäminen edellyttää huoneen nykyisen instanssin sulkemista ja uuden huoneen luomista sen tilalle. Jotta tämä kävisi huoneen jäsenten kannalta mahdollisimman sujuvasti, teemme seuraavaa:",
-    "Upload all": "Lataa kaikki palvelimelle",
+    "Upload all": "Lähetä kaikki palvelimelle",
     "Upload": "Lähetä",
     "Changes your avatar in all rooms": "Vaihtaa kuvasi kaikissa huoneissa",
     "%(senderName)s made no change.": "%(senderName)s ei tehnyt muutoksia.",
@@ -1431,12 +1431,12 @@
     "Terms of service not accepted or the identity server is invalid.": "Käyttöehtoja ei ole hyväksytty tai identiteettipalvelin ei ole kelvollinen.",
     "Enter a new identity server": "Syötä uusi identiteettipalvelin",
     "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Hyväksy identiteettipalvelimen (%(serverName)s) käyttöehdot (Terms of Service), jotta sinut voi löytää sähköpostiosoitteen tai puhelinnumeron perusteella.",
-    "Deactivate account": "Deaktivoi tili",
+    "Deactivate account": "Poista tili pysyvästi",
     "Remove %(email)s?": "Poista %(email)s?",
     "Remove %(phone)s?": "Poista %(phone)s?",
     "Command Help": "Komento-ohje",
-    "This account has been deactivated.": "Tämä tili on deaktivoitu.",
-    "Sends a message as plain text, without interpreting it as markdown": "Lähettää viestin pelkkänä tekstinä, tulkitsematta sitä markdownina",
+    "This account has been deactivated.": "Tämä tili on poistettu.",
+    "Sends a message as plain text, without interpreting it as markdown": "Lähettää viestin sellaisenaan, tulkitsematta sitä markdownina",
     "You do not have the required permissions to use this command.": "Sinulla ei ole vaadittavia oikeuksia tämän komennon käyttämiseksi.",
     "Use an identity server": "Käytä identiteettipalvelinta",
     "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Ellet halua käyttää palvelinta <server /> löytääksesi tuntemiasi ihmisiä ja tullaksesi löydetyksi, syötä toinen identiteettipalvelin alle.",
@@ -1467,7 +1467,7 @@
     "Strikethrough": "Yliviivattu",
     "Code block": "Ohjelmakoodia",
     "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Kutsu huoneeseen %(roomName)s lähetettiin osoitteeseen %(email)s, joka ei ole yhteydessä tiliisi",
-    "Filter": "Suodata",
+    "Filter": "Haku",
     "Filter rooms…": "Suodata huoneita…",
     "Changes the avatar of the current room": "Vaihtaa nykyisen huoneen kuvan",
     "Error changing power level requirement": "Virhe muutettaessa oikeustasovaatimusta",
@@ -1492,9 +1492,9 @@
     "Explore rooms": "Selaa huoneita",
     "ID": "Tunnus",
     "Unable to revoke sharing for phone number": "Puhelinnumeron jakamista ei voi kumota",
-    "Deactivate user?": "Deaktivoi käyttäjä?",
-    "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?": "Käyttäjän deaktivoiminen kirjaa hänet ulos ja estää häntä kirjautumasta takaisin sisään. Lisäksi hän poistuu kaikista huoneista, joissa hän on. Tätä toimintoa ei voi kumota. Oletko varma, että haluat deaktivoida tämän käyttäjän?",
-    "Deactivate user": "Deaktivoi käyttäjä",
+    "Deactivate user?": "Poista käyttäjä pysyvästi?",
+    "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?": "Käyttäjän poistaminen kirjaa hänet ulos ja estää häntä kirjautumasta takaisin sisään. Lisäksi hän poistuu kaikista huoneista, joissa hän on. Tätä toimintoa ei voi kumota. Oletko varma, että haluat pysyvästi poistaa tämän käyttäjän?",
+    "Deactivate user": "Poista käyttäjä pysyvästi",
     "Link this email with your account in Settings to receive invites directly in %(brand)s.": "Linkitä tämä sähköposti tilisi kanssa asetuksissa, jotta voit saada kutsuja suoraan %(brand)sissa.",
     "e.g. my-room": "esim. oma-huone",
     "Please enter a name for the room": "Syötä huoneelle nimi",
@@ -1541,7 +1541,7 @@
     "Jump to first invite.": "Siirry ensimmäiseen kutsuun.",
     "DuckDuckGo Results": "DuckDuckGo-tulokset",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Tekstiviesti on lähetetty numeroon +%(msisdn)s. Syötä siinä oleva varmistuskoodi.",
-    "Failed to deactivate user": "Käyttäjän deaktivointi epäonnistui",
+    "Failed to deactivate user": "Käyttäjän poistaminen epäonnistui",
     "Hide advanced": "Piilota edistyneet",
     "Show advanced": "Näytä edistyneet",
     "Document": "Asiakirja",
@@ -1591,7 +1591,7 @@
     "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Voit käyttää identiteettipalvelinta lähettääksesi sähköpostikutsuja. Klikkaa Jatka käyttääksesi oletuspalvelinta (%(defaultIdentityServerName)s) tai syötä eri palvelin asetuksissa.",
     "Use an identity server to invite by email. Manage in Settings.": "Voit käyttää identiteettipalvelinta sähköpostikutsujen lähettämiseen.",
     "Multiple integration managers": "Useita integraatiolähteitä",
-    "Try out new ways to ignore people (experimental)": "Kokeile uusia tapoja käyttäjien huomiotta jättämiseen (kokeellinen)",
+    "Try out new ways to ignore people (experimental)": "Kokeile uusia tapoja käyttäjien sivuuttamiseen (kokeellinen)",
     "Match system theme": "Käytä järjestelmän teemaa",
     "Decline (%(counter)s)": "Hylkää (%(counter)s)",
     "Connecting to integration manager...": "Yhdistetään integraatioiden lähteeseen...",
@@ -1602,25 +1602,25 @@
     "Manage integrations": "Hallitse integraatioita",
     "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integraatioiden lähteet vastaanottavat asetusdataa ja voivat muokata sovelmia, lähettää kutsuja huoneeseen ja asettaa oikeustasoja puolestasi.",
     "Discovery": "Käyttäjien etsintä",
-    "Ignored/Blocked": "Jätetty huomiotta/estetty",
-    "Error adding ignored user/server": "Ongelma huomiotta jätetyn käyttäjän/palvelimen lisäämisessä",
+    "Ignored/Blocked": "Sivuutettu/estetty",
+    "Error adding ignored user/server": "Virhe sivuutetun käyttäjän/palvelimen lisäämisessä",
     "Error subscribing to list": "Virhe listalle liityttäessä",
-    "Error removing ignored user/server": "Ongelma huomiotta jätetyn käyttäjän/palvelimen poistamisessa",
+    "Error removing ignored user/server": "Virhe sivuutetun käyttäjän/palvelimen poistamisessa",
     "Error unsubscribing from list": "Virhe listalta poistuttaessa",
     "Ban list rules - %(roomName)s": "Estolistan säännöt - %(roomName)s",
     "Server rules": "Palvelinehdot",
     "User rules": "Käyttäjäehdot",
-    "You have not ignored anyone.": "Et ole jättänyt ketään huomiotta.",
+    "You have not ignored anyone.": "Et ole sivuuttanut ketään.",
     "You are currently ignoring:": "Jätät tällä hetkellä huomiotta:",
     "You are not subscribed to any lists": "Et ole liittynyt yhteenkään listaan",
     "You are currently subscribed to:": "Olet tällä hetkellä liittynyt:",
     "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.": "Käyttäjien huomiotta jättäminen tapahtuu estolistojen kautta, joissa on tieto siitä, kenet pitää estää. Estolistalle liittyminen tarkoittaa, että ne käyttäjät/palvelimet, jotka tämä lista estää, eivät näy sinulle.",
     "Personal ban list": "Henkilökohtainen estolista",
     "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.": "Henkilökohtainen estolistasi sisältää kaikki käyttäjät/palvelimet, joilta et henkilökohtaisesti halua nähdä viestejä. Sen jälkeen, kun olet estänyt ensimmäisen käyttäjän/palvelimen, huonelistaan ilmestyy uusi huone nimeltä ”Tekemäni estot” (englanniksi ”My Ban List”). Pysy tässä huoneessa, jotta estolistasi pysyy voimassa.",
-    "Server or user ID to ignore": "Huomiotta jätettävä palvelin tai käyttäjätunnus",
+    "Server or user ID to ignore": "Sivuutettava palvelin tai käyttäjätunnus",
     "Subscribed lists": "Tilatut listat",
     "Subscribing to a ban list will cause you to join it!": "Estolistan käyttäminen saa sinut liittymään listalle!",
-    "If this isn't what you want, please use a different tool to ignore users.": "Jos tämä ei ole mitä haluat, käytä eri työkalua käyttäjien huomiotta jättämiseen.",
+    "If this isn't what you want, please use a different tool to ignore users.": "Jos et halua tätä, käytä eri työkalua käyttäjien sivuuttamiseen.",
     "Integration Manager": "Integraatioiden lähde",
     "Read Marker lifetime (ms)": "Viestin luetuksi merkkaamisen kesto (ms)",
     "Click the link in the email you received to verify and then click continue again.": "Klikkaa lähettämässämme sähköpostissa olevaa linkkiä vahvistaaksesi tunnuksesi. Klikkaa sen jälkeen tällä sivulla olevaa painiketta ”Jatka”.",
@@ -1631,12 +1631,12 @@
     "Discovery options will appear once you have added a phone number above.": "Etsinnän asetukset näkyvät sen jälkeen, kun olet lisännyt puhelinnumeron.",
     "Failed to connect to integration manager": "Yhdistäminen integraatioiden lähteeseen epäonnistui",
     "Trusted": "Luotettu",
-    "Not trusted": "Epäluotettu",
-    "This client does not support end-to-end encryption.": "Tämä asiakasohjelma ei tue osapuolten välistä salausta.",
-    "Messages in this room are not end-to-end encrypted.": "Tämän huoneen viestit eivät ole salattuja.",
-    "Messages in this room are end-to-end encrypted.": "Tämän huoneen viestit ovat salattuja.",
+    "Not trusted": "Ei-luotettu",
+    "This client does not support end-to-end encryption.": "Tämä asiakasohjelma ei tue päästä päähän -salausta.",
+    "Messages in this room are not end-to-end encrypted.": "Tämän huoneen viestit eivät ole päästä päähän -salattuja.",
+    "Messages in this room are end-to-end encrypted.": "Tämän huoneen viestit ovat päästä päähän -salattuja.",
     "Verify": "Varmenna",
-    "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Olet jättänyt tämän käyttäjän huomiotta, joten hänen viestit ovat piilotettu. <a>Näytä käyttäjän viestit.</a>",
+    "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Olet sivuuttanut tämän käyttäjän, joten hänen viestinsä on piilotettu. <a>Näytä silti.</a>",
     "You verified %(name)s": "Varmensit käyttäjän %(name)s",
     "You cancelled verifying %(name)s": "Peruutit käyttäjän %(name)s varmennuksen",
     "%(name)s cancelled verifying": "%(name)s peruutti varmennuksen",
@@ -1692,14 +1692,14 @@
     "Cross-signing and secret storage are enabled.": "Ristivarmennus ja salavarasto on käytössä.",
     "Cross-signing and secret storage are not yet set up.": "Ristivarmennusta ja salavarastoa ei ole vielä otettu käyttöön.",
     "Bootstrap cross-signing and secret storage": "Ota käyttöön ristivarmennus ja salavarasto",
-    "Cross-signing public keys:": "Ristivarmennuksen julkiset avaimet:",
+    "Cross-signing public keys:": "Ristiinvarmennuksen julkiset avaimet:",
     "not found": "ei löydetty",
-    "Cross-signing private keys:": "Ristivarmennuksen salaiset avaimet:",
+    "Cross-signing private keys:": "Ristiinvarmennuksen salaiset avaimet:",
     "in secret storage": "salavarastossa",
     "Secret storage public key:": "Salavaraston julkinen avain:",
-    "in account data": "tunnuksen tiedoissa",
+    "in account data": "tilin tiedoissa",
     "not stored": "ei tallennettu",
-    "Cross-signing": "Ristivarmennus",
+    "Cross-signing": "Ristiinvarmennus",
     "Backup has a <validity>valid</validity> signature from this user": "Varmuuskopiossa on <validity>kelvollinen</validity> allekirjoitus tältä käyttäjältä",
     "Backup has a <validity>invalid</validity> signature from this user": "Varmuuskopiossa on <validity>epäkelpo</validity> allekirjoitus tältä käyttäjältä",
     "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Varmuuskopiossa on <verify>tuntematon</verify> allekirjoitus käyttäjältä, jonka ID on %(deviceId)s",
@@ -1739,7 +1739,7 @@
     "Lock": "Lukko",
     "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Käytätkö %(brand)sia laitteella, jossa kosketus on ensisijainen syöttömekanismi",
     "Whether you're using %(brand)s as an installed Progressive Web App": "Käytätkö %(brand)sia asennettuna PWA:na (Progressive Web App)",
-    "Cancel entering passphrase?": "Peruuta salalauseen syöttäminen?",
+    "Cancel entering passphrase?": "Peruuta salasanan syöttäminen?",
     "Encryption upgrade available": "Salauksen päivitys saatavilla",
     "a few seconds ago": "muutama sekunti sitten",
     "about a minute ago": "noin minuutti sitten",
@@ -1808,7 +1808,7 @@
     "Suggestions": "Ehdotukset",
     "Your account is not secure": "Tilisi ei ole turvallinen",
     "Your password": "Salasanasi",
-    "Incorrect recovery passphrase": "Virheellinen palautuksen salalause",
+    "Incorrect recovery passphrase": "Virheellinen palautussalasana",
     "Enter recovery passphrase": "Syötä palautuksen salalause",
     "Enter recovery key": "Syötä palautusavain",
     "Confirm your identity by entering your account password below.": "Vahvista henkilöllisyytesi syöttämällä tilisi salasana alle.",
@@ -1829,7 +1829,7 @@
     "Use your account or create a new one to continue.": "Käytä tiliäsi tai luo uusi jatkaaksesi.",
     "Create Account": "Luo tili",
     "Session already verified!": "Istunto on jo vahvistettu!",
-    "WARNING: Session already verified, but keys do NOT MATCH!": "VAROITUS: Istunto on jo vahvistettu, mutta avaimet EIVÄT VASTAA!",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "VAROITUS: Istunto on jo vahvistettu, mutta avaimet EIVÄT TÄSMÄÄ!",
     "Not Trusted": "Ei luotettu",
     "Ask this user to verify their session, or manually verify it below.": "Pyydä tätä käyttäjää vahvistamaan istuntonsa, tai vahvista se manuaalisesti alla.",
     "a few seconds from now": "muutama sekunti sitten",
@@ -1846,13 +1846,13 @@
     "If you cancel now, you won't complete verifying your other session.": "Jos peruutat nyt, toista istuntoasi ei varmenneta.",
     "Setting up keys": "Otetaan avaimet käyttöön",
     "Verifies a user, session, and pubkey tuple": "Varmentaa käyttäjän, istunnon ja julkiset avaimet",
-    "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!": "VAROITUS: AVAIMEN VARMENTAMINEN EPÄONNISTUI! Käyttäjän %(userId)s ja laitteen %(deviceId)s istunnon allekirjoitusavain on ”%(fprint)s”, mikä ei täsmää annettuun avaimeen ”%(fingerprint)s”. Tämä voi tarkoittaa, että yhteyksiänne peukaloidaan!",
+    "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!": "VAROITUS: AVAIMEN VARMENTAMINEN EPÄONNISTUI! Käyttäjän %(userId)s ja laitteen %(deviceId)s istunnon allekirjoitusavain on ”%(fprint)s”, mikä ei täsmää annettuun avaimeen ”%(fingerprint)s”. Tämä voi tarkoittaa, että viestintäänne siepataan!",
     "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Antamasi allekirjoitusavain täsmää käyttäjältä %(userId)s saamaasi istunnon %(deviceId)s allekirjoitusavaimeen. Istunto on varmennettu.",
     "Displays information about a user": "Näyttää tietoa käyttäjästä",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s vaihtoi huoneen nimen %(oldRoomName)s nimeksi %(newRoomName)s.",
-    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s lisäsi vaihtoehtoisia osoitteita %(addresses)s tälle huoneelle.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s lisäsi vaihtoehtoiset osoitteet %(addresses)s tälle huoneelle.",
     "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s lisäsi vaihtoehtoisen osoitteen %(addresses)s tälle huoneelle.",
-    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s poisti vaihtoehtoisia osoitteita %(addresses)s tältä huoneelta.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s poisti vaihtoehtoiset osoitteet %(addresses)s tältä huoneelta.",
     "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s poisti vaihtoehtoisen osoitteitteen %(addresses)s tältä huoneelta.",
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s muutti tämän huoneen vaihtoehtoisia osoitteita.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s muutti tämän huoneen pää- sekä vaihtoehtoisia osoitteita.",
@@ -1956,7 +1956,7 @@
     "Liberate your communication": "Vapauta viestintäsi",
     "Send a Direct Message": "Lähetä yksityisviesti",
     "Explore Public Rooms": "Selaa julkisia huoneita",
-    "Create a Group Chat": "Luo ryhmäkeskustelu",
+    "Create a Group Chat": "Luo huone",
     "Super": "Super",
     "Cancel replying to a message": "Peruuta viestiin vastaaminen",
     "Jump to room search": "Siirry huonehakuun",
@@ -1981,7 +1981,7 @@
     "Review where you’re logged in": "Tarkasta missä olet sisäänkirjautuneena",
     "New login. Was this you?": "Uusi sisäänkirjautuminen. Olitko se sinä?",
     "%(name)s is requesting verification": "%(name)s pyytää varmennusta",
-    "Sends a message as html, without interpreting it as markdown": "Lähettää viestin HTML-muodossa, tulkitsematta sitä Markdowniksi",
+    "Sends a message as html, without interpreting it as markdown": "Lähettää viestin HTML-muodossa, tulkitsematta sitä markdownina",
     "Please supply a widget URL or embed code": "Anna sovelman osoite tai upotettava koodinpätkä",
     "You signed in to a new session without verifying it:": "Olet kirjautunut uuteen istuntoon varmentamatta sitä:",
     "Verify your other session using one of the options below.": "Varmenna toinen istuntosi käyttämällä yhtä seuraavista tavoista.",
@@ -2016,13 +2016,13 @@
     "Verify this session by confirming the following number appears on its screen.": "Varmenna tämä istunto varmistamalla, että seuraava numero ilmestyy sen näytölle.",
     "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Odotetaan toista istuntoasi, %(deviceName)s (%(deviceId)s), varmennukseen…",
     "Waiting for your other session to verify…": "odotetaan toista istuntoasi varmennukseen…",
-    "Verify all your sessions to ensure your account & messages are safe": "Varmenna kaikki istuntosi varmistaaksesi, että tunnuksesi ja viestisi ovat turvassa",
-    "Verify the new login accessing your account: %(name)s": "Varmenna uusi tunnuksellesi sisäänkirjautunut taho: %(name)s",
-    "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.": "Tällä hetkellä salasanan vaihtaminen nollaa kaikki osapuolten välisen salauksen avaimet kaikissa istunnoissa, tehden salatusta keskusteluhistoriasta lukukelvotonta, ellet ensin vie kaikkia huoneavaimiasi ja tuo niitä salasanan vaihtamisen jäkeen takaisin. Tulevaisuudessa tämä tulee toimimaan paremmin.",
-    "Your homeserver does not support cross-signing.": "Kotipalvelimesi ei tue ristivarmennusta.",
-    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Tunnuksellasi on ristivarmennuksen identiteetti salavarastossa, mutta tämä istunto ei luota siihen.",
+    "Verify all your sessions to ensure your account & messages are safe": "Varmenna kaikki istuntosi varmistaaksesi, että käyttäjätilisi ja viestisi ovat turvassa",
+    "Verify the new login accessing your account: %(name)s": "Varmenna uusi kirjautuminen tilillesi: %(name)s",
+    "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.": "Tällä hetkellä salasanan vaihtaminen nollaa kaikki päästä päähän -salauksen avaimet kaikissa istunnoissa, tehden salatusta keskusteluhistoriasta lukukelvotonta, ellet ensin vie kaikkia huoneavaimiasi ja tuo niitä salasanan vaihtamisen jäkeen takaisin. Tulevaisuudessa tämä tulee toimimaan paremmin.",
+    "Your homeserver does not support cross-signing.": "Kotipalvelimesi ei tue ristiinvarmennusta.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Tililläsi on ristiinvarmennuksen identiteetti salaisessa tallennustilassa, mutta tämä istunto ei vielä luota siihen.",
     "Reset cross-signing and secret storage": "Nollaa ristivarmennus ja salavarasto",
-    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Varmenna jokainen käyttäjän istunto erikseen, äläkä luota ristivarmennettuihin laitteisiin.",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Varmenna jokainen istunto erikseen, äläkä luota ristiinvarmennettuihin laitteisiin.",
     "Securely cache encrypted messages locally for them to appear in search results.": "Pidä salatut viestit turvallisessa välimuistissa, jotta ne näkyvät hakutuloksissa.",
     "%(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)sissa ei ole joitain komponentteja, joita tarvitaan viestien turvalliseen välimuistitallennukseen. Jos haluat kokeilla tätä ominaisuutta, käännä mukautettu %(brand)s Desktop, jossa on mukana <nativeLink>hakukomponentit</nativeLink>.",
     "This session is backing up your keys. ": "Tämä istunto varmuuskopioi avaimesi. ",
@@ -2046,7 +2046,7 @@
     "This user has not verified all of their sessions.": "Tämä käyttäjä ei ole varmentanut kaikkia istuntojaan.",
     "You have not verified this user.": "Et ole varmentanut tätä käyttäjää.",
     "You have verified this user. This user has verified all of their sessions.": "Olet varmentanut tämän käyttäjän. Tämä käyttäjä on varmentanut kaikki istuntonsa.",
-    "This room is end-to-end encrypted": "Tämä huone käyttää osapuolten välistä salausta",
+    "This room is end-to-end encrypted": "Tämä huone käyttää päästä päähän -salausta",
     "Everyone in this room is verified": "Kaikki tämän huoneen käyttäjät on varmennettu",
     "Your key share request has been sent - please check your other sessions for key share requests.": "Avainten jakopyyntösi on lähetetty. Tarkista muut istuntosi avainten jakopyyntöjen varalta.",
     "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.": "Avainten jakopyynnöt lähetetään muille istunnoillesi automaattisesti. Jos hylkäsit tai jätit huomiotta avainten jakopyynnön toisessa istunnossasi, klikkaa tästä pyytääksesi avaimia uudelleen.",
@@ -2054,7 +2054,7 @@
     "Encrypted by an unverified session": "Salattu varmentamattoman istunnon toimesta",
     "Encrypted by a deleted session": "Salattu poistetun istunnon toimesta",
     "Create room": "Luo huone",
-    "Reject & Ignore user": "Hylkää ja jätä käyttäjä huomiotta",
+    "Reject & Ignore user": "Hylkää ja sivuuta käyttäjä",
     "Start Verification": "Aloita varmennus",
     "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Viestisi ovat turvattu, ja vain sinulla ja vastaanottajalla on avaimet viestien lukemiseen.",
     "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "Salausta käyttävissä huoneissa viestisi on turvattu, ja vain sinulla ja vastaanottajilla on yksityiset avaimet viestien lukemiseen.",
@@ -2093,14 +2093,14 @@
     "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Tämän huoneen viestit ovat salattuja osapuolten välisellä salauksella. Lue lisää ja varmenna tämä käyttäjä hänen profiilistaan.",
     "Enter the name of a new server you want to explore.": "Syötä sen uuden palvelimen nimi, jota hauat tutkia.",
     "%(networkName)s rooms": "Verkon %(networkName)s huoneet",
-    "Destroy cross-signing keys?": "Tuhoa ristivarmennuksen avaimet?",
-    "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Ristivarmennuksen avainten tuhoamista ei voi kumota. Jokainen, jonka olet varmentanut, tulee näkemään turvallisuushälytyksiä. Et todennäköisesti halua tehdä tätä, ellet ole hukannut kaikkia laitteitasi, joista pystyt ristivarmentamaan.",
-    "Clear cross-signing keys": "Tyhjennä ristivarmennuksen avaimet",
-    "Enable end-to-end encryption": "Ota osapuolten välinen salaus käyttöön",
+    "Destroy cross-signing keys?": "Tuhoa ristiinvarmennuksen avaimet?",
+    "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Ristiinvarmennuksen avainten tuhoamista ei voi kumota. Jokainen, jonka olet varmentanut, tulee näkemään turvallisuushälytyksiä. Et todennäköisesti halua tehdä tätä, ellet ole hukannut kaikkia laitteitasi, joista pystyit ristiinvarmentamaan.",
+    "Clear cross-signing keys": "Tyhjennä ristiinvarmennuksen avaimet",
+    "Enable end-to-end encryption": "Ota päästä päähän -salaus käyttöön",
     "Session key": "Istunnon tunnus",
     "Verification Requests": "Varmennuspyynnöt",
     "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Tämän käyttäjän varmentaminen merkitsee hänen istuntonsa luotetuksi, ja myös merkkaa sinun istuntosi luotetuksi hänen laitteissaan.",
-    "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.": "Varmenna tämä laite merkataksesi se luotetuksi. Tähän laitteeseen luottaminen antaa sinulle ja muille käyttäjille ylimääräistä mielenrauhaa, kun käytätte osapuolten välistä salausta.",
+    "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.": "Varmenna tämä laite merkitäksesi sen luotetuksi. Tähän laitteeseen luottaminen antaa sinulle ja muille käyttäjille lisää mielenrauhaa, kun käytätte päästä päähän -salausta.",
     "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Tämän laitteen varmentaminen merkkaa sen luotetuksi, ja sinut varmentaneet käyttäjät luottavat automaattisesti tähän laitteeseen.",
     "Confirm to continue": "Haluan jatkaa",
     "Click the button below to confirm your identity.": "Paina alapuolella olevaa painiketta varmistaaksesi identiteettisi.",
@@ -2144,7 +2144,7 @@
     "Address (optional)": "Osoite (valinnainen)",
     "Light": "Vaalea",
     "Dark": "Tumma",
-    "Emoji picker": "Emojivalitsin",
+    "Emoji picker": "Emojit",
     "No recently visited rooms": "Ei hiljattain vierailtuja huoneita",
     "People": "Ihmiset",
     "Sort by": "Lajittelutapa",
@@ -2222,5 +2222,653 @@
     "We’re excited to announce Riot is now Element!": "Meillä on ilo ilmoittaa, että Riot on nyt Element!",
     "Learn more at <a>element.io/previously-riot</a>": "Lue lisää osoitteessa <a>element.io/previously-riot</a>",
     "Security & privacy": "Tietoturva ja -suoja",
-    "User menu": "Käyttäjän valikko"
+    "User menu": "Käyttäjän valikko",
+    "Video conference started by %(senderName)s": "%(senderName)s aloitti ryhmävideopuhelun",
+    "Video conference updated by %(senderName)s": "%(senderName)s päivitti ryhmävideopuhelun",
+    "Video conference ended by %(senderName)s": "%(senderName)s päätti ryhmävideopuhelun",
+    "Join the conference from the room information card on the right": "Liity ryhmäpuheluun oikealla olevasta huoneen tiedoista",
+    "Join the conference at the top of this room": "Liity ryhmäpuheluun huoneen ylälaidassa",
+    "This will end the conference for everyone. Continue?": "Tämä päättää ryhmäpuhelun kaikilta. Jatka?",
+    "End conference": "Päätä ryhmäpuhelu",
+    "Wrong Recovery Key": "Väärä palautusavain",
+    "Wrong file type": "Väärä tiedostotyyppi",
+    "Please provide a room address": "Anna huoneen osoite",
+    "Room address": "Huoneen osoite",
+    "Message deleted on %(date)s": "Viesti poistettu %(date)s",
+    "Show %(count)s more|one": "Näytä %(count)s lisää",
+    "Show %(count)s more|other": "Näytä %(count)s lisää",
+    "Mod": "Valvoja",
+    "Read Marker off-screen lifetime (ms)": "Viestin luetuksi merkkaamisen kesto, kun Element ei ole näkyvissä (ms)",
+    "Maximize widget": "Suurenna sovelma",
+    "Minimize widget": "Pienennä sovelma",
+    "You can only pin 2 widgets at a time": "Vain kaksi sovelmaa voi olla kiinnitettynä samaan aikaan",
+    "Add widgets, bridges & bots": "Lisää sovelmia, siltoja ja botteja",
+    "Edit widgets, bridges & bots": "Muokkaa sovelmia, siltoja ja botteja",
+    "Widgets": "Sovelmat",
+    "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Yhteisöjen v2 prototyypit. Vaatii yhteensopivan kotipalvelimen. Erittäin kokeellinen – käytä varoen.",
+    "Change notification settings": "Muokkaa ilmoitusasetuksia",
+    "The person who invited you already left the room, or their server is offline.": "Henkilö, joka kutsui sinut, on jo lähtenyt huoneesta, tai hänen palvelin on pois verkosta.",
+    "The person who invited you already left the room.": "Henkilö, joka kutsui sinut, lähti jo huoneesta.",
+    "Unknown App": "Tuntematon sovellus",
+    "Error leaving room": "Virhe poistuessa huoneesta",
+    "Unexpected server error trying to leave the room": "Huoneesta poistuessa tapahtui odottamaton palvelinvirhe",
+    "%(senderName)s declined the call.": "%(senderName)s hylkäsi puhelun.",
+    "(an error occurred)": "(tapahtui virhe)",
+    "(their device couldn't start the camera / microphone)": "(hänen laitteensa ei voinut käynnistää kameraa tai mikrofonia)",
+    "(connection failed)": "(yhteys katkesi)",
+    "🎉 All servers are banned from participating! This room can no longer be used.": "Kaikki palvelimet ovat saaneet porttikiellon huoneeseen! Tätä huonetta ei voi enää käyttää.",
+    "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Lisää ( ͡° ͜ʖ ͡°) viestin alkuun",
+    "Are you sure you want to cancel entering passphrase?": "Haluatko varmasti peruuttaa salasanan syöttämisen?",
+    "The call was answered on another device.": "Puheluun vastattiin toisessa laitteessa.",
+    "Answered Elsewhere": "Vastattu muualla",
+    "The call could not be established": "Puhelua ei voitu muodostaa",
+    "The other party declined the call.": "Toinen osapuoli hylkäsi puhelun.",
+    "Call Declined": "Puhelu hylätty",
+    "%(brand)s Android": "%(brand)s Android",
+    "%(brand)s iOS": "%(brand)s iOS",
+    "Starting microphone...": "Käynnistetään mikrofonia...",
+    "Starting camera...": "Käynnistetään kameraa...",
+    "Call connecting...": "Yhdistetään puhelua...",
+    "Calling...": "Soitetaan...",
+    "%(creator)s created this DM.": "%(creator)s loi tämän yksityisviestin.",
+    "You do not have permission to create rooms in this community.": "Sinulla ei ole lupaa luoda huoneita tähän yhteisöön.",
+    "Cannot create rooms in this community": "Tähän yhteisöön ei voi luoda huoneita",
+    "Welcome %(name)s": "Tervetuloa, %(name)s",
+    "Create community": "Luo yhteisö",
+    "No files visible in this room": "Tässä huoneessa ei näy tiedostoja",
+    "Take a picture": "Ota kuva",
+    "Your server isn't responding to some of your requests. Below are some of the most likely reasons.": "Palvelimesi ei vastaa joihinkin pyynnöistäsi. Alla on joitakin todennäköisimpiä syitä.",
+    "Server isn't responding": "Palvelin ei vastaa",
+    "Add comment": "Lisää kommentti",
+    "Update community": "Päivitä yhteisö",
+    "Create a room in %(communityName)s": "Luo huone yhteisöön %(communityName)s",
+    "Your server requires encryption to be enabled in private rooms.": "Palvelimesi edellyttää, että salaus on käytössä yksityisissä huoneissa.",
+    "An image will help people identify your community.": "Kuva auttaa ihmisiä tunnistamaan yhteisösi.",
+    "Add image (optional)": "Lisää kuva (valinnainen)",
+    "Enter name": "Syötä nimi",
+    "What's the name of your community or team?": "Mikä on yhteisösi tai tiimisi nimi?",
+    "Invite people to join %(communityName)s": "Kutsu ihmisiä yhteisöön %(communityName)s",
+    "Send %(count)s invites|one": "Lähetä %(count)s kutsu",
+    "Send %(count)s invites|other": "Lähetä %(count)s kutsua",
+    "Add another email": "Lisää toinen sähköposti",
+    "Click to view edits": "Napsauta nähdäksesi muokkaukset",
+    "Edited at %(date)s": "Muokattu %(date)s",
+    "Role": "Rooli",
+    "Show files": "Näytä tiedostot",
+    "%(count)s people|one": "%(count)s henkilö",
+    "%(count)s people|other": "%(count)s ihmistä",
+    "Forget Room": "Unohda huone",
+    "Show previews of messages": "Näytä viestien esikatselut",
+    "Show rooms with unread messages first": "Näytä ensimmäisenä huoneet, joissa on lukemattomia viestejä",
+    "%(count)s results|one": "%(count)s tulos",
+    "%(count)s results|other": "%(count)s tulosta",
+    "Start a new chat": "Aloita uusi keskustelu",
+    "Can't see what you’re looking for?": "Etkö löydä, mitä etsit?",
+    "This is the start of <roomName/>.": "Tästä alkaa <roomName/>.",
+    "%(displayName)s created this room.": "%(displayName)s loi tämän huoneen.",
+    "You created this room.": "Loit tämän huoneen.",
+    "<a>Add a topic</a> to help people know what it is about.": "<a>Lisää aihe</a>, jotta ihmiset tietävät mistä on kyse.",
+    "Topic: %(topic)s ": "Aihe: %(topic)s ",
+    "Topic: %(topic)s (<a>edit</a>)": "Aihe: %(topic)s (<a>muokkaa</a>)",
+    "This is the beginning of your direct message history with <displayName/>.": "Tästä alkaa yksityisviestihistoriasi käyttäjän <displayName/> kanssa.",
+    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Vain te kaksi olette tässä keskustelussa, ellei jompi kumpi kutsu muita.",
+    "Remove messages sent by others": "Poista toisten lähettämät viestit",
+    "Privacy": "Tietosuoja",
+    "not ready": "ei valmis",
+    "ready": "valmis",
+    "unexpected type": "odottamaton tyyppi",
+    "Algorithm:": "Algoritmi:",
+    "Failed to save your profile": "Profiilisi tallentaminen ei onnistunut",
+    "Your server isn't responding to some <a>requests</a>.": "Palvelimesi ei vastaa joihinkin <a>pyyntöihin</a>.",
+    "Incoming call": "Saapuva puhelu",
+    "Incoming video call": "Saapuva videopuhelu",
+    "Incoming voice call": "Saapuva äänipuhelu",
+    "Unknown caller": "Tuntematon soittaja",
+    "Enable experimental, compact IRC style layout": "Ota käyttöön kokeellinen, IRC-tyylinen asettelu",
+    "Use Ctrl + Enter to send a message": "Ctrl + Enter lähettää viestin",
+    "Use Command + Enter to send a message": "Komento + Enter lähettää viestin",
+    "%(senderName)s ended the call": "%(senderName)s lopetti puhelun",
+    "You ended the call": "Lopetit puhelun",
+    "New version of %(brand)s is available": "%(brand)s-sovelluksesta on saatavilla uusi versio",
+    "Update %(brand)s": "Päivitä %(brand)s",
+    "Enable desktop notifications": "Ota työpöytäilmoitukset käyttöön",
+    "Takes the call in the current room off hold": "Ottaa nykyisen huoneen puhelun pois pidosta",
+    "Places the call in the current room on hold": "Asettaa nykyisen huoneen puhelun pitoon",
+    "Away": "Poissa",
+    "A confirmation email has been sent to %(emailAddress)s": "Vahvistussähköposti on lähetetty osoitteeseen %(emailAddress)s",
+    "Open the link in the email to continue registration.": "Jatka rekisteröitymistä avaamalla sähköpostissa oleva linkki.",
+    "Enter email address": "Syötä sähköpostiosoite",
+    "Enter phone number": "Syötä puhelinnumero",
+    "Now, let's help you get started": "Autetaanpa sinut alkuun",
+    "delete the address.": "poista osoite.",
+    "Filter rooms and people": "Hae huoneita ja ihmisiä",
+    "Go to Home View": "Siirry kotinäkymään",
+    "Community and user menu": "Yhteisö- ja käyttäjävalikko",
+    "Decline All": "Kieltäydy kaikista",
+    "Approve": "Hyväksy",
+    "Your area is experiencing difficulties connecting to the internet.": "Alueellasi on ongelmia internet-yhteyksissä.",
+    "The server is offline.": "Palvelin ei ole verkossa.",
+    "Your firewall or anti-virus is blocking the request.": "Palomuurisi tai virustentorjuntaohjelmasi estää pyynnön.",
+    "The server (%(serverName)s) took too long to respond.": "Palvelin (%(serverName)s) ei vastannut ajoissa.",
+    "Feedback sent": "Palaute lähetetty",
+    "There was an error updating your community. The server is unable to process your request.": "Yhteisösi päivittämisessä tapahtui virhe. Palvelin ei voi käsitellä pyyntöäsi.",
+    "You can change this later if needed.": "Voit tarvittaessa vaihtaa tämän myöhemmin.",
+    "There was an error creating your community. The name may be taken or the server is unable to process your request.": "Yhteisösi luomisessa tapahtui virhe. Nimi saattaa olla varattu tai palvelin ei voi käsitellä pyyntöäsi.",
+    "Download logs": "Lataa lokit",
+    "Preparing to download logs": "Valmistellaan lokien lataamista",
+    "About": "Tietoa",
+    "Unpin": "Poista kiinnitys",
+    "Customise your appearance": "Mukauta ulkoasuasi",
+    "Appearance Settings only affect this %(brand)s session.": "Ulkoasuasetukset vaikuttavat vain tähän %(brand)s-istuntoon.",
+    "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Aseta käyttöjärjestelmääsi asennetun fontin nimi, niin %(brand)s pyrkii käyttämään sitä.",
+    "The operation could not be completed": "Toimintoa ei voitu tehdä loppuun asti",
+    "There are advanced notifications which are not shown here.": "On edistyneitä ilmoituksia, joita ei näytetä tässä.",
+    "Return to call": "Palaa puheluun",
+    "Voice Call": "Äänipuhelu",
+    "Video Call": "Videopuhelu",
+    "Send stickers to your active room as you": "Lähetä aktiiviseen huoneeseesi tarroja itsenäsi",
+    "Send stickers to this room as you": "Lähetä tähän huoneeseen tarroja itsenäsi",
+    "Change the avatar of your active room": "Vaihda aktiivisen huoneesi kuva",
+    "Change the avatar of this room": "Vaihda huoneen kuva",
+    "Change the name of your active room": "Muuta aktiivisen huoneesi nimeä",
+    "Change the name of this room": "Muuta tämän huoneen nimeä",
+    "Change the topic of your active room": "Muuta aktiivisen huoneesi aihetta",
+    "Change the topic of this room": "Muuta huoneen aihetta",
+    "Change which room you're viewing": "Vaihda näytettävää huonetta",
+    "Send stickers into your active room": "Lähetä tarroja aktiiviseen huoneeseesi",
+    "Send stickers into this room": "Lähetä tarroja tähän huoneeseen",
+    "Comoros": "Komorit",
+    "Colombia": "Kolumbia",
+    "Cocos (Keeling) Islands": "Kookossaaret",
+    "Christmas Island": "Joulusaari",
+    "China": "Kiina",
+    "Chile": "Chile",
+    "Chad": "Tšad",
+    "Central African Republic": "Keski-Afrikan tasavalta",
+    "Cayman Islands": "Caymansaaret",
+    "Caribbean Netherlands": "Alankomaiden Karibia",
+    "Cape Verde": "Kap Verde",
+    "Canada": "Kanada",
+    "Cameroon": "Kamerun",
+    "Cambodia": "Kambodža",
+    "Burundi": "Burundi",
+    "Burkina Faso": "Burkina Faso",
+    "Bulgaria": "Bulgaria",
+    "Brunei": "Brunei",
+    "British Virgin Islands": "Brittiläiset Neitsytsaaret",
+    "British Indian Ocean Territory": "Brittiläinen Intian valtameren alue",
+    "Brazil": "Brasilia",
+    "Bouvet Island": "Bouvet’nsaari",
+    "Botswana": "Botswana",
+    "Bosnia": "Bosnia ja Hertsegovina",
+    "Bolivia": "Bolivia",
+    "Bhutan": "Bhutan",
+    "Bermuda": "Bermuda",
+    "Benin": "Benin",
+    "Belize": "Belize",
+    "Belgium": "Belgia",
+    "Belarus": "Valko-Venäjä",
+    "Barbados": "Barbados",
+    "Bangladesh": "Bangladesh",
+    "Bahrain": "Bahrain",
+    "Bahamas": "Bahama",
+    "Azerbaijan": "Azerbaidžan",
+    "Austria": "Itävalta",
+    "Australia": "Australia",
+    "Aruba": "Aruba",
+    "Armenia": "Armenia",
+    "Argentina": "Argentiina",
+    "Antigua & Barbuda": "Antigua ja Barbuda",
+    "Antarctica": "Antarktis",
+    "Anguilla": "Anguilla",
+    "Angola": "Angola",
+    "Andorra": "Andorra",
+    "American Samoa": "Amerikan Samoa",
+    "Algeria": "Algeria",
+    "Albania": "Albania",
+    "Åland Islands": "Ahvenanmaa",
+    "Afghanistan": "Afganistan",
+    "United States": "Yhdysvallat",
+    "United Kingdom": "Iso-Britannia",
+    "No other application is using the webcam": "Mikään muu sovellus ei käytä kameraa",
+    "Permission is granted to use the webcam": "Lupa käyttää kameraa myönnetty",
+    "A microphone and webcam are plugged in and set up correctly": "Mikrofoni ja kamera on kytketty ja asennettu oiken",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "Puhelu epäonnistui, koska kameraa tai mikrofonia ei voitu käyttää. Tarkista että:",
+    "Unable to access webcam / microphone": "Kameraa / mikrofonia ei voi käyttää",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Puhelu epäonnistui, koska mikrofonia ei voitu käyttää. Tarkista, että mikrofoni on kytketty ja asennettu oikein.",
+    "Unable to access microphone": "Mikrofonia ei voi käyttää",
+    "El Salvador": "El Salvador",
+    "Egypt": "Egypti",
+    "Ecuador": "Ecuador",
+    "Dominican Republic": "Dominikaaninen tasavalta",
+    "Dominica": "Dominica",
+    "Djibouti": "Djibouti",
+    "Denmark": "Tanska",
+    "Côte d’Ivoire": "Norsunluurannikko",
+    "Czech Republic": "Tšekki",
+    "Cyprus": "Kypros",
+    "Curaçao": "Curaçao",
+    "Cuba": "Kuuba",
+    "Croatia": "Kroatia",
+    "Costa Rica": "Costa Rica",
+    "Cook Islands": "Cookinsaaret",
+    "Congo - Kinshasa": "Kongo-Kinshasa",
+    "Congo - Brazzaville": "Kongo-Brazzavile",
+    "Micronesia": "Mikronesia",
+    "Mexico": "Meksiko",
+    "Mayotte": "Mayotte",
+    "Mauritius": "Mauritius",
+    "Mauritania": "Mauritania",
+    "Martinique": "Martinique",
+    "Marshall Islands": "Marshallinsaaret",
+    "Malta": "Malta",
+    "Mali": "Mali",
+    "Maldives": "Malediivit",
+    "Malaysia": "Malesia",
+    "Malawi": "Malawi",
+    "Madagascar": "Madagaskar",
+    "Macedonia": "Pohjois-Makedonia",
+    "Macau": "Macao",
+    "Luxembourg": "Luxemburg",
+    "Lithuania": "Liettua",
+    "Liechtenstein": "Liechtenstein",
+    "Libya": "Libya",
+    "Liberia": "Liberia",
+    "Lesotho": "Lesotho",
+    "Lebanon": "Libanon",
+    "Latvia": "Latvia",
+    "Laos": "Laos",
+    "Kyrgyzstan": "Kirgisia",
+    "Kuwait": "Kuwait",
+    "Kosovo": "Kosovo",
+    "Kiribati": "Kiribati",
+    "Kenya": "Kenia",
+    "Kazakhstan": "Kazakstan",
+    "Jordan": "Jordania",
+    "Jersey": "Jersey",
+    "Japan": "Japani",
+    "Jamaica": "Jamaika",
+    "Italy": "Italia",
+    "Israel": "Israel",
+    "Isle of Man": "Mansaari",
+    "Ireland": "Irlanti",
+    "Iraq": "Irak",
+    "Iran": "Iran",
+    "Indonesia": "Indonesia",
+    "India": "Intia",
+    "Iceland": "Islanti",
+    "Hungary": "Unkari",
+    "Hong Kong": "Hongkong",
+    "Honduras": "Honduras",
+    "Heard & McDonald Islands": "Heard ja McDonaldinsaaret",
+    "Haiti": "Haiti",
+    "Guyana": "Guyana",
+    "Guinea-Bissau": "Guinea-Bissau",
+    "Guinea": "Guinea",
+    "Guernsey": "Guernsey",
+    "Guatemala": "Guatemala",
+    "Guam": "Guam",
+    "Guadeloupe": "Guadeloupe",
+    "Grenada": "Grenada",
+    "Greenland": "Grönlanti",
+    "Greece": "Kreikka",
+    "Gibraltar": "Gibraltar",
+    "Ghana": "Ghana",
+    "Germany": "Saksa",
+    "Georgia": "Georgia",
+    "Gambia": "Gambia",
+    "Gabon": "Gabon",
+    "French Southern Territories": "Ranskan eteläiset ja antarktiset alueet",
+    "French Polynesia": "Ranskan Polynesia",
+    "French Guiana": "Ranskan Guayana",
+    "France": "Ranska",
+    "Finland": "Suomi",
+    "Fiji": "Fidži",
+    "Faroe Islands": "Färsaaret",
+    "Falkland Islands": "Falklandinsaaret",
+    "Ethiopia": "Etiopia",
+    "Estonia": "Viro",
+    "Eritrea": "Eritrea",
+    "Equatorial Guinea": "Päiväntasaajan Guinea",
+    "You've reached the maximum number of simultaneous calls.": "Saavutit samanaikaisten puheluiden enimmäismäärän.",
+    "Too Many Calls": "Liian monta puhelua",
+    "Moldova": "Moldova",
+    "You’re all caught up": "Olet ajan tasalla",
+    "Room settings": "Huoneen asetukset",
+    "or another cross-signing capable Matrix client": "tai muu ristiinvarmentava Matrix-asiakas",
+    "a device cross-signing signature": "laitteen ristiinvarmennuksen allekirjoitus",
+    "a new cross-signing key signature": "Uusi ristiinvarmennuksen allekirjoitus",
+    "Cross-signing is not set up.": "Ristiinvarmennusta ei ole asennettu.",
+    "Cross-signing is ready for use.": "Ristiinvarmennus on käyttövalmis.",
+    "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.": "Varmuuskopioi tilitietojesi salausavaimet, istuntojen menettämisen varalta. Avaimet varmistetaan ainutlaatuisella Palatusavaimella.",
+    "well formed": "hyvin muotoiltu",
+    "Backup version:": "Varmuuskopiointiversio:",
+    "Backup key stored:": "Varmuuskopioavain tallennettu:",
+    "Backup key cached:": "Välimuistissa oleva varmuuskopioavain:",
+    "Secret storage:": "Salainen tallennus:",
+    "Hey you. You're the best!": "Hei siellä, olet paras!",
+    "Room ID or address of ban list": "Huonetunnus tai -osoite on estolistalla",
+    "Secure Backup": "Turvallinen varmuuskopio",
+    "Add a photo, so people can easily spot your room.": "Lisää kuva, jotta ihmiset voivat helpommin huomata huoneesi.",
+    "Hide Widgets": "Piilota sovelmat",
+    "Show Widgets": "Näytä sovelmat",
+    "Explore community rooms": "Selaa yhteisön huoneita",
+    "Explore public rooms": "Selaa julkisia huoneita",
+    "Custom Tag": "Mukautettu tunniste",
+    "Explore all public rooms": "Selaa julkisia huoneita",
+    "List options": "Lajittele",
+    "Activity": "Aktiivisuus",
+    "A-Z": "A-Ö",
+    "Server Options": "Palvelinasetukset",
+    "Information": "Tiedot",
+    "Effects": "Tehosteet",
+    "Zimbabwe": "Zimbabwe",
+    "Zambia": "Sambia",
+    "Yemen": "Jemen",
+    "Western Sahara": "Länsi-Sahara",
+    "Wallis & Futuna": "Wallis ja Futuna",
+    "Vietnam": "Vietnam",
+    "Venezuela": "Venezuela",
+    "Vatican City": "Vatikaani",
+    "Vanuatu": "Vanuatu",
+    "Uzbekistan": "Uzbekistan",
+    "Uruguay": "Uruguay",
+    "United Arab Emirates": "Yhdistyneet arabiemiirikunnat",
+    "Ukraine": "Ukraina",
+    "Uganda": "Uganda",
+    "U.S. Virgin Islands": "Yhdysvaltain Neitsytsaaret",
+    "Tuvalu": "Tuvalu",
+    "Turks & Caicos Islands": "Turks- ja Caicossaaret",
+    "Turkmenistan": "Turkmenistan",
+    "Turkey": "Turkki",
+    "Tunisia": "Tunisia",
+    "Trinidad & Tobago": "Trinidad ja Tobago",
+    "Tonga": "Tonga",
+    "Tokelau": "Tokelau",
+    "Togo": "Togo",
+    "Timor-Leste": "Itä-Timor",
+    "Thailand": "Thaimaa",
+    "Tanzania": "Tansania",
+    "Tajikistan": "Tadžikistan",
+    "Taiwan": "Taiwan",
+    "São Tomé & Príncipe": "São Tomé ja Príncipe",
+    "Syria": "Syyria",
+    "Switzerland": "Sveitsi",
+    "Sweden": "Ruotsi",
+    "Swaziland": "Swazimaa",
+    "Svalbard & Jan Mayen": "Huippuvuoret ja Jan Mayen",
+    "Suriname": "Suriname",
+    "Sudan": "Sudan",
+    "St. Vincent & Grenadines": "Saint Vincent ja Grenadiinit",
+    "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": "Espanja",
+    "South Sudan": "Etelä-Sudan",
+    "South Korea": "Etelä-Korea",
+    "South Georgia & South Sandwich Islands": "Etelä-Georgia ja Eteläiset Sandwichsaaret",
+    "South Africa": "Etelä-Afrikka",
+    "Somalia": "Somalia",
+    "Solomon Islands": "Salomonsaaret",
+    "Slovenia": "Slovenia",
+    "Slovakia": "Slovakia",
+    "Sint Maarten": "Sint Maarten",
+    "Singapore": "Singapore",
+    "Sierra Leone": "Sierra Leone",
+    "Seychelles": "Seychellit",
+    "Serbia": "Serbia",
+    "Senegal": "Senegal",
+    "Saudi Arabia": "Saudi-Arabia",
+    "San Marino": "San Marino",
+    "Samoa": "Samoa",
+    "Réunion": "Réunion",
+    "Rwanda": "Ruanda",
+    "Russia": "Venäjä",
+    "Romania": "Romania",
+    "Qatar": "Qatar",
+    "Puerto Rico": "Puerto Rico",
+    "Portugal": "Portugali",
+    "Poland": "Puola",
+    "Pitcairn Islands": "Pitcairnsaaret",
+    "Philippines": "Filippiinit",
+    "Peru": "Peru",
+    "Paraguay": "Paraguay",
+    "Papua New Guinea": "Papua-Uusi-Guinea",
+    "Panama": "Panama",
+    "Palestine": "Palestiina",
+    "Palau": "Palau",
+    "Pakistan": "Pakistan",
+    "Oman": "Oman",
+    "Norway": "Norja",
+    "Northern Mariana Islands": "Pohjois-Mariaanit",
+    "North Korea": "Pohjois-Korea",
+    "Norfolk Island": "Norfolkinsaari",
+    "Niue": "Niue",
+    "Nigeria": "Nigeria",
+    "Niger": "Niger",
+    "Nicaragua": "Nicaragua",
+    "New Zealand": "Uusi-Seelanti",
+    "New Caledonia": "Uusi-Kaledonia",
+    "Netherlands": "Alankomaat",
+    "Nepal": "Nepal",
+    "Nauru": "Nauru",
+    "Namibia": "Namibia",
+    "Myanmar": "Myanmar",
+    "Mozambique": "Mosambik",
+    "Morocco": "Marokko",
+    "Montserrat": "Montserrat",
+    "Montenegro": "Montenegro",
+    "Mongolia": "Mongolia",
+    "Monaco": "Monaco",
+    "Room Info": "Huoneen tiedot",
+    "not found in storage": "ei löytynyt muistista",
+    "Sign into your homeserver": "Kirjaudu sisään kotipalvelimellesi",
+    "About homeservers": "Tietoa kotipalvelimista",
+    "Not encrypted": "Ei salattu",
+    "You have no visible notifications in this room.": "Olet nähnyt tämän huoneen kaikki ilmoitukset.",
+    "Session verified": "Istunto vahvistettu",
+    "Verify this login": "Vahvista tämä sisäänkirjautuminen",
+    "User settings": "Käyttäjäasetukset",
+    "Community settings": "Yhteisön asetukset",
+    "Got an account? <a>Sign in</a>": "Sinulla on jo tili? <a>Kirjaudu sisään</a>",
+    "New here? <a>Create an account</a>": "Uusi täällä? <a>Luo tili</a>",
+    "Failed to find the general chat for this community": "Tämän yhteisön yleisen keskustelun löytäminen epäonnistui",
+    "Explore rooms in %(communityName)s": "Tutki %(communityName)s -yhteisön huoneita",
+    "Delete the room address %(alias)s and remove %(name)s from the directory?": "Poistetaanko huoneosoite %(alias)s ja %(name)s hakemisto?",
+    "Self-verification request": "Itsevarmennuspyyntö",
+    "Add a photo so people know it's you.": "Lisää kuva, jotta ihmiset tietävät, että se olet sinä.",
+    "Great, that'll help people know it's you": "Hienoa, tämä auttaa ihmisiä tietämään, että se olet sinä",
+    "Attach files from chat or just drag and drop them anywhere in a room.": "Liitä tiedostoja alalaidan klemmarilla, tai raahaa ja pudota ne mihin tahansa huoneen kohtaan.",
+    "Use email or phone to optionally be discoverable by existing contacts.": "Käytä sähköpostiosoitetta tai puhelinnumeroa, jos haluat olla löydettävissä nykyisille yhteystiedoille.",
+    "Use email to optionally be discoverable by existing contacts.": "Käytä sähköpostiosoitetta, jos haluat olla löydettävissä nykyisille yhteystiedoille.",
+    "Add an email to be able to reset your password.": "Lisää sähköpostiosoite, jotta voit palauttaa salasanasi.",
+    "Forgot password?": "Unohtuiko salasana?",
+    "That phone number doesn't look quite right, please check and try again": "Tämä puhelinnumero ei näytä oikealta, tarkista se ja yritä uudelleen",
+    "Move right": "Siirry oikealle",
+    "Move left": "Siirry vasemmalle",
+    "Revoke permissions": "Peruuta käyttöoikeudet",
+    "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.": "Varoitus: Henkilökohtaiset tietosi (mukaan lukien salausavaimet) tallennetaan edelleen tähän istuntoon. Poista ne jos lopetat istunnon käytön, tai haluat kirjautua toiselle tilille.",
+    "You're all caught up.": "Olet ajan tasalla.",
+    "Unable to validate homeserver": "Kotipalvelimen vahvistus epäonnistui",
+    "This version of %(brand)s does not support searching encrypted messages": "Tämä %(brand)s-versio ei tue salattujen viestien hakua",
+    "This version of %(brand)s does not support viewing some encrypted files": "Tämä %(brand)s-versio ei tue joidenkin salattujen tiedostojen katselua",
+    "Use the <a>Desktop app</a> to see all encrypted files": "Voit tarkastella kaikkia salattuja tiedostoja <a>työpöytäsovelluksella</a>",
+    "Use the <a>Desktop app</a> to search encrypted messages": "Käytä salattuja viestejä <a>työpöytäsovelluksella</a>",
+    "Ignored attempt to disable encryption": "Ohitettu yritys poistaa salaus käytöstä",
+    "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Tässä olevat viestit on päästä päähän -salattu. Vahvista %(displayName)s profiilistaan napauttamalla profiilikuvaa.",
+    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Tämän huoneen viestit on päästä päähän -salattu. Kun ihmisiä liittyy, heidät voi vahvistaa profiilistaan profiilikuvaa napauttamalla.",
+    "Unpin a widget to view it in this panel": "Irrota sovelma, jotta voit tarkastella sitä tässä paneelissa",
+    "You can only pin up to %(count)s widgets|other": "Voit kiinnittää enintään %(count)s sovelmaa",
+    "Favourited": "Suositut",
+    "Use the + to make a new room or explore existing ones below": "Luo uusi huone tai tutustu alla oleviin + -painikeella",
+    "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s loi tämän huoneen palvelinten pääsynvalvontalistan.",
+    "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s muutti tämän huoneen palvelinten pääsynvalvontalistaa.",
+    "Expand room list section": "Laajenna huoneluettelon osa",
+    "Collapse room list section": "Supista huoneluettelon osa",
+    "Use a different passphrase?": "Käytä eri salalausetta?",
+    "Already have an account? <a>Sign in here</a>": "Onko sinulla jo tili? <a>Kirjaudu tästä</a>",
+    "There was a problem communicating with the homeserver, please try again later.": "Yhteydessä kotipalvelimeen ilmeni ongelma, yritä myöhemmin uudelleen.",
+    "This widget would like to:": "Tämä sovelma haluaa:",
+    "Learn more": "Lue lisää",
+    "Other homeserver": "Muu kotipalvelin",
+    "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "Matrix.org on maailman suurin kotipalvelin, joten se on hyvä paikka monille.",
+    "Specify a homeserver": "Määritä kotipalvelin",
+    "The server has denied your request.": "Palvelin eväsi pyyntösi.",
+    "Just a heads up, if you don't add an email and forget your password, you could <b>permanently lose access to your account</b>.": "Huomio: jos et lisää sähköpostia ja unohdat salasanasi, saatat <b>menettää pääsyn tiliisi pysyvästi</b>.",
+    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Yksityiset huoneet ovat löydettävissä ja liityttävissä vain kutsulla. Julkiset huoneet ovat kenen tahansa tämän yhteisön jäsenen löydettävissä ja liityttävissä.",
+    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Yksityiset huoneet ovat löydettävissä ja liityttävissä vain kutsulla. Julkiset huoneet ovat kenen tahansa löydettävissä ja liityttävissä.",
+    "Homeserver": "Kotipalvelin",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Palvelimesi ylläpitäjä on poistanut päästä päähän -salauksen oletuksena käytöstä yksityisissä huoneissa ja yksityisviesteissä.",
+    "%(peerName)s held the call": "%(peerName)s piti puhelua pidossa",
+    "Send general files as you in your active room": "Lähetä aktiiviseen huoneeseesi yleisiä tiedostoja itsenäsi",
+    "Send general files as you in this room": "Lähetä tähän huoneeseen yleisiä tiedostoja itsenäsi",
+    "Send videos as you in your active room": "Lähetä aktiiviseen huoneeseesi videoita itsenäsi",
+    "Send videos as you in this room": "Lähetä tähän huoneeseen videoita itsenäsi",
+    "Send images as you in your active room": "Lähetä aktiiviseen huoneeseesi kuvia itsenäsi",
+    "Send images as you in this room": "Lähetä tähän huoneeseen kuvia itsenäsi",
+    "Send text messages as you in your active room": "Lähetä aktiiviseen huoneeseesi tekstiviestejä itsenäsi",
+    "Send text messages as you in this room": "Lähetä tähän huoneeseen tekstiviestejä itsenäsi",
+    "Send messages as you in your active room": "Lähetä aktiiviseen huoneeseesi viestejä itsenäsi",
+    "Send messages as you in this room": "Lähetä tähän huoneeseen viestejä itsenäsi",
+    "Show message previews for reactions in DMs": "Näytä reaktioille esikatselu yksityisviesteissä",
+    "Show message previews for reactions in all rooms": "Näytä reaktioille esikatselu kaikissa huoneissa",
+    "New spinner design": "Uusi kehrääjä tyyli",
+    "Render LaTeX maths in messages": "Piirrä LaTeX-matematiikka viesteissä",
+    "* %(senderName)s %(emote)s": "* %(senderName)s %(emote)s",
+    "Downloading logs": "Ladataan lokeja",
+    "Uploading logs": "Lähetetään lokeja",
+    "Show chat effects": "Näytä keskustelutehosteet",
+    "Enable advanced debugging for the room list": "Ota huoneluettelon edistynyt virheenkorjaus käyttöön",
+    "A connection error occurred while trying to contact the server.": "Yhteysvirhe yritettäessä ottaa yhteyttä palvelimeen.",
+    "The <b>%(capability)s</b> capability": "<b>%(capability)s</b>-ominaisuus",
+    "See when the avatar changes in this room": "Näe, milloin kuva vaihtuu tässä huoneessa",
+    "See when the name changes in your active room": "Näe milloin käyttäjän nimi muuttuu aktiivisessa huoneessa",
+    "If disabled, messages from encrypted rooms won't appear in search results.": "Jos ei ole käytössä, salattujen huoneiden viestejä ei näytetä hakutuloksissa.",
+    "Jump to start/end of the composer": "Siirry kirjoittimen alkuun/loppuun",
+    "Dismiss read marker and jump to bottom": "Hylkää lukumerkki ja hyppää pohjaan",
+    "Toggle the top left menu": "Vaihda vasemman yläkulman valikkoa",
+    "New? <a>Create account</a>": "Uusi? <a>Luo tili</a>",
+    "Continuing without email": "Jatka ilman sähköpostia",
+    "Invite by email": "Kutsu sähköpostilla",
+    "Report a bug": "Raportoi virheestä",
+    "Invalid Recovery Key": "Virheellinen palautusavain",
+    "Confirm Security Phrase": "Vahvista turvalauseke",
+    "Upload a file": "Lähetä tiedosto",
+    "Confirm encryption setup": "Vahvista salauksen asetukset",
+    "Verify other session": "Vahvista toinen istunto",
+    "Confirm account deactivation": "Vahvista tilin deaktivointi",
+    "Toggle right panel": "Vaihda oikea paneeli",
+    "Navigate composer history": "Selaa kirjoittimen historiaa",
+    "a key signature": "avaimen allekirjoitus",
+    "Homeserver feature support:": "Kotipalvelimen ominaisuuksien tuki:",
+    "Create key backup": "Luo avaimen varmuuskopio",
+    "Recovery key mismatch": "Palautusavain ei täsmää",
+    "%(name)s paused": "%(name)s keskeytetty",
+    "Invalid URL": "Virheellinen URL",
+    "Reason (optional)": "Syy (valinnainen)",
+    "Fill Screen": "Täytä näyttö",
+    "Send feedback": "Lähetä palautetta",
+    "Rate %(brand)s": "Arvioi %(brand)s",
+    "%(brand)s Desktop": "%(brand)s Desktop",
+    "%(brand)s Web": "%(brand)s Web",
+    "Security Phrase": "Turvalauseke",
+    "Security Key": "Turva-avain",
+    "Verify session": "Vahvista istunto",
+    "Hold": "Pidä",
+    "Resume": "Jatka",
+    "Comment": "Kommentti",
+    "Navigation": "Navigointi",
+    "Manage": "Hallitse",
+    "Remain on your screen when viewing another room, when running": "Pysy ruudulla katsellessasi huonetta, kun se on käynnissä",
+    "Remain on your screen while running": "Pysy ruudulla käynnissä olon ajan",
+    "Move autocomplete selection up/down": "Siirrä automaattisen täydennyksen valintaa ylös/alas",
+    "sends snowfall": "lähetä lumisadetta",
+    "Sends the given message with snowfall": "Lähettää viestin lumisateen kera",
+    "Sends the given message with fireworks": "Lähettää viestin ilotulitteiden kera",
+    "sends confetti": "lähettää konfettia",
+    "Sends the given message with confetti": "Lähettää viestin konfettien kera",
+    "sends fireworks": "lähetä ilotulitus",
+    "You held the call <a>Switch</a>": "Puhelu pidossa <a>Vaihda</a>",
+    "You held the call <a>Resume</a>": "Puhelu pidossa <a>Jatka</a>",
+    "%(name)s on hold": "%(name)s on pidossa",
+    "Please verify the room ID or address and try again.": "Tarkista huonetunnus ja yritä uudelleen.",
+    "Use this when referencing your community to others. The community ID cannot be changed.": "Käytä tätä, kun kutsut muita yhteisöösi. Yhteisön tunnusta ei voi muuttaa.",
+    "Community ID: +<localpart />:%(domain)s": "Yhteisön tunnus: +<localpart />:%(domain)s",
+    "Are you sure you want to deactivate your account? This is irreversible.": "Haluatko varmasti poistaa tilisi pysyvästi?",
+    "Data on this screen is shared with %(widgetDomain)s": "Tällä näytöllä olevaa tietoa jaetaan verkkotunnuksen %(widgetDomain)s kanssa",
+    "A browser extension is preventing the request.": "Selainlaajennus estää pyynnön.",
+    "Approve widget permissions": "Hyväksy sovelman käyttöoikeudet",
+    "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.": "Olet kirjautunut ulos kaikista istunnoista, etkä enää saa push-ilmoituksia. Ota ilmoitukset uudelleen käyttöön kirjautumalla uudelleen kullekin laitteelle.",
+    "That username already exists, please try another.": "Antamasi käyttäjänimi on varattu, kokeile toista.",
+    "Continue with %(ssoButtons)s": "Jatka %(ssoButtons)slla",
+    "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s Tai %(usernamePassword)s",
+    "Host account on": "Ylläpidä tiliä osoitteessa",
+    "Decide where your account is hosted": "Päätä, missä tiliäsi isännöidään",
+    "Your new session is now verified. Other users will see it as trusted.": "Uusi istuntosi on vahvistettu. Muut käyttäjät näkevät sen luotettavana.",
+    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Uusi istuntosi on vahvistettu. Sillä on nyt pääsy salattuihin viesteihisi, ja muut käyttäjät näkevät sen luotettavana.",
+    "Enter a recovery passphrase": "Syötä palautuksen salasana",
+    "Great! This recovery passphrase looks strong enough.": "Hienoa! Tämä palautuksen salasana näyttää riittävän vahvalta.",
+    "Please enter your recovery passphrase a second time to confirm.": "Vahvista antamalla palautuksen salasana uudelleen.",
+    "Repeat your recovery passphrase...": "Toista palautuksen salasana...",
+    "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.": "Syötä salasana, jonka tiedät vain sinä, koska sitä käytetään tietojesi suojaamiseen. Turvallisuuden takaamiseksi älä käytä samaa salasanaa muualla.",
+    "Enter your recovery passphrase a second time to confirm it.": "Vahvista antamalla palautuksen salasana uudelleen.",
+    "Message downloading sleep time(ms)": "Viestin lataamisen odotusaika (ms)",
+    "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "Lisää ┬──┬ ノ( ゜-゜ノ) viestin alkuun",
+    "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "Lisää (╯°□°）╯︵ ┻━┻ viestin alkuun",
+    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Salaisen tallenustilan avaaminen epäonnistui. Varmista, että syötit oikean palautuksen salasanan.",
+    "Enter a Security Phrase": "Kirjoita turvalauseke",
+    "Set a Security Phrase": "Aseta turvalauseke",
+    "Unable to query secret storage status": "Salaisen tallennustilan tilaa ei voi kysellä",
+    "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "Jos peruutat nyt, voit menettää salattuja viestejä ja tietoja, jos menetät pääsyn kirjautumistietoihisi.",
+    "You can also set up Secure Backup & manage your keys in Settings.": "Voit myös ottaa käyttöön suojatun varmuuskopioinnin ja hallita avaimia asetuksista.",
+    "Save your Security Key": "Tallenna turva-avain",
+    "This session is encrypting history using the new recovery method.": "Tämä istunto salaa historiansa käyttäen uutta palautustapaa.",
+    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Tämä istunto on havainnut, että palauttamisen salauslause ja salattujen viestien avain on poistettu.",
+    "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.": "",
+    "Close dialog or context menu": "Sulje valintaikkuna tai pikavalikko",
+    "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "%(brand)s tallentaa turvallisesti salattuja viestejä välimuistiin, jotta ne näkyvät hakutuloksissa:",
+    "Navigate recent messages to edit": "Voit muokata viimeisimpiä viestejä",
+    "Clear room list filter field": "Tyhjennä huoneluettelon suodatinkenttä",
+    "May include members not in %(communityName)s": "Voi sisältää muitakin kuin yhteistön %(communityName)s jäseniä",
+    "Failed to transfer call": "Puhelunsiirto epäonnistui",
+    "A call can only be transferred to a single user.": "Puhelun voi siirtää vain yhdelle käyttäjälle.",
+    "Active Widgets": "Aktiiviset sovelmat",
+    "Block anyone not part of %(serverName)s from ever joining this room.": "Estä muita kuin palvelimen %(serverName)s jäseniä liittymästä tähän huoneeseen.",
+    "Continue with %(provider)s": "Jatka käyttäen palveluntarjoajaa %(provider)s",
+    "Open dial pad": "Avaa näppäimistö",
+    "Start a Conversation": "Aloita keskustelu",
+    "Dial pad": "Näppäimistö",
+    "There was an error looking up the phone number": "Puhelinnumeron haussa tapahtui virhe",
+    "Unable to look up phone number": "Puhelinnumeroa ei voi hakea",
+    "Use Ctrl + F to search": "Etsi painamalla Ctrl + F",
+    "Use Command + F to search": "Etsi painamalla Komento + F",
+    "Use app": "Käytä sovellusta",
+    "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Element Web on mobiililaitteilla kokeellinen. Ilmainen sovelluksemme tarjoaa paremman kokemuksen ja uusimmat ominaisuudet.",
+    "Use app for a better experience": "Parempi kokemus sovelluksella",
+    "Change which room, message, or user you're viewing": "Vaihda näytettävää huonetta, viestiä tai käyttäjää",
+    "Converts the DM to a room": "Muuntaa yksityisviestin huoneeksi",
+    "Converts the room to a DM": "Muuntaa huoneen yksityisviestiksi",
+    "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "Kotipalvelimesi hylkäsi kirjautumisyrityksesi. Syynä saattaa olla, että asiat tapahtuvat liian hitaasti. Yritä uudelleen. Mikäli ongelma jatkuu, ota yhteyttä kotipalvelimesi ylläpitäjään.",
+    "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "Kotipalvelintasi ei tavoitettu eikä sinua siksi kirjattu sisään. Yritä uudelleen. Mikäli ongelma jatkuu, ota yhteyttä kotipalvelimesi ylläpitäjään.",
+    "Try again": "Yritä uudelleen",
+    "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.": "Lisää tähän käyttäjät ja palvelimet, jotka haluat sivuuttaa. Asteriski täsmää mihin tahansa merkkiin. Esimerkiksi <code>@bot:*</code> sivuuttaa kaikki käyttäjät, joiden nimessä on \"bot\".",
+    "Show stickers button": "Näytä tarrapainike",
+    "Expand code blocks by default": "Laajenna koodilohkot oletuksena",
+    "Show line numbers in code blocks": "Näytä rivinumerot koodilohkoissa",
+    "Recently visited rooms": "Hiljattain vieraillut huoneet",
+    "Screens": "Näytöt",
+    "Share your screen": "Jaa näyttösi",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Element with an existing Matrix account on a different homeserver.": "Voit kirjautua muille Matrix-palvelimille antamalla eri kotipalvelimen URL-osoitteen palvelinasetuksissa. Näin voit käyttää Elementiä eri kotipalvelimella olevan Matrix-tilin kanssa.",
+    "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.": "Voi olla paikallaan poistaa tämä käytöstä, jos huonetta käyttävät myös ulkoiset tiimit joilla on oma kotipalvelimensa. Asetusta ei voi muuttaa myöhemmin.",
+    "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Voi olla paikallaan ottaa tämä käyttöön, jos huonetta käyttävät vain sisäiset tiimit kotipalvelimellasi. Asetusta ei voi muuttaa myöhemmin.",
+    "Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.": "Lue lisää: <privacyPolicyLink />, <termsOfServiceLink /> ja <cookiePolicyLink />.",
+    "Failed to connect to your homeserver. Please close this dialog and try again.": "Kotipalvelimeesi yhdistäminen ei onnistunut. Sulje tämä ikkuna ja yritä uudelleen.",
+    "Privacy Policy": "Tietosuojakäytäntö",
+    "Cookie Policy": "Evästekäytäntö",
+    "Recent changes that have not yet been received": "Tuoreet muutokset, joita ei ole vielä otettu vastaan",
+    "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "Pyysimme selainta muistamaan kirjautumista varten mitä kotipalvelinta käytät, mutta selain on unohtanut sen. Mene kirjautumissivulle ja yritä uudelleen."
 }
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 42eead2057..c942cae520 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -377,7 +377,7 @@
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (rang %(powerLevelNumber)s)",
     "(could not connect media)": "(impossible de se connecter au média)",
     "(no answer)": "(pas de réponse)",
-    "(unknown failure: %(reason)s)": "(erreur inconnue :  %(reason)s)",
+    "(unknown failure: %(reason)s)": "(erreur inconnue : %(reason)s)",
     "Your browser does not support the required cryptography extensions": "Votre navigateur ne supporte pas les extensions cryptographiques nécessaires",
     "Not a valid %(brand)s keyfile": "Fichier de clé %(brand)s non valide",
     "Authentication check failed: incorrect password?": "Erreur d’authentification : mot de passe incorrect ?",
@@ -862,7 +862,7 @@
     "Upgrade this room to version %(version)s": "Mettre à niveau ce salon vers la version %(version)s",
     "Forces the current outbound group session in an encrypted room to be discarded": "Force la session de groupe sortante actuelle dans un salon chiffré à être rejetée",
     "Unable to connect to Homeserver. Retrying...": "Impossible de se connecter au serveur d'accueil. Reconnexion...",
-    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s à défini l'adresse principale pour ce salon comme %(address)s.",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s a défini l'adresse principale pour ce salon comme %(address)s.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s a supprimé l'adresse principale de ce salon.",
     "%(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!": "%(brand)s utilise maintenant 3 à 5 fois moins de mémoire, en ne chargeant les informations des autres utilisateurs que quand elles sont nécessaires. Veuillez patienter pendant que l'on se resynchronise avec le serveur !",
     "Updating %(brand)s": "Mise à jour de %(brand)s",
@@ -970,7 +970,7 @@
     "Invite anyway": "Inviter quand même",
     "Whether or not you're logged in (we don't record your username)": "Si vous êtes connecté ou pas (votre nom d'utilisateur n'est pas enregistré)",
     "Upgrades a room to a new version": "Met à niveau un salon vers une nouvelle version",
-    "Sets the room name": "Défini le nom du salon",
+    "Sets the room name": "Définit le nom du salon",
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s a mis à niveau ce salon.",
     "%(displayName)s is typing …": "%(displayName)s est en train d'écrire…",
     "%(names)s and %(count)s others are typing …|other": "%(names)s et %(count)s autres sont en train d'écrire…",
@@ -1085,7 +1085,7 @@
     "Recovery Method Removed": "Méthode de récupération supprimée",
     "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 vous n'avez pas supprimé la méthode de récupération, un attaquant peut être en train d'essayer d'accéder à votre compte. Modifiez le mot de passe de votre compte et configurez une nouvelle méthode de récupération dans les réglages.",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Le fichier \"%(fileName)s\" dépasse la taille limite autorisée par ce serveur pour les téléchargements",
-    "Gets or sets the room topic": "Récupère ou défini le sujet du salon",
+    "Gets or sets the room topic": "Récupère ou définit le sujet du salon",
     "This room has no topic.": "Ce salon n'a pas de sujet.",
     "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s a rendu le salon public à tous ceux qui en connaissent le lien.",
     "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s a rendu le salon disponible sur invitation seulement.",
@@ -1126,7 +1126,7 @@
     "Pizza": "Pizza",
     "Cake": "Gâteau",
     "Heart": "Cœur",
-    "Smiley": "Smiley",
+    "Smiley": "Émoticône",
     "Robot": "Robot",
     "Hat": "Chapeau",
     "Glasses": "Lunettes",
@@ -1759,7 +1759,7 @@
     "about a day from now": "dans un jour environ",
     "%(num)s days from now": "dans %(num)s jours",
     "Failed to invite the following users to chat: %(csvUsers)s": "Échec de l’invitation des utilisateurs suivants à discuter : %(csvUsers)s",
-    "We couldn't create your DM. Please check the users you want to invite and try again.": "Impossible de créer votre Message direct. Vérifiez les utilisateurs que vous souhaitez inviter et réessayez.",
+    "We couldn't create your DM. Please check the users you want to invite and try again.": "Impossible de créer votre message direct. Vérifiez les utilisateurs que vous souhaitez inviter et réessayez.",
     "Something went wrong trying to invite the users.": "Une erreur est survenue en essayant d’inviter les utilisateurs.",
     "We couldn't invite those users. Please check the users you want to invite and try again.": "Impossible d’inviter ces utilisateurs. Vérifiez les utilisateurs que vous souhaitez inviter et réessayez.",
     "Recently Direct Messaged": "Messages directs récents",
@@ -1903,7 +1903,7 @@
     "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.": "Récupérez l’accès à votre compte et restaurez les clés de chiffrement dans cette session. Sans elles, vous ne pourrez pas lire tous vos messages chiffrés dans n’importe quelle session.",
     "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.": "Attention : Vos données personnelles (y compris les clés de chiffrement) seront stockées dans cette session. Effacez-les si vous n’utilisez plus cette session ou si vous voulez vous connecter à un autre compte.",
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Mettez à niveau cette session pour l’autoriser à vérifier d’autres sessions, ce qui leur permettra d’accéder aux messages chiffrés et de les marquer comme fiables pour les autres utilisateurs.",
-    "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.": "Si vous ne configurez pas la récupération de messages sécurisée, vous ne pourrez  pas restaurer l’historique de vos messages chiffrés si vous vous déconnectez ou si vous utilisez une autre session.",
+    "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.": "Si vous ne configurez pas la récupération de messages sécurisée, vous ne pourrez pas restaurer l’historique de vos messages chiffrés si vous vous déconnectez ou si vous utilisez une autre session.",
     "This session is encrypting history using the new recovery method.": "Cette session chiffre l’historique en utilisant la nouvelle méthode de récupération.",
     "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Cette session a détecté que votre mot de passe et votre clé de récupération pour les messages chiffrés ont été supprimés.",
     "Setting up keys": "Configuration des clés",
@@ -2395,5 +2395,653 @@
     "Cross-signing is ready for use, but secret storage is currently not being used to backup your keys.": "La signature croisée est prête à l'emploi, mais le coffre secret n'est pas actuellement utilisé pour sauvegarder vos clés.",
     "Master private key:": "Clé privée maîtresse :",
     "%(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 ne peut actuellement mettre en cache vos messages chiffrés localement de manière sécurisée via le navigateur Web. Utilisez <desktopLink>%(brand)s Desktop</desktopLink> pour que les messages chiffrés apparaissent dans vos résultats de recherche.",
-    "There are advanced notifications which are not shown here.": "Des notifications avancées ne sont pas affichées ici."
+    "There are advanced notifications which are not shown here.": "Des notifications avancées ne sont pas affichées ici.",
+    "ready": "prêt",
+    "The operation could not be completed": "L'opération n'a pas pu être terminée",
+    "Failed to save your profile": "Erreur lors de l'enregistrement du profile",
+    "Unknown App": "Application inconnue",
+    "%(senderName)s declined the call.": "%(senderName)s a refusé l'appel.",
+    "(an error occurred)": "(une erreur est survenue)",
+    "(connection failed)": "(échec de connexion)",
+    "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s a changé les paramètres d'accès du serveur pour ce salon.",
+    "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s a défini les paramètres d'accès du serveur pour ce salon.",
+    "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Ajoute ( ͡° ͜ʖ ͡°) devant un message en texte brut",
+    "This will end the conference for everyone. Continue?": "Ceci arrêtera la téléconférence pour tout le monde. Continuer ?",
+    "End conference": "Finir la téléconférence",
+    "The call was answered on another device.": "L'appel a été répondu sur un autre appareil.",
+    "Answered Elsewhere": "Répondu autre-part",
+    "The call could not be established": "L'appel n'a pas pu être établi",
+    "The other party declined the call.": "L'autre personne a décliné l'appel.",
+    "Call Declined": "Appel rejeté",
+    "Ignored attempt to disable encryption": "Essai de désactiver le chiffrement ignoré",
+    "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.": "Ajoutez les utilisateurs et les serveurs que vous voulez ignorer ici. Utilisez des astérisques pour que %(brand)s comprenne tous les caractères. Par exemple, <code>@bot:*</code> va ignorer tous les utilisateurs ayant le nom 'bot' sur n'importe quel serveur.",
+    "not ready": "pas prêt",
+    "Secret storage:": "Coffre secret :",
+    "Backup key cached:": "Clé de sauvegarde mise en cache :",
+    "Backup key stored:": "Clé de sauvegarde enregistrée :",
+    "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.": "Sauvegarder vos clés de chiffrement avec les données de votre compte dans le cas où vous perdez l'accès à vos sessions. Vos clés seront sécurisées grâce à une unique clé de récupération.",
+    "Backup version:": "Version de la sauvegarde :",
+    "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "Vous les avez peut-être configurés dans un autre client que %(brand)s. Vous ne pouvez pas les configurer dans %(brand)s mais ils s'appliquent quand même.",
+    "not found in storage": "non trouvé dans le coffre",
+    "Cross-signing is not set up.": "La signature croisée n'est pas configurée.",
+    "Cross-signing is ready for use.": "La signature croisée est prête à être utilisée.",
+    "Offline encrypted messaging using dehydrated devices": "Messagerie hors-ligne chiffrée utilisant des appareils déshydratés",
+    "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Prototype de communautés v2. Requiert un serveur d'accueil compatible. Très expérimental - à utiliser avec précaution.",
+    "Safeguard against losing access to encrypted messages & data": "Sécurité contre la perte d'accès aux messages & données chiffrées",
+    "(their device couldn't start the camera / microphone)": "(son appareil ne peut pas démarrer la caméra / le microphone)",
+    "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Tous les serveurs sont interdits de participation ! Ce salon ne peut plus être utilisé.",
+    "What's the name of your community or team?": "Quel est le nom de votre communauté ou équipe ?",
+    "You can change this later if needed.": "Vous pouvez modifier ceci après si besoin.",
+    "Use this when referencing your community to others. The community ID cannot be changed.": "Utilisez ceci lorsque vous faites référence à votre communauté aux autres. L'identifiant de la communauté ne peut pas être modifié.",
+    "There was an error creating your community. The name may be taken or the server is unable to process your request.": "Une erreur est survenue lors de la création de votre communauté. Le nom est peut-être pris ou le serveur ne peut pas exécuter votre requête.",
+    "This version of %(brand)s does not support searching encrypted messages": "Cette version de %(brand)s ne prend pas en charge la recherche dans les messages chiffrés",
+    "This version of %(brand)s does not support viewing some encrypted files": "Cette version de %(brand)s ne prend pas en charge l'affichage de certains fichiers chiffrés",
+    "Use the <a>Desktop app</a> to search encrypted messages": "Utilisez une <a>Application de bureau</a> pour rechercher dans tous les messages chiffrés",
+    "Use the <a>Desktop app</a> to see all encrypted files": "Utilisez une <a>Application de bureau</a> pour voir tous les fichiers chiffrés",
+    "Join the conference at the top of this room": "Rejoignez la téléconférence en haut de ce salon",
+    "Join the conference from the room information card on the right": "Rejoignez la téléconférence à partir de la carte d'informations sur la droite",
+    "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Définissez le nom d'une police de caractères installée sur votre système et %(brand)s essaiera de l'utiliser.",
+    "Create a room in %(communityName)s": "Créer un salon dans %(communityName)s",
+    "An image will help people identify your community.": "Une image aidera les personnes à identifier votre communauté.",
+    "Add image (optional)": "Ajouter une image (facultatif)",
+    "Enter name": "Saisir un nom",
+    "Community ID: +<localpart />:%(domain)s": "Identifiant de la communauté : +<localpart />:%(domain)s",
+    "Invite people to join %(communityName)s": "Inviter des personnes à rejoindre %(communityName)s",
+    "Send %(count)s invites|one": "Envoyer %(count)s invitation",
+    "Send %(count)s invites|other": "Envoyer %(count)s invitations",
+    "People you know on %(brand)s": "Les personnes que vous connaissez dans %(brand)s",
+    "Add another email": "Ajouter un autre e-mail",
+    "Download logs": "Télécharger les journaux",
+    "Preparing to download logs": "Préparation du téléchargement des journaux",
+    "Information": "Informations",
+    "Video conference started by %(senderName)s": "vidéoconférence démarrée par %(senderName)s",
+    "Video conference updated by %(senderName)s": "vidéoconférence mise à jour par %(senderName)s",
+    "Video conference ended by %(senderName)s": "vidéoconférence terminée par %(senderName)s",
+    "Room settings": "Paramètres du salon",
+    "Show files": "Afficher les fichiers",
+    "%(count)s people|other": "%(count)s personnes",
+    "%(count)s people|one": "%(count)s personne",
+    "About": "À propos",
+    "Not encrypted": "Non-chiffré",
+    "Add widgets, bridges & bots": "Ajouter des widgets, ponts et bots",
+    "Edit widgets, bridges & bots": "Modifier les widgets, ponts et bots",
+    "Widgets": "Widgets",
+    "Unpin a widget to view it in this panel": "Dépingler un widget pour l'afficher dans ce panneau",
+    "Unpin": "Dépingler",
+    "You can only pin up to %(count)s widgets|other": "Vous ne pouvez épingler que jusqu'à %(count)s widgets",
+    "Room Info": "Informations sur le salon",
+    "%(count)s results|one": "%(count)s résultat",
+    "%(count)s results|other": "%(count)s résultats",
+    "Explore all public rooms": "Explorer tous les salons publiques",
+    "Can't see what you’re looking for?": "Vous ne voyez pas ce que vous cherchez ?",
+    "Custom Tag": "Étiquette personnalisée",
+    "Explore public rooms": "Explorer les salons publiques",
+    "Explore community rooms": "Explorer les salons de la communauté",
+    "Show Widgets": "Afficher les widgets",
+    "Hide Widgets": "Masquer les widgets",
+    "Remove messages sent by others": "Supprimer les messages envoyés par d'autres",
+    "Privacy": "Vie privée",
+    "Secure Backup": "Sauvegarde sécurisée",
+    "Algorithm:": "Algorithme :",
+    "Set up Secure Backup": "Configurer la sauvegarde sécurisée",
+    "%(brand)s Android": "%(brand)s Android",
+    "Community and user menu": "Menu de la communauté et de l'utilisateur",
+    "User settings": "Paramètres de l'utilisateur",
+    "Community settings": "Paramètres de la communauté",
+    "Failed to find the general chat for this community": "Impossible de trouver le chat général de cette communauté",
+    "Starting microphone...": "Allumage du microphone …",
+    "Starting camera...": "Allumage de la caméra ...",
+    "Call connecting...": "Connexion à l'appel …",
+    "Calling...": "Appel en cours …",
+    "Explore rooms in %(communityName)s": "Explorer les salons dans %(communityName)s",
+    "You have no visible notifications in this room.": "Vous n'avez pas de notification visible dans ce salon.",
+    "You’re all caught up": "Vous êtes à jour",
+    "You do not have permission to create rooms in this community.": "Vous n'avez pas la permission de créer des salons dans cette communauté.",
+    "Cannot create rooms in this community": "Impossible de créer des salons dans cette communauté",
+    "Create community": "Créer une communauté",
+    "Attach files from chat or just drag and drop them anywhere in a room.": "Envoyez des fichiers depuis le chat ou juste glissez et déposez-les n'importe où dans le salon.",
+    "No files visible in this room": "Aucun fichier visible dans ce salon",
+    "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>.": "Entrez l'emplacement de votre serveur d'accueil Element Matrix Services. Cela peut utiliser votre propre nom de domaine ou être un sous-domaine de <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.": "Vous pouvez utiliser l'option de serveur personnalisé pour vous connecter à d'autres serveurs Matrix en spécifiant une URL de serveur d'accueil différente. Cela vous permet d'utiliser %(brand)s avec un compte Matrix existant sur un serveur d'accueil différent.",
+    "Away": "Absent",
+    "Move right": "Aller à droite",
+    "Move left": "Aller à gauche",
+    "Revoke permissions": "Révoquer les permissions",
+    "Take a picture": "Prendre une photo",
+    "Unable to set up keys": "Impossible de configurer les clés",
+    "Recent changes that have not yet been received": "Changements récents qui n'ont pas encore été reçus",
+    "The server is not configured to indicate what the problem is (CORS).": "Le n'est n'est pas configuré pour indiquer quel est le problème (CORS).",
+    "A connection error occurred while trying to contact the server.": "Une erreur de connexion est survenue en essayant de contacter le serveur.",
+    "Your area is experiencing difficulties connecting to the internet.": "Votre emplacement connaît des difficultés à se connecter à Internet.",
+    "The server has denied your request.": "Le serveur a refusé votre requête.",
+    "The server is offline.": "Le serveur est éteint.",
+    "A browser extension is preventing the request.": "Une extension du navigateur bloque la requête.",
+    "Your firewall or anti-virus is blocking the request.": "Votre pare-feu ou votre antivirus bloque la requête.",
+    "The server (%(serverName)s) took too long to respond.": "Le serveur (%(serverName)s) met trop de temps à répondre.",
+    "Your server isn't responding to some of your requests. Below are some of the most likely reasons.": "Votre serveur ne répond pas à certaines requêtes. Vous trouverez ci-dessus quelles sont la plupart des raisons.",
+    "Server isn't responding": "Le serveur ne répond pas",
+    "You're all caught up.": "Vous êtes à jour.",
+    "Data on this screen is shared with %(widgetDomain)s": "Les données sur cet écran sont partagées avec %(widgetDomain)s",
+    "Modal Widget": "Fenêtre de widget",
+    "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.": "Invitez quelqu'un à partir de son nom, pseudo (comme <userId/>) ou <a>partagez ce salon</a>.",
+    "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>": "Cela ne va pas l'inviter à %(communityName)s. Pour inviter quelqu'un à %(communityName)s, cliquez <a>ici</a>",
+    "Start a conversation with someone using their name or username (like <userId/>).": "Démarrer une conversation avec quelqu'un en utilisant son nom ou son pseudo (comme <userId/>).",
+    "May include members not in %(communityName)s": "Peut inclure des membres qui ne sont pas dans %(communityName)s",
+    "Send feedback": "Envoyer un commentaire",
+    "PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> to help us track down the problem.": "CONSEIL : si vous reportez un bug, merci d'envoyer <debugLogsLink>les logs de débogage</debugLogsLink> pour nous aider à identifier le problème.",
+    "Please view <existingIssuesLink>existing bugs on Github</existingIssuesLink> first. No match? <newIssueLink>Start a new one</newIssueLink>.": "Merci de regarder d'abord les <existingIssuesLink>bugs déjà répertoriés sur Github</existingIssuesLink>. Pas de résultat ? <newIssueLink>Reportez un nouveau bug</newIssueLink>.",
+    "Report a bug": "Reporter un bug",
+    "There are two ways you can provide feedback and help us improve %(brand)s.": "Il y a deux manières pour que vous puissiez faire vos retour et nous aider à améliorer %(brand)s.",
+    "Comment": "Commentaire",
+    "Add comment": "Ajouter un commentaire",
+    "Please go into as much detail as you like, so we can track down the problem.": "Merci d'ajouter le plus de détails possible, pour que nous puissions mieux identifier le problème.",
+    "Tell us below how you feel about %(brand)s so far.": "Dites-nous ci-dessous quel est votre ressenti à propos de %(brand)s jusque là.",
+    "Rate %(brand)s": "Noter %(brand)s",
+    "Feedback sent": "Commentaire envoyé",
+    "Update community": "Modifier la communauté",
+    "There was an error updating your community. The server is unable to process your request.": "Une erreur est survenue lors de la mise à jour de votre communauté. Le serveur est incapable de traiter votre requête.",
+    "Block anyone not part of %(serverName)s from ever joining this room.": "Bloque n'importe qui qui n'est pas membre de %(serverName)s de rejoindre ce salon.",
+    "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.": "Vous devriez le déactiver si le salon est utilisé pour collaborer avec des équipes externes qui ont leur propre serveur d'accueil. Ce ne peut pas être changé plus tard.",
+    "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Vous devriez l'activer si le salon n'est utilisé que pour collaborer avec des équipes internes sur votre serveur d'accueil. Ce ne peut pas être changé plus tard.",
+    "Your server requires encryption to be enabled in private rooms.": "Votre serveur requiert d'activer le chiffrement dans les salons privés.",
+    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Les salons privés ne peuvent être trouvés et rejoints seulement par invitation. Les salons publics peut être trouvés et rejoints par n'importe qui dans cette communauté.",
+    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Les salons privés ne peuvent être trouvés et rejoints seulement par invitation. Les salons publics peut être trouvés et rejoints par n'importe qui.",
+    "Start a new chat": "Commencer une nouvelle discussion",
+    "Add a photo so people know it's you.": "Ajoutez une photo pour que les gens sachent qu’il s’agit de vous.",
+    "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s ou %(usernamePassword)s",
+    "Decide where your account is hosted": "Décidez où votre compte est hébergé",
+    "Go to Home View": "Revenir à la page d'accueil",
+    "Use Ctrl + Enter to send a message": "Utilisez Ctrl + Entrée pour envoyer un message",
+    "%(senderName)s ended the call": "%(senderName)s a terminé l'appel",
+    "You ended the call": "Vous avez terminé l'appel",
+    "%(creator)s created this DM.": "%(creator)s a envoyé ce DM.",
+    "Now, let's help you get started": "Maintenant, commençons à vous initier",
+    "Welcome %(name)s": "Bienvenue %(name)s",
+    "Filter rooms and people": "Filtrer des salons et personnes",
+    "Got an account? <a>Sign in</a>": "Vous avez un compte ? <a>Connectez-vous</a>",
+    "New here? <a>Create an account</a>": "Nouveau ici ? <a>Créez un compte</a>",
+    "There was a problem communicating with the homeserver, please try again later.": "Il y a eu un problème lors de la communication avec le serveur d'accueil, veuillez réessayer ultérieurement.",
+    "New? <a>Create account</a>": "Nouveau ? <a>Créez un compte</a>",
+    "That username already exists, please try another.": "Ce nom d'utilisateur existe déjà, essayez-en un autre.",
+    "Already have an account? <a>Sign in here</a>": "Vous avez déjà un compte ? <a>Connectez-vous ici</a>",
+    "Algeria": "Algérie",
+    "Albania": "Albanie",
+    "Åland Islands": "Îles Åland",
+    "Afghanistan": "Afghanistan",
+    "United States": "États-Unis",
+    "United Kingdom": "Royaume-Uni",
+    "You've reached the maximum number of simultaneous calls.": "Vous avez atteint le nombre maximum d'appels en simultané.",
+    "No other application is using the webcam": "Aucune autre application n'est en train d'utiliser la caméra",
+    "A microphone and webcam are plugged in and set up correctly": "Un microphone et une caméra sont branchées et bien configurées",
+    "Unable to access webcam / microphone": "Impossible d'accéder à la caméra ou microphone",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "La fonction a échoué car le microphone n'a pas pu être accédé. Vérifiez qu'un microphone est branché et bien configuré.",
+    "Unable to access microphone": "Impossible d'accéder au microphone",
+    "Belgium": "Belgique",
+    "Belarus": "Biélorussie",
+    "Barbados": "Barbade",
+    "Bangladesh": "Bangladesh",
+    "Bahrain": "Bahreïn",
+    "Bahamas": "Les Bahamas",
+    "Azerbaijan": "Azerbaïdjan",
+    "Austria": "Autriche",
+    "Australia": "Australie",
+    "Aruba": "Aruba",
+    "Armenia": "Arménie",
+    "Argentina": "Argentine",
+    "Antigua & Barbuda": "Antigue-et-Barbude",
+    "Antarctica": "Antarctique",
+    "Anguilla": "Anguilla",
+    "Angola": "République d'Angola",
+    "Andorra": "Andorre",
+    "American Samoa": "Samoa américaines",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Invitez quelqu'un via leur nom, e-mail ou nom d'utilisateur (p. ex. <userId/>) ou <a>partagez ce salon</a>.",
+    "Start a conversation with someone using their name, email address or username (like <userId/>).": "Commencer une conversation avec quelqu'un via leur nom, e-mail ou nom d'utilisateur (comme par exemple <userId/>).",
+    "Too Many Calls": "Trop d'appels",
+    "Permission is granted to use the webcam": "Permission accordée pour l'utilisation de la webcam",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "La fonction a échoué car la webcam ou le microphone ne pouvait pas être accédé. Vérifiez que :",
+    "Send stickers to this room as you": "Envoyer des stickers dans ce salon en tant que vous",
+    "Zambia": "Zambie",
+    "Yemen": "Yémen",
+    "Western Sahara": "Sahara occidental",
+    "Wallis & Futuna": "Wallis-et-Futuna",
+    "Vietnam": "Viêt Nam",
+    "Venezuela": "Vénézuéla",
+    "Vatican City": "Vatican",
+    "Vanuatu": "Vanuatu",
+    "Uzbekistan": "Ouzbékistan",
+    "Uruguay": "Uruguay",
+    "United Arab Emirates": "Émirats arabes unis",
+    "Ukraine": "Ukraine",
+    "Uganda": "Ouganda",
+    "U.S. Virgin Islands": "Îles Vierges des États-Unis",
+    "Tuvalu": "Tuvalu",
+    "Turks & Caicos Islands": "Îles Turques-et-Caïques",
+    "Turkmenistan": "Turkménistan",
+    "Turkey": "Turquie",
+    "Tunisia": "Tunisie",
+    "Trinidad & Tobago": "Trinité-et-Tobago",
+    "Tonga": "Tonga",
+    "Tokelau": "Tokelau",
+    "Togo": "Togo",
+    "Timor-Leste": "Timor oriental",
+    "Thailand": "Thaïlande",
+    "Tanzania": "Tanzanie",
+    "Tajikistan": "Tadjikistan",
+    "Taiwan": "Taïwan",
+    "São Tomé & Príncipe": "Sao Tomé-et-Principe",
+    "Syria": "Syrie",
+    "Switzerland": "Suisse",
+    "Sweden": "Suède",
+    "Swaziland": "Eswatini",
+    "Svalbard & Jan Mayen": "Svalbard et Jan Mayen",
+    "Suriname": "Suriname",
+    "Sudan": "Soudan",
+    "St. Vincent & Grenadines": "Saint-Vincent-et-les-Grenadines",
+    "St. Pierre & Miquelon": "Saint-Pierre-et-Miquelon",
+    "St. Martin": "Saint-Martin (Antilles françaises)",
+    "St. Lucia": "Sainte-Lucie",
+    "St. Kitts & Nevis": "Saint-Christophe-et-Niévès",
+    "St. Helena": "Île Sainte-Hélène",
+    "St. Barthélemy": "Saint-Barthélemy",
+    "Sri Lanka": "Sri Lanka",
+    "Spain": "Espagne",
+    "South Sudan": "Soudan du Sud",
+    "South Korea": "Corée du Sud",
+    "South Georgia & South Sandwich Islands": "Géorgie du Sud-et-les îles Sandwich du Sud",
+    "South Africa": "Afrique du Sud",
+    "Somalia": "Somalie",
+    "Solomon Islands": "Îles Salomon",
+    "Slovenia": "Slovénie",
+    "Slovakia": "Slovaquie",
+    "Sint Maarten": "Saint-Martin (royaume des Pays-Bas)",
+    "Singapore": "Singapour",
+    "Sierra Leone": "Sierra Leone",
+    "Seychelles": "Seychelles",
+    "Serbia": "Serbie",
+    "Senegal": "Sénégal",
+    "Saudi Arabia": "Arabie saoudite",
+    "San Marino": "Saint-Marin",
+    "Samoa": "Samoa",
+    "Réunion": "La Réunion",
+    "Rwanda": "Rwanda",
+    "Russia": "Russie",
+    "Romania": "Roumanie",
+    "Qatar": "Qatar",
+    "Puerto Rico": "Porto Rico",
+    "Portugal": "Portugal",
+    "Poland": "Pologne",
+    "Pitcairn Islands": "Îles Pitcairn",
+    "Philippines": "Philippines",
+    "Peru": "Pérou",
+    "Paraguay": "Paraguay",
+    "Papua New Guinea": "Papouasie-Nouvelle-Guinée",
+    "Panama": "Panama",
+    "Palestine": "Palestine",
+    "Palau": "Palaos",
+    "Pakistan": "Pakistan",
+    "Oman": "Oman",
+    "Norway": "Norvège",
+    "Northern Mariana Islands": "Îles Mariannes du Nord",
+    "North Korea": "Corée du Nord",
+    "Norfolk Island": "Île Norfolk",
+    "Niue": "Niue",
+    "Nigeria": "Nigéria",
+    "Niger": "Niger",
+    "Nicaragua": "Nicaragua",
+    "New Zealand": "Nouvelle-Zélande",
+    "New Caledonia": "Nouvelle-Calédonie",
+    "Netherlands": "Pays-Bas",
+    "Nepal": "Népal",
+    "Nauru": "Nauru",
+    "Namibia": "Namibie",
+    "Myanmar": "Birmanie",
+    "Mozambique": "Mozambique",
+    "Morocco": "Maroc",
+    "Montserrat": "Montserrat",
+    "Montenegro": "Monténégro",
+    "Mongolia": "Mongolie",
+    "Monaco": "Monaco",
+    "Moldova": "Moldavie",
+    "Micronesia": "États fédérés de Micronésie",
+    "Mexico": "Mexico",
+    "Mayotte": "Mayotte",
+    "Mauritius": "République de Maurice",
+    "Mauritania": "Mauritanie",
+    "Martinique": "Martinique",
+    "Marshall Islands": "Îles Marshall",
+    "Malta": "Malte",
+    "Mali": "Mali",
+    "Maldives": "Maldives",
+    "Malaysia": "Malaisie",
+    "Malawi": "Malawi",
+    "Madagascar": "Madagascar",
+    "Macedonia": "Macédoine du Nord",
+    "Macau": "Macao",
+    "Benin": "Bénin",
+    "Host account on": "Héberger le compte sur",
+    "Belize": "Bélize",
+    "Luxembourg": "Luxembourg",
+    "Lithuania": "Lituanie",
+    "Liechtenstein": "Liechtenstein",
+    "Libya": "Libye",
+    "Liberia": "Liberia",
+    "Lesotho": "Lesotho",
+    "Lebanon": "Liban",
+    "Latvia": "Lettonie",
+    "Laos": "Laos",
+    "Kyrgyzstan": "Kirghizistan",
+    "Kuwait": "Koweït",
+    "Kosovo": "Kosovo",
+    "Kiribati": "Kiribati",
+    "Kenya": "Kenya",
+    "Kazakhstan": "Kazakhstan",
+    "Jordan": "Jordanie",
+    "Jersey": "Jersey",
+    "Japan": "Japon",
+    "Jamaica": "Jamaïque",
+    "Italy": "Italie",
+    "Israel": "Israël",
+    "Isle of Man": "Île de Man",
+    "Ireland": "Irlande",
+    "Iraq": "Irak",
+    "Iran": "Iran",
+    "Indonesia": "Indonésie",
+    "India": "Inde",
+    "Iceland": "Islande",
+    "Hungary": "Hongrie",
+    "Hong Kong": "Hong Kong",
+    "Honduras": "Honduras",
+    "Heard & McDonald Islands": "Îles Heard-et-MacDonald",
+    "Haiti": "Haïti",
+    "Guyana": "Guyana",
+    "Guinea-Bissau": "Guinée-Bissau",
+    "Guinea": "Guinée",
+    "Guernsey": "Guernesey",
+    "Guatemala": "Guatemala",
+    "Guam": "Guam",
+    "Guadeloupe": "Guadeloupe",
+    "Grenada": "Grenade",
+    "Greenland": "Groenland",
+    "Greece": "Grèce",
+    "Gibraltar": "Gibraltar",
+    "Ghana": "Ghana",
+    "Germany": "Allemagne",
+    "Georgia": "Géorgie",
+    "Gambia": "Gambie",
+    "Gabon": "République gabonaise",
+    "French Southern Territories": "Terres australes et antarctiques françaises",
+    "French Polynesia": "Polynésie française",
+    "French Guiana": "Guyane",
+    "France": "France",
+    "Finland": "Finlande",
+    "Fiji": "Îles Fidji",
+    "Faroe Islands": "Îles Féroé",
+    "Falkland Islands": "Îles Malouines (Falkland)",
+    "Ethiopia": "Éthiopie",
+    "Estonia": "Estonie",
+    "Eritrea": "Érythrée",
+    "Equatorial Guinea": "Guinée équatoriale",
+    "El Salvador": "Le Salvador",
+    "Egypt": "Égypte",
+    "Ecuador": "République de l'Équateur",
+    "Dominican Republic": "République dominicaine",
+    "Dominica": "Dominique",
+    "Djibouti": "Djibouti",
+    "Denmark": "Danemark",
+    "Côte d’Ivoire": "Côte d’Ivoire (Terre d'Éburnie)",
+    "Czech Republic": "La République tchèque",
+    "Cyprus": "Chypre",
+    "Curaçao": "Curaçao",
+    "Cuba": "Cuba",
+    "Croatia": "Croatie",
+    "Costa Rica": "Costa Rica",
+    "Cook Islands": "Îles Cook",
+    "Congo - Kinshasa": "République démocratique du Congo",
+    "Congo - Brazzaville": "République du Congo",
+    "Comoros": "Comores",
+    "Colombia": "Colombia",
+    "Cocos (Keeling) Islands": "îles Cocos",
+    "Christmas Island": "île Christmas",
+    "China": "Chine",
+    "Chile": "Chili",
+    "Chad": "Tchad",
+    "Central African Republic": "République centrafricaine",
+    "Cayman Islands": "Îles Caïmans",
+    "Caribbean Netherlands": "Pays-Bas caribéens",
+    "Cape Verde": "Cap-Vert",
+    "Canada": "Canada",
+    "Cameroon": "Cameroun",
+    "Cambodia": "Cambodge",
+    "Burundi": "La république du Burundi",
+    "Burkina Faso": "Burkina Faso",
+    "Bulgaria": "Bulgarie",
+    "Brunei": "Brunéi",
+    "British Virgin Islands": "Îles Vierges britanniques",
+    "British Indian Ocean Territory": "Territoire britannique de l'océan Indien",
+    "Brazil": "Brésil",
+    "Bouvet Island": "Île Bouvet",
+    "Botswana": "Botswana",
+    "Bosnia": "Bosnie-Herzegovine",
+    "Bolivia": "Bolivie",
+    "Bhutan": "Bhoutan",
+    "Bermuda": "Bermudes",
+    "with state key %(stateKey)s": "avec la ou les clés d'état %(stateKey)s",
+    "with an empty state key": "avec une clé d'état vide",
+    "See when anyone posts a sticker to your active room": "Voir quand n'importe qui envoye un sticker dans le salon actuel",
+    "See when a sticker is posted in this room": "Voir quand un sticker est envoyé dans ce salon",
+    "See when the avatar changes in your active room": "Voir quand l'avatar change dans le salon actuel",
+    "Change the avatar of your active room": "Changer l'avatar du salon actuel",
+    "See when the avatar changes in this room": "Voir quand l'avatar change dans ce salon",
+    "Change the avatar of this room": "Changer l'avatar de ce salon",
+    "Send stickers into your active room": "Envoyer des stickers dans le salon actuel",
+    "See when the topic changes in this room": "Voir quand le sujet change dans ce salon",
+    "See when the topic changes in your active room": "Voir quand le sujet change dans le salon actuel",
+    "Change the name of your active room": "Changer le nom du salon actuel",
+    "See when the name changes in this room": "Suivre quand le nom de ce salon change",
+    "Change the name of this room": "Changer le nom de ce salon",
+    "Change the topic of your active room": "Changer le sujet dans le salon actuel",
+    "Change the topic of this room": "Changer le sujet de ce salon",
+    "Send stickers into this room": "Envoyer des stickers dans ce salon",
+    "Remain on your screen when viewing another room, when running": "Reste sur votre écran quand vous regardez un autre salon lors de l'appel",
+    "Takes the call in the current room off hold": "Reprends l'appel en cours dans ce salon",
+    "Places the call in the current room on hold": "Met l'appel en pause dans ce salon",
+    "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "Ajoute \"(╯°□°）╯︵ ┻━┻\" en préfixe du message",
+    "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "Ajoute \"┬──┬ ノ( ゜-゜ノ)\" en préfixe du message",
+    "Effects": "Effets",
+    "Zimbabwe": "Zimbabwe",
+    "Send images as you in your active room": "Envoie des images sous votre nom dans le salon actuel",
+    "Send images as you in this room": "Envoie des images sous votre nom dans ce salon",
+    "See emotes posted to your active room": "Voir les émoticônes envoyées dans le salon actuel",
+    "See emotes posted to this room": "Voir les émoticônes envoyées dans ce salon",
+    "Send emotes as you in your active room": "Envoyer des émoticônes sous votre nom dans le salon actuel",
+    "Send emotes as you in this room": "Envoyer des émoticônes sous votre nom dans ce salon",
+    "See videos posted to your active room": "Voir les vidéos publiées dans votre salon actuel",
+    "See videos posted to this room": "Voir les vidéos publiées dans ce salon",
+    "Send videos as you in your active room": "Envoie des vidéos en tant que vous dans votre salon actuel",
+    "Send videos as you in this room": "Envoie des vidéos en tant que vous dans ce salon",
+    "See images posted to this room": "Voir les images publiées dans ce salon",
+    "See images posted to your active room": "Voir les images publiées dans votre salon actuel",
+    "See messages posted to your active room": "Voir les messages publiés dans votre salon actuel",
+    "See messages posted to this room": "Voir les messages publiés dans ce salon",
+    "Send messages as you in your active room": "Envoie des messages en tant que vous dans votre salon actuel",
+    "Send messages as you in this room": "Envoie des messages en tant que vous dans ce salon",
+    "The <b>%(capability)s</b> capability": "La capacité <b>%(capability)s</b>",
+    "See <b>%(eventType)s</b> events posted to your active room": "Voir les événements <b>%(eventType)s</b> publiés dans votre salon actuel",
+    "Send <b>%(eventType)s</b> events as you in your active room": "Envoie des événements <b>%(eventType)s</b> en tant que vous dans votre salon actuel",
+    "See <b>%(eventType)s</b> events posted to this room": "Voir les événements <b>%(eventType)s</b> publiés dans ce salon",
+    "Send <b>%(eventType)s</b> events as you in this room": "Envoie des événements <b>%(eventType)s</b> en tant que vous dans ce salon",
+    "Send stickers to your active room as you": "Envoie des stickers en tant que vous dans le salon actuel",
+    "Continue with %(ssoButtons)s": "Continuer avec %(ssoButtons)s",
+    "About homeservers": "À propos des serveurs d'accueils",
+    "Learn more": "En savoir plus",
+    "Use your preferred Matrix homeserver if you have one, or host your own.": "Utilisez votre serveur d'accueil Matrix préféré si vous en avez un, ou hébergez le vôtre.",
+    "Other homeserver": "Autre serveur d'accueil",
+    "We call the places where you can host your account ‘homeservers’.": "Nous appelons ‘serveur d'accueils’ les lieux où vous pouvez héberger votre compte.",
+    "Sign into your homeserver": "Connectez-vous sur votre serveur d'accueil",
+    "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "Matrix.org est le plus grand serveur d'accueil dans le monde, donc c'est un bon lieu pour beaucoup.",
+    "Specify a homeserver": "Spécifiez un serveur d'accueil",
+    "Invalid URL": "URL invalide",
+    "Unable to validate homeserver": "Impossible de valider le serveur d'accueil",
+    "Just a heads up, if you don't add an email and forget your password, you could <b>permanently lose access to your account</b>.": "Juste une remarque, si vous n'ajoutez pas un email et que vous oubliez votre mot de passe, vous pourriez <b>perdre définitivement l'accés à votre compte</b>.",
+    "Continuing without email": "Continuer sans email",
+    "Transfer": "Transférer",
+    "Failed to transfer call": "N'a pas réussi à transférer l'appel",
+    "A call can only be transferred to a single user.": "Un appel peut seulement être transféré à un seul utilisateur.",
+    "Invite by email": "Inviter par email",
+    "Active Widgets": "Gadgets actifs",
+    "Reason (optional)": "Raison (optionnelle)",
+    "Continue with %(provider)s": "Continuer avec %(provider)s",
+    "Homeserver": "Serveur d'accueil",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Element with an existing Matrix account on a different homeserver.": "Vous pouvez utiliser les options de serveur personnalisés pour vous connecter à d'autres serveurs Matrix en spécifiant une URL de serveur d'accueil différente. Celà vous permet d'utiliser Element avec un compte Matrix existant sur un serveur d'accueil différent.",
+    "Server Options": "Options serveur",
+    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Les messages ici sont chiffrés de bout en bout. Quand les gens joignent, vous pouvez les vérifier dans leur profil, tapez simplement sur leur avatar.",
+    "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Les messages ici sont chiffrés de bout en bout. Vérifiez %(displayName)s dans leur profil - tapez sur leur avatar.",
+    "Role": "Rôle",
+    "Use the + to make a new room or explore existing ones below": "Utilisez le + pour créer un nouveau salon ou explorer les existantes ci-dessous",
+    "This is the start of <roomName/>.": "C'est le début de <roomName/>.",
+    "Add a photo, so people can easily spot your room.": "Ajoutez une photo afin que les gens repèrent facilement votre salon.",
+    "%(displayName)s created this room.": "%(displayName)s a créé ce salon.",
+    "You created this room.": "Vous avez créé ce salon.",
+    "<a>Add a topic</a> to help people know what it is about.": "<a>Ajoutez un sujet</a> pour aider les gens à savoir de quoi il est question.",
+    "Topic: %(topic)s ": "Sujet : %(topic)s ",
+    "Topic: %(topic)s (<a>edit</a>)": "Sujet : %(topic)s (<a>éditer</a>)",
+    "This is the beginning of your direct message history with <displayName/>.": "C'est le début de votre historique de messages direct avec <displayName/>.",
+    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Seulement vous deux êtes dans cette conversation, à moins que l'un de vous invite quelqu'un à joindre.",
+    "%(name)s on hold": "%(name)s est en attente",
+    "Return to call": "Revenir à l'appel",
+    "Fill Screen": "Remplir l'écran",
+    "Voice Call": "Appel vocal",
+    "Video Call": "Appel vidéo",
+    "%(peerName)s held the call": "%(peerName)s a mis l'appel en pause",
+    "You held the call <a>Resume</a>": "Vous avez mis l'appel en attente <a>Reprendre</a>",
+    "You held the call <a>Switch</a>": "Vous avez mis l'appel en attente <a>Basculer</a>",
+    "sends snowfall": "envoie une chute de neige",
+    "Sends the given message with snowfall": "Envoie le message donné avec une chute de neige",
+    "sends fireworks": "envoie des feux d'artifices",
+    "Sends the given message with fireworks": "Envoie le message donné avec des feux d'artifices",
+    "sends confetti": "envoie des confettis",
+    "Sends the given message with confetti": "Envoie le message avec des confettis",
+    "Show chat effects": "Montrer les effets cosmétiques du chat",
+    "Use Command + Enter to send a message": "Utilisez Ctrl + Entrée pour envoyer un message",
+    "Render LaTeX maths in messages": "Formate et affiche les maths format LaTeX dans les messages",
+    "New version of %(brand)s is available": "Nouvelle version de %(brand)s disponible",
+    "Update %(brand)s": "Mettre à jour %(brand)s",
+    "Enable desktop notifications": "Activer les notifications sur le bureau",
+    "Don't miss a reply": "Ne ratez pas une réponse",
+    "See <b>%(msgtype)s</b> messages posted to your active room": "Voir les messages de type <b>%(msgtype)s</b> publiés dans le salon actuel",
+    "See <b>%(msgtype)s</b> messages posted to this room": "Voir les messages de type <b>%(msgtype)s</b> publiés dans ce salon",
+    "Send <b>%(msgtype)s</b> messages as you in this room": "Envoie des messages de type<b>%(msgtype)s</b> en tant que vous dans ce salon",
+    "Send <b>%(msgtype)s</b> messages as you in your active room": "Envoie des messages de type <b>%(msgtype)s</b> en tant que vous dans votre salon actuel",
+    "See general files posted to your active room": "Voir les fichiers postés dans votre salon actuel",
+    "See general files posted to this room": "Voir les fichiers postés dans ce salon",
+    "Send general files as you in your active room": "Envoie des fichiers en tant que vous dans votre salon actuel",
+    "Send general files as you in this room": "Envoie des fichiers en tant que vous dans ce salon",
+    "Search (must be enabled)": "Recherche (si activée)",
+    "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "Cette session a détecté que votre phrase de passe et clé de sécurité pour les messages sécurisés ont été supprimées.",
+    "A new Security Phrase and key for Secure Messages have been detected.": "Une nouvelle phrase de passe et clé pour les messages sécurisés ont été détectées.",
+    "Make a copy of your Security Key": "Faire une copie de votre Clé de Sécurité",
+    "Confirm your Security Phrase": "Confirmez votre phrase de passe",
+    "Secure your backup with a Security Phrase": "Protégez votre sauvegarde avec une Clé de Sécurité",
+    "Your Security Key is in your <b>Downloads</b> folder.": "Votre Clé de Sécurité est dans le répertoire <b>Téléchargements</b>.",
+    "Your Security Key has been <b>copied to your clipboard</b>, paste it to:": "Votre Clé de Sécurité a été <b>copiée dans votre presse-papier</b>, copiez la pour :",
+    "Your Security Key": "Votre Clé de Sécurité",
+    "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "Votre Clé de Sécurité est un filet de sécurité. Vous pouvez l’utiliser pour retrouver l’accès à vos messages chiffrés si vous oubliez votre phrase de passe.",
+    "Repeat your Security Phrase...": "Répétez votre phrase de passe…",
+    "Please enter your Security Phrase a second time to confirm.": "Merci de saisir votre phrase de passe une seconde fois pour confirmer.",
+    "Set up with a Security Key": "Configurer avec une Clé de Sécurité",
+    "Great! This Security Phrase looks strong enough.": "Super ! Cette phrase de passe a l’air assez solide.",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "Nous avons stocké une copie chiffrée de vos clés sur notre serveur. Sécurisez vos sauvegardes avec une phrase de passe.",
+    "Use Security Key": "Utiliser la Clé de Sécurité",
+    "Use Security Key or Phrase": "Utilisez votre Clé de Sécurité ou phrase de passe",
+    "You have no visible notifications.": "Vous n’avez aucune notification visible.",
+    "Upgrade to pro": "Mettre à jour vers pro",
+    "Great, that'll help people know it's you": "Super, ceci aidera des personnes à confirmer qu’il s’agit bien de vous",
+    "<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 pour votre page de communauté</h1>\n<p>\n    Utilisez la description longue pour présenter la communauté aux nouveaux membres\n    ou pour diffuser des <a href=\"foo\">liens</a> importants\n</p>\n<p>\n    Vous pouvez même ajouter des images avec des URL Matrix <img src=\"mxc://url\" />\n</p>\n",
+    "Use email to optionally be discoverable by existing contacts.": "Utiliser une adresse e-mail pour pouvoir être découvert par des contacts existants.",
+    "Use email or phone to optionally be discoverable by existing contacts.": "Utiliser une adresse e-mail ou un numéro de téléphone pour pouvoir être découvert par des contacts existants.",
+    "Add an email to be able to reset your password.": "Ajouter une adresse e-mail pour pouvoir réinitialiser votre mot de passe.",
+    "Forgot password?": "Mot de passe oublié ?",
+    "That phone number doesn't look quite right, please check and try again": "Ce numéro de téléphone ne semble pas correct, merci de vérifier et réessayer",
+    "Enter email address": "Saisir l’adresse e-mail",
+    "Enter phone number": "Saisir le numéro de téléphone",
+    "Something went wrong in confirming your identity. Cancel and try again.": "Une erreur s’est produite lors de la vérification de votre identité. Annulez et réessayez.",
+    "Open the link in the email to continue registration.": "Ouvrez le lien dans l’e-mail pour poursuivre l’inscription.",
+    "A confirmation email has been sent to %(emailAddress)s": "Un e-mail de confirmation a été envoyé à %(emailAddress)s",
+    "Hold": "Mettre en pause",
+    "Resume": "Reprendre",
+    "If you've forgotten your Security Key you can <button>set up new recovery options</button>": "Si vous avez oublié votre Clé de Sécurité, vous pouvez <button>définir de nouvelles options de récupération</button>",
+    "Access your secure message history and set up secure messaging by entering your Security Key.": "Accédez à votre historique de messages chiffrés et mettez en place la messagerie sécurisée en entrant votre Clé de Sécurité.",
+    "Not a valid Security Key": "Clé de Sécurité invalide",
+    "This looks like a valid Security Key!": "Ça ressemble à une Clé de Sécurité !",
+    "Enter Security Key": "Saisir la clé de sécurité",
+    "If you've forgotten your Security Phrase you can <button1>use your Security Key</button1> or <button2>set up new recovery options</button2>": "Si vous avez oublié votre phrase de passe vous pouvez <button1>utiliser votre Clé de Sécurité</button1> ou <button2>définir de nouvelles options de récupération</button2>",
+    "Access your secure message history and set up secure messaging by entering your Security Phrase.": "Accédez à votre historique de messages chiffrés et mettez en place la messagerie sécurisée en entrant votre phrase de passe.",
+    "Enter Security Phrase": "Saisir la phrase de passe",
+    "Backup could not be decrypted with this Security Phrase: please verify that you entered the correct Security Phrase.": "La sauvegarde n’a pas pu être déchiffrée avec cette phrase de passe : merci de vérifier que vous avez saisi la bonne phrase de passe.",
+    "Incorrect Security Phrase": "Phrase de passe incorrecte",
+    "Backup could not be decrypted with this Security Key: please verify that you entered the correct Security Key.": "La sauvegarde n’a pas pu être déchiffrée avec cette Clé de Sécurité : merci de vérifier que vous avez saisi la bonne Clé de Sécurité.",
+    "Security Key mismatch": "Pas de correspondance entre les Clés de Sécurité",
+    "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "Impossible d’accéder à l’espace de stockage sécurisé. Merci de vérifier que vous avez saisi la bonne phrase de passe.",
+    "Invalid Security Key": "Clé de Sécurité invalide",
+    "Wrong Security Key": "Mauvaise Clé de Sécurité",
+    "Remember this": "Mémoriser ceci",
+    "The widget will verify your user ID, but won't be able to perform actions for you:": "Ce widget vérifiera votre identifiant d’utilisateur, mais ne pourra pas effectuer des actions en votre nom :",
+    "Allow this widget to verify your identity": "Autoriser ce widget à vérifier votre identité",
+    "Decline All": "Tout refuser",
+    "Approve": "Approuver",
+    "This widget would like to:": "Le widget voudrait :",
+    "Approve widget permissions": "Approuver les permissions du widget",
+    "We recommend you change your password and Security Key in Settings immediately": "Nous vous recommandons de changer votre mot de passe et Clé de Sécurité dans les Paramètres immédiatement",
+    "Minimize dialog": "Réduire la modale",
+    "Maximize dialog": "Maximiser la modale",
+    "%(hostSignupBrand)s Setup": "Configuration de %(hostSignupBrand)s",
+    "You should know": "Vous devriez connaître",
+    "Privacy Policy": "Politique de confidentialité",
+    "Cookie Policy": "Politique de gestion des cookies",
+    "Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.": "Consultez nos <privacyPolicyLink />, <termsOfServiceLink /> et <cookiePolicyLink />.",
+    "Continuing temporarily allows the %(hostSignupBrand)s setup process to access your account to fetch verified email addresses. This data is not stored.": "Continuer permettra temporairement au processus de configuration de %(hostSignupBrand)s d’accéder à votre compte pour récupérer les adresses email vérifiées. Les données ne sont pas stockées.",
+    "Failed to connect to your homeserver. Please close this dialog and try again.": "Impossible de vous connecter à votre serveur d’accueil. Merci de fermer cette modale et de réessayer.",
+    "Abort": "Annuler",
+    "Are you sure you wish to abort creation of the host? The process cannot be continued.": "Êtes-vous sûr de vouloir annuler la création de cet hôte ? Le process ne pourra pas être repris.",
+    "Confirm abort of host creation": "Confirmer l’annulation de la création de cet hôte",
+    "There was an error finding this widget.": "Erreur lors de la récupération de ce widget.",
+    "Windows": "Windows",
+    "Screens": "Écrans",
+    "Share your screen": "Partager votre écran",
+    "Set my room layout for everyone": "Définir ma disposition de salon pour tout le monde",
+    "Open dial pad": "Ouvrir le pavé de numérotation",
+    "Start a Conversation": "Démarrer une conversation",
+    "Recently visited rooms": "Salons visités récemment",
+    "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 Security Key.": "Sauvegardez vos clés de chiffrement et les données de votre compte au casoù vous perdiez l’accès à vos sessions. Vos clés seront sécurisés avec une Clé de Sécurité unique.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Mettre en cache localement et de manière sécurisée les messages chiffrés pour qu’ils apparaissent dans les résultats de recherche, en utilisant %(size)s pour stocker les messages de %(rooms)s salons.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Mettre en cache localement et de manière sécurisée les messages chiffrés pour qu’ils apparaissent dans les résultats de recherche, en utilisant %(size)s pour stocker les messages de %(rooms)s salons.",
+    "Channel: <channelLink/>": "Canal : <channelLink/>",
+    "Workspace: <networkLink/>": "Espace de travail : <networkLink/>",
+    "Dial pad": "Pavé de numérotation",
+    "There was an error looking up the phone number": "Erreur lors de la recherche de votre numéro de téléphone",
+    "Unable to look up phone number": "Impossible de trouver votre numéro de téléphone",
+    "Use Ctrl + F to search": "Utilisez Control + F pour rechercher",
+    "Use Command + F to search": "Utilisez Commande + F pour rechercher",
+    "Show line numbers in code blocks": "Afficher les numéros de ligne dans les blocs de code",
+    "Expand code blocks by default": "Dérouler les blocs de code par défaut",
+    "Show stickers button": "Afficher le bouton stickers",
+    "Use app": "Utiliser l’application",
+    "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Element Web est expérimental sur téléphone. Pour une meilleure expérience et bénéficier des dernières fonctionnalités, utilisez notre application native gratuite.",
+    "Use app for a better experience": "Utilisez une application pour une meilleure expérience",
+    "See text messages posted to your active room": "Voir les messages textuels dans le salon actif",
+    "See text messages posted to this room": "Voir les messages textuels envoyés dans ce salon",
+    "Send text messages as you in your active room": "Envoyez des messages textuels en tant que vous-même dans le salon actif",
+    "Send text messages as you in this room": "Envoyez des messages textuels en tant que vous-même dans ce salon",
+    "See when the name changes in your active room": "Suivre les changements de nom dans le salon actif",
+    "Change which room, message, or user you're viewing": "Changer le salon, message, ou la personne que vous visualisez",
+    "Change which room you're viewing": "Changer le salon que vous visualisez",
+    "Remain on your screen while running": "Restez sur votre écran pendant l’exécution",
+    "%(senderName)s has updated the widget layout": "%(senderName)s a mis à jour la disposition du widget",
+    "Converts the DM to a room": "Transformer le message privé en salon",
+    "Converts the room to a DM": "Transformer le salon en message privé",
+    "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "Votre serveur d’accueil a rejeté la demande de connexion. Ceci pourrait être dû à une connexion qui prend trop de temps. Si cela persiste, merci de contacter l’administrateur de votre serveur d’accueil.",
+    "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "Votre serveur d’accueil n’est pas accessible, nous n’avons pas pu vous connecter. Merci de réessayer. Si cela persiste, merci de contacter l’administrateur de votre serveur d’accueil.",
+    "Try again": "Réessayez",
+    "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "Nous avons demandé à votre navigateur de mémoriser votre serveur d’accueil, mais il semble l’avoir oublié. Rendez-vous à la page de connexion et réessayez.",
+    "We couldn't log you in": "Impossible de vous déconnecter"
 }
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 0dc3b770dd..b309f12245 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,13 +131,13 @@
     "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",
     "Automatically replace plain text Emoji": "Substituír automaticamente Emoji en texto plano",
     "Enable inline URL previews by default": "Activar por defecto as vistas previas en liña de URL",
-    "Enable URL previews for this room (only affects you)": "Activar avista previa de URL nesta sala (só che afesta a ti)",
+    "Enable URL previews for this room (only affects you)": "Activar vista previa de URL nesta sala (só che afecta a ti)",
     "Enable URL previews by default for participants in this room": "Activar a vista previa de URL por defecto para as participantes nesta sala",
     "Room Colour": "Cor da sala",
     "Active call (%(roomName)s)": "Chamada activa (%(roomName)s)",
@@ -163,13 +163,13 @@
     "Current password": "Contrasinal actual",
     "Password": "Contrasinal",
     "New Password": "Novo contrasinal",
-    "Confirm password": "Confirme o contrasinal",
+    "Confirm password": "Confirma o contrasinal",
     "Change Password": "Cambiar contrasinal",
     "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",
-    "Mirror local video feed": "Copiar fonte de vídeo local",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
+    "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",
@@ -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",
@@ -424,7 +424,7 @@
     "email address": "enderezo de correo",
     "Try using one of the following valid address types: %(validTypesList)s.": "Intentar utilizar algún dos seguintes tipos de enderezo válidos: %(validTypesList)s.",
     "You have entered an invalid address.": "Introduciu un enderezo non válido.",
-    "Confirm Removal": "Confirme a retirada",
+    "Confirm Removal": "Confirma a retirada",
     "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 certa de que queres quitar (eliminar) este evento? Debes saber que se eliminas un nome de sala ou cambias o asunto, poderías desfacer o cambio.",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Os ID de comunidade só poden conter caracteres a-z, 0-9, or '=_-./'",
     "Community IDs cannot be empty.": "O ID de comunidade non pode quedar baldeiro.",
@@ -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",
@@ -547,14 +547,14 @@
     "<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.",
     "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",
@@ -614,7 +614,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.": "Este proceso permíteche exportar a un ficheiro local as chaves para as mensaxes que recibiches en salas cifradas. Após poderás importar as chaves noutro cliente Matrix no futuro, así o cliente poderá descifrar esas mensaxes.",
     "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 ficheiro exportado permitiralle a calquera que poida lelo descifrar e cifrar mensaxes que ti ves, así que deberías ter coidado e gardalo de xeito seguro. Para axudarche, deberías escribir unha frase de paso aquí abaixo que será usada para cifrar os datos exportados. Só será posible importar os datos utilizando a mesma frase de paso.",
     "Enter passphrase": "Introduza a frase de paso",
-    "Confirm passphrase": "Confirme a frase de paso",
+    "Confirm passphrase": "Confirma a frase de paso",
     "Export": "Exportar",
     "Import room keys": "Importar chaves de sala",
     "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 proceso permíteche importar chaves de cifrado que exportaches doutro cliente Matrix. Así poderás descifrar calquera mensaxe que o outro cliente puidese cifrar.",
@@ -639,11 +639,11 @@
     "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.",
-    "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",
@@ -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": "Antecede con ¯\\_(ツ)_/¯ 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",
@@ -936,7 +936,7 @@
     "This room has no topic.": "Esta sala non ten asunto.",
     "Sets the room name": "Establecer nome da sala",
     "Use an identity server": "Usar un servidor de identidade",
-    "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Usar un servidor de identidade para convidar por email. Preme continuar para usar o servidor de identidade por omisión (%(defaultIdentityServerName)s) ou cambiao en Axustes.",
+    "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Usar un servidor de identidade para convidar por email. Preme continuar para usar o servidor de identidade por defecto (%(defaultIdentityServerName)s) ou cambiao en Axustes.",
     "Use an identity server to invite by email. Manage in Settings.": "Usar un servidor de indentidade para convidar por email. Xestionao en Axustes.",
     "Command failed": "O comando fallou",
     "Could not find user in room": "Non se atopa a usuaria na sala",
@@ -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.",
@@ -1494,7 +1494,7 @@
     "Key backup": "Copia da Chave",
     "Message search": "Buscar mensaxe",
     "Cross-signing": "Sinatura cruzada",
-    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "A administración do servidor desactivou por omisión o cifrado extremo-a-extremo en salas privadas e Mensaxes Directas.",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "A administración do servidor desactivou por defecto o cifrado extremo-a-extremo en salas privadas e Mensaxes Directas.",
     "A session's public name is visible to people you communicate with": "Un nome público de sesión é visible para a xente coa que te comunicas",
     "Missing media permissions, click the button below to request.": "Falta permiso acceso multimedia, preme o botón para solicitalo.",
     "Request media permissions": "Solicitar permiso a multimedia",
@@ -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.",
@@ -1580,7 +1580,7 @@
     "Dark": "Escuro",
     "Customise your appearance": "Personaliza o aspecto",
     "Appearance Settings only affect this %(brand)s session.": "Os axustes da aparencia só lle afectan a esta sesión %(brand)s.",
-    "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.": "As solicitudes de compartir Chave envíanse ás outras túas sesións abertas. Se rexeitaches ou obviaches a solicitude nas outras sesións, preme aquí para voltar a facer a solicitude.",
+    "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.": "As solicitudes de compartir Chave envíanse ás outras túas sesións abertas. Se rexeitaches ou obviaches a solicitude nas outras sesións, preme aquí para volver a facer a solicitude.",
     "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Se as túas outras sesións non teñen a chave para esta mensaxe non poderás descifrala.",
     "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Volta a solicitar chaves de cifrado</requestLink> desde as outras sesións.",
     "This message cannot be decrypted": "Esta mensaxe non pode descifrarse",
@@ -1713,7 +1713,7 @@
     "Remove recent messages": "Eliminar mensaxes recentes",
     "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> en %(roomName)s",
     "Deactivate user?": "¿Desactivar usuaria?",
-    "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?": "Ao desactivar esta usuaria ficará desconectada e non poderá voltar a conectar. Ademáis deixará todas as salas nas que estivese. Esta acción non ten volta, ¿desexas desactivar esta usuaria?",
+    "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?": "Ao desactivar esta usuaria ficará desconectada e non poderá volver a conectar. Ademáis deixará todas as salas nas que estivese. Esta acción non ten volta, ¿desexas desactivar esta usuaria?",
     "Deactivate user": "Desactivar usuaria",
     "Failed to deactivate user": "Fallo ao desactivar a usuaria",
     "This client does not support end-to-end encryption.": "Este cliente non soporta o cifrado extremo-a-extremo.",
@@ -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",
@@ -1833,7 +1833,7 @@
     "Add a new server...": "Engadir un novo servidor...",
     "%(networkName)s rooms": "Salas de %(networkName)s",
     "That doesn't look like a valid email address": "Non semella un enderezo de email válido",
-    "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Usa un servidor de identidade para convidar por email. <default>Usa valor por omisión (%(defaultIdentityServerName)s)</default> ou xestionao en <settings>Axustes</settings>.",
+    "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Usa un servidor de identidade para convidar por email. <default>Usa o valor por defecto (%(defaultIdentityServerName)s)</default> ou xestionao en <settings>Axustes</settings>.",
     "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Usa un servidor de identidade para convidar por email. Xestionao en <settings>Axustes</settings>.",
     "The following users may not exist": "As seguintes usuarias poderían non existir",
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Non se atopou o perfil dos IDs Matrix da lista inferior - ¿Desexas convidalas igualmente?",
@@ -1864,8 +1864,8 @@
     "Hide advanced": "Ocultar Avanzado",
     "Show advanced": "Mostrar Avanzado",
     "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Evitar que usuarias de outros servidores matrix se unan a esta sala (Este axuste non se pode cambiar máis tarde!)",
-    "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of %(brand)s to do this": "Para evitar perder o historial da conversa, debes exportar as chaves da sala antes de desconectarte. Necesitarás voltar á nova versión de %(brand)s para facer esto",
-    "You've previously used a newer version of %(brand)s with this session. To use this version again with end to end encryption, you will need to sign out and back in again.": "Xa utilizaches unha versión máis nova de %(brand)s nesta sesión. Para usar esta versión novamente con cifrado extremo-a-extremo tes que desconectarte e voltar a conectar.",
+    "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of %(brand)s to do this": "Para evitar perder o historial da conversa, debes exportar as chaves da sala antes de desconectarte. Necesitarás volver á nova versión de %(brand)s para facer esto",
+    "You've previously used a newer version of %(brand)s with this session. To use this version again with end to end encryption, you will need to sign out and back in again.": "Xa utilizaches unha versión máis nova de %(brand)s nesta sesión. Para usar esta versión novamente con cifrado extremo-a-extremo tes que desconectarte e volver a conectar.",
     "Incompatible Database": "Base de datos non compatible",
     "Continue With Encryption Disabled": "Continuar con Cifrado Desactivado",
     "Are you sure you want to deactivate your account? This is irreversible.": "¿Tes a certeza de querer desactivar a túa conta? Esto é irreversible.",
@@ -1884,10 +1884,10 @@
     "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 compañeiro confirme...",
+    "Waiting for partner to confirm...": "Agardando a que o contacto confirme...",
     "Incoming Verification Request": "Solicitude entrante de verificación",
     "Integrations are disabled": "As Integracións están desactivadas",
     "Enable 'Manage Integrations' in Settings to do this.": "Activa 'Xestionar Integracións' nos Axustes para facer esto.",
@@ -1918,7 +1918,7 @@
     "The authenticity of this encrypted message can't be guaranteed on this device.": "A autenticidade desta mensaxe cifrada non está garantida neste dispositivo.",
     "Signature upload success": "Subeuse correctamente a sinatura",
     "Signature upload failed": "Fallou a subida da sinatura",
-    "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.": "Anteriormente utilizaches %(brand)s en %(host)s con carga preguiceira de membros. Nesta versión a carga preguiceira está desactivada. Como a caché local non é compatible entre as dúas configuracións, %(brand)s precisa voltar a sincronizar a conta.",
+    "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.": "Anteriormente utilizaches %(brand)s en %(host)s con carga preguiceira de membros. Nesta versión a carga preguiceira está desactivada. Como a caché local non é compatible entre as dúas configuracións, %(brand)s precisa volver a sincronizar a conta.",
     "Incompatible local cache": "Caché local incompatible",
     "Clear cache and resync": "Baleirar caché e sincronizar",
     "%(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!": "%(brand)s utiliza agora entre 3 e 5 veces menos memoria, cargando só información sobre as usuarias cando é preciso. Agarda mentras se sincroniza co servidor!",
@@ -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",
@@ -2079,7 +2079,7 @@
     "Premium hosting for organisations <a>Learn more</a>": "Hospedaxe Premium para organizacións <a>Saber máis</a>",
     "Find other public servers or use a custom server": "Atopa outros servidores públicos ou usa un servidor personalizado",
     "Couldn't load page": "Non se puido cargar a páxina",
-    "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Administras esta comunidade. Non poderás voltar a unirte sen un convite doutra persoa administradora.",
+    "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Administras esta comunidade. Non poderás volver a unirte sen un convite doutra persoa administradora.",
     "Want more than a community? <a>Get your own server</a>": "¿Queres algo máis que unha comunidade? <a>Monta o teu propio servidor</a>",
     "This homeserver does not support communities": "Este servidor non soporta comunidades",
     "Welcome to %(appName)s": "Benvida a %(appName)s",
@@ -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",
@@ -2360,7 +2360,7 @@
     "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Escolle unha das tipografías instaladas no teu sistema e %(brand)s intentará utilizalas.",
     "Make this room low priority": "Marcar a sala como de baixa prioridade",
     "Low priority rooms show up at the bottom of your room list in a dedicated section at the bottom of your room list": "As salas de baixa prioridade aparecen abaixo na lista de salas, nunha sección dedicada no final da lista",
-    "Use default": "Usar por omisión",
+    "Use default": "Usar por defecto",
     "Mentions & Keywords": "Mencións e Palabras chave",
     "Notification options": "Opcións de notificación",
     "Favourited": "Con marca de Favorita",
@@ -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",
@@ -2523,5 +2523,547 @@
     "Ignored attempt to disable encryption": "Intento ignorado de desactivar o cifrado",
     "Failed to save your profile": "Non se gardaron os cambios",
     "The operation could not be completed": "Non se puido realizar a acción",
-    "Remove messages sent by others": "Eliminar mensaxes enviadas por outras"
+    "Remove messages sent by others": "Eliminar mensaxes enviadas por outras",
+    "Calling...": "Chamando...",
+    "Call connecting...": "Conectando a chamada...",
+    "Starting camera...": "Iniciando a cámara...",
+    "Starting microphone...": "Iniciando o micrófono...",
+    "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Tódolos servidores están prohibidos! Esta sala xa non pode ser utilizada.",
+    "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s cambiou ACLs de servidor para esta sala.",
+    "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s estableceu ACLs de servidor para esta sala.",
+    "%(senderName)s declined the call.": "%(senderName)s rexeitou a chamada.",
+    "(an error occurred)": "(algo fallou)",
+    "(their device couldn't start the camera / microphone)": "(o dispositivo deles non puido iniciar a cámara / micrófono)",
+    "(connection failed)": "(fallou a conexión)",
+    "The call could not be established": "Non se puido establecer a chamada",
+    "The other party declined the call.": "A outra persoa rexeitou a chamada.",
+    "Call Declined": "Chamada rexeitada",
+    "Move right": "Mover á dereita",
+    "Move left": "Mover á esquerda",
+    "Revoke permissions": "Revogar permisos",
+    "Unpin a widget to view it in this panel": "Desafixar un widget para velo neste panel",
+    "You can only pin up to %(count)s widgets|other": "Só podes fixar ata %(count)s widgets",
+    "Show Widgets": "Mostrar Widgets",
+    "Hide Widgets": "Agochar Widgets",
+    "The call was answered on another device.": "A chamada foi respondida noutro dispositivo.",
+    "Answered Elsewhere": "Respondido noutro lugar",
+    "Data on this screen is shared with %(widgetDomain)s": "Os datos nesta pantalla compártense con %(widgetDomain)s",
+    "Modal Widget": "Widget modal",
+    "Tell us below how you feel about %(brand)s so far.": "Cóntanos que opinas acerca de %(brand)s ata o momento.",
+    "Rate %(brand)s": "Valora %(brand)s",
+    "Feedback sent": "Comentario enviado",
+    "Send feedback": "Enviar comentario",
+    "PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> to help us track down the problem.": "PRO TIP: se inicias un novo informe, envía <debugLogsLink>rexistros de depuración</debugLogsLink> para axudarnos a investigar o problema.",
+    "Please view <existingIssuesLink>existing bugs on Github</existingIssuesLink> first. No match? <newIssueLink>Start a new one</newIssueLink>.": "Primeiro revisa <existingIssuesLink>a lista existente de fallo en Github</existingIssuesLink>. Non hai nada? <newIssueLink>Abre un novo</newIssueLink>.",
+    "Report a bug": "Informar dun fallo",
+    "There are two ways you can provide feedback and help us improve %(brand)s.": "Podes axudarnos a mellorar %(brand)s contactando destos dous xeitos.",
+    "Comment": "Comentar",
+    "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",
+    "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",
+    "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",
+    "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",
+    "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",
+    "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.",
+    "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",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)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 %(rooms)s salas.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)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 %(rooms)s salas.",
+    "Go to Home View": "Ir á Páxina de Inicio",
+    "<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 para a páxina da túa comunidade</h1>\n<p>\n    Usa a descrición longa para presentar a comunidade ás novas particpantes, ou publicar \nalgunha  <a href=\"foo\">ligazón</a> importante\n   \n</p>\n<p>\n   Tamén podes engadir imaxes con URLs de Matrix <img src=\"mxc://url\" />\n</p>\n",
+    "The <b>%(capability)s</b> capability": "A capacidade de <b>%(capability)s</b>",
+    "Decline All": "Rexeitar todo",
+    "Approve": "Aprobar",
+    "This widget would like to:": "O widget podería querer:",
+    "Approve widget permissions": "Aprovar permisos do widget",
+    "Use Ctrl + Enter to send a message": "Usar Ctrl + Enter para enviar unha mensaxe",
+    "Use Command + Enter to send a message": "Usar Command + Enter para enviar unha mensaxe",
+    "See <b>%(msgtype)s</b> messages posted to your active room": "Ver mensaxes <b>%(msgtype)s</b> publicados na túa sala activa",
+    "See <b>%(msgtype)s</b> messages posted to this room": "Ver mensaxes <b>%(msgtype)s</b> publicados nesta sala",
+    "Send <b>%(msgtype)s</b> messages as you in your active room": "Enviar mensaxes <b>%(msgtype)s</b> no teu nome á túa sala activa",
+    "Send <b>%(msgtype)s</b> messages as you in this room": "Enviar mensaxes <b>%(msgtype)s</b> no teu nome a esta sala",
+    "See general files posted to your active room": "Ver ficheiros publicados na túa sala activa",
+    "See general files posted to this room": "Ver ficheiros publicados nesta sala",
+    "Send general files as you in your active room": "Enviar ficheiros no teu nome á túa sala activa",
+    "Send general files as you in this room": "Enviar ficheiros no teu nome a esta sala",
+    "See videos posted to your active room": "Ver vídeos publicados na túa sala activa",
+    "See videos posted to this room": "Ver vídeos publicados nesta sala",
+    "Send videos as you in your active room": "Enviar vídeos no teu nome á túa sala activa",
+    "Send videos as you in this room": "Enviar vídeos no teu nome a esta sala",
+    "See images posted to your active room": "Ver imaxes publicadas na túa sala activa",
+    "See images posted to this room": "Ver imaxes publicadas nesta sala",
+    "Send images as you in your active room": "Enviar imaxes no teu nome á túa sala activa",
+    "Send images as you in this room": "Enviar imaxes no teu nome a esta sala",
+    "See emotes posted to your active room": "Ver emotes publicados na túa sala activa",
+    "See emotes posted to this room": "Ver emotes publicados nesta sala",
+    "Send emotes as you in your active room": "Enviar emotes no teu nome á túa sala activa",
+    "Send emotes as you in this room": "Enviar emotes no teu nome a esta sala",
+    "See text messages posted to your active room": "Ver mensaxes de texto publicados na túa sala activa",
+    "See text messages posted to this room": "Ver mensaxes de texto publicados nesta sala",
+    "Send text messages as you in your active room": "Enviar mensaxes de texto no teu nome á túa sala activa",
+    "Send text messages as you in this room": "Enviar mensaxes de texto no teu nome a esta sala",
+    "See messages posted to your active room": "Ver as mensaxes publicadas na túa sala activa",
+    "See messages posted to this room": "Ver as mensaxes publicadas nesta sala",
+    "Send messages as you in your active room": "Enviar mensaxes no teu nome na túa sala activa",
+    "Send messages as you in this room": "Enviar mensaxes no teu nome nesta sala",
+    "See <b>%(eventType)s</b> events posted to your active room": "Ver os eventos <b>%(eventType)s</b> publicados na túa sala activa",
+    "Send <b>%(eventType)s</b> events as you in your active room": "Envía no teu nome <b>%(eventType)s</b> eventos á túa sala activa",
+    "See <b>%(eventType)s</b> events posted to this room": "Ver <b>%(eventType)s</b> eventos publicados nesta sala",
+    "Send <b>%(eventType)s</b> events as you in this room": "Envia no teu nome <b>%(eventType)s</b> eventos a esta sala",
+    "with state key %(stateKey)s": "coa chave de estado %(stateKey)s",
+    "with an empty state key": "cunha chave de estado baleiro",
+    "See when anyone posts a sticker to your active room": "Ver cando alguén publica un adhesivo na túa sala activa",
+    "Send stickers to your active room as you": "Enviar no teu nome adhesivos á túa sala activa",
+    "See when a sticker is posted in this room": "Ver cando un adhesivo se publica nesta sala",
+    "Send stickers to this room as you": "Enviar no teu nome adhesivos a esta sala",
+    "See when the avatar changes in your active room": "Ver cando o avatar da túa sala activa cambie",
+    "Change the avatar of your active room": "Cambiar o avatar da túa sala activa",
+    "See when the avatar changes in this room": "Ver cando o avatar desta sala cambie",
+    "Change the avatar of this room": "Cambiar o avatar desta sala",
+    "See when the name changes in your active room": "Ver cando o nome da túa sala activa cambie",
+    "Change the name of your active room": "Cambiar o tema da túa sala activa",
+    "See when the name changes in this room": "Ver cando o nome desta sala cambie",
+    "Change the name of this room": "Cambiar o nome desta sala",
+    "See when the topic changes in your active room": "Ver cando o tema da túa sala activa cambie",
+    "Change the topic of your active room": "Cambiar o tema da túa sala activa",
+    "See when the topic changes in this room": "Ver cando o tema desta sala cambie",
+    "Change the topic of this room": "Cambiar o tema desta sala",
+    "Change which room you're viewing": "Cambiar a sala que estás vendo",
+    "Send stickers into your active room": "Enviar adhesivos á túa sala activa",
+    "Send stickers into this room": "Enviar adhesivos a esta sala",
+    "Remain on your screen while running": "Permanecer na túa pantalla mentras se executa",
+    "Remain on your screen when viewing another room, when running": "Permanecer na túa pantalla cando visualizas outra sala, ó executar",
+    "Enter phone number": "Escribe número de teléfono",
+    "Enter email address": "Escribe enderezo email",
+    "Return to call": "Volver á chamada",
+    "Fill Screen": "Encher a pantalla",
+    "Voice Call": "Chamada de voz",
+    "Video Call": "Chamada de vídeo",
+    "New here? <a>Create an account</a>": "Acabas de coñecernos? <a>Crea unha conta</a>",
+    "Got an account? <a>Sign in</a>": "Tes unha conta? <a>Conéctate</a>",
+    "Render LaTeX maths in messages": "Mostrar fórmulas matemáticas LaTex",
+    "No other application is using the webcam": "Outra aplicación non está usando a cámara",
+    "Permission is granted to use the webcam": "Tes permiso para acceder ó uso da cámara",
+    "A microphone and webcam are plugged in and set up correctly": "O micrófono e a cámara están conectados e correctamente configurados",
+    "Call failed because no webcam or microphone could not be accessed. Check that:": "A chamada fallou porque non están accesibles a cámara ou o micrófono. Comproba que:",
+    "Unable to access webcam / microphone": "Non se puido acceder a cámara / micrófono",
+    "Call failed because no microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "A chamada fallou porque non se puido acceder a un micrófono. Comproba que o micrófono está conectado e correctamente configurado.",
+    "Unable to access microphone": "Non se puido acceder ó micrófono",
+    "Decide where your account is hosted": "Decide onde queres crear a túa conta",
+    "Host account on": "Crea a conta en",
+    "Already have an account? <a>Sign in here</a>": "Xa tes unha conta? <a>Conecta aquí</a>",
+    "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s Ou %(usernamePassword)s",
+    "Continue with %(ssoButtons)s": "Continúa con %(ssoButtons)s",
+    "That username already exists, please try another.": "Ese nome de usuaria xa existe, proba con outro.",
+    "New? <a>Create account</a>": "Recén cheagada? <a>Crea unha conta</a>",
+    "There was a problem communicating with the homeserver, please try again later.": "Houbo un problema de comunicación co servidor de inicio, inténtao máis tarde.",
+    "Use email to optionally be discoverable by existing contacts.": "Usa o email para ser opcionalmente descubrible para os contactos existentes.",
+    "Use email or phone to optionally be discoverable by existing contacts.": "Usa un email ou teléfono para ser (opcionalmente) descubrible polos contactos existentes.",
+    "Add an email to be able to reset your password.": "Engade un email para poder restablecer o contrasinal.",
+    "Forgot password?": "Esqueceches o contrasinal?",
+    "That phone number doesn't look quite right, please check and try again": "Non semella correcto este número, compróbao e inténtao outra vez",
+    "About homeservers": "Acerca dos servidores de inicio",
+    "Learn more": "Saber máis",
+    "Use your preferred Matrix homeserver if you have one, or host your own.": "Usa o teu servidor de inicio Matrix preferido, ou usa o teu propio.",
+    "Other homeserver": "Outro servidor de inicio",
+    "We call the places you where you can host your account ‘homeservers’.": "Chamámoslle 'Servidores de inicio' ós servidores onde poderías ter a túa conta.",
+    "Sign into your homeserver": "Conecta co teu servidor de inicio",
+    "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "Matrix.org é o servidor de inicio máis grande de todos, polo que é lugar común para moitas persoas.",
+    "Specify a homeserver": "Indica un servidor de inicio",
+    "Just a heads up, if you don't add an email and forget your password, you could <b>permanently lose access to your account</b>.": "Lembra que se non engades un email e esqueces o contrasinal <b>perderás de xeito permanente o acceso á conta</b>.",
+    "Continuing without email": "Continuando sen email",
+    "Continue with %(provider)s": "Continuar con %(provider)s",
+    "Homeserver": "Servidor de inicio",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Element with an existing Matrix account on a different homeserver.": "Podes usar as opcións do servidor para poder conectarte a outros servidores Matrix indicando o URL dese servidor. Esto permíteche usar Element cunha conta Matrix existente noutro servidor.",
+    "Server Options": "Opcións do servidor",
+    "Reason (optional)": "Razón (optativa)",
+    "We call the places where you can host your account ‘homeservers’.": "Ós lugares onde podes ter unha conta chamámoslle 'servidores de inicio'.",
+    "Invalid URL": "URL non válido",
+    "Unable to validate homeserver": "Non se puido validar o servidor de inicio",
+    "sends confetti": "envía confetti",
+    "Sends the given message with confetti": "Envía a mensaxe con confetti",
+    "Show chat effects": "Mostrar efectos do chat",
+    "Effects": "Efectos",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "A chamada fallou porque non tiñas acceso á cámara ou ó micrófono. Comproba:",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "A chamada fallou porque non tiñas acceso ó micrófono. Comproba que o micrófono está conectado e correctamente configurado.",
+    "Hold": "Colgar",
+    "Resume": "Retomar",
+    "%(peerName)s held the call": "%(peerName)s finalizou a chamada",
+    "You held the call <a>Resume</a>": "Colgaches a chamada, <a>Retomar</a>",
+    "You've reached the maximum number of simultaneous calls.": "Acadaches o número máximo de chamadas simultáneas.",
+    "Too Many Calls": "Demasiadas chamadas",
+    "%(name)s paused": "detido por %(name)s",
+    "sends fireworks": "envía fogos de artificio",
+    "Sends the given message with fireworks": "Envia a mensaxe dada con fogos de artificio",
+    "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "Antecede con ┬──┬ ノ( ゜-゜ノ) a unha mensaxe de texto plano",
+    "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "Antecede con (╯°□°）╯︵ ┻━┻ a unha mensaxe de texto plano",
+    "%(name)s on hold": "%(name)s agardando",
+    "You held the call <a>Switch</a>": "Pausaches a chamada <a>Cambiar</a>",
+    "sends snowfall": "envía neve",
+    "Sends the given message with snowfall": "Engade neve caendo á mensaxe",
+    "You have no visible notifications.": "Non tes notificacións visibles.",
+    "Transfer": "Transferir",
+    "Failed to transfer call": "Fallou a transferencia da chamada",
+    "A call can only be transferred to a single user.": "Unha chamada só se pode transferir a unha única usuaria.",
+    "There was an error finding this widget.": "Houbo un fallo ao buscar o widget.",
+    "Active Widgets": "Widgets activos",
+    "Open dial pad": "Abrir marcador",
+    "Start a Conversation": "Iniciar unha Conversa",
+    "Dial pad": "Marcador",
+    "There was an error looking up the phone number": "Houbo un erro buscando o número de teléfono",
+    "Unable to look up phone number": "Non atopamos o número de teléfono",
+    "Channel: <channelLink/>": "Canle: <channelLink/>",
+    "Workspace: <networkLink/>": "Espazo de traballo: <networkLink/>",
+    "Change which room, message, or user you're viewing": "Cambia a sala, mensaxe ou usuaria que estás vendo",
+    "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "Esta sesión detectou que se eliminaron a túa Frase de Seguridade e chave para Mensaxes Seguras.",
+    "A new Security Phrase and key for Secure Messages have been detected.": "Detectouse unha nova Frase de Seguridade e chave para as Mensaxes Seguras.",
+    "Make a copy of your Security Key": "Fai unha copia da túa Chave de Seguridade",
+    "Confirm your Security Phrase": "Confirma a Frase de Seguridade",
+    "Secure your backup with a Security Phrase": "Asegura a copia cunha Frase de Seguridade",
+    "Your Security Key is in your <b>Downloads</b> folder.": "A Chave de Seguridade está no cartafol <b>Descargas</b>.",
+    "Your Security Key has been <b>copied to your clipboard</b>, paste it to:": "A Chave de Seguridade foi <b>copiada ao portapapeis</b>, pégaa en:",
+    "Your Security Key": "A túa Chave de Seguridade",
+    "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "A túa Chave de Seguridade é unha rede de seguridade - podes utilizala para restablecer o acceso ás mensaxes cifradas se esqueceches a Frase de Seguridade.",
+    "Repeat your Security Phrase...": "Repite a Frase de Seguridade...",
+    "Please enter your Security Phrase a second time to confirm.": "Escribe outra vez a Frase de Seguridade para confirmala.",
+    "Set up with a Security Key": "Configurar cunha Chave de Seguridade",
+    "Great! This Security Phrase looks strong enough.": "Ben! Esta Frase de Seguridade semella ser forte abondo.",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "Gardaremos unha copia cifrada das túas chaves no noso servidor. Asegura a túa copia cunha Frase de Seguridade.",
+    "Use Security Key": "Usar Chave de Seguridade",
+    "Use Security Key or Phrase": "Usar Chave ou Frase de Seguridade",
+    "If you've forgotten your Security Key you can <button>set up new recovery options</button>": "Se esqueceches a túa Chave de Seguridade podes <button>establecer novas opcións de recuperación</button>",
+    "Access your secure message history and set up secure messaging by entering your Security Key.": "Accede ao teu historial de mensaxes seguras e asegura a comunicación escribindo a Chave de Seguridade.",
+    "Not a valid Security Key": "Chave de Seguridade non válida",
+    "This looks like a valid Security Key!": "Semella unha Chave de Seguridade válida!",
+    "Enter Security Key": "Escribe a Chave de Seguridade",
+    "If you've forgotten your Security Phrase you can <button1>use your Security Key</button1> or <button2>set up new recovery options</button2>": "Se esqueceches a túa Frase de Seguridade podes <button1>usar a túa Chave de Seguridade</button1> ou <button2>establecer novas opcións de recuperación</button2>",
+    "Access your secure message history and set up secure messaging by entering your Security Phrase.": "Accede ao teu historial de mensaxes seguras e configura a comunicación segura escribindo a túa Frase de Seguridade.",
+    "Enter Security Phrase": "Escribe a Frase de Seguridade",
+    "Backup could not be decrypted with this Security Phrase: please verify that you entered the correct Security Phrase.": "Non se puido descifrar a Copia con esta Frase de Seguridade: comproba que escribiches a Frase de Seguridade correcta.",
+    "Incorrect Security Phrase": "Frase de Seguridade incorrecta",
+    "Backup could not be decrypted with this Security Key: please verify that you entered the correct Security Key.": "Non se puido descifrar a Copia con esta Chave de Seguridade: comproba que aplicaches a Chave de Seguridade correcta.",
+    "Security Key mismatch": "Non concorda a Chave de Seguridade",
+    "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "Non se puido acceder ao almacenaxe segredo. Comproba que escribiches correctamente a Frase de Seguridade.",
+    "Invalid Security Key": "Chave de Seguridade non válida",
+    "Wrong Security Key": "Chave de Seguridade incorrecta",
+    "We recommend you change your password and Security Key in Settings immediately": "Recomendámosche cambiar o teu contrasinal e Chave de Seguridade inmediatamente nos Axustes",
+    "Set my room layout for everyone": "Establecer a miña disposición da sala para todas",
+    "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 Security Key.": "Fai unha copia de apoio das chaves de cifrado da túa conta en caso de perder o acceso ás túas sesións. As chaves estarán seguras cunha única Chave de Seguridade.",
+    "%(senderName)s has updated the widget layout": "%(senderName)s actualizou a disposición dos widgets",
+    "Converts the room to a DM": "Converte a sala en MD",
+    "Converts the DM to a room": "Converte a MD nunha sala",
+    "Use Command + F to search": "Usa Command + F para buscar",
+    "Use Ctrl + F to search": "Usa Ctrl + F para buscar",
+    "Use app for a better experience": "Para ter unha mellor experiencia usa a app",
+    "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Element Web en móbiles está en fase experimental. Para ter unha mellor experiencia e máis funcións utiliza a app nativa gratuíta.",
+    "Use app": "Usa a app",
+    "Search (must be enabled)": "Buscar (debe esta activa)",
+    "Allow this widget to verify your identity": "Permitir a este widget verificar a túa identidade",
+    "The widget will verify your user ID, but won't be able to perform actions for you:": "Este widget vai verificar o ID do teu usuario, pero non poderá realizar accións no teu nome:",
+    "Remember this": "Lembrar isto",
+    "Something went wrong in confirming your identity. Cancel and try again.": "Algo fallou ao intentar confirma a túa identidade. Cancela e inténtao outra vez.",
+    "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "O servidor de inicio rexeitou o intento de conexión. Esto podería deberse a que lle levou moito tempo. Inténtao outra vez e se persiste o problema contacta coa administración do servidor.",
+    "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "Non temos acceso ao teu servidor de inicio e non puidemos conectarte. Inténtao outra vez. Se persiste o problema, contacta coa administración do servidor.",
+    "Try again": "Intentar outra vez",
+    "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "Pedíramoslle ao teu navegador que lembrase o teu servidor de inicio para conectarte, pero o navegador esqueceuno. Vaite á páxina de conexión e inténtao outra vez.",
+    "We couldn't log you in": "Non puidemos conectarte",
+    "Show stickers button": "Mostrar botón dos adhesivos",
+    "Windows": "Ventás",
+    "Screens": "Pantallas",
+    "Share your screen": "Compartir a túa pantalla",
+    "Recently visited rooms": "Salas visitadas recentemente",
+    "Show line numbers in code blocks": "Mostrar números de liña nos bloques de código",
+    "Expand code blocks by default": "Por omsión despregar bloques de código",
+    "Upgrade to pro": "Mellorar a pro",
+    "Minimize dialog": "Minimizar ventá",
+    "Maximize dialog": "Maximizar ventá",
+    "%(hostSignupBrand)s Setup": "Configurar %(hostSignupBrand)s",
+    "You should know": "Deberías saber",
+    "Privacy Policy": "Política de Privacidade",
+    "Cookie Policy": "Política de Cookies",
+    "Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.": "Aprende máis na nosa <privacyPolicyLink />, <termsOfServiceLink /> e <cookiePolicyLink />.",
+    "Continuing temporarily allows the %(hostSignupBrand)s setup process to access your account to fetch verified email addresses. This data is not stored.": "Ao continuar de xeito temporal permitirás que %(hostSignupBrand)s complete o acceso á túa conta para obter os enderezos de email verificados. Os datos non se almacenan.",
+    "Failed to connect to your homeserver. Please close this dialog and try again.": "Fallou a conexión co teu servidor de inicio. Pecha esta información e inténtao outra vez.",
+    "Abort": "Abortar",
+    "Are you sure you wish to abort creation of the host? The process cannot be continued.": "Tes a certeza de querer cancelar a creación do servidor? O proceso non pode ser completado.",
+    "Confirm abort of host creation": "Corfirma que cancelas a creación do servidor"
 }
diff --git a/src/i18n/strings/he.json b/src/i18n/strings/he.json
index b17fc5abc5..dda9902e72 100644
--- a/src/i18n/strings/he.json
+++ b/src/i18n/strings/he.json
@@ -46,7 +46,7 @@
     "Unpin Message": "שחרר צימוד הודעה",
     "Online": "מקוון",
     "Register": "רשום",
-    "Rooms": "חדרי שיחוח",
+    "Rooms": "חדרים",
     "Add rooms to this community": "הוסף חדר שיחוח לקהילה זו",
     "OK": "בסדר",
     "Operation failed": "פעולה נכשלה",
@@ -161,7 +161,7 @@
     "Unable to look up room ID from server": "לא ניתן לאתר מזהה חדר על השרת",
     "Couldn't find a matching Matrix room": "לא נמצא חדר כזה ב מטריקס",
     "Invite to this room": "הזמן לחדר זה",
-    "You cannot delete this message. (%(code)s)": "לא ניתן למחוק הודעה זו.  (%(code)s)",
+    "You cannot delete this message. (%(code)s)": "לא ניתן למחוק הודעה זו. (%(code)s)",
     "Thursday": "חמישי",
     "Search…": "חפש…",
     "Logs sent": "יומנים נשלחו",
@@ -196,5 +196,2594 @@
     "Thank you!": "רב תודות!",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "באמצעות הדפדפן הנוכחי שלך המראה של היישום יכול להיות שגוי לחלוטין וחלק מהאפשרויות לא תתפקדנה. אם תרצה לנסות בכל זאת תוכל אבל אז כל האחריות עליך!",
     "Checking for an update...": "בודק עדכונים...",
-    "Your %(brand)s is misconfigured": "ה %(brand)s שלך מוגדר באופן שגוי"
+    "Your %(brand)s is misconfigured": "ה %(brand)s שלך מוגדר באופן שגוי",
+    "Which officially provided instance you are using, if any": "איזה אינסטנס רשמי אתם משתמשים אם בכללאיזה אינסטנס רשמי אתם משתמשים אם בכלל",
+    "Your language of choice": "בחירת שפה",
+    "Whether or not you're logged in (we don't record your username)": "אם הנכם מחוברים או לא (אנחנו לא שומרים מידע על המשתמש שלכם)",
+    "The version of %(brand)s": "גירסאת מוצר %(brand)s",
+    "The platform you're on": "הפלטפורמה שהינכם משתמשים בה",
+    "Add Phone Number": "הוסף מספר טלפון",
+    "Click the button below to confirm adding this phone number.": "לחצו על הכפתור לאישור הוספת מספר הטלפון הזה.",
+    "Confirm adding phone number": "אישור הוספת מספר טלפון",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "אשר הוספת מספר טלפון על ידי כניסה חד שלבית לאימות חשבונכם.",
+    "Add Email Address": "הוספת כתובת מייל",
+    "Confirm": "אישור",
+    "Click the button below to confirm adding this email address.": "לחץ על הכפתור בכדי לאשר הוספה של כתובת מייל הזו.",
+    "Confirm adding email": "אשר הוספת כתובת מייל",
+    "Single Sign On": "כניסה חד שלבית",
+    "Opens chat with the given user": "פתח שיחה עם המשתמש הזה",
+    "Send a bug report with logs": "שולח דוח תקלה עם לוג",
+    "Displays information about a user": "מציג מידע אודות משתמש",
+    "Displays list of commands with usages and descriptions": "מציג רשימת פקודות עם שימוש והוראות",
+    "Sends the given emote coloured as a rainbow": "שולח את האימוג'י צבוע בקשת של צבעים",
+    "Sends the given message coloured as a rainbow": "שולח את ההודעה כקשת של צבעים",
+    "Forces the current outbound group session in an encrypted room to be discarded": "מאלץ להתעלם מהתקשורת היוצאת מהתחברות של קבוצה בחדר מוצפן",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "המפתח החתום שנתתם תואם את המפתח שקבלתם מ %(userId)s מהתחברות %(deviceId)s. ההתחברות סומנה כמאושרת.",
+    "Verified key": "מפתח מאושר",
+    "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!": "אזהרה: אימות מפתח נכשל! חתימת המפתח של %(userId)s ושל ההתחברות של מכשיר %(deviceId)s הינו \"%(fprint)s\" אשר אינו תואם למפתח הנתון \"%(fingerprint)s\". דבר זה יכול להעיר על כך שישנו נסיון להאזין לתקשורת שלכם!",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "אזהרה: ההתחברות כבר אושרה אך המפתחות לא תואמים!",
+    "Session already verified!": "ההתחברות כבר אושרה!",
+    "Unknown (user, session) pair:": "צימוד לא ידוע (משתמש, התחברות):",
+    "Verifies a user, session, and pubkey tuple": "מוודא משתמש, התחברות וצמד מפתח ציבורי",
+    "You cannot modify widgets in this room.": "אינכם יכולים לערוך ווידג'ט בחדר זה.",
+    "Please supply a https:// or http:// widget URL": "אנא הוסיפו קישור לווידג'ט עם http:// או https://",
+    "Please supply a widget URL or embed code": "אנא ספקו כתובת של ווידג'ט או קוד הטמעה",
+    "Adds a custom widget by URL to the room": "מוסיף ווידג'ט מותאם לפי קישור לחדר זה",
+    "Opens the Developer Tools dialog": "פותח את דיאלוג כלי המפתחים",
+    "Deops user with given id": "מסיר משתמש עם קוד זיהוי זה",
+    "Could not find user in room": "משתמש זה לא נמצא בחדר",
+    "Command failed": "הפקודה נכשלה",
+    "Define the power level of a user": "הגדירו את רמת ההרשאות של משתמש",
+    "You are no longer ignoring %(userId)s": "אינכם מתעלמים יותר מ %(userId)s",
+    "Unignored user": "משתמש מוכר",
+    "Stops ignoring a user, showing their messages going forward": "הפסקת התעלמות ממשתמש, אשרו את ההודעות שלהם אליכם",
+    "You are now ignoring %(userId)s": "אתם עכשיו מתעלמים מ %(userId)s",
+    "Ignored user": "משתמש נעלם",
+    "Ignores a user, hiding their messages from you": "התעלם ממשתמש, הסתר הודעות מהם",
+    "Unbans user with given ID": "ביטול חסימה של משתמש עם קוד זיהוי",
+    "Bans user with given id": "חסום משתמש עם קוד זיהוי",
+    "Kicks user with given id": "בעט במשתמש עם קוד זיהוי",
+    "Unrecognised room address:": "כתובת חדר לא מזוהה:",
+    "Leave room": "עזוב חדר",
+    "Joins room with given address": "חיבור לחדר עם כתובת מסויימת",
+    "Use an identity server to invite by email. Manage in Settings.": "השתמש בשרת זיהוי להזמין דרך מייל. ניהול דרך ההגדרות.",
+    "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "השתמש בשרת זיהוי על מנת להזמין דרך מייל. לחצו על המשך להשתמש בשרת ברירת המחדל %(defaultIdentityServerName)s או הגדירו את השרת שלכם בהגדרות.",
+    "Use an identity server": "השתמש בשרת זיהוי",
+    "Invites user with given id to current room": "מזמין משתמש עם זיהוי מוגדר לחדר זה",
+    "Sets the room name": "מגדיר את שם החדר",
+    "This room has no topic.": "לחדר זה אין נושא.",
+    "Failed to set topic": "כשלון בהגדרת נושא החדר",
+    "Gets or sets the room topic": "קורא או כותב את נושא החדר",
+    "Changes your avatar in all rooms": "משנה את האווטר שלכם בכל החדרים",
+    "Changes your avatar in this current room only": "משנה את האווטר שלכם בחדר זה בלבד",
+    "Changes the avatar of the current room": "משנה את האווטר של החדר הנוכחי",
+    "Changes your display nickname in the current room only": "משנה את שם התצוגה שלכם בחדר זה בלבד",
+    "Changes your display nickname": "משנה את שם התצוגה שלכם",
+    "Double check that your server supports the room version chosen and try again.": "בדקו שהשרת תומך בגרסאת החדר ונסו שוב.",
+    "Error upgrading room": "שגיאה בשדרוג חדר",
+    "You do not have the required permissions to use this command.": "אין לכם הרשאות להשתמש בפקודה זו.",
+    "Upgrades a room to a new version": "משדרג את החדר לגרסא חדשה",
+    "To use it, just wait for autocomplete results to load and tab through them.": "בכדי להשתמש אנא המתינו לתוצאות האוטומטיות להראות והשתמשו בטאב לעבור עליהן.",
+    "/ddg is not a command": "/ddg אינה פקודה",
+    "Searches DuckDuckGo for results": "חיפוש תוצאות ב DuckDuckGo",
+    "Sends a message as html, without interpreting it as markdown": "שלח הודעות כ HTML ללא תרגום שלהם כ MARKDOWN",
+    "Sends a message as plain text, without interpreting it as markdown": "שלח הודעה כטקסט פשוט ללא תרגום כקוד MARKDOWN",
+    "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "הוסף לפני הודעת טקסט ( ͡° ͜ʖ ͡°)",
+    "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "הוסף לפני הודעת טקסט ┬──┬ ノ( ゜-゜ノ)",
+    "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "הוסף לפני הודעת טקסט (╯°□°）╯︵ ┻━┻",
+    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "הוסף לפני הודעת טקסט ¯\\_(ツ)_/¯",
+    "Usage": "שימוש",
+    "Command error": "שגיאת פקודה",
+    "Other": "אחר",
+    "Effects": "אפקטים",
+    "Advanced": "מתקדם",
+    "Actions": "פעולות",
+    "Messages": "הודעות",
+    "Setting up keys": "מגדיר מפתחות",
+    "Go Back": "חזרה",
+    "Are you sure you want to cancel entering passphrase?": "האם אתם בטוחים שהינכם רוצים לבטל?",
+    "Cancel entering passphrase?": "בטל הקלדת סיסמא?",
+    "Missing user_id in request": "קוד זיהוי משתמש חסר בשורת הבקשה",
+    "Room %(roomId)s not visible": "קוד זיהוי החדר %(roomId)s אינו נראה",
+    "Missing room_id in request": "קוד זיהוי החדר חסר בשורת הבקשה",
+    "You do not have permission to do that in this room.": "אין לכם הרשאות לבצע פעולה זו בחדר זה.",
+    "You are not in this room.": "אינכם נמצאים בחדר זה.",
+    "Power level must be positive integer.": "דרגת הרשאות חייבת להיות מספר חיובי.",
+    "This room is not recognised.": "החדר הזה אינו מזוהה.",
+    "Failed to send request.": "שליחת בקשה נכשלה.",
+    "Missing roomId.": "קוד זיהוי של החדר חסר.",
+    "Unable to create widget.": "לא ניתן היה ליצור ווידג'ט.",
+    "You need to be able to invite users to do that.": "עליכם להיות מאושרים להזמין משתמשים על מנת לבצע פעולה זו.",
+    "You need to be logged in.": "עליכם להיות מחוברים.",
+    "Failed to invite the following users to the %(roomName)s room:": "הזמנת המשתמשים הבאים לחדר %(roomName)s נכשלה:",
+    "Failed to invite users to the room:": "הזמנת משתמשים לחדר נכשלה:",
+    "Failed to invite": "הזמנה נכשלה",
+    "Custom (%(level)s)": "ידני %(level)s",
+    "Admin": "אדמין",
+    "Moderator": "מנהל",
+    "Restricted": "מחוץ לתחום",
+    "Timor-Leste": "טמור-לסטה",
+    "St. Martin": "סיינט מרטין",
+    "Oman": "אומן",
+    "Unable to load! Check your network connectivity and try again.": "טעינת הדף נכשלה. אנא בדקו את החיבור שלכם לאינטרנט ונסו שנית.",
+    "e.g. <CurrentPageURL>": "כלומר קישור נוכחי של הדף",
+    "Failure to create room": "כשלון ביצירת חדר",
+    "The server does not support the room version specified.": "השרת אינו תומך בגירסת החדר הזו.",
+    "Server may be unavailable, overloaded, or you hit a bug.": "השרת יכול להיות סגור או עמוס או יתכן ויש לכם תקלה.",
+    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "הקובץ %(fileName)s עולה בגודלו על הגודל המותר להעלאה",
+    "The file '%(fileName)s' failed to upload.": "נכשלה העלאת הקובץ %(fileName)s.",
+    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "לא ניתן כעת להשיב עם קובץ. האם תרצו להעלות את הקובץ ללא תגובה?",
+    "Replying With Files": "משוב עם קבצים",
+    "This will end the conference for everyone. Continue?": "זה יסיים את הועידה עבור כולם, להמשיך?",
+    "End conference": "סיום ועידה",
+    "You do not have permission to start a conference call in this room": "אין לכם הרשאות להתחיל ועידה בחדר זה",
+    "Permission Required": "הרשאה דרושה",
+    "A call is currently being placed!": "כרגע מתבצעת התחברות לשיחה!",
+    "Call in Progress": "שיחה פעילה",
+    "You've reached the maximum number of simultaneous calls.": "הגעתם למקסימום שיחות שניתן לבצע בו זמנית.",
+    "Too Many Calls": "יותר מדי שיחות",
+    "No other application is using the webcam": "שום אפליקציה אחרת אינה משתמשת במצלמה",
+    "Permission is granted to use the webcam": "ניתנה הרשאה לשימוש במצלמה",
+    "A microphone and webcam are plugged in and set up correctly": "מצלמה ומיקרופון מחוברים ומוגדרים היטב",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "השיחה נכשלה משום שלא ניתן היה להפעיל מצלמה או מיקרופון, בדקו אותם:",
+    "Unable to access webcam / microphone": "לא ניתן היה להפעיל מצלמה \\ מיקרופון",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "השיחה נכשלה בגלל שלא ניתן היה להפעיל את המיקרופון. אנא בדקו שהמיקרופון מחובר ומוגדר נכון.",
+    "Unable to access microphone": "לא ניתן לגשת אל המיקרופון",
+    "Try using turn.matrix.org": "נסו להשתמש ב- turn.matrix.org",
+    "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.": "לחלופין אתם יכולים לנסות את השרת הציבורי <code>turn.matrix.org</code>, אך דעו שהוא לא יהיה עקבי וכתובת הרשת שלכם תהיה חשופה לשרת הזה. אתם יכולים לנהל תכונה זו בהגדרות השרת.",
+    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "אנא בקשו ממנהל השרת (<code>%(homeserverDomain)s</code>) לסדר את הגדרות שרת TURN על מנת שהשיחות יפעלו בעקביות.",
+    "Call failed due to misconfigured server": "השיחה נכשלה בגלל הגדרות שרת שגויות",
+    "The call was answered on another device.": "השיחה נענתה במכשיר אחר.",
+    "Answered Elsewhere": "נענה במקום אחר",
+    "The call could not be established": "לא ניתן להתקשר",
+    "The other party declined the call.": "הצד השני דחה את השיחה.",
+    "Call Declined": "שיחה נדחתה",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "כאשר הדף הזה מכיל מידע מזהה כגון, שם חדר, משתמש או קבוצה, המידע הזה מוסר לפני שהוא נשלח אל השרת.",
+    "The information being sent to us to help make %(brand)s better includes:": "המידע אשר נשלח אלינו על מנת לשפר את %(brand)s מכיל:",
+    "Analytics": "אנליטיקה",
+    "Your device resolution": "רזולוציית המסך של המכשיר",
+    "Your user agent": "סוכן המשתמש שלך",
+    "Every page you use in the app": "כל דף שאתם משתמשים בו באפליקציה",
+    "e.g. %(exampleValue)s": "כלומר %(exampleValue)s",
+    "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)": "האם אתם משתמשים בתכונת ה 'פירורים' (אוואטרים מעל רשימת החדרים)",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "האם אתם משתמשים ב %(brand)s על מכשיר אשר המגע בו הוא התפעול העיקרי",
+    "Your homeserver's URL": "הקישור של השרת",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "האם אתם משתמשים בתכונה המתקדמת של עורך הטקסט",
+    "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.": "פעולה זו דורשת להכנס אל שרת הזיהוי <server /> לאשר מייל או טלפון, אבל לשרת אין כללי שרות.",
+    "Identity server has no terms of service": "לשרת הזיהוי אין כללי שרות",
+    "Unnamed Room": "חדר ללא שם",
+    "Failed to add the following rooms to %(groupId)s:": "הוספת החדרים אל %(groupId)s נכשלה:",
+    "Failed to invite users to %(groupId)s": "הזמנת משתמשים אל %(groupId)s נכשלה",
+    "Failed to invite users to community": "הזמנת משתמשים אל הקהילה נכשלה",
+    "Failed to invite the following users to %(groupId)s:": "הזמנת החברים אל %(groupId)s נכשלה:",
+    "Add to community": "הוסף אל קהילה",
+    "Room name or address": "שם חדר או כתובת",
+    "Name or Matrix ID": "שם או שם משתמש",
+    "Only continue if you trust the owner of the server.": "המשיכו רק אם הנכם בוטחים בבעלים של השרת.",
+    "American Samoa": "סמואה האמריקאית",
+    "Algeria": "אלג'ריה",
+    "Albania": "אלבניה",
+    "Åland Islands": "איי אלנד",
+    "Afghanistan": "אפגניסטן",
+    "United States": "ארצות הברית",
+    "United Kingdom": "אנגליה",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "המייל שלכם לא משוייך לחשבון בשרת הזה.",
+    "This email address was not found": "המייל הזה לא נמצא",
+    "Unable to enable Notifications": "לא מצליח להחיל התרעות",
+    "%(brand)s was not given permission to send notifications - please try again": "%(brand)s לא נתנו הרשאות לשלוח התרעות - אנא נסו שוב",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s אין אישור לשלוח אליכם הודעות - אנא בדקו את הרשאות הדפדפן",
+    "%(name)s is requesting verification": "%(name)s מבקש אימות",
+    "Trust": "לבטוח",
+    "Andorra": "אנדורה",
+    "Bangladesh": "בנגלדש",
+    "Bahrain": "בחריין",
+    "Bahamas": "בהמהס",
+    "Azerbaijan": "אזרבייג'ין",
+    "Austria": "אוסטריה",
+    "Australia": "אוסטרליה",
+    "Aruba": "ארובה",
+    "Armenia": "ארמניה",
+    "Argentina": "ארגנטינה",
+    "Antigua & Barbuda": "אנטיגואה וברבודה",
+    "Antarctica": "אנטארקטיקה",
+    "Anguilla": "אנגילה",
+    "Angola": "אנגולה",
+    "Barbados": "ברבדוס",
+    "Brunei": "ברוניי",
+    "British Virgin Islands": "איי הבתולה הבריטיים",
+    "British Indian Ocean Territory": "הטריטוריה הבריטית של האוקיינוס ההודי",
+    "Brazil": "ברזיל",
+    "Bouvet Island": "איי בובט",
+    "Botswana": "בוטסוואנה",
+    "Bosnia": "בוסניה",
+    "Bolivia": "בוליביה",
+    "Bhutan": "בוטאן",
+    "Bermuda": "ברמודה",
+    "Benin": "בנין",
+    "Belize": "בליזה",
+    "Belgium": "בלגיה",
+    "Belarus": "בלרוס",
+    "Bulgaria": "בולגריה",
+    "Cocos (Keeling) Islands": "איי קוקוס קלינג",
+    "Christmas Island": "איי קריסטמס",
+    "China": "סין",
+    "Chile": "צ'ילה",
+    "Chad": "צ'אד",
+    "Central African Republic": "הרפובליקה של מרכז אפריקה",
+    "Cayman Islands": "איי קיימן",
+    "Caribbean Netherlands": "קאריבים הולנדים",
+    "Cape Verde": "קייפ וורדה",
+    "Canada": "קנדה",
+    "Cameroon": "קאמרון",
+    "Cambodia": "קאמבודיה",
+    "Burundi": "בורונדי",
+    "Burkina Faso": "בורקינה פאסו",
+    "Colombia": "קולומביה",
+    "Comoros": "קומורוס",
+    "Dominican Republic": "הרפובליקה הדומיניקית",
+    "Dominica": "דומיניקה",
+    "Djibouti": "דג'יבוטי",
+    "Denmark": "דנמרק",
+    "Côte d’Ivoire": "קוטה דלוואיר",
+    "Czech Republic": "הרפובליקה הצ'כית",
+    "Cyprus": "קפריסין",
+    "Curaçao": "קורצ'ייאו",
+    "Cuba": "קובה",
+    "Croatia": "קרואטיה",
+    "Costa Rica": "קוטה ריקה",
+    "Cook Islands": "איי קוק",
+    "Congo - Kinshasa": "קונגו - קינשסה",
+    "Congo - Brazzaville": "קונגו - בראזווילה",
+    "Ecuador": "אקוודור",
+    "French Southern Territories": "הטריטוריות הדרומיות הצרפתיות",
+    "French Polynesia": "פולינזיה הצרפתית",
+    "French Guiana": "גיניאה הצרפתית",
+    "France": "צרפת",
+    "Finland": "פינלנד",
+    "Fiji": "פיג'י",
+    "Faroe Islands": "איי פארואה",
+    "Falkland Islands": "איי פולקלנד",
+    "Ethiopia": "אתיופיה",
+    "Estonia": "אסטוניה",
+    "Eritrea": "אריתריאה",
+    "Equatorial Guinea": "גיניאה המשוונית",
+    "El Salvador": "אל סלבדור",
+    "Egypt": "מצריים",
+    "Gabon": "גאבון",
+    "Guinea-Bissau": "גיניאה ביסאו",
+    "Guinea": "גיניאה",
+    "Guernsey": "גורנסיי",
+    "Guatemala": "גואטמלה",
+    "Guam": "גואם",
+    "Guadeloupe": "גואדלופה",
+    "Grenada": "גרנדה",
+    "Greenland": "גרינלנד",
+    "Greece": "יוון",
+    "Gibraltar": "גיברלטר",
+    "Ghana": "גאנה",
+    "Germany": "גרמניה",
+    "Georgia": "ג'ורג'יה",
+    "Gambia": "גמביה",
+    "Guyana": "גויאנה",
+    "Italy": "איטליה",
+    "Israel": "ישראל",
+    "Isle of Man": "איי מן",
+    "Ireland": "אירלנד",
+    "Iraq": "עירק",
+    "Iran": "אירן",
+    "Indonesia": "אינדונזיה",
+    "India": "הודו",
+    "Iceland": "איסלנד",
+    "Hungary": "הונגריה",
+    "Hong Kong": "הונק קונג",
+    "Honduras": "הונדורס",
+    "Heard & McDonald Islands": "איי הרס ומקדונלד",
+    "Haiti": "הייטי",
+    "Jamaica": "ג'מייקה",
+    "Liberia": "ליבריה",
+    "Lesotho": "לסות'ו",
+    "Lebanon": "לבנון",
+    "Latvia": "לטביה",
+    "Laos": "לאוס",
+    "Kyrgyzstan": "קירג'יזסטן",
+    "Kuwait": "כווית",
+    "Kosovo": "קוסובו",
+    "Kiribati": "קיריבאטי",
+    "Kenya": "קניה",
+    "Kazakhstan": "קאזחסטן",
+    "Jordan": "ירדן",
+    "Jersey": "ג'רסי",
+    "Japan": "יפן",
+    "Libya": "לוב",
+    "Martinique": "מרטיניק",
+    "Marshall Islands": "איי מארשל",
+    "Malta": "מלטה",
+    "Mali": "מאלי",
+    "Maldives": "מאלדיביים",
+    "Malaysia": "מלזיה",
+    "Malawi": "מלאווי",
+    "Madagascar": "מדגסקר",
+    "Macedonia": "מאקדוניה",
+    "Macau": "מאקאו",
+    "Luxembourg": "לוקסמבורג",
+    "Lithuania": "ליטואניה",
+    "Liechtenstein": "ליכטנשטיין",
+    "Morocco": "מרוקו",
+    "Montserrat": "מונטסראט",
+    "Montenegro": "מונטנגרו",
+    "Mongolia": "מונגוליה",
+    "Monaco": "מונקו",
+    "Moldova": "מולדובה",
+    "Micronesia": "מיקרונזיה",
+    "Mexico": "מקסיקו",
+    "Mayotte": "מיוטה",
+    "Mauritius": "מאוריטיוס",
+    "Mauritania": "מאוריטניה",
+    "Namibia": "נמיביה",
+    "Myanmar": "מיאנמר",
+    "Mozambique": "מוזמביק",
+    "Norway": "נורבגיה",
+    "Northern Mariana Islands": "צפון איי מריאנה",
+    "North Korea": "צפון קוריאה",
+    "Norfolk Island": "איי נורפולק",
+    "Niue": "ניו",
+    "Nigeria": "ניגריה",
+    "Niger": "ניגר",
+    "Nicaragua": "ניקרגואה",
+    "New Zealand": "ניו זילנד",
+    "New Caledonia": "קלדוניה החדשה",
+    "Netherlands": "הולנד",
+    "Nepal": "נפאל",
+    "Nauru": "נארו",
+    "Pakistan": "פקיסטן",
+    "Palau": "פאלאו",
+    "Rwanda": "רואנדה",
+    "Russia": "רוסיה",
+    "Romania": "רומניה",
+    "Qatar": "קאטאר",
+    "Puerto Rico": "פוארטו ריקו",
+    "Portugal": "פורטוגל",
+    "Poland": "פולין",
+    "Pitcairn Islands": "איי פיטצ'יירן",
+    "Philippines": "פיליפינים",
+    "Peru": "פרו",
+    "Paraguay": "פאראגוואי",
+    "Papua New Guinea": "פפואה ניו גיניאה",
+    "Panama": "פנמה",
+    "Palestine": "ישראל",
+    "Réunion": "ריוניון",
+    "Slovenia": "סלובניה",
+    "Slovakia": "סלובקיה",
+    "Sint Maarten": "סיינט מרטין",
+    "Singapore": "סינגפור",
+    "Sierra Leone": "סיירה לאון",
+    "Seychelles": "איי סיישל",
+    "Serbia": "סרביה",
+    "Senegal": "סנגל",
+    "Saudi Arabia": "ערב הסעודית",
+    "San Marino": "סאן מרינו",
+    "Samoa": "סמואה",
+    "South Georgia & South Sandwich Islands": "דרום ג'ורג'יה ודרום איי סנדוויץ",
+    "St. Lucia": "סיינט לוסייה",
+    "St. Kitts & Nevis": "סיינט קיטס ונביס",
+    "St. Helena": "סיינט הלנה",
+    "St. Barthélemy": "סיינט ברתלמי",
+    "Sri Lanka": "סרילנקה",
+    "Spain": "ספרד",
+    "South Sudan": "דרום סודן",
+    "South Korea": "דרום קוריאה",
+    "South Africa": "דרום אפריקה",
+    "Somalia": "סומליה",
+    "Solomon Islands": "איי שלמה",
+    "St. Vincent & Grenadines": "סיינט וינסנט וגרנדינס",
+    "St. Pierre & Miquelon": "סיינט פייר ומיקוולון",
+    "Thailand": "תאילנד",
+    "Tanzania": "טנזניה",
+    "Tajikistan": "טג'יקיסטן",
+    "Taiwan": "טאיוואן",
+    "São Tomé & Príncipe": "סאו תומא ופרינציפה",
+    "Syria": "סוריה",
+    "Switzerland": "שוויץ",
+    "Sweden": "שוודיה",
+    "Swaziland": "סוואזילנד",
+    "Svalbard & Jan Mayen": "סוואלבאד וג'אן מיין",
+    "Suriname": "סורינמה",
+    "Sudan": "סודן",
+    "Togo": "תוגו",
+    "Uzbekistan": "אוזבקיסטן",
+    "Uruguay": "אורוגוואי",
+    "United Arab Emirates": "איחוד האמירויות",
+    "Ukraine": "אוקרינה",
+    "Uganda": "אוגנדה",
+    "U.S. Virgin Islands": "איי הבתולה ארה\"ב",
+    "Tuvalu": "תובלאו",
+    "Turks & Caicos Islands": "טוקרס ואיי קאייקו",
+    "Turkmenistan": "טורקמניסטן",
+    "Turkey": "טורקיה",
+    "Tunisia": "תוניסיה",
+    "Trinidad & Tobago": "טרינידאד וטובאגו",
+    "Tonga": "טונגה",
+    "Tokelau": "טוקלאו",
+    "Vanuatu": "ונואטו",
+    "Default": "ברירת מחדל",
+    "Sign In": "כניסה",
+    "Create Account": "יצירת חשבון",
+    "Use your account or create a new one to continue.": "השתמשו בחשבונכם או צרו חשבון חדש.",
+    "Sign In or Create Account": "התחברו או צרו חשבון",
+    "Zimbabwe": "זימבבואה",
+    "Zambia": "זמביה",
+    "Yemen": "תימן",
+    "Western Sahara": "מערב סהרה",
+    "Wallis & Futuna": "וואליס ופוטונה",
+    "Vietnam": "וייטנאם",
+    "Venezuela": "ונצואלה",
+    "Vatican City": "ותיקן",
+    "Use Single Sign On to continue": "השתמש בכניסה חד שלבית על מנת להמשיך",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "אשרו הוספת מייל זה על ידי כניסה למערכת להוכיח את זהותכם.",
+    "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 כבר נמצא בחדר זה",
+    "You do not have permission to invite people to this room.": "אין לכם הרשאות להזמין אנשים לחדר זה.",
+    "Unrecognised address": "כתובת לא מזוהה",
+    "Error leaving room": "שגיאת נסיון לצאת מהחדר",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "החדר הזה משמש להודעות חשובות מהשרת ולכן אינכם יכולים לעזוב אותו.",
+    "Can't leave Server Notices room": "לא יכול לעזוב את חדר ההודעות של השרת",
+    "Unexpected server error trying to leave the room": "שגיאת שרת לא צפויה בנסיון לעזוב את החדר",
+    "Authentication check failed: incorrect password?": "האימות שלכם נכשל: סיסמא שגוייה?",
+    "Not a valid %(brand)s keyfile": "קובץ מפתח של %(brand)s אינו תקין",
+    "Your browser does not support the required cryptography extensions": "הדפדפן שלכם אינו תומך בהצפנה הדרושה",
+    "%(name)s (%(userId)s)": "%(userId)s %(name)s",
+    "%(num)s days from now": "בעוד %(num)s ימים מעכשיו",
+    "about a day from now": "בערך בעוד יום מעכשיו",
+    "%(num)s hours from now": "בעוד %(num)s שעות",
+    "about an hour from now": "בערך בעוד כשעה",
+    "%(num)s minutes from now": "בעוד %(num)s דקות",
+    "about a minute from now": "בערך עוד דקה אחת",
+    "a few seconds from now": "בעוד מספר שניות מעכשיו",
+    "%(num)s days ago": "לפני %(num)s ימים",
+    "about a day ago": "בערך לפני יום",
+    "%(num)s hours ago": "לפני %(num)s שעות",
+    "about an hour ago": "בערך לפני כשעה",
+    "%(num)s minutes ago": "לפני %(num)s דקות",
+    "about a minute ago": "לפני בערך דקה",
+    "a few seconds ago": "לפני מספר שניות",
+    "%(items)s and %(lastItem)s": "%(items)s ו%(lastItem)s אחרון",
+    "%(items)s and %(count)s others|one": "%(items)s ועוד אחד אחר",
+    "%(items)s and %(count)s others|other": "%(items)s ו%(count)s אחרים",
+    "Unable to connect to Homeserver. Retrying...": "לא מצליח להתחבר אל השרת הראשי. מנסה שוב...",
+    "Please <a>contact your service administrator</a> to continue using the service.": "אנא <a>צרו קשר עם אדמין השרת</a> על מנת להמשיך להשתמש בשרות.",
+    "This homeserver has exceeded one of its resource limits.": "השרת הזה חרג מאחד ממגבלות המשאבים שלו.",
+    "This homeserver has hit its Monthly Active User limit.": "השרת הזה הגיע לקצה מספר המשתמשים הפעילים לחודש.",
+    "The message you are trying to send is too large.": "ההודעה שהנכם מנסים לשלוח גדולה מדי.",
+    "Unexpected error resolving identity server configuration": "שגיאה לא צפויה בהתחברות אל שרת הזיהוי",
+    "Unexpected error resolving homeserver configuration": "שגיאה לא צפוייה של התחברות לשרת הראשי",
+    "No homeserver URL provided": "לא סופקה כתובת של שרת הראשי",
+    "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.": "אתם יכולים להכנס, אך כמה מן התכונות יהיו לא פעילים עד ששרת הזיהוי ישוב לפעילות תקינה. אם אתם עדיין רואים את השגיאה הזו אנא צרו קשר עם אדמין השרת או בדקו את ההגדרות שלכם.",
+    "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.": "אתם יכולים לחדש סיסמא, אך כמה מן התכונות יהיו לא פעילים עד ששרת הזיהוי ישוב לפעילות תקינה. אם אתם עדיין רואים את השגיאה הזו אנא צרו קשר עם אדמין השרת או בדקו את ההגדרות שלכם.",
+    "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.": "אתם יכולים להרשם, אך כמה מן התכונות יהיו לא פעילים עד ששרת הזיהוי ישוב לפעילות תקינה. אם אתם עדיין רואים את השגיאה הזו אנא צרו קשר עם אדמין השרת או בדקו את ההגדרות שלכם.",
+    "Cannot reach identity server": "אין תקשורת עם שרת הזיהוי",
+    "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "בקשו מהאדמין של %(brand)s לבדוק <a>קונפיגורציה</a> לרשומות כפולות שגויות.",
+    "Ensure you have a stable internet connection, or get in touch with the server admin": "בדקו שיש לכם תקשורת אינטרנט יציבה, או צרו קשר עם האדמין של השרת",
+    "Cannot reach homeserver": "אין תקשורת עם השרת הראשי",
+    "See <b>%(msgtype)s</b> messages posted to your active room": "ראו <b>%(msgtype)s</b> הודעות שפורסמו בחדר הפעיל שלכם",
+    "See <b>%(msgtype)s</b> messages posted to this room": "ראו <b>%(msgtype)s</b> הודעות שפורסמו בחדר זה",
+    "Send <b>%(msgtype)s</b> messages as you in your active room": "שלחו <b>%(msgtype)s</b> הודעות בשמכם בחדר הפעיל שלכם",
+    "Send <b>%(msgtype)s</b> messages as you in this room": "שלחו <b>%(msgtype)s</b> הודעות בשמכם בחדר זה",
+    "See general files posted to your active room": "צפו בקבצים הכללים שפורסמו בחדר הפעיל שלכם",
+    "See general files posted to this room": "צפו בקבצים כללים אשר פורסמו בחדר זה",
+    "Send general files as you in your active room": "שלחו קבצים כללים בשמכם בחדר הפעיל שלכם",
+    "Send general files as you in this room": "שלחו קבצים כללים בשמכם בחדר זה",
+    "See videos posted to your active room": "ראו סרטונים שנשלחו לחדר הפעיל שלכם",
+    "See videos posted to this room": "ראו סרטונים שנשלחו לחדר זה",
+    "Send videos as you in your active room": "שלחו סרטונים בשמכם בחדר הפעיל שלכם",
+    "Send videos as you in this room": "שלחו סרטונים בשמכם בחדר זה",
+    "See images posted to your active room": "ראו תמונות שפורסמו בחדר הפעיל שלכם",
+    "See images posted to this room": "ראו תמונות שפוסמו בחדר זה",
+    "Send images as you in your active room": "שלחו תמונות בשמכם בחדר הפעיל שלכם",
+    "Send images as you in this room": "שלחו תמונות בשמכם בחדר זה",
+    "See emotes posted to your active room": "ראו סמלים שפורסמו בחדר הפעיל שלכם",
+    "See emotes posted to this room": "ראו סמלים שפורסמו בחדר זה",
+    "Send emotes as you in your active room": "שלחו סמלים בשמכם בחדר הפעיל שלכם",
+    "Send emotes as you in this room": "שלחו סמלים בשמכם בחדר זה",
+    "See text messages posted to your active room": "ראו הודעות טקסט שפורסמו בחדר הפעיל שלכם",
+    "See text messages posted to this room": "ראו הודעות טקסט שפורסמו בחדר זה",
+    "Send text messages as you in your active room": "שלחו הודעות טקסט בשמכם בחדר הפעיל שלכם",
+    "Send text messages as you in this room": "שלחו הודעות טקסט בשמכם בחדר זה",
+    "See messages posted to your active room": "ראו הודעות שפורסמו בחדר הפעיל שלכם",
+    "See messages posted to this room": "ראו הודעות שפורסמו בחדר זה",
+    "Send messages as you in your active room": "שלחו הודעות בשמכם בחדר הפעיל שלכם",
+    "Send messages as you in this room": "שלחו הודעות בשמכם בחדר זה",
+    "The <b>%(capability)s</b> capability": "ה<b>%(capability)s</b> יכולת",
+    "See <b>%(eventType)s</b> events posted to your active room": "ראו <b>%(eventType)s</b> התרעות שפורסמו בחדר הפעיל שלכם",
+    "Send <b>%(eventType)s</b> events as you in your active room": "שלח <b>%(eventType)s</b> התרעות בשמכם לחדר הפעיל שלכם",
+    "See <b>%(eventType)s</b> events posted to this room": "ראו <b>%(eventType)s</b> התרעות שפורסמו בשמכם בחדר זה",
+    "Send <b>%(eventType)s</b> events as you in this room": "שלח <b>%(eventType)s</b> התרעות בשמכם לחדר זה",
+    "with state key %(stateKey)s": "עם מפתח מצב %(stateKey)s",
+    "with an empty state key": "עם מפתח ללא מצב",
+    "See when anyone posts a sticker to your active room": "ראו מתי כל אחד מפרסם מדבקה בחדר הפעיל שלכם",
+    "Send stickers to your active room as you": "שלחו מדבקות אל החדר הפעיל שלכם בשמכם",
+    "See when a sticker is posted in this room": "ראו מתי מדבקה מפורסמת בחדר זה",
+    "Send stickers to this room as you": "שלחו מדבקות לחדר זה בשמכם",
+    "See when the avatar changes in your active room": "ראו מתי שונה האווטר בחדר הפעיל שלכם",
+    "Change the avatar of your active room": "שנו את האווטר של החדר הפעיל שלכם",
+    "See when the avatar changes in this room": "ראו מתי האוורט משתנה בחדר זה",
+    "Change the avatar of this room": "שנו את האווטר של החדר הזה",
+    "See when the name changes in your active room": "ראו מתי השם משתנה בחדר הפעיל שלכם",
+    "Change the name of your active room": "שנו את השם של החדר הפעיל שלכם",
+    "See when the name changes in this room": "ראו מתי השם שונה בחדר זה",
+    "Change the name of this room": "שנו את שם החדר הזה",
+    "See when the topic changes in your active room": "ראו מתי שונה שם הנושא של הקבוצה הפעילה שלכם",
+    "Change the topic of your active room": "שנו את שם הנושא של החדר הפעיל שלכם",
+    "See when the topic changes in this room": "ראו מתי הנושא שונה בחדר זה",
+    "Change the topic of this room": "שנו את שם הנושא של חדר זה",
+    "Change which room you're viewing": "שנו את החדר שבו אתם נמצאים",
+    "Send stickers into your active room": "שלחו מדבקות אל החדר הפעיל שלכם",
+    "Send stickers into this room": "שלחו מדבקות לחדר זה",
+    "Remain on your screen while running": "השארו במסך זה כאשר אתם פעילים",
+    "Remain on your screen when viewing another room, when running": "השארו במסך הראשי כאשר אתם עברים בין חדרים בכל קהילה",
+    "%(names)s and %(lastPerson)s are typing …": "%(names)s ו%(lastPerson)s כותבים…",
+    "%(names)s and %(count)s others are typing …|one": "%(names)s ועוד משהו כותבים…",
+    "%(names)s and %(count)s others are typing …|other": "%(names)s ו%(count)s אחרים כותבים…",
+    "%(displayName)s is typing …": "%(displayName)s כותב…",
+    "Done": "סיום",
+    "Interactively verify by Emoji": "אימות עם משוב בעזרת סמלים",
+    "Manually Verify by Text": "אימות ידני בעזרת טקסט",
+    "Not Trusted": "לא אמין",
+    "Ask this user to verify their session, or manually verify it below.": "בקש ממשתמש זה לאמת את ההתחברות שלו, או לאמת אותה באופן ידני למטה.",
+    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s %(userId)s נכנס דרך התחברות חדשה מבלי לאמת אותה:",
+    "Verify your other session using one of the options below.": "אמתו את ההתחברות האחרת שלכם דרך אחת מהאפשרויות למטה.",
+    "You signed in to a new session without verifying it:": "נכנסתם דרך התחברות חדשה מבלי לאמת אותה:",
+    "Dark": "כהה",
+    "Light": "בהיר",
+    "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s עדכן כלל חסימה אשר תאם ל%(oldGlob)s ל%(newGlob)s עבור %(reason)s",
+    "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)sשינה כלל אשר חסם שרתים שתאמו ל%(oldGlob)s ל%(newGlob)s עבור %(reason)s",
+    "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s שינה כלל אשר חסם חדרים התואמים ל%(oldGlob)s ל%(newGlob)s עבור %(reason)s",
+    "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s שינה כלל אשר חסם משתמשים שתאמו ל%(oldGlob)s ל%(newGlob)s עבור %(reason)s",
+    "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s יצר כלל חסימה התואם ל%(glob)s עבור %(reason)s",
+    "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s יצר כלל החוסם שרתים התואמים ל%(glob)s עבור %(reason)s",
+    "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s יצר כלל החוסם חדרים התואמים ל%(glob)s עבור %(reason)s",
+    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s יצר כלל החוסם משתמשים התואמים ל%(glob)s עבור %(reason)s",
+    "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s עדכן כלל חסימה התואם ל%(glob)s עבור %(reason)s",
+    "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s עדכן את הכללים המאפשרים חסימת שרתים התואמים ל%(glob)s עבור %(reason)s",
+    "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s עדכן את הכלל שפאפשר חסימה של חדרים התואמים ל%(glob)s עבור %(reason)s",
+    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s עדכן את הכלל שמאפשר חסימת משתמשים התואמים ל%(glob)s עבור %(reason)s",
+    "%(senderName)s updated an invalid ban rule": "%(senderName)s עידכן כלל חסימה שגוי",
+    "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s הסיר כלל חסימה התואם ל%(glob)s",
+    "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s הסיר את הכלל החוסם שרתים התואמים ל%(glob)s",
+    "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s הסיר את הכלל שחוסם חדרים התואמים ל%(glob)s",
+    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s הסיר את הכלל שחוסם משתמשים התואמים ל %(glob)s",
+    "%(widgetName)s widget removed by %(senderName)s": "היישומון %(widgetName)s הוסר על ידי %(senderName)s",
+    "%(widgetName)s widget added by %(senderName)s": "היישומון %(widgetName)s התווסף על ידי %(senderName)s",
+    "%(widgetName)s widget modified by %(senderName)s": "היישומון %(widgetName)s שונה על ידי %(senderName)s",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s שינה את ההודעה הנעוצה של החדר.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s שינה את רמת ההרשאה של %(powerLevelDiffText)s.",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s מ%(fromPowerLevel)s ל%(toPowerLevel)s",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s הגדיר את הסטוריית החדר פתוחה עבור (%(visibility)s) לא ידועים.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s הגדיר את הסטוריית החדר פתוחה עבור כולם.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s הגדיר את הסטוריית החדר כפתוחה לכל משתמשי החדר.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s הגדיר את תצוגת ההסטוריה של החדר כפתוחה עבור כל משתמשי החדר, מהרגע שבו הם הצתרפו.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s הגדיר את תצוגת ההסטוריה של החדר כפתוחה עבור כל משתמשי החדר, מהרגע שבו הם הוזמנו.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s שלח הזמנה ל%(targetDisplayName)s להצטרף אל החדר.",
+    "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s דחה את ההזמנה של %(targetDisplayName)s להצטרף אל החדר.",
+    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s התחיל שיחת וידאו. (אינו נתמך בדפדפן זה)",
+    "%(senderName)s placed a video call.": "%(senderName)s התחיל שיחת וידאו.",
+    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s התחיל שיחה קולית. (אינו נתמך בדפדפן זה)",
+    "%(senderName)s placed a voice call.": "%(senderName)s התחיל שיחה קולית.",
+    "%(senderName)s declined the call.": "%(senderName)s דחה את השיחה.",
+    "%(senderName)s ended the call.": "%(senderName)s סיים את השיחה.",
+    "(unknown failure: %(reason)s)": "(תקלה לא ידועה: %(reason)s)",
+    "(no answer)": "(אין תשובה)",
+    "(an error occurred)": "(שגיאה קרתה)",
+    "(their device couldn't start the camera / microphone)": "(המכשיר שלהם לא הצליח להתחיל מצלמה \\ מיקרופון)",
+    "(connection failed)": "(התקשרות נכשלה)",
+    "(could not connect media)": "(לא ניתן לחבר מדיה)",
+    "%(senderName)s answered the call.": "%(senderName)s ענה לשיחה.",
+    "(not supported by this browser)": "(אינו נתמך בדפדפן זה)",
+    "Someone": "משהו",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s שינה את הכתובות של חדר זה.",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s שינה את הכתובת הראשית והמשנית של חדר זה.",
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s שניה את הכתובת המשנית של חדר זה.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s הסיר את הכתובת המשנית %(addresses)s עבור חדר זה.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s הסיר את הכתובת המשנית %(addresses)s עבור חדר זה.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s הוסיף כתובת משנית %(addresses)s עבור חדר זה.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s הוסיף את הכתובת המשנית %(addresses)s עבור חדר זה.",
+    "%(senderName)s removed the main address for this room.": "%(senderName)s הסיר את הכתובת הראשית עבור חדר זה.",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s הגדיר את הכתובת הראשית עבור חדר זה ל- %(address)s.",
+    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s שלח תמונה.",
+    "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 כל השרתים חסומים מהשתתפות! החדר הזה אינו בשימוש יותר.",
+    "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s שינה את הגדרות של השרת עבור חדר זה.",
+    "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s הגדיר את רשימת הכניסה של השרת עבור חדר זה.",
+    "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s הפעיל את פלייר עבור %(newGroups)s וביטל את פלייר עבור %(oldGroups)s בחדר זה.",
+    "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s ביטל פלייר עבור %(groups)s בחדר זה.",
+    "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s הפעילו פלייר עבור %(groups)s בחדר זה.",
+    "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s שינה את כללי הכניסה לאורחים ל- %(rule)s",
+    "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s מנע אפשרות מאורחים להכנס אל החדר.",
+    "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s איפשר לאורחים להכנס אל החדר.",
+    "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s שינה את כללי ההצטרפות ל־%(rule)s",
+    "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s הגדיר את החדר כ- \"הזמנה בלבד!\".",
+    "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s הגדיר את החדר כציבורי עבור כל מי שקיבל את הקישור.",
+    "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s שידרג את החדר הזה.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s שינה את שם החדר ל%(roomName)s.",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s שינה את שם החדר מ-%(oldRoomName)s ל%(newRoomName)s.",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s הסיר את שם החדר.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s שינה את שם הנושא ל-\"%(topic)s\".",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s בעט החוצה את %(targetName)s.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s משך את ההזמנה מ %(targetName)s.",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s הסיר חסימה מ %(targetName)s.",
+    "%(targetName)s left the room.": "%(targetName)s עזב\\ה את החדר.",
+    "%(targetName)s rejected the invitation.": "%(targetName)s דחו את ההזמנה.",
+    "%(targetName)s joined the room.": "%(targetName)s הצטרף אל החדר.",
+    "%(senderName)s made no change.": "%(senderName)s לא עשה שום שינוי.",
+    "%(senderName)s set a profile picture.": "%(senderName)s הגדירו תמונת פרופיל.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s שינו את תמונת הפרופיל שלהם.",
+    "%(senderName)s removed their profile picture.": "%(senderName)s הסירו את תמונת הפרופיל שלהם.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s הסירו את השם הישן שלהם %(oldDisplayName)s.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s הגדירו את שמם ל %(displayName)s.",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s שינו את שמם ל %(displayName)s.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s חסם את %(targetName)s.",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s הזמין את %(targetName)s.",
+    "%(targetName)s accepted an invitation.": "%(targetName)s קיבל את ההזמנה.",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s קיבל את ההזמנה עבור %(displayName)s.",
+    "Reason": "סיבה",
+    "Displays action": "הצג פעולה",
+    "Takes the call in the current room off hold": "מחזיר את השיחה הנוכחית ממצב המתנה",
+    "Places the call in the current room on hold": "שם את השיחה הנוכחית במצב המתנה",
+    "Sends a message to the given user": "שליחת הודעת למשתמש מסויים",
+    "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>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 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> עם ID%(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": "שמירת הפרופיל שלכם נכשלה",
+    "Enable audible notifications for this session": "אפשר התראות נשמעות עבור התחברות זו",
+    "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.": "ישנן התראות מתקדמות שלא מוצגות כאן.",
+    "Add an email address to configure email notifications": "הוסף כתובת דוא\"ל להגדרת התראות דוא\"ל",
+    "Clear notifications": "נקה התראות",
+    "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 אינם יכולים לשמור במטמון מאובטח הודעות מוצפנות באופן מקומי בזמן שהם פועלים בדפדפן אינטרנט. השתמש ב- <desktopLink>%(brand)s Desktop </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.": "שמור באופן מאובטח הודעות מוצפנות באופן מקומי כדי שיופיעו בתוצאות החיפוש.",
+    "Manage": "ניהול",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "שמור באופן מאובטח הודעות מוצפנות באופן מקומי כדי שיופיעו בתוצאות החיפוש באמצעות %(size)s לשמור הודעות מחדרים %(rooms)s.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "שמור באופן מאובטח הודעות מוצפנות באופן מקומי כדי שיופיעו בתוצאות החיפוש באמצעות %(size)s לשמור הודעות מחדרים %(rooms)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": "קיים",
+    "Homeserver feature support:": "תמיכה שרת:",
+    "User signing private key:": "משתמש חותם על מפתח פרטי:",
+    "Self signing private key:": "מפתח פרטי ברישום עצמאי:",
+    "not found locally": "לא נמצא באחסון מקומי",
+    "cached locally": "אוחסן מקומי",
+    "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.": "לחשבונך זהות חתימה צולבת באחסון סודי, אך הפגישה זו אינה מהימנה עדיין.",
+    "Your homeserver does not support cross-signing.": "השרת שלכם אינו תומך בחתימות-צולבות.",
+    "Cross-signing is ready for use.": "חתימה צולבת מוכנה לשימוש.",
+    "Change Password": "שנה סיסמא",
+    "Current password": "הסיסמא הנוכחית",
+    "Passwords don't match": "ססמאות לא תואמות",
+    "Confirm 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.": "שינוי הסיסמה יאפס כרגע את כל מפתחות ההצפנה מקצה לקצה בכל ההפעלות, מה שהופך את היסטוריית הצ'אט המוצפנת לבלתי קריאה, אלא אם כן אתה מייצא תחילה את מפתחות החדר שלך ומייבא אותם מחדש לאחר מכן. בעתיד זה ישופר.",
+    "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",
+    "Workspace: %(networkName)s": "סביבת עבודה: %(networkName)s",
+    "This bridge is managed by <user />.": "הגשר הזה מנוהל על ידי משתמש <user />.",
+    "This bridge was provisioned 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>.",
+    "Pin": "נעץ",
+    "Folder": "תקיה",
+    "Headphones": "אוזניות",
+    "Anchor": "עוגן",
+    "Ball": "כדור",
+    "Bell": "פעמון",
+    "Trumpet": "חצוצרה",
+    "Guitar": "גיטרה",
+    "Trophy": "פרס",
+    "Rocket": "רקטה",
+    "Aeroplane": "אוירון",
+    "Bicycle": "אופניים",
+    "Train": "רכבת",
+    "Flag": "דגל",
+    "Telephone": "טלפון",
+    "Hammer": "פטיש",
+    "Key": "מפתח",
+    "Lock": "מנעול",
+    "Scissors": "מספריים",
+    "Paperclip": "מהדק נייר",
+    "Pencil": "עפרון",
+    "Book": "ספר",
+    "Light bulb": "נורה",
+    "Gift": "מתנה",
+    "Clock": "שעון",
+    "Hourglass": "שעון חול",
+    "Umbrella": "מטריה",
+    "Thumbs up": "חיובי",
+    "Santa": "סנטה",
+    "Spanner": "סביבון",
+    "Glasses": "משקפיים",
+    "Hat": "כובע",
+    "Robot": "רובוט",
+    "Smiley": "חיוך",
+    "Heart": "לב",
+    "Cake": "עוגה",
+    "Pizza": "פיצה",
+    "Corn": "תירס",
+    "Strawberry": "תות",
+    "Apple": "תפוח",
+    "Banana": "בננה",
+    "Fire": "אש",
+    "Cloud": "ענן",
+    "Moon": "לבנה",
+    "Globe": "גלובוס-דמיוני",
+    "Mushroom": "פטריה",
+    "Cactus": "קקטוס",
+    "Tree": "עץ",
+    "Flower": "פרח",
+    "Butterfly": "פרפר",
+    "Octopus": "תמנון",
+    "Fish": "דג",
+    "Turtle": "צב",
+    "Penguin": "פנגוין",
+    "Rooster": "תרנגול",
+    "Panda": "פנדה",
+    "Rabbit": "שפן",
+    "Elephant": "פיל",
+    "Pig": "חזיר",
+    "Unicorn": "חד קרן",
+    "Horse": "סוס",
+    "Lion": "אריה",
+    "Cat": "חתול",
+    "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": "מתקשר לא ידוע",
+    "%(name)s on hold": "%(name)s במצב המתנה",
+    "You held the call <a>Switch</a>": "שמם את השיחה על המתנה <a>להחליף</a>",
+    "sends snowfall": "שלח שלג נופל",
+    "Sends the given message with snowfall": "שלח הודעה זו עם שלג נופל",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s%(day)s%(fullYear)s%(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s - %(day)s - %(fullYear)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(monthName)s - %(day)s - %(time)s",
+    "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
+    "Return to call": "חזור לשיחה",
+    "Fill Screen": "מסך מלא",
+    "Voice Call": "שיחת אודיו",
+    "Video Call": "שיחת וידאו",
+    "%(peerName)s held the call": "%(peerName)s שם את השיחה במצב המתנה",
+    "You held the call <a>Resume</a>": "שמתם את השיחה במצב המתנה <a>לשוב</a>",
+    "sends fireworks": "שלח זיקוקים",
+    "Sends the given message with fireworks": "שולח הודעה זו עם זיקוקים",
+    "sends confetti": "שלח קונפטי",
+    "Sends the given message with confetti": "שולח הודעה זו ביחד עם קונפטי",
+    "This is your list of users/servers you have blocked - don't leave the room!": "זוהי רשימת השרתים\\משתמשים אשר בחרתם לחסום - אל תצאו מחדר זה!",
+    "My Ban List": "רשימת החסומים שלי",
+    "When rooms are upgraded": "כאשר חדרים משתדרגים",
+    "Encrypted messages in group chats": "הודעות מוצפנות בצאטים של קבוצות",
+    "Encrypted messages in one-to-one chats": "הודעות מוצפנות בחדרים של אחד-ל-לאחד",
+    "Messages containing @room": "הודעות שמכילות שם חדר כגון: room@",
+    "Messages containing my username": "הודעות שמכילות את שם המשתמש שלי",
+    "Downloading logs": "מוריד לוגים",
+    "Uploading logs": "מעלה לוגים",
+    "Show chat effects": "הצג אפקטים של צאט",
+    "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": "הראה תצוגה מקדימה\\ממוזערת של תמונות",
+    "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "אפשר שימוש בשרת של מטריקס כאשר השרת שלכם לא פעיל (כתובת ה-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": "שאלו אותי לפני שאתם שולחים הזמנה אל קוד זיהוי אפשרי של משתמש מערכת",
+    "Enable widget screenshots on supported widgets": "אפשר צילומי מסך של ישומונים עבור ישומונים נתמכים",
+    "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": "התאם לתבנית המערכת",
+    "Enable Community Filter Panel": "החל פנל לסינון קהילות",
+    "Mirror local video feed": "שקף זרימת וידאו מקומית",
+    "Automatically replace plain text Emoji": "החלף טקסט עם סמל באופן אוטומטי",
+    "Use Ctrl + Enter to send a message": "השתמש ב Ctrl + Enter על מנת לשלוח הודעה",
+    "Use Command + Enter to send a message": "השתמש במקלדת Command + Enter על מנת לשלוח הודעה",
+    "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": "נגן אנימציות וסרטונים",
+    "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": "עיצוב מסובב חדש",
+    "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "גירסת קהילות 2. דורש שרת תואם. מאוד נסיוני - השתמשו בזהירות.",
+    "Render LaTeX maths in messages": "בצע מתמטיקה של LaTeX בהודעות",
+    "Change notification settings": "שינוי הגדרת התרעות",
+    "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
+    "%(senderName)s: %(message)s": "%(senderName)s :%(message)s",
+    "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
+    "* %(senderName)s %(emote)s": "* %(senderName)s %(emote)s",
+    "%(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": "יתכן משתמשים אחרים לא יבטחו בזה",
+    "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": "אשרו התרעות שולחן עבודה",
+    "Don't miss a reply": "אל תפספסו תגובה",
+    "Later": "מאוחר יותר",
+    "Review where you’re logged in": "סקור מהיכן כבר התחברת",
+    "Review": "סקירה",
+    "Verify all your sessions to ensure your account & messages are safe": "אשרו את כל ההתחברויות שלך על מנת לוודא שהחשבון וההודעות שלכם מאובטחים",
+    "No": "לא",
+    "Yes": "כן",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "שלח <UsageDataLink>מידע שימוש אנונימי</UsageDataLink> אשר עוזר לנו לשפר את %(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": "זוהי אחת ממאה הסיסמאות המוכרות ביותר",
+    "This is a top-10 common password": "זוהי אחת מעשר הסיסמאות המוכרות ביותר",
+    "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": "המנעו ממילים ואותיות נשנות",
+    "Use a longer keyboard pattern with more turns": "השתמשו בדפוס ארוך שמכיל אותיות מכל שורה במקלדת",
+    "No need for symbols, digits, or uppercase letters": "אין צורך בסמלים, מספרים או אותיות גדולות",
+    "Use a few words, avoid common phrases": "השתמשו במילים ספורות, המנעו מביטויים מוכרים",
+    "Verification Requests": "בקשות אימות",
+    "View Servers in Room": "צפה בשרתים בחדר",
+    "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> זה יגרום למשתמשים עתידיים לראות תצוגה חלקית של שיחות)",
+    "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.": "נראות ההודעות במטריקס דומה לדוא\"ל. המשמעות של שכחת ההודעות שלך היא שהודעות ששלחת לא ישותפו עם משתמשים חדשים או לא רשומים, אך למשתמשים רשומים שכבר יש להם גישה להודעות אלה עדיין תהיה גישה להעתק שלהם.",
+    "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> אם תרצה שנשכח את הודעותיך, סמן את התיבה למטה.",
+    "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>": "זה יהפוך את חשבונך ללא שימוש לצמיתות. לא תוכל להתחבר, ואף אחד לא יוכל לרשום מחדש את אותו מזהה משתמש. זה יביא לחשבונך לעזוב את כל החדרים בהם הוא משתתף, וזה יסיר את פרטי חשבונך משרת הזהות שלך. <b> פעולה זו היא בלתי הפיכה. </b>",
+    "Server did not return valid authentication information.": "השרת לא החזיר מידע אימות תקף.",
+    "Server did not require any authentication": "השרת לא נדרש לאימות כלשהו",
+    "There was a problem communicating with the server. Please try again.": "הייתה בעיה בתקשורת עם השרת. בבקשה נסה שוב.",
+    "To continue, please enter your password:": "להמשך, הזן את הסיסמה שלך:",
+    "Confirm account deactivation": "אשר את השבתת החשבון",
+    "Are you sure you want to deactivate your account? This is irreversible.": "האם אתה בטוח שברצונך להשבית את חשבונך? זה בלתי הפיך.",
+    "Confirm your account deactivation by using Single Sign On to prove your identity.": "אשר את השבתת חשבונך באמצעות כניסה יחידה כדי להוכיח את זהותך.",
+    "Continue With Encryption Disabled": "המשך כאשר ההצפנה מושבתת",
+    "Incompatible Database": "מסד נתונים לא תואם",
+    "You've previously used a newer version of %(brand)s with this session. To use this version again with end to end encryption, you will need to sign out and back in again.": "השתמשת בעבר בגרסה חדשה יותר של %(brand)s עם הפעלה זו. כדי להשתמש בגרסה זו שוב עם הצפנה מקצה לקצה, יהיה עליך לצאת ולחזור שוב.",
+    "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of %(brand)s to do this": "כדי להימנע מאיבוד היסטוריית הצ'אט שלך, עליך לייצא את מפתחות החדר שלך לפני שאתה מתנתק. יהיה עליך לחזור לגרסה החדשה יותר של %(brand)s כדי לעשות זאת",
+    "Sign out": "יציאה",
+    "Create Room": "צור חדר",
+    "Block anyone not part of %(serverName)s from ever joining this room.": "חסום ממישהו שאינו חלק מ- %(serverName)s מלהצטרף אי פעם לחדר זה.",
+    "Make this room public": "הפוך חדר זה לציבורי",
+    "Topic (optional)": "נושא (לא חובה)",
+    "Name": "שם",
+    "Create a room in %(communityName)s": "צור חדר בקהילה %(communityName)s",
+    "Create a private room": "צור חדר פרטי",
+    "Create a public room": "צור חדר ציבורי",
+    "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.": "ייתכן שתאפשר זאת אם החדר ישמש רק לשיתוף פעולה עם צוותים פנימיים בשרת הבית שלך. לא ניתן לשנות זאת מאוחר יותר.",
+    "Enable end-to-end encryption": "אפשר הצפנה מקצה לקצה",
+    "Your server requires encryption to be enabled in private rooms.": "השרת שלכם דורש הפעלת הצפנה בחדרים פרטיים.",
+    "You can’t disable this later. Bridges & most bots won’t work yet.": "אינך יכול להשבית זאת מאוחר יותר. גשרים ורוב הרובוטים עדיין לא יעבדו.",
+    "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.": "ניתן למצוא חדרים פרטיים ולהצטרף אליהם בהזמנה בלבד. חדרים ציבוריים יכולים למצוא ולהצטרף לכל אחד.",
+    "Please enter a name for the room": "אנא הזינו שם לחדר",
+    "example": "דוגמא",
+    "Community ID": "זהות קהילה",
+    "Example": "דוגמא",
+    "Community Name": "שם קהילה",
+    "Create Community": "צור קהילה",
+    "Something went wrong whilst creating your community": "משהו השתבש בעת יצירת הקהילה שלך",
+    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "מזהי קהילה עשויים להכיל רק תווים a-z, 0-9 או '= _-. /'",
+    "Community IDs cannot be empty.": "מזהי קהילה לא יכולים להיות ריקים.",
+    "An image will help people identify your community.": "תמונה תעזור לאנשים לזהות את הקהילה שלך.",
+    "Add image (optional)": "הוספת תמונה (לא חובה)",
+    "Create": "צור",
+    "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.": "אירעה שגיאה ביצירת הקהילה שלך. השם עשוי להילקח או שהשרת אינו יכול לעבד את בקשתך.",
+    "Clear all data": "נקה את כל הנתונים",
+    "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "ניקוי כל הנתונים מהפגישה זו הוא קבוע. הודעות מוצפנות יאבדו אלא אם כן גובו על המפתחות שלהן.",
+    "Clear all data in this session?": "למחוק את כל הנתונים בפגישה זו?",
+    "Reason (optional)": "סיבה (לא חובה)",
+    "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.": "האם אתה בטוח שברצונך להסיר (למחוק) אירוע זה? שים לב שאם תמחק שם של חדר או שינוי נושא, זה עלול לבטל את השינוי.",
+    "Confirm Removal": "אשר הסרה",
+    "Removing…": "מסיר…",
+    "Invite people to join %(communityName)s": "הזמנת אנשים להצטרף אל %(communityName)s",
+    "Send %(count)s invites|one": "שלח %(count)s הזמנות",
+    "Send %(count)s invites|other": "שלח %(count)s הזמנות",
+    "Skip": "דלג",
+    "Show": "הצג",
+    "Hide": "הסתר",
+    "People you know on %(brand)s": "אנשים שאתם מכירים ב-%(brand)s",
+    "Add another email": "הוסף עוד כתובת דוא\"ל",
+    "Email address": "כתובת דוא\"ל",
+    "Unable to load commit detail: %(msg)s": "לא ניתן לטעון את פרטי ההתחייבות: %(msg)s",
+    "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.": "אם ישנו הקשר נוסף שיעזור לניתוח הבעיה, כגון מה שעשיתם באותו זמן, תעודות זהות, מזהי משתמש וכו ', אנא כללו את הדברים כאן.",
+    "Notes": "הערות",
+    "GitHub issue": "סוגיית GitHub",
+    "Download logs": "הורד יומנים",
+    "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "לפני שמגישים יומנים, עליכם <a> ליצור בעיה של GitHub </a> כדי לתאר את הבעיה שלכם.",
+    "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "תזכורת: הדפדפן שלך אינו נתמך, כך שהחוויה שלך עשויה להיות בלתי צפויה.",
+    "Preparing to download logs": "מתכונן להורדת יומנים",
+    "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "אנא ספר לנו מה השתבש או, יותר טוב, צור בעיה של GitHub המתארת את הבעיה.",
+    "Close dialog": "סגור דיאלוג",
+    "Invite anyway": "הזמן בכל מקרה",
+    "Invite anyway and never warn me again": "הזמן בכל מקרה ולעולם לא הזהיר אותי שוב",
+    "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "לא הצלחת למצוא פרופילים עבור מזהי המטריצה המפורטים להלן - האם תרצה להזמין אותם בכל זאת?",
+    "The following users may not exist": "המשתמשים הבאים עשויים שלא להתקיים",
+    "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "השתמש בשרת זהות כדי להזמין בדוא\"ל. לנהל ב <settings>הגדרות</settings>.",
+    "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "השתמש בשרת זהות כדי להזמין בדוא\"ל. <default> השתמש בברירת המחדל (%(defaultIdentityServerName)s) </default> או נהל ב <settings>הגדרות</settings>.",
+    "Try using one of the following valid address types: %(validTypesList)s.": "נסה להשתמש באחד מסוגי הכתובות החוקיים הבאים: %(validTypesList)s.",
+    "You have entered an invalid address.": "הזנת כתובת לא חוקית.",
+    "That doesn't look like a valid email address": "זה לא נראה כמו כתובת דוא\"ל תקפה",
+    "email address": "כתובת דוא\"ל",
+    "Matrix Room ID": "זהות חדר מטריקס",
+    "Matrix ID": "זהות מטריקס",
+    "Matrix rooms": "חדרים במטריקס",
+    "%(networkName)s rooms": "חדרים ב-%(networkName)s",
+    "Add a new server...": "הוסף שרת חדש...",
+    "Server name": "שם השרת",
+    "Enter the name of a new server you want to explore.": "הזן את שם השרת החדש שתרצה לחקור.",
+    "Add a new server": "הוסף שרת חדש",
+    "Matrix": "מטריקס",
+    "Remove server": "הסר שרת",
+    "Are you sure you want to remove <b>%(serverName)s</b>": "האם אתה בטוח שברצונך להסיר <b>%(serverName)s</b>",
+    "Your server": "השרת שלכם",
+    "All rooms": "כל החדרים",
+    "Can't find this server or its room list": "לא ניתן למצוא שרת זה או את רשימת החדרים שלו",
+    "Looks good": "נראה טוב",
+    "Enter a server name": "הכנס שם שרת",
+    "Home": "הבית",
+    "And %(count)s more...|other": "ו%(count)s עוד...",
+    "Sign in with single sign-on": "היכנס באמצעות כניסה יחידה",
+    "Continue with %(provider)s": "המשך עם %(provider)s",
+    "Homeserver": "שרת הבית",
+    "Join millions for free on the largest public server": "הצטרפו למיליונים בחינם בשרת הציבורי הגדול ביותר",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Element with an existing Matrix account on a different homeserver.": "באפשרותך להשתמש באפשרויות השרת המותאמות אישית כדי להיכנס לשרתי מטריקס אחרים על ידי ציון כתובת URL אחרת של שרת בית. זה מאפשר לך להשתמש ב- Element עם חשבון מטריקס קיים בשרת בית אחר.",
+    "Server Options": "אפשרויות שרת",
+    "Room directory": "מדריך חדרים",
+    "This address is already in use": "כתובת זו נמצאת בשימוש",
+    "This address is available to use": "כתובת זו זמינה לשימוש",
+    "Please provide a room address": "אנא ספקו כתובת לחדר",
+    "Some characters not allowed": "חלק מהתווים אינם מורשים",
+    "e.g. my-room": "כגון החדר-שלי",
+    "Room address": "כתובת חדר",
+    "<a>In reply to</a> <pill>": "<a> בתשובה ל- </a> <pill>",
+    "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "לא ניתן לטעון אירוע שהשיב לו, או שהוא לא קיים או שאין לך הרשאה להציג אותו.",
+    "QR Code": "קוד QR",
+    "Custom level": "דרגה מותאמת",
+    "Power level": "דרגת מנהל",
+    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s לא ערכו שינוי",
+    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s לא ערך שום שינוי %(count)s פעמים",
+    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s לא ערכו שום שינוי",
+    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s לא ערכו שום שינוי %(count)s פעמים",
+    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s שינו את האוואטר שלהם",
+    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)s שינו את האוואטר שלהם %(count)s פעמים",
+    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)s שינו את האוואטר שלהם",
+    "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)s שימו את האווטאר שלהם %(count)s פעמים",
+    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s שינו את שמם",
+    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s שינו את שמם %(count)s פעמים",
+    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s שינו את שמם",
+    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s שינו את שמם %(count)s פעמים",
+    "was kicked %(count)s times|one": "נבעטו",
+    "was kicked %(count)s times|other": "נבעטו %(count)s פעמים",
+    "were kicked %(count)s times|one": "נבעט",
+    "were kicked %(count)s times|other": "נבעט %(count)s פעמים",
+    "was unbanned %(count)s times|one": "חסימה בוטלה",
+    "was unbanned %(count)s times|other": "חסימה בוטלה %(count)s פעמים",
+    "were unbanned %(count)s times|one": "חסימה בוטלה",
+    "were unbanned %(count)s times|other": "חסימה בוטלה %(count)s פעמים",
+    "was banned %(count)s times|one": "נחסם",
+    "was banned %(count)s times|other": "נחסם %(count)s פעמים",
+    "were banned %(count)s times|one": "נחסמו",
+    "were banned %(count)s times|other": "נחסם %(count)s פעמים",
+    "was invited %(count)s times|one": "הוזמן",
+    "was invited %(count)s times|other": "הוזמן %(count)s פעמים",
+    "were invited %(count)s times|one": "הוזמנו",
+    "were invited %(count)s times|other": "הוזמנו %(count)s פעמים",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)s משכו את ההזמנה שלהם",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)s משך את ההזמנה שלו %(count)s פעמים",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)s משכו את ההזמנות שלהם",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s משכו את ההזמנות שלהם %(count)s פעמים",
+    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s דחו את ההזמנה שלו\\ה",
+    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s דחה את ההזמנה %(count)s פעמים",
+    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s דחו את ההזמנה שלהם",
+    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s דחו את ההזמנה שלהם%(count)s פעמים",
+    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s עזב וחזר",
+    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s עזב וחזר %(count)s פעמים",
+    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s עזבו וחזרו",
+    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s עזבו וחזרו %(count)s פעמים",
+    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s הצטרפ/ה ועזב/ה",
+    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s הצטרף ועזב/ה %(count)s פעמים",
+    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s הצתרפו ועזבו",
+    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s הצתרפו ועזבו %(count)s פעמים",
+    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s עזב\\ה",
+    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s עזב %(count)s פעמים",
+    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s עזבו",
+    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s עזבו %(count)s פעמים",
+    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s הצתרפו",
+    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s הצתרפו %(count)s פעמים",
+    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s הצתרפו %(count)s פעמים",
+    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s הצטרפ/ה",
+    "%(nameList)s %(transitionList)s": "%(nameList)s-%(transitionList)s",
+    "Language Dropdown": "תפריט שפות",
+    "Information": "מידע",
+    "Rotate clockwise": "סובב עם כיוון השעון",
+    "Rotate Right": "סובב ימינה",
+    "Rotate counter-clockwise": "סובב נגד כיוון השעון",
+    "Rotate Left": "סובב שמאלה",
+    "collapse": "כווץ",
+    "expand": "הרחב",
+    "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 אינה תומכת בצפייה בקבצים מוצפנים מסוימים",
+    "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": "יישומון קופץ",
+    "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": "פעולות הודעה",
+    "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 בפרופיל שלהם - הקש על הדמות שלהם.",
+    "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)!",
+    "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.": "אמת את כל המשתמשים בחדר כדי לוודא שהוא מאובטח.",
+    "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.": "ההפעלה שאתה מנסה לאמת אינה תומכת בסריקת קוד QR או אימות אמוג'י, וזה מה שתומך ב- %(brand)s. נסה עם לקוח אחר.",
+    "Security": "אבטחה",
+    "This client does not support end-to-end encryption.": "לקוח זה אינו תומך בהצפנה מקצה לקצה.",
+    "Role": "תפקיד",
+    "Failed to deactivate user": "השבתת משתמש נכשלה",
+    "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?": "השבתת משתמש זה תנתק אותו וימנע ממנו להתחבר חזרה. בנוסף, הם יעזבו את כל החדרים בהם הם נמצאים. לא ניתן לבטל פעולה זו. האם אתה בטוח שברצונך להשבית משתמש זה?",
+    "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": "הסר מהקהילה",
+    "Unmute": "בטל השתקה",
+    "Failed to mute user": "כשלון בהשתקת משתמש",
+    "Failed to ban user": "כשלון בחסימת משתמש",
+    "Ban this user?": "חסום משתמש זה?",
+    "Unban this user?": "בטל חסימה למשתמש זה?",
+    "Ban": "חסום",
+    "Remove recent messages": "הסר הודעות אחרונות",
+    "Remove %(count)s messages|one": "הסר הודעה 1",
+    "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": "שתף קישור למשתמש",
+    "Invite": "הזמן",
+    "Mention": "אזכר",
+    "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": "1 מושב מאומת",
+    "%(count)s verified sessions|other": "%(count)s מושבים מאומתים",
+    "Not trusted": "לא אמין",
+    "Trusted": "אמין",
+    "Room settings": "הגדרות חדר",
+    "Share room": "שתף חדר",
+    "Show files": "הצג קבצים",
+    "%(count)s people|one": "%(count)s cbh בני אדם",
+    "%(count)s people|other": "%(count)s אנשים%(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": "מידע החדר",
+    "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 להודעה שלו, ניתן להציג תצוגה מקדימה של כתובת אתר כדי לתת מידע נוסף על קישור זה, כמו הכותרת, התיאור והתמונה מהאתר.",
+    "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 previews are disabled by default for participants in this room.": "תצוגות מקדימות של כתובות אתרים מושבתות כברירת מחדל עבור משתתפים בחדר זה.",
+    "URL previews are enabled by default for participants in this room.": "תצוגות מקדימות של כתובות אתרים מופעלות כברירת מחדל עבור משתתפים בחדר זה.",
+    "You have <a>disabled</a> URL previews by default.": "יש לך <a> השבת </a> תצוגות מקדימות של כתובות אתרים כברירת מחדל.",
+    "You have <a>enabled</a> URL previews by default.": "כברירת מחדל, <a> הפעלת </a> תצוגה מקדימה של כתובות אתרים.",
+    "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": "חדר זה אינו מגלה כישרון בקרב קהילות כלשהן",
+    "Showing flair for these communities:": "מציג כשרון עבור קהילות אלו:",
+    "'%(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.": "אירעה שגיאה בעדכון הכשרון לחדר זה. ייתכן שהשרת לא מאפשר זאת או שהתרחשה שגיאה זמנית.",
+    "Error updating 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": "הצג מדבקות",
+    "Stickerpack": "חבילת מדבקות",
+    "Hide Stickers": "הסתר מדבקות",
+    "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> /help </code> כדי לרשום פקודות זמינות. האם התכוונת לשלוח זאת כהודעה?",
+    "Unrecognised command: %(commandText)s": "פקודה לא מזוהה: %(commandText)s",
+    "Unknown Command": "פקודה לא ידועה",
+    "Server unavailable, overloaded, or something else went wrong.": "השרת לא זמין, עמוס מדי או שמשהו אחר השתבש.",
+    "Server error": "שגיאת שרת",
+    "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": "1 הודעה שלא נקראה.",
+    "%(count)s unread messages.|other": "%(count)s הודעות שלא נקראו.",
+    "%(count)s unread messages including mentions.|one": "1 אזכור שלא נקרא.",
+    "%(count)s unread messages including mentions.|other": "%(count)s הודעות שלא נקראו כולל אזכורים.",
+    "Room options": "אפשרויות חדר",
+    "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": "צפה בכל החדרים הציבוריים",
+    "Start a new chat": "התחל צאט חדש",
+    "Can't see what you’re looking for?": "אינכם מוצאים את מה שאתם מחפשים?",
+    "Custom Tag": "תגיות מותאמות",
+    "Historical": "היסטוריה",
+    "System Alerts": "התרעות מערכת",
+    "Low priority": "עדיפות נמוכה",
+    "Explore public rooms": "שוטט בחדרים ציבוריים",
+    "Explore community rooms": "שוטט בחדרי קהילות",
+    "Create new room": "צור חדר חדש",
+    "Add room": "הוסף חדר",
+    "Start chat": "התחל שיחה",
+    "People": "אנשים",
+    "Favourites": "מועדפים",
+    "Invites": "הזמנות",
+    "Show Widgets": "הצג ישומונים",
+    "Hide Widgets": "הסתר ישומונים",
+    "Forget room": "שכח חדר",
+    "Join Room": "הצטרף אל חדר",
+    "(~%(count)s results)|one": "(תוצאת %(count)s)",
+    "(~%(count)s results)|other": "(תוצאת %(count)s)",
+    "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": "לא פעיל",
+    "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": "קפוץ להודעה",
+    "Pinned Messages": "הודעות מוצמדות",
+    "Loading...": "טוען...",
+    "No pinned messages.": "אין הודעות מוצמדות.",
+    "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.": "רק שניכם נמצאים בשיחה הזו, אלא אם כן מישהו מכם מזמין מישהו להצטרף.",
+    "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": "מוזמן",
+    "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": "הוצפן על ידי מושב לא מאומת",
+    "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": "לא ניתן לשתף מספר טלפון",
+    "Unable to revoke sharing for phone number": "לא ניתן לבטל את השיתוף למספר טלפון",
+    "Discovery options will appear once you have added an email above.": "אפשרויות גילוי יופיעו לאחר הוספת דוא\"ל לעיל.",
+    "Share": "לשתף",
+    "Revoke": "לשלול",
+    "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": "שינוי הגדרות",
+    "Invite users": "הזמנת משתמשים",
+    "Send messages": "שלח הודעות",
+    "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": "שנה הרשאות",
+    "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.": "הצג את הכשרון הקהילתי שלך בחדרים שהוגדרו להציג אותו.",
+    "Something went wrong when trying to get your communities.": "משהו השתבש כשניסה להשיג את הקהילות שלך.",
+    "Filter community rooms": "סנן חדרי קהילה",
+    "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.",
+    "Something went wrong!": "משהו השתבש!",
+    "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",
+    "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": "לא ניתן לגשת לחדר זה באמצעות שרתי מטריקס מרוחקים",
+    "Voice & Video": "שמע ווידאו",
+    "Camera": "מצלמה",
+    "Microphone": "מיקרופון",
+    "Audio Output": "יציאת שמע",
+    "Default Device": "התקן ברירת מחדל",
+    "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 גישה למיקרופון / מצלמת האינטרנט שלך",
+    "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>": "<לא נתמך>",
+    "Unignore": "הסר התעלמות",
+    "Read Marker off-screen lifetime (ms)": "חיי סמן קריאה מחוץ למסך (ms)",
+    "Read Marker lifetime (ms)": "חיי סמן קריאה (ms)",
+    "Autocomplete delay (ms)": "עיכוב השלמה אוטומטית (ms)",
+    "Timeline": "קו זמן",
+    "Composer": "כתבן",
+    "Room list": "רשימת חדרים",
+    "Preferences": "העדפות",
+    "Show tray icon and minimize window to it on close": "הצג את סמל המגש וצמצם את החלון אליו בסגירה",
+    "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.": "רשימת האיסורים האישית שלך מכילה את כל המשתמשים / שרתים שאתה אישית לא רוצה לראות מהם הודעות. לאחר שהתעלמת מהמשתמש / השרת הראשונים שלך, חדר חדש יופיע ברשימת החדרים שלך בשם 'רשימת האיסורים שלי' - הישאר בחדר זה כדי לשמור על רשימת האיסורים.",
+    "Personal ban list": "רשימת חסומים פרטית",
+    "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 יתאימו לכל תו. לדוגמא, <code> @bot: * </code> יתעלם מכל המשתמשים שיש להם את השם 'בוט' בשרת כלשהו.",
+    "⚠ 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.": "נסה שוב או הצג את המסוף שלך לקבלת רמזים.",
+    "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.": "משהו השתבש. נסה שוב או הצג את המסוף שלך לקבלת רמזים.",
+    "Error adding ignored user/server": "שגיאה בהוספת שרת\\משתמש שהתעלמתם ממנו",
+    "Ignored/Blocked": "התעלם\\חסום",
+    "Customise your experience with experimental labs features. <a>Learn more</a>.": "התאם אישית את החוויה שלך בעזרת תכונות מעבדתיות ניסיוניות. <a> למידע נוסף </a>.",
+    "Labs": "מעבדות",
+    "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>.": "כדי לדווח על בעיית אבטחה הקשורה למטריקס, אנא קראו את <a> מדיניות גילוי האבטחה של Matrix.org </a>.",
+    "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": "הצלחה",
+    "Flair": "כשרון",
+    "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 ים ינסו להשתמש בו.",
+    "Show advanced": "הצג מתקדם",
+    "Hide advanced": "הסתר מתקדם",
+    "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)s ל %(max)s נקודות",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "גודל גופן מותאם אישית יכול להיות רק בין %(min)s ל %(max)s נקודות",
+    "Size must be a number": "הגדול חייב להיות מספר",
+    "Hey you. You're the best!": "היי, אתם אלופים!",
+    "Check for update": "בדוק עדכונים",
+    "New version available. <a>Update now.</a>": "גרסא חדשה קיימת. <a>שדרגו עכשיו.</a>",
+    "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)": "בדוק בתוספי הדפדפן שלך כל דבר העלול לחסום את שרת הזהות (כגון תגית פרטיות)",
+    "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": "הזיהוי של כתובת השרת חייבת להיות מאובטחת ב- HTTPS",
+    "not ready": "לא מוכן",
+    "ready": "מוכן",
+    "Secret storage:": "אחסון סודי:",
+    "in account data": "במידע בחשבון",
+    "Secret storage public key:": "מקום שמירה סודי של המפתח הציבורי:",
+    "Backup key cached:": "גבה מפתח במטמון:",
+    "not stored": "לא שמור",
+    "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.": "גבה את מפתחות ההצפנה שלך עם נתוני חשבונך במקרה שתאבד גישה למפגשים שלך. המפתחות שלך מאובטחים באמצעות מפתח שחזור ייחודי.",
+    "unexpected type": "סוג בלתי צפוי",
+    "well formed": "מעוצב היטב",
+    "Back up your keys before signing out to avoid losing them.": "גבה את המפתחות שלך לפני היציאה כדי להימנע מלאבד אותם.",
+    "Leave Room": "עזוב חדר",
+    "Settings": "הגדרות",
+    "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": "דחה והתעלם ממשתמש זה",
+    "<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.": "אתה יכול להצטרף אליו רק עם הזמנה עובדת.",
+    "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",
+    "Are you sure you want to leave the room '%(roomName)s'?": "האם אתה בטוח שברצונך לעזוב את החדר '%(roomName)s'?",
+    "This room is not public. You will not be able to rejoin without an invite.": "חדר זה אינו ציבורי. לא תוכל להצטרף שוב ללא הזמנה.",
+    "You do not have permission to create rooms in this community.": "אין לך הרשאה ליצור חדרים בקהילה זו.",
+    "Cannot create rooms in this community": "לא ניתן ליצור חדרים בקהילה זו",
+    "Failed to reject invitation": "דחיית ההזמנה נכשלה",
+    "Explore rooms": "שיטוט בחדרים",
+    "Create a Group Chat": "צור צ'אט קבוצתי",
+    "Explore Public Rooms": "חקור חדרים ציבוריים",
+    "Send a Direct Message": "שלח הודעה ישירה",
+    "Liberate your communication": "שחררו את התקשורת שלכם",
+    "Welcome to %(appName)s": "ברוכים הבאים אל %(appName)s",
+    "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": "נהדר, זה יעזור לאנשים לדעת שזה אתה",
+    "Failed to load %(groupId)s": "טעינת %(groupId)s נכשלה",
+    "This homeserver does not support communities": "שרת בית זה אינו תומך בקהילות",
+    "Community %(groupId)s not found": "קהילת %(groupId)s לא נמצאה",
+    "Description": "תאור",
+    "Upload avatar": "העלה אוואטר",
+    "Long Description (HTML)": "תאור ארוך (HTML)",
+    "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/> לחץ כאן כדי לפתוח הגדרות ולתת לו אחת!",
+    "Everyone": "כולם",
+    "Who can join this community?": "מי יכולים להצטרף לקהילה זו?",
+    "You are a member of this community": "אתם חברים בקהילה זו",
+    "You are an administrator of this community": "אתם המנהלים של קהילה זו",
+    "Leave this community": "עזוב קהילה זו",
+    "Join this community": "הצטרפות לקהילה זו",
+    "%(inviter)s has invited you to join this community": "%(inviter)s הזמין אותך להצטרף לקהילה זו",
+    "Featured Users:": "משתמשים מומלצים:",
+    "Featured Rooms:": "חדרים מומלצים:",
+    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "חדרים אלה מוצגים בפני חברי הקהילה בדף הקהילה. חברי הקהילה יכולים להצטרף לחדרים על ידי לחיצה עליהם.",
+    "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> ייתכן שלא יופיעו על ידי משתמשים אחרים למשך עד 30 דקות.",
+    "Want more than a community? <a>Get your own server</a>": "רוצה יותר מקהילה? <a> קבל שרת משלך </a>",
+    "Community Settings": "הגדרות קהילה",
+    "Unable to leave community": "לא ניתן לעזוב את הקהילה",
+    "Leave %(groupName)s?": "עזוב את %(groupName)s?",
+    "Leave Community": "עזוב קהילה",
+    "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "אתה מנהל קהילה זו. לא תוכל להצטרף מחדש ללא הזמנה ממנהל אחר.",
+    "Unable to join community": "לא ניתן להצטרף לקהילה",
+    "Unable to accept invite": "לא ניתן לקבל הזמנה",
+    "Failed to update community": "עדכון הקהילה נכשל",
+    "Failed to upload image": "העלאת התמונה נכשלה",
+    "The user '%(displayName)s' could not be removed from the summary.": "לא ניתן היה להסיר את המשתמש '%(displayName)s' מהסיכום.",
+    "Failed to remove a user from the summary of %(groupId)s": "הסרת משתמש מהסיכום של %(groupId)s נכשלה",
+    "Add a User": "הוסף משתמש",
+    "Failed to add the following users to the summary of %(groupId)s:": "נכשל הוספת המשתמשים הבאים לסיכום של %(groupId)s:",
+    "Who would you like to add to this summary?": "את מי תרצה להוסיף לסיכום זה?",
+    "Add users to the community summary": "הוסף משתמשים לסיכום הקהילה",
+    "The room '%(roomName)s' could not be removed from the summary.": "לא ניתן היה להסיר את החדר '%(roomName)s' מהסיכום.",
+    "Failed to remove the room from the summary of %(groupId)s": "הסרת החדר נכשלה מהסיכום של %(groupId)s",
+    "Add a Room": "הוסף חדר",
+    "Failed to add the following rooms to the summary of %(groupId)s:": "נכשלה הוספת החדרים הבאים לסיכום של %(groupId)s:",
+    "Add to summary": "הוסף לסיכום",
+    "Which rooms would you like to add to this summary?": "אילו חדרים תרצה להוסיף לסיכום זה?",
+    "Add rooms to the community summary": "הוסף חדרים לסיכום הקהילה",
+    "<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 לדף הקהילה שלך </h1>\n<p>\n     השתמש בתיאור הארוך כדי להציג חברים חדשים בקהילה, או הפץ\n     כמה <a href=\"foo\"> קישורים </a> חשובים\n</p>\n<p>\n     אתה יכול אפילו להוסיף תמונות עם כתובות אתרי מטריצה <img src = \"mxc: //url\" />\n</p>\n",
+    "Create community": "צור קהילה",
+    "Communities": "קהילות",
+    "Attach files from chat or just drag and drop them anywhere in a room.": "צרף קבצים מצ'ט או פשוט גרור ושחרר אותם לכל מקום בחדר.",
+    "No files visible in this room": "אין קבצים גלויים בחדר זה",
+    "You must join the room to see its files": "עליך להצטרף לחדר כדי לראות את הקבצים שלו",
+    "You must <a>register</a> to use this functionality": "עליך <a> להירשם </a> כדי להשתמש בפונקציונליות זו",
+    "Couldn't load page": "לא ניתן לטעון את הדף",
+    "Sign in with SSO": "היכנס באמצעות SSO",
+    "Use email to optionally be discoverable by existing contacts.": "השתמש באימייל כדי שאפשר יהיה למצוא אותו על ידי אנשי קשר קיימים.",
+    "Use email or phone to optionally be discoverable by existing contacts.": "השתמש בדוא\"ל או בטלפון בכדי שאפשר יהיה לגלות אותם על ידי אנשי קשר קיימים.",
+    "Add an email to be able to reset your password.": "הוסף דוא\"ל כדי שתוכל לאפס את הסיסמה שלך.",
+    "Phone (optional)": "טלפון (לא חובה)",
+    "Use lowercase letters, numbers, dashes and underscores only": "השתמש באותיות קטנות, מספרים, מקפים וקווים תחתונים בלבד",
+    "Enter phone number (required on this homeserver)": "הזן מספר טלפון (חובה בשרת בית זה)",
+    "Other users can invite you to rooms using your contact details": "משתמשים אחרים יכולים להזמין אותך לחדרים באמצעות פרטי יצירת הקשר שלך",
+    "Enter email address (required on this homeserver)": "הזן כתובת דוא\"ל (חובה בשרת הבית הזה)",
+    "Use an email address to recover your account": "השתמש בכתובת דוא\"ל לשחזור חשבונך",
+    "Sign in": "כניסה",
+    "Sign in with": "כניסה עם",
+    "Forgot password?": "שכחנו סיסמה?",
+    "Phone": "טלפון",
+    "Username": "שם משתמש",
+    "Email": "דוא\"ל",
+    "That phone number doesn't look quite right, please check and try again": "מספר הטלפון הזה לא נראה בסדר, אנא בדוק ונסה שוב",
+    "Enter phone number": "הזן טלפון",
+    "Enter email address": "הזן כתובת דוא\"ל",
+    "Enter username": "הזן שם משתמש",
+    "Keep going...": "המשיכו...",
+    "Password is allowed, but unsafe": "סיסמא מותרת, אך אינה בטוחה",
+    "Nice, strong password!": "יפה, סיסמה חזקה!",
+    "Enter password": "הזן סיסמה",
+    "Start authentication": "התחל אימות",
+    "Submit": "הגש",
+    "Code": "קוד",
+    "Please enter the code it contains:": "אנא הכנס את הקוד שהוא מכיל:",
+    "A text message has been sent to %(msisdn)s": "הודעת טקסט נשלחה אל %(msisdn)s",
+    "Token incorrect": "אסימון שגוי",
+    "Open the link in the email to continue registration.": "פתח את הקישור בדוא\"ל להמשך ההרשמה.",
+    "A confirmation email has been sent to %(emailAddress)s": "דוא\"ל אישור נשלח אל %(emailAddress)s",
+    "Please review and accept the policies of this homeserver:": "אנא עיין וקבל את המדיניות של שרת בית זה:",
+    "Please review and accept all of the homeserver's policies": "אנא עיין וקבל את כל המדיניות של שרת הבית",
+    "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "חסר מפתח ציבורי של captcha בתצורת שרת הבית. אנא דווח על כך למנהל שרת הבית שלך.",
+    "Password": "סיסמה",
+    "Confirm your identity by entering your account password below.": "אשר את זהותך על ידי הזנת סיסמת החשבון שלך למטה.",
+    "Country Dropdown": "נפתח במדינה",
+    "This homeserver would like to make sure you are not a robot.": "שרת בית זה רוצה לוודא שאתה לא רובוט.",
+    "User Status": "סטטוס משתמש",
+    "Away": "מרוחק",
+    "This room is public": "חדר זה ציבורי",
+    "Move right": "הזז ימינה",
+    "Move left": "הזז שמאלה",
+    "Revoke permissions": "שלילת הרשאות",
+    "Remove for everyone": "הסר לכולם",
+    "Delete widget": "מחק ישומון",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "מחיקת יישומון מסירה אותו לכל המשתמשים בחדר זה. האם אתה בטוח שברצונך למחוק את היישומון הזה?",
+    "Delete Widget": "מחק ישומון",
+    "Take a picture": "צלם תמונה",
+    "Set a new status...": "הגדר סטטוס חדש ...",
+    "Set status": "הגדר סטטוס",
+    "Update status": "עדכן סטטוס",
+    "Clear status": "נקה סטטוס",
+    "Report Content": "דווח על תוכן",
+    "Collapse Reply Thread": "כווץ התשובה",
+    "Share Message": "שתף הודעה",
+    "Share Permalink": "שתף קישור קבוע",
+    "Resend removal": "שלח את ההסרה מחדש",
+    "Resend %(unsentCount)s reaction(s)": "שלח שוב תגובות %(unsentCount)s",
+    "Resend edit": "שלח שוב את העריכה",
+    "Unable to reject invite": "לא ניתן לדחות את ההזמנה",
+    "Are you sure you want to reject the invitation?": "האם אתם בטוחים שברצונכם לדחות את ההזמנה?",
+    "Reject invitation": "דחה הזמנה",
+    "Hold": "החזק",
+    "Resume": "תקציר",
+    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "אם שכחת את מפתח השחזור שלך, תוכל <button> להגדיר אפשרויות שחזור חדשות </button>",
+    "Access your secure message history and set up secure messaging by entering your recovery key.": "גש להיסטוריית ההודעות המאובטחות שלך והגדר הודעות מאובטחות על ידי הזנת מפתח השחזור שלך.",
+    "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b> אזהרה </b>: עליך להגדיר גיבוי מקשים רק ממחשב מהימן.",
+    "Not a valid recovery key": "לא מפתח שחזור תקף",
+    "This looks like a valid recovery key!": "זה נראה כמו מפתח שחזור תקף!",
+    "Enter recovery key": "הזן מפתח שחזור",
+    "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>",
+    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "גש להיסטוריית ההודעות המאובטחות שלך והגדר הודעות מאובטחות על ידי הזנת משפט סיסמה לשחזור שלך.",
+    "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b> אזהרה </b>: עליך להגדיר גיבוי מקשים רק ממחשב מהימן.",
+    "Enter recovery passphrase": "הזן ביטוי סיסמה לשחזור",
+    "Successfully restored %(sessionCount)s keys": "שוחזר בהצלחה %(sessionCount)s מפתחות",
+    "Failed to decrypt %(failedCount)s sessions!": "הפענוח של %(failedCount)s שניות נכשל!",
+    "Keys restored": "מפתחות משוחזרים",
+    "No backup found!": "לא נמצא גיבוי!",
+    "Unable to restore backup": "לא ניתן לשחזר את הגיבוי",
+    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "לא ניתן היה לפענח גיבוי עם ביטוי סיסמה לשחזור זה: ודא שהזנת את משפט סיסמת השחזור הנכון.",
+    "Incorrect recovery passphrase": "משפט סיסמה שגוי לשחזור",
+    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "לא ניתן היה לפענח גיבוי באמצעות מפתח שחזור זה: ודא שהזנת את מפתח השחזור הנכון.",
+    "Recovery key mismatch": "אי התאמה בין מפתח השחזור",
+    "Unable to load backup status": "לא ניתן לטעון את מצב הגיבוי",
+    "%(completed)s of %(total)s keys restored": "%(completed)s שניות מתוך %(total)s מפתחות שוחזרו",
+    "Fetching keys from server...": "מאחזר מפתחות מהשרת ...",
+    "Restoring keys from backup": "שחזור מפתחות מגיבוי",
+    "Retry": "נסה שוב",
+    "Unable to set up keys": "לא ניתן להגדיר מקשים",
+    "Click the button below to confirm setting up encryption.": "לחץ על הלחצן למטה כדי לאשר את הגדרת ההצפנה.",
+    "Confirm encryption setup": "אשר את הגדרת ההצפנה",
+    "Clear cross-signing keys": "נקה מפתחות חתימה צולבת",
+    "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "מחיקת מפתחות חתימה צולבת הינה קבועה. כל מי שאימתת איתו יראה התראות אבטחה. כמעט בוודאות אינך רוצה לעשות זאת, אלא אם איבדת כל מכשיר ממנו תוכל לחתום.",
+    "Destroy cross-signing keys?": "להרוס מפתחות חתימה צולבת?",
+    "Use your Security Key to continue.": "השתמש במפתח האבטחה שלך כדי להמשיך.",
+    "Security Key": "מפתח אבטחה",
+    "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "הזן את ביטוי האבטחה שלך או <button> השתמש במפתח האבטחה שלך </button> כדי להמשיך.",
+    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "אין אפשרות לגשת לאחסון סודי. אנא ודא שהזנת את משפט סיסמת השחזור הנכון.",
+    "Security Phrase": "ביטוי אבטחה",
+    "Invalid Recovery Key": "מפתח שחזור לא תקין",
+    "Wrong Recovery Key": "מפתח שחזור שגוי",
+    "Looks good!": "נראה טוב!",
+    "Wrong file type": "סוג קובץ שגוי",
+    "Deny": "סרב",
+    "Allow": "אפשר",
+    "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.": "יישומון שנמצא ב- %(widgetUrl)s מעוניין לאמת את זהותך. בכך שתאפשר זאת, היישומון יוכל לאמת את מזהה המשתמש שלך, אך לא לבצע פעולות כמוך.",
+    "A widget would like to verify your identity": "יישומון רוצה לאמת את זהותך",
+    "Remember my selection for this widget": "זכור את הבחירה שלי עבור יישומון זה",
+    "Decline All": "סרב להכל",
+    "Approve": "אישור",
+    "This widget would like to:": "יישומון זה רוצה:",
+    "Approve widget permissions": "אשר הרשאות יישומון",
+    "Verification Request": "בקשת אימות",
+    "Verify other session": "אמת מושבים אחרים",
+    "Upload Error": "שגיאת העלאה",
+    "Cancel All": "בטל הכל",
+    "Upload %(count)s other files|one": "העלה %(count)s של קובץ אחר",
+    "Upload %(count)s other files|other": "העלה %(count)s של קבצים אחרים",
+    "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "חלק מהקבצים <b> גדולים מדי </b> כדי להעלות אותם. מגבלת גודל הקובץ היא %(limit)s.",
+    "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "קבצים אלה <b> גדולים מדי </b> להעלאה. מגבלת גודל הקובץ היא %(limit)s.",
+    "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "קובץ זה <b> גדול מדי </b> להעלאה. מגבלת גודל הקובץ היא %(limit)s אך קובץ זה הוא %(sizeOfThisFile)s.",
+    "Upload all": "מעלה הכל",
+    "Upload files (%(current)s of %(total)s)": "מעלה קבצים (%(current)s מ %(total)s)",
+    "Upload files": "מעלה קבצים",
+    "Next": "הבא",
+    "Document": "מסמך",
+    "Summary": "תקציר",
+    "Service": "שֵׁרוּת",
+    "To continue you need to accept the terms of this service.": "כדי להמשיך עליך לקבל את תנאי השירות הזה.",
+    "Terms of Service": "תנאי השירות",
+    "Use bots, bridges, widgets and sticker packs": "השתמש בבוטים, גשרים, ווידג'טים וחבילות מדבקות",
+    "Be found by phone or email": "להימצא בטלפון או בדוא\"ל",
+    "Find others by phone or email": "מצא אחרים בטלפון או בדוא\"ל",
+    "Integration Manager": "מנהל אינטגרציה",
+    "Your browser likely removed this data when running low on disk space.": "סביר להניח שהדפדפן שלך הסיר נתונים אלה כאשר שטח הדיסק שלהם נמוך.",
+    "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "חלק מנתוני ההפעלה, כולל מפתחות הודעות מוצפנים, חסרים. צא והיכנס כדי לתקן זאת, ושחזר את המפתחות מהגיבוי.",
+    "Missing session data": "חסרים נתוני הפעלות",
+    "To help us prevent this in future, please <a>send us logs</a>.": "כדי לעזור לנו למנוע זאת בעתיד, אנא <a> שלחו לנו יומנים </a>.",
+    "Command Help": "עזרה לפיקוד",
+    "Copy": "העתק",
+    "Link to selected message": "קישור להודעה שנבחרה",
+    "Share Room Message": "שתף הודעה בחדר",
+    "Share Community": "שתף קהילה",
+    "Share User": "שתף משתמש",
+    "Link to most recent message": "קישור להודעה האחרונה",
+    "Share Room": "שתף חדר",
+    "This will allow you to reset your password and receive notifications.": "זה יאפשר לך לאפס את הסיסמה שלך ולקבל התראות.",
+    "Please check your email and click on the link it contains. Once this is done, click continue.": "אנא בדוק את הדוא\"ל שלך ולחץ על הקישור שהוא מכיל. לאחר שתסיים, לחץ על המשך.",
+    "Verification Pending": "אימות בהמתנה",
+    "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "ניקוי שטח האחסון של הדפדפן עשוי לפתור את הבעיה, אך ינתק אתכם ויגרום לכל היסטוריית צ'אט מוצפנת להיות בלתי קריאה.",
+    "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.": "אם השתמשת בעבר בגרסה עדכנית יותר של %(brand)s, ייתכן שההפעלה שלך אינה תואמת לגרסה זו. סגרו חלון זה וחזרו לגרסה העדכנית יותר.",
+    "We encountered an error trying to restore your previous session.": "נתקלנו בשגיאה בניסיון לשחזר את ההפעלה הקודמת שלך.",
+    "Unable to restore session": "לא ניתן לשחזר את ההפעלה",
+    "Refresh": "רענן",
+    "Send Logs": "שלח יומנים",
+    "Clear Storage and Sign Out": "נקה אחסון והתנתק",
+    "Sign out and remove encryption keys?": "להתנתק ולהסיר מפתחות הצפנה?",
+    "About homeservers": "אודות שרתי בית",
+    "Learn more": "למד עוד",
+    "Use your preferred Matrix homeserver if you have one, or host your own.": "השתמש בשרת הבית המועדף על מטריקס אם יש לך כזה, או מארח משלך.",
+    "Other homeserver": "שרת בית אחר",
+    "We call the places where you can host your account ‘homeservers’.": "אנו מכנים את המקומות שבהם אתה יכול לארח את חשבונך 'שרתים ביתיים'.",
+    "Sign into your homeserver": "היכנס לשרת הבית שלך",
+    "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "Matrix.org היא שרת הבית הציבורי הגדול בעולם, ולכן זה מקום טוב עבור רבים.",
+    "Specify a homeserver": "ציין שרת בית",
+    "Invalid URL": "כתובת אתר לא חוקית",
+    "Unable to validate homeserver": "לא ניתן לאמת את שרת הבית",
+    "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.": "חומת האש או האנטי-וירוס שלך חוסמים את הבקשה.",
+    "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.": "כולכם נתפסתם.",
+    "You'll upgrade this room from <oldVersion /> to <newVersion />.": "תשדרג את החדר הזה מ- <oldVersion/> ל- <newVersion/>.",
+    "This usually only affects how the room is processed on the server. If you're having problems with your %(brand)s, please <a>report a bug</a>.": "זה בדרך כלל משפיע רק על אופן עיבוד החדר בשרת. אם אתה נתקל בבעיות באחוזים שלך %(brand)s, אנא <a> דווח על באג </a>.",
+    "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "שדרוג חדר הוא פעולה מתקדמת ומומלץ בדרך כלל כאשר החדר אינו יציב עקב באגים, תכונות חסרות או פרצות אבטחה.",
+    "Upgrade public room": "שדרג חדר ציבורי",
+    "Upgrade private room": "שדרג חדר פרטי",
+    "Automatically invite users": "הזמן משתמשים באופן אוטומטי",
+    "Put a link back to the old room at the start of the new room so people can see old messages": "החזירו קישור לחדר הישן בתחילת החדר החדש כדי שאנשים יוכלו לראות הודעות ישנות",
+    "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "עצור מהמשתמשים לדבר בגרסה הישנה של החדר, ושלח הודעה הממליצה למשתמשים לעבור לחדר החדש",
+    "Update any local room aliases to point to the new room": "עדכן את כינויי החדר המקומיים בכדי להצביע על החדר החדש",
+    "Create a new room with the same name, description and avatar": "צור חדר חדש עם אותו שם, תיאור ואווטאר",
+    "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:": "שדרוג חדר זה מחייב סגירת המופע הנוכחי של החדר ויצירת חדר חדש במקומו. כדי להעניק לחברי החדר את החוויה הטובה ביותר האפשרית, אנו:",
+    "Upgrade Room Version": "גרסת חדר שדרוג",
+    "Upgrade this room to version %(version)s": "שדרג חדר זה לגרסה %(version)s",
+    "The room upgrade could not be completed": "לא ניתן היה להשלים את שדרוג החדר",
+    "Failed to upgrade room": "שדרוג החדר נכשל",
+    "Room Settings - %(roomName)s": "הגדרות חדר - %(roomName)s",
+    "Send report": "שלח דיווח",
+    "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "דיווח על הודעה זו ישלח את 'מזהה האירוע' הייחודי למנהל שרת הבית שלך. אם הודעות בחדר זה מוצפנות, מנהל שרת הבית שלך לא יוכל לקרוא את טקסט ההודעה או להציג קבצים או תמונות.",
+    "Report Content to Your Homeserver Administrator": "דווח על תוכן למנהל שרת הבית שלך",
+    "Please fill why you're reporting.": "אנא מלאו מדוע אתם מדווחים.",
+    "Email (optional)": "דוא\"ל (לא חובה)",
+    "Just a heads up, if you don't add an email and forget your password, you could <b>permanently lose access to your account</b>.": "רק קדימה, אם לא תוסיף דוא\"ל ושכחת את הסיסמה שלך, אתה יכול <b> לאבד לצמיתות את הגישה לחשבונך </b>.",
+    "Continuing without email": "ממשיך ללא דוא\"ל",
+    "Doesn't look like a valid email address": "לא נראה כמו כתובת דוא\"ל תקפה",
+    "This wasn't me": "זה לא הייתי אני",
+    "If you didn’t sign in to this session, your account may be compromised.": "אם לא נכנסת למפגש זה, ייתכן שחשבונך נפגע.",
+    "Use this session to verify your new one, granting it access to encrypted messages:": "השתמש בפגישה זו כדי לאמת את הפגישה החדשה שלך, והעניק לה גישה להודעות מוצפנות:",
+    "New session": "מושב חדש",
+    "We recommend you change your password and recovery key in Settings immediately": "אנו ממליצים לך לשנות את הסיסמה ומפתח השחזור שלך בהגדרות באופן מיידי",
+    "The internet connection either session is using": "חיבור האינטרנט או כל מושב משתמש",
+    "This session, or the other session": "המושב הזה או המושב האחר",
+    "Your password": "הסיסמה שלכם",
+    "Your account is not secure": "חשבונכם אינו מאובטח",
+    "Data on this screen is shared with %(widgetDomain)s": "הנתונים על המסך הזה משותפים עם %(widgetDomain)s",
+    "Modal Widget": "יישומון מודאלי",
+    "Message edits": "עריכת הודעות",
+    "Your homeserver doesn't seem to support this feature.": "נראה ששרת הבית שלך אינו תומך בתכונה זו.",
+    "Verify session": "אמת מושב",
+    "If they don't match, the security of your communication may be compromised.": "אם הם לא תואמים, אבטחת התקשורת שלך עלולה להיפגע.",
+    "Session key": "מפתח מושב",
+    "Session ID": "זהות מושב",
+    "Session name": "שם מושב",
+    "Confirm this user's session by comparing the following with their User Settings:": "אשר את הפעלת המשתמש הזה על ידי השוואה בין הדברים הבאים להגדרות המשתמש שלהם:",
+    "Confirm by comparing the following with the User Settings in your other session:": "אשר על ידי השוואה בין הדברים הבאים להגדרות המשתמש בפגישה האחרת שלך:",
+    "Are you sure you want to sign out?": "האם אתה בטוח שברצונך לצאת?",
+    "You'll lose access to your encrypted messages": "תאבד את הגישה להודעות המוצפנות שלך",
+    "Manually export keys": "ייצא ידנית מפתחות",
+    "I don't want my encrypted messages": "אני לא רוצה את ההודעות המוצפנות שלי",
+    "Start using Key Backup": "התחל להשתמש בגיבוי מקשים",
+    "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "הודעות מוצפנות מאובטחות באמצעות הצפנה מקצה לקצה. רק לך ולמקבל / ים יש / ה מקשים לקריאת הודעות אלה.",
+    "Updating %(brand)s": "מעדכן %(brand)s",
+    "%(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!": "%(brand)s משתמש כעת בזכרון פחות פי 3-5, על ידי טעינת מידע רק על משתמשים אחרים בעת הצורך. אנא המתן בזמן שאנחנו מסתנכרנים מחדש עם השרת!",
+    "Clear cache and resync": "נקה מטמון וסנכרן מחדש",
+    "Incompatible local cache": "מטמון מקומי לא תואם",
+    "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.": "אם הגרסה האחרת של %(brand)s עדיין פתוחה בכרטיסייה אחרת, אנא סגור אותה כשימוש ב-%(brand)s באותו מארח כאשר טעינה עצלה מופעלת וגם מושבתת בו זמנית תגרום לבעיות.",
+    "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.": "השתמשת בעבר ב- %(brand)s ב- %(host)s עם טעינה עצלה של חברים מופעלת. בגרסה זו טעינה עצלה מושבתת. מכיוון שהמטמון המקומי אינו תואם בין שתי ההגדרות הללו, %(brand)s צריך לסנכרן מחדש את חשבונך.",
+    "Signature upload failed": "העלאת החתימה נכשלה",
+    "Signature upload success": "הצלחה בהעלאת חתימה",
+    "Unable to upload": "לא ניתן להעלות",
+    "Cancelled signature upload": "העלאת החתימה בוטלה",
+    "Upload completed": "העלאה הושלמה",
+    "%(brand)s encountered an error during upload of:": "%(brand)s נתקל בשגיאה במהלך ההעלאה של:",
+    "a key signature": "חתימת מפתח",
+    "a new cross-signing key signature": "חתימת מפתח צולבת חדשה",
+    "a device cross-signing signature": "חתימה צולבת של התקן",
+    "a new master key signature": "חתימת מפתח ראשית חדשה",
+    "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>.",
+    "Go": "המשך",
+    "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/>).",
+    "Direct Messages": "הודעות ישירות",
+    "Recently Direct Messaged": "הודעות ישירות לאחרונה",
+    "May include members not in %(communityName)s": "עשוי לכלול חברים שאינם ב- %(communityName)s",
+    "Suggestions": "הצעות",
+    "Recent Conversations": "שיחות אחרונות",
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "המשתמשים הבאים עשויים שלא להתקיים או שאינם תקפים, ולא ניתן להזמין אותם: %(csvNames)s",
+    "Failed to find the following users": "מציאת המשתמשים הבאים נכשלה",
+    "We couldn't invite those users. Please check the users you want to invite and try again.": "לא יכולנו להזמין את המשתמשים האלה. אנא בדוק את המשתמשים שברצונך להזמין ונסה שוב.",
+    "Something went wrong trying to invite the users.": "משהו השתבש בניסיון להזמין את המשתמשים.",
+    "We couldn't create your DM. Please check the users you want to invite and try again.": "לא הצלחנו ליצור את ה- DM שלך. אנא בדוק את המשתמשים שברצונך להזמין ונסה שוב.",
+    "Failed to invite the following users to chat: %(csvUsers)s": "הזמנת המשתמשים הבאים לצ'אט נכשלה: %(csvUsers)s",
+    "Invite by email": "הזמנה באמצעות דוא\"ל",
+    "Click the button below to confirm your identity.": "לחץ על הלחצן למטה כדי לאשר את זהותך.",
+    "Confirm to continue": "אשרו בכדי להמשיך",
+    "To continue, use Single Sign On to prove your identity.": "כדי להמשיך, השתמש בכניסה יחידה כדי להוכיח את זהותך.",
+    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "%(brand)s שלכם אינו מאפשר לך להשתמש במנהל שילוב לשם כך. אנא צרו קשר עם מנהל מערכת.",
+    "Integrations not allowed": "שילובים אינם מורשים",
+    "Enable 'Manage Integrations' in Settings to do this.": "אפשר 'ניהול אינטגרציות' בהגדרות כדי לעשות זאת.",
+    "Integrations are disabled": "שילובים מושבתים",
+    "Incoming Verification Request": "בקשת אימות נכנסת",
+    "Waiting for partner to confirm...": "מחכה לשותף שיאשר ...",
+    "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "אימות מכשיר זה יסמן אותו כאמין, ומשתמשים שאימתו איתך יסמכו על מכשיר זה.",
+    "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.": "אמת את המכשיר הזה כדי לסמן אותו כאמין. אמון במכשיר זה מעניק לך ולמשתמשים אחרים שקט נפשי נוסף בשימוש בהודעות מוצפנות מקצה לקצה.",
+    "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "אימות משתמש זה יסמן את ההפעלה שלו כאמינה, וגם יסמן את ההפעלה שלך כאמינה להם.",
+    "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "אמת את המשתמש הזה כדי לסמן אותו כאמין. אמון במשתמשים מעניק לך שקט נפשי נוסף בשימוש בהודעות מוצפנות מקצה לקצה.",
+    "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": "דיווח על תקלה",
+    "Feedback": "משוב",
+    "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": "משוב נשלח",
+    "An error has occurred.": "קרתה שגיאה.",
+    "Update community": "עדכן קהילה",
+    "There was an error updating your community. The server is unable to process your request.": "אירעה שגיאה בעדכון הקהילה שלך. השרת אינו יכול לעבד את בקשתך.",
+    "Transfer": "לְהַעֲבִיר",
+    "Failed to transfer call": "העברת השיחה נכשלה",
+    "A call can only be transferred to a single user.": "ניתן להעביר שיחה רק למשתמש יחיד.",
+    "End": "מקש סוף",
+    "Space": "מקש רווח",
+    "Enter": "מקש אנטר",
+    "Esc": "אסקייפ Esc",
+    "Page Down": "עמוד למטה",
+    "Page Up": "גלול למעלה",
+    "Cancel autocomplete": "בטל השלמה אוטומטית",
+    "Move autocomplete selection up/down": "הזז את הבחירה בהשלמה אוטומטית למעלה / למטה",
+    "Go to Home View": "עבור אל תצוגת הבית",
+    "Toggle this dialog": "החלף דו-שיח זה",
+    "Toggle right panel": "החלף את החלונית הימנית",
+    "Activate selected button": "הפעל את הלחצן שנבחר",
+    "Close dialog or context menu": "סגור את תיבת הדו-שיח או את תפריט ההקשר",
+    "Toggle the top left menu": "החלף את התפריט הימני העליון",
+    "Previous/next room or DM": "החדר הקודם / הבא או DM",
+    "Previous/next unread room or DM": "חדר שלא נקרא / DM הקודם / הבא",
+    "Clear room list filter field": "נקה את שדה הסינון של רשימת החדרים",
+    "Expand room list section": "הרחב את קטע רשימת החדרים",
+    "Collapse room list section": "כווץ את קטע רשימת החדרים",
+    "Select room from the room list": "בחר חדר מרשימת החדרים",
+    "Navigate up/down in the room list": "נווט למעלה / למטה ברשימת החדרים",
+    "Jump to room search": "קפצו לחיפוש חדרים",
+    "Upload a file": "לעלות קובץ",
+    "Jump to oldest unread message": "קפיצה להודעה הוותיקה ביותר שלא נקראה",
+    "Dismiss read marker and jump to bottom": "דחה את סמן הקריאה וקפוץ לתחתית",
+    "Scroll up/down in the timeline": "גלול למעלה / למטה בציר הזמן",
+    "Toggle video on/off": "הפעל / כבה את הסרטון",
+    "Toggle microphone mute": "החלף השתקה של מיקרופון",
+    "Cancel replying to a message": "בטל מענה להודעה",
+    "Navigate composer history": "נווט בהיסטוריית המלחין",
+    "Jump to start/end of the composer": "קפיצה להתחלה / סוף של המלחין",
+    "Navigate recent messages to edit": "נווט בהודעות אחרונות לעריכה",
+    "New line": "שורה חדשה",
+    "Toggle Quote": "גרשיים",
+    "Toggle Italics": "אותיות נטויות",
+    "Toggle Bold": "הדגשת אותיות",
+    "Ctrl": "קונטרול",
+    "Super": "סופר",
+    "Shift": "הזזה",
+    "Alt Gr": "החלפה ל Gr",
+    "Alt": "החלפה",
+    "Autocomplete": "השלמה אוטומטית",
+    "Room List": "רשימת חדרים",
+    "Calls": "שיחות",
+    "Navigation": "ניווט",
+    "Message downloading sleep time(ms)": "הורדת זמן שינה (ms)",
+    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s מתוך %(totalRooms)s",
+    "Indexed rooms:": "חדרים רשומים:",
+    "Indexed messages:": "הודעות באינדקס:",
+    "Space used:": "שטח משומש:",
+    "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "%(brand)s מאחסן באופן מאובטח הודעות מוצפנות באופן מקומי כדי שיופיעו בתוצאות החיפוש:",
+    "Currently indexing: %(currentRoom)s": "אינדקס כרגע: %(currentRoom)s",
+    "Not currently indexing messages for any room.": "כרגע לא מוסיף לאינדקס הודעות עבור אף חדר.",
+    "Disable": "השבת",
+    "If disabled, messages from encrypted rooms won't appear in search results.": "אם מושבת, הודעות מחדרים מוצפנים לא יופיעו בתוצאות החיפוש.",
+    "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.": "אם לא הסרת את שיטת השחזור, ייתכן שתוקף מנסה לגשת לחשבונך. שנה את סיסמת החשבון שלך והגדר מיד שיטת שחזור חדשה בהגדרות.",
+    "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.": "אם עשית זאת בטעות, באפשרותך להגדיר הודעות מאובטחות בהפעלה זו אשר תצפין מחדש את היסטוריית ההודעות של הפגישה בשיטת שחזור חדשה.",
+    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "בפגישה זו זוהה כי ביטוי הסיסמה והמפתח לשחזור שלך עבור הודעות מאובטחות הוסר.",
+    "Recovery Method Removed": "שיטת השחזור הוסרה",
+    "Set up Secure Messages": "הגדר הודעות מאובטחות",
+    "Go to Settings": "עבור להגדרות",
+    "This session is encrypting history using the new recovery method.": "הפעלה זו היא הצפנת היסטוריה בשיטת השחזור החדשה.",
+    "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.": "אם לא הגדרת את שיטת השחזור החדשה, ייתכן שתוקף מנסה לגשת לחשבונך. שנה את סיסמת החשבון שלך והגדר מיד שיטת שחזור חדשה בהגדרות.",
+    "A new recovery passphrase and key for Secure Messages have been detected.": "ביטוי סיסמה ומפתח שחזור חדשים עבור הודעות מאובטחות זוהו.",
+    "New Recovery Method": "שיטת שחזור חדשה",
+    "Import": "יבא",
+    "File to import": "קובץ ליבא",
+    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "קובץ הייצוא יהיה מוגן באמצעות משפט סיסמה. עליך להזין כאן את משפט הסיסמה כדי לפענח את הקובץ.",
+    "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.": "תהליך זה מאפשר לך לייבא מפתחות הצפנה שייצאת בעבר מלקוח מטריקס אחר. לאחר מכן תוכל לפענח את כל ההודעות שהלקוח האחר יכול לפענח.",
+    "Import room keys": "יבא מפתחות חדר",
+    "Export": "יצא",
+    "Confirm passphrase": "אשר ביטוי",
+    "Enter passphrase": "הזן ביטוי סיסמה",
+    "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.": "הקובץ המיוצא יאפשר לכל מי שיוכל לקרוא אותו לפענח את כל ההודעות המוצפנות שאתה יכול לראות, לכן עליך להקפיד לשמור עליו מאובטח. כדי לעזור בכך, עליך להזין משפט סיסמה למטה, שישמש להצפנת הנתונים המיוצאים. ניתן יהיה לייבא את הנתונים רק באמצעות אותו ביטוי סיסמה.",
+    "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.": "תהליך זה מאפשר לך לייצא את המפתחות להודעות שקיבלת בחדרים מוצפנים לקובץ מקומי. לאחר מכן תוכל לייבא את הקובץ ללקוח מטריקס אחר בעתיד, כך שלקוח יוכל גם לפענח הודעות אלה.",
+    "Export room keys": "ייצא מפתחות לחדר",
+    "Unknown error": "שגיאה לא ידועה",
+    "Passphrase must not be empty": "ביטוי הסיסמה לא יכול להיות ריק",
+    "Passphrases must match": "ביטויי סיסמה חייבים להתאים",
+    "Unable to set up secret storage": "לא ניתן להגדיר אחסון סודי",
+    "Save your Security Key": "שמור את מפתח האבטחה שלך",
+    "Confirm Security Phrase": "אשר את ביטוי האבטחה",
+    "Set a Security Phrase": "הגדר ביטוי אבטחה",
+    "Upgrade your encryption": "שדרג את ההצפנה שלך",
+    "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.": "אם תבטל עכשיו, אתה עלול לאבד הודעות ונתונים מוצפנים אם תאבד את הגישה לכניסות שלך.",
+    "Unable to query secret storage status": "לא ניתן לשאול על סטטוס האחסון הסודי",
+    "Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.": "אחסן את מפתח האבטחה שלך במקום בטוח, כמו מנהל סיסמאות או כספת, מכיוון שהוא משמש כדי להגן על הנתונים המוצפנים שלך.",
+    "Enter your recovery passphrase a second time to confirm it.": "הזן את משפט סיסמת ההתאוששות שלך בפעם השנייה כדי לאשר זאת.",
+    "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.": "הזן ביטוי אבטחה רק אתה מכיר, מכיוון שהוא משמש כדי להגן על הנתונים שלך. כדי להיות בטוח, אתה לא צריך להשתמש מחדש בסיסמת החשבון שלך.",
+    "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "שדרג את ההפעלה הזו כדי לאפשר לה לאמת פעילויות אחרות, הענק להם גישה להודעות מוצפנות וסמן אותן כאמינות עבור משתמשים אחרים.",
+    "You'll need to authenticate with the server to confirm the upgrade.": "יהיה עליך לבצע אימות מול השרת כדי לאשר את השדרוג.",
+    "Restore": "לשחזר",
+    "Restore your key backup to upgrade your encryption": "שחזר את גיבוי המפתח שלך כדי לשדרג את ההצפנה שלך",
+    "Enter your account password to confirm the upgrade:": "הזן את סיסמת החשבון שלך כדי לאשר את השדרוג:",
+    "Safeguard against losing access to encrypted messages & data by backing up encryption keys on your server.": "הגן מפני אובדן גישה להודעות ונתונים מוצפנים על ידי גיבוי של מפתחות הצפנה בשרת שלך.",
+    "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.": "ניצור עבורך מפתח אבטחה לאחסון בטוח, כמו מנהל סיסמאות או כספת.",
+    "Generate a Security Key": "צור מפתח אבטחה",
+    "Unable to create key backup": "לא ניתן ליצור גיבוי מפתח",
+    "Create key backup": "צור מפתח גיבוי",
+    "Success!": "הצלחה!",
+    "Starting backup...": "מתחיל גיבוי...",
+    "Make a copy of your recovery key": "צור עותק של מפתח השחזור שלך",
+    "Confirm your recovery passphrase": "אשר את משפט סיסמת ההתאוששות שלך",
+    "Secure your backup with a recovery passphrase": "אבטח את הגיבוי שלך עם משפט סיסמה לשחזור",
+    "Set up Secure Message Recovery": "הגדר שחזור הודעות מאובטח",
+    "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.": "מבלי להגדיר שחזור הודעות מאובטח, לא תוכל לשחזר את היסטוריית ההודעות המוצפנת שלך אם אתה מתנתק או משתמש בהפעלה אחרת.",
+    "Your keys are being backed up (the first backup could take a few minutes).": "גיבוי המפתחות שלך (הגיבוי הראשון יכול לקחת מספר דקות).",
+    "<b>Copy it</b> to your personal cloud storage": "<b> העתק אותו </b> לאחסון הענן האישי שלך",
+    "<b>Save it</b> on a USB key or backup drive": "<b> שמור אותו </b> במפתח USB או בכונן גיבוי",
+    "<b>Print it</b> and store it somewhere safe": "<b> הדפיסו אותו </b> ואחסנו במקום בטוח",
+    "Your recovery key is in your <b>Downloads</b> folder.": "מפתח השחזור שלך נמצא בתיקיה <b> הורדות </b>.",
+    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "מפתח השחזור שלך הועתק <b> אל הלוח שלך </b>, הדבק אותו ל:",
+    "Download": "הורדה",
+    "Your recovery key": "מפתח ההתאוששות שלך",
+    "Keep a copy of it somewhere secure, like a password manager or even a safe.": "שמור עותק ממנו במקום מאובטח, כמו מנהל סיסמאות או אפילו כספת.",
+    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "מפתח השחזור שלך הוא רשת ביטחון - אתה יכול להשתמש בו כדי להחזיר את הגישה להודעות המוצפנות שלך אם תשכח את משפט הסיסמה לשחזור שלך.",
+    "Repeat your recovery passphrase...": "חזור על משפט סיסמת ההתאוששות שלך ...",
+    "Please enter your recovery passphrase a second time to confirm.": "אנא הזן את משפט סיסמת השחזור שלך בפעם השנייה כדי לאשר.",
+    "Go back to set it again.": "חזור להגדיר אותו שוב.",
+    "That doesn't match.": "זה לא תואם.",
+    "Use a different passphrase?": "להשתמש בביטוי סיסמה אחר?",
+    "That matches!": "זה מתאים!",
+    "Set up with a recovery key": "הגדר עם מפתח שחזור",
+    "Great! This recovery passphrase looks strong enough.": "גדול! ביטוי סיסמה לשחזור זה נראה מספיק חזק.",
+    "Enter a recovery passphrase": "הזן ביטוי סיסמה לשחזור",
+    "For maximum security, this should be different from your account password.": "ליתר ביטחון, זה צריך להיות שונה מסיסמת החשבון שלך.",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "נאחסן עותק מוצפן של המפתחות שלך בשרת שלנו. אבטח את הגיבוי שלך עם משפט סיסמה לשחזור.",
+    "User Autocomplete": "השלמה אוטומטית למשתמשים",
+    "Users": "משתמשים",
+    "Room Autocomplete": "השלמה אוטומטית לחדרים",
+    "Notification Autocomplete": "השלמה אוטומטית להתראות",
+    "Room Notification": "הודעת חדר",
+    "Notify the whole room": "הודע לכל החדר",
+    "Emoji Autocomplete": "השלמה אוטומטית של אימוג'י",
+    "Emoji": "אימוג'י",
+    "DuckDuckGo Results": "תוצאות DuckDuckGo",
+    "Results from DuckDuckGo": "תוצאות מ- DuckDuckGo",
+    "Community Autocomplete": "השלמה אוטומטית של קהילות",
+    "Command Autocomplete": "השלמה אוטומטית של פקודות",
+    "Commands": "פקודות",
+    "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.": "אזהרה: הנתונים האישיים שלך (כולל מפתחות הצפנה) עדיין נשמרים בפגישה זו. נקה זאת אם סיימת להשתמש בהפעלה זו, או אם ברצונך להיכנס לחשבון אחר.",
+    "Clear personal data": "נקה מידע אישי",
+    "You're signed out": "התנתקתם",
+    "You cannot sign in to your account. Please contact your homeserver admin for more information.": "אינך יכול להיכנס לחשבונך. אנא פנה למנהל שרת הבית שלך למידע נוסף.",
+    "Sign in and regain access to your account.": "היכנס וקבל שוב גישה לחשבונך.",
+    "Forgotten your password?": "שכחת את הסיסמה שלך?",
+    "Enter your password to sign in and regain access to your account.": "הזן את הסיסמה שלך כדי להיכנס לחזרה ולחזור אליה.",
+    "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.": "השיב שוב גישה לחשבונך ושחזר מפתחות הצפנה המאוחסנים בהפעלה זו. בלעדיהם, לא תוכל לקרוא את כל ההודעות המאובטחות שלך בשום הפעלה.",
+    "Failed to re-authenticate": "האימות מחדש נכשל",
+    "Incorrect password": "סיסמה שגויה",
+    "Failed to re-authenticate due to a homeserver problem": "האימות מחדש נכשל עקב בעיית שרת בית",
+    "Without completing security on this session, it won’t have access to encrypted messages.": "מבלי להשלים את האבטחה במפגש זה, לא תהיה לו גישה להודעות מוצפנות.",
+    "Your new session is now verified. Other users will see it as trusted.": "ההפעלה החדשה שלך אומתה. משתמשים אחרים יראו בכך אמין.",
+    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "ההפעלה החדשה שלך אומתה. יש לו גישה להודעות המוצפנות שלך, ומשתמשים אחרים יראו בכך אמינים.",
+    "or another cross-signing capable Matrix client": "או לקוח מטריקס אחר עם יכולת חתימה צולבת",
+    "%(brand)s Android": "%(brand)s אנדרויד",
+    "%(brand)s iOS": "%(brand)s אפל",
+    "%(brand)s Desktop": "%(brand)s למחשב דסקטופ",
+    "%(brand)s Web": "%(brand)s ברשת",
+    "This requires the latest %(brand)s on your other devices:": "לשם כך נדרשים האחוזים האחרונים %(brand)s במכשירים האחרים שלך:",
+    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "אשר את זהותך על ידי אימות התחברות זו מאחד מהפגישות האחרות שלך, והעניק לה גישה להודעות מוצפנות.",
+    "Use Recovery Key": "השתמש במפתח שחזור",
+    "Use Recovery Key or Passphrase": "השתמש במפתח השחזור או בביטוי הסיסמה",
+    "Decide where your account is hosted": "החלט היכן מתארח חשבונך",
+    "Host account on": "חשבון מארח ב",
+    "Create account": "צור חשבון",
+    "Registration Successful": "ההרשמה בוצעה בהצלחה",
+    "You can now close this window or <a>log in</a> to your new account.": "כעת תוכלו לסגור חלון זה או <a> להיכנס </a> לחשבונכם החדש.",
+    "<a>Log in</a> to your new account.": "<a> היכנס </a> לחשבונך החדש.",
+    "Continue with previous account": "המשך בחשבון הקודם",
+    "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "החשבון החדש שלך (%(newAccountId)s) רשום, אך אתה כבר מחובר לחשבון אחר (%(loggedInUserId)s).",
+    "Already have an account? <a>Sign in here</a>": "כבר יש לכם חשבון? <a> היכנסו כאן </a>",
+    "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s או %(usernamePassword)s",
+    "Continue with %(ssoButtons)s": "המשך עם %(ssoButtons)s",
+    "That username already exists, please try another.": "שם משתמש זה כבר קיים, אנא נסה אחר.",
+    "This server does not support authentication with a phone number.": "שרת זה אינו תומך באימות עם מספר טלפון.",
+    "Registration has been disabled on this homeserver.": "ההרשמה הושבתה בשרת הבית הזה.",
+    "Unable to query for supported registration methods.": "לא ניתן לשאול לשיטות רישום נתמכות.",
+    "New? <a>Create account</a>": "חָדָשׁ? <a> צור חשבון </a>",
+    "If you've joined lots of rooms, this might take a while": "אם הצטרפת להרבה חדרים, זה עשוי לקחת זמן מה",
+    "Signing In...": "מתחבר...",
+    "Syncing...": "מסנכרן...",
+    "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "לא ניתן להתחבר לשרת בית - אנא בדוק את הקישוריות שלך, וודא ש- <a> תעודת ה- SSL של שרת הביתה </a> שלך מהימנה ושהסיומת לדפדפן אינה חוסמת בקשות.",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "לא ניתן להתחבר לשרת ביתי באמצעות HTTP כאשר כתובת HTTPS נמצאת בסרגל הדפדפן שלך. השתמש ב- HTTPS או <a> הפעל סקריפטים לא בטוחים </a>.",
+    "There was a problem communicating with the homeserver, please try again later.": "הייתה תקשורת עם שרת הבית. נסה שוב מאוחר יותר.",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "שרת בית זה אינו מציע זרמי התחברות הנתמכים על ידי לקוח זה.",
+    "Failed to perform homeserver discovery": "נכשל גילוי שרת הבית",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "שים לב שאתה מתחבר לשרת %(hs)s, לא ל- matrix.org.",
+    "Incorrect username and/or password.": "שם משתמש ו / או סיסמה שגויים.",
+    "This account has been deactivated.": "חשבון זה הושבת.",
+    "Please <a>contact your service administrator</a> to continue using this service.": "אנא <a> פנה למנהל השירות שלך </a> כדי להמשיך להשתמש בשירות זה.",
+    "This homeserver does not support login using email address.": "שרת בית זה אינו תומך בכניסה באמצעות כתובת דוא\"ל.",
+    "General failure": "שגיאה כללית",
+    "Identity server URL does not appear to be a valid identity server": "נראה שכתובת האתר של שרת זהות אינה שרת זהות חוקי",
+    "Invalid base_url for m.identity_server": "Base_url לא חוקי עבור m.identity_server",
+    "Invalid identity server discovery response": "תגובת גילוי שרת זהות לא חוקית",
+    "Homeserver URL does not appear to be a valid Matrix homeserver": "נראה שכתובת האתר של שרת הבית אינה שרת ביתי של מטריקס",
+    "Invalid base_url for m.homeserver": "Base_url לא חוקי עבור m.homeserver",
+    "Failed to get autodiscovery configuration from server": "קבלת תצורת הגילוי האוטומטי מהשרת נכשלה",
+    "Invalid homeserver discovery response": "תגובת גילוי שרת בית לא חוקית",
+    "Set a new password": "הגדר סיסמה חדשה",
+    "Return to login screen": "חזור למסך הכניסה",
+    "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.": "הוצאת מכל ההפעלות ולא תקבל עוד התראות דחיפה. כדי להפעיל מחדש את ההתראות, היכנס שוב בכל מכשיר.",
+    "Your password has been reset.": "הסיסמה שלך אופסה.",
+    "I have verified my email address": "אימתתי את כתובת הדוא\"ל שלי",
+    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "דוא\"ל נשלח אל %(emailAddress)s. לאחר שתעקוב אחר הקישור שהוא מכיל, לחץ למטה.",
+    "Sign in instead": "היכנס במקום זאת",
+    "Send Reset Email": "שלח איפוס אימייל",
+    "A verification email will be sent to your inbox to confirm setting your new password.": "דוא\"ל אימות יישלח לתיבת הדואר הנכנס שלך כדי לאשר את הגדרת הסיסמה החדשה שלך.",
+    "New Password": "סיסמה חדשה",
+    "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "שינוי הסיסמה יאפס את כל מפתחות ההצפנה מקצה לקצה בכל ההפעלות שלך, מה שהופך את היסטוריית הצ'אט המוצפנת לבלתי קריאה. הגדר גיבוי מקשים או ייצא את מפתחות החדר שלך מהפעלה אחרת לפני איפוס הסיסמה שלך.",
+    "New passwords must match each other.": "סיסמאות חדשות חייבות להתאים זו לזו.",
+    "A new password must be entered.": "יש להזין סיסמה חדשה.",
+    "The email address linked to your account must be entered.": "יש להזין את כתובת הדוא\"ל המקושרת לחשבונך.",
+    "Failed to send email": "כשלון בשליחת מייל",
+    "Session verified": "מושב נכשל",
+    "Verify this login": "אמת את הכניסה הזאת",
+    "Could not load user profile": "לא ניתן לטעון את פרופיל המשתמש",
+    "Community and user menu": "תפריט משתמש וקהילה",
+    "User menu": "תפריט משתמש",
+    "Switch theme": "שנה ערכת נושא",
+    "Switch to dark mode": "שנה למצב כהה",
+    "Switch to light mode": "שנה למצב בהיר",
+    "User settings": "הגדרות משתמש",
+    "Community settings": "הגדרות קהילה",
+    "All settings": "כל ההגדרות",
+    "Security & privacy": "אבטחה ופרטיות",
+    "Notification settings": "הגדרות התראה",
+    "New here? <a>Create an account</a>": "חדש פה? <a> צור חשבון </a>",
+    "Got an account? <a>Sign in</a>": "יש לך חשבון? <a> היכנס </a>",
+    "Failed to find the general chat for this community": "מציאת הצ'אט הכללי לקהילה זו נכשלה",
+    "Uploading %(filename)s and %(count)s others|one": "מעלה %(filename)s ו-%(count)s אחרים",
+    "Uploading %(filename)s and %(count)s others|zero": "מעלה %(filename)s",
+    "Uploading %(filename)s and %(count)s others|other": "מעלה %(filename)s ו-%(count)s אחרים",
+    "Failed to load timeline position": "טעינת מיקום ציר הזמן נכשלה",
+    "Tried to load a specific point in this room's timeline, but was unable to find it.": "ניסה לטעון נקודה מסוימת בציר הזמן של החדר הזה, אך לא הצליח למצוא אותה.",
+    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "ניסיתי לטעון נקודה ספציפית בציר הזמן של החדר הזה, אך אין לך הרשאה להציג את ההודעה המדוברת.",
+    "You have %(count)s unread notifications in a prior version of this room.|one": "יש לך %(count)s הודעה שלא נקראה בגירסה קודמת של חדר זה.",
+    "You have %(count)s unread notifications in a prior version of this room.|other": "יש לך %(count)s הודעות שלא נקראו בגרסה קודמת של חדר זה.",
+    "Failed to reject invite": "דחיית הזמנה נכשלה",
+    "Room": "חדר",
+    "No more results": "אין יותר תוצאות",
+    "Server may be unavailable, overloaded, or search timed out :(": "יתכן שהשרת לא יהיה זמין, עמוס יתר על המידה או שתם הזמן הקצוב לחיפוש :(",
+    "Search failed": "החיפוש נכשל",
+    "You seem to be in a call, are you sure you want to quit?": "נראה שאתה בשיחה, האם אתה בטוח שאתה רוצה להפסיק?",
+    "You seem to be uploading files, are you sure you want to quit?": "נראה שאתה מעלה קבצים, האם אתה בטוח שברצונך להפסיק?",
+    "Sent messages will be stored until your connection has returned.": "הודעות שנשלחו יאוחסנו עד שהחיבור שלך יחזור.",
+    "Connectivity to the server has been lost.": "הקישוריות לשרת אבדה.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText> שלח הכל מחדש </resendText> או <cancelText> בטל הכל </cancelText> עכשיו. אתה יכול גם לבחור הודעות בודדות לשליחה מחדש או לביטול.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText> שלח הכל מחדש </resendText> או <cancelText> בטל הכל </cancelText> עכשיו. אתה יכול גם לבחור הודעות בודדות לשליחה מחדש או לביטול.",
+    "%(count)s of your messages have not been sent.|one": "ההודעה שלך לא נשלחה.",
+    "%(count)s of your messages have not been sent.|other": "חלק מההודעות שלך לא נשלחו.",
+    "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.": "ההודעה שלך לא נשלחה מכיוון ששרת הבית הזה חרג ממגבלת המשאבים. אנא <a> פנה למנהל השירות שלך </a> כדי להמשיך להשתמש בשירות.",
+    "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.": "ההודעה שלך לא נשלחה מכיוון ששרת הבתים הזה הגיע למגבלת המשתמשים הפעילים החודשיים שלה. אנא <a> פנה למנהל השירות שלך </a> כדי להמשיך להשתמש בשירות.",
+    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "אינך יכול לשלוח שום הודעה עד שתבדוק ותסכים ל <consentLink> התנאים וההגבלות שלנו </consentLink>.",
+    "Filter rooms and people": "סנן חדרים ואנשים",
+    "Clear filter": "נקה מסנן",
+    "Filter": "סנן",
+    "Explore rooms in %(communityName)s": "חקור חדרים בקהילת %(communityName)s",
+    "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "אם אינך מוצא את החדר שאתה מחפש, בקש הזמנה או <a> צור חדר חדש </a>.",
+    "Find a room… (e.g. %(exampleRoom)s)": "מצא חדר (דוגמא: %(exampleRoom)s)",
+    "Find a room…": "מצא חדר…",
+    "View": "צפה",
+    "Preview": "תצוגה מקדימה",
+    "delete the address.": "מחק את הכתובת.",
+    "Delete the room address %(alias)s and remove %(name)s from the directory?": "למחוק את כתובת החדר %(alias)s ולהסיר את %(name)s מהספרייה?",
+    "The homeserver may be unavailable or overloaded.": "שרת הבית עשוי להיות לא זמין או עומס יתר.",
+    "%(brand)s failed to get the public room list.": "%(brand)s לא הצליחו להשיג את רשימת החדרים הציבוריים.",
+    "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s לא הצליחו להשיג את רשימת הפרוטוקולים משרת הבית. שרת הבית עשוי להיות זקן מכדי לתמוך ברשתות צד שלישי.",
+    "You have no visible notifications.": "אין לך התראות גלויות.",
+    "You’re all caught up": "כולכם מעודכנים",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "צור קהילה שתקבץ משתמשים וחדרים! בנה דף בית מותאם אישית כדי לסמן את החלל שלך ביקום מטריקס.",
+    "Create a new community": "צור קהילה חדשה",
+    "Error whilst fetching joined communities": "שגיאה בעת אחזור קהילות שהצטרפו",
+    "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.": "להגדרת מסנן, גרור אווטאר קהילתי לחלונית המסנן בצד שמאל הקיצוני של המסך. אתה יכול ללחוץ על אווטאר בחלונית המסנן בכל עת כדי לראות רק את החדרים והאנשים המשויכים לקהילה זו.",
+    "Did you know: you can use communities to filter your %(brand)s experience!": "האם ידעת: תוכל להשתמש בקהילות כדי לסנן את חוויית %(brand)s שלך!",
+    "Your Communities": "הקהילות שלכם",
+    "%(creator)s created and configured the room.": "%(creator)s יצא והגדיר את החדר.",
+    "%(creator)s created this DM.": "%(creator)s יצר את DM הזה.",
+    "Logout": "יציאה",
+    "Self-verification request": "בקשה לאימות עצמי",
+    "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.": "נתגלו גרסאות ישנות יותר של %(brand)s. זה יגרום לתקלה בקריפטוגרפיה מקצה לקצה בגרסה הישנה יותר. הודעות מוצפנות מקצה לקצה שהוחלפו לאחרונה בעת השימוש בגרסה הישנה עשויות שלא להיות ניתנות לפענוח בגירסה זו. זה עלול גם לגרום להודעות שהוחלפו עם גרסה זו להיכשל. אם אתה נתקל בבעיות, צא וחזור שוב. כדי לשמור על היסטוריית ההודעות, ייצא וייבא מחדש את המפתחות שלך.",
+    "Old cryptography data detected": "נתגלו נתוני הצפנה ישנים",
+    "Terms and Conditions": "תנאים והגבלות",
+    "Review terms and conditions": "עיין בתנאים ובהגבלות",
+    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "כדי להמשיך להשתמש בשרת הבית (%(homeserverDomain)s), עליך לבדוק ולהסכים לתנאים ולהגבלות שלנו.",
+    "For security, this session has been signed out. Please sign in again.": "למען ביטחון, הפגישה הזו נותקה. אנא היכנסו שוב.",
+    "Signed Out": "יציאה",
+    "Channel: <channelLink/>": "ערוץ: <channelLink/>",
+    "Dial pad": "לוח חיוג",
+    "There was an error looking up the phone number": "אירעה שגיאה בחיפוש מספר הטלפון",
+    "Unable to look up phone number": "לא ניתן לחפש את מספר הטלפון",
+    "%(senderName)s has updated the widget layout": "%(senderName)s עדכן את פריסת היישומון",
+    "There was an error finding this widget.": "אירעה שגיאה במציאת היישומון הזה.",
+    "Active Widgets": "יישומונים פעילים",
+    "Set my room layout for everyone": "הגדר את פריסת החדר שלי עבור כולם",
+    "Open dial pad": "פתח לוח חיוג",
+    "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 Security Key.": "גבה את מפתחות ההצפנה שלך עם נתוני חשבונך במקרה שתאבד את הגישה להפעלות שלך. המפתחות שלך מאובטחים באמצעות מפתח אבטחה ייחודי.",
+    "If you've forgotten your Security Key you can <button>set up new recovery options</button>": "אם שכחת את מפתח האבטחה שלך תוכל <button>להגדיר אפשרויות שחזור חדשות<button/>",
+    "Search (must be enabled)": "חיפוש (חייב להיות מופעל)",
+    "Make a copy of your Security Key": "צור עותק של מפתח האבטחה שלך",
+    "Your Security Key": "מפתח האבטחה שלך",
+    "Set up with a Security Key": "הגדר עם מפתח אבטחה",
+    "Use Security Key": "השתמש במפתח אבטחה",
+    "Access your secure message history and set up secure messaging by entering your Security Key.": "גש להיסטוריית ההודעות המאובטחות שלך והגדר הודעות מאובטחות על ידי הזנת מפתח האבטחה שלך.",
+    "Enter Security Key": "הזן מפתח אבטחה",
+    "Backup could not be decrypted with this Security Key: please verify that you entered the correct Security Key.": "לא ניתן היה לפענח את הגיבוי באמצעות מפתח האבטחה הזה: ודא שהזנת את מפתח האבטחה הנכון.",
+    "Security Key mismatch": "מפתחות האבטחה לא תואמים",
+    "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "אין אפשרות לגשת לאחסון הסודי. אנא אשר שהזנת את ביטוי האבטחה הנכון.",
+    "Invalid Security Key": "מפתח אבטחה לא חוקי",
+    "Wrong Security Key": "מפתח אבטחה שגוי",
+    "Remember this": "זכור את זה",
+    "The widget will verify your user ID, but won't be able to perform actions for you:": "היישומון יאמת את מזהה המשתמש שלך, אך לא יוכל לבצע פעולות עבורך:",
+    "Allow this widget to verify your identity": "אפשר לווידג'ט זה לאמת את זהותך",
+    "We recommend you change your password and Security Key in Settings immediately": "אנו ממליצים לך לשנות את הסיסמה ומפתח האבטחה שלך בהגדרות באופן מיידי",
+    "Start a Conversation": "התחל שיחה",
+    "Workspace: <networkLink/>": "סביבת עבודה: <networkLink/>",
+    "Use Ctrl + F to search": "השתמש ב- Ctrl + F כדי לחפש",
+    "Use Command + F to search": "השתמש ב- Command + F כדי לחפש",
+    "Change which room, message, or user you're viewing": "שנה את החדר, ההודעה או המשתמש שאתה צופה בו",
+    "Expand code blocks by default": "הרחב את בלוקי הקוד כברירת מחדל",
+    "Show stickers button": "הצג את לחצן הסטיקרים",
+    "Use app": "השתמש באפליקציה",
+    "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Element Web הוא ניסיוני במובייל. לקבלת חוויה טובה יותר והתכונות העדכניות ביותר, השתמש באפליקציה המקורית החינמית שלנו.",
+    "Use app for a better experience": "השתמש באפליקציה לחוויה טובה יותר",
+    "Converts the DM to a room": "המר את ה- DM לחדר שיחוח",
+    "Converts the room to a DM": "המר את החדר ל- DM",
+    "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "לא ניתן היה להגיע לשרת הבית שלך ולא היה ניתן להתחבר. נסה שוב. אם זה נמשך, אנא פנה למנהל שרת הבית שלך.",
+    "Try again": "נסה שוב",
+    "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "ביקשנו מהדפדפן לזכור באיזה שרת בית אתה משתמש כדי לאפשר לך להיכנס, אך למרבה הצער הדפדפן שלך שכח אותו. עבור לדף הכניסה ונסה שוב.",
+    "We couldn't log you in": "לא הצלחנו להתחבר אליך"
 }
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 0e76c1a97d..398dd04ec2 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -5,7 +5,7 @@
     "Custom Server Options": "Egyéni kiszolgálóbeállítások",
     "Dismiss": "Eltüntetés",
     "Error": "Hiba",
-    "Failed to forget room %(errCode)s": "Nem sikerült elfelejteni a szobát: %(errCode)s",
+    "Failed to forget room %(errCode)s": "A szobát nem sikerült elfelejtetni: %(errCode)s",
     "Favourite": "Kedvenc",
     "Mute": "Elnémít",
     "Notifications": "Értesítések",
@@ -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",
@@ -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",
@@ -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",
@@ -116,7 +116,7 @@
     "Failed to set display name": "Megjelenítési nevet nem sikerült beállítani",
     "Failed to unban": "Kizárás visszavonása sikertelen",
     "Failed to upload profile picture!": "Profil kép feltöltése sikertelen!",
-    "Failed to verify email address: make sure you clicked the link in the email": "E-mail cím ellenőrzése sikertelen: ellenőrizd, hogy az e-mailben lévő hivatkozásra kattintottál",
+    "Failed to verify email address: make sure you clicked the link in the email": "E-mail cím ellenőrzése sikertelen: ellenőrizze, hogy az e-mailben lévő hivatkozásra kattintott-e",
     "Failure to create room": "Szoba létrehozása sikertelen",
     "Favourites": "Kedvencek",
     "Fill screen": "Képernyő kitöltése",
@@ -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).",
@@ -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",
@@ -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",
@@ -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.",
@@ -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",
@@ -279,9 +279,9 @@
     "Who can read history?": "Ki olvashatja a régi üzeneteket?",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s visszavonta %(targetName)s meghívóját.",
     "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 cannot place a call with yourself.": "Nem hívhatja fel saját magát.",
+    "You cannot place VoIP calls in this browser.": "Nem indíthat VoIP hívást ebben a böngészőben.",
+    "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",
@@ -292,13 +292,13 @@
     "You seem to be in a call, are you sure you want to quit?": "Úgy tűnik hívásban vagy, biztosan kilépsz?",
     "You seem to be uploading files, are you sure you want to quit?": "Úgy tűnik fájlokat töltesz fel, biztosan kilépsz?",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Nem leszel képes visszavonni ezt a változtatást mivel a felhasználót ugyanarra a szintre emeled amin te vagy.",
-    "Sun": "v",
-    "Mon": "h",
-    "Tue": "k",
-    "Wed": "sze",
-    "Thu": "cs",
-    "Fri": "p",
-    "Sat": "szo",
+    "Sun": "Vas",
+    "Mon": "Hé",
+    "Tue": "Ke",
+    "Wed": "Sze",
+    "Thu": "Csü",
+    "Fri": "Pé",
+    "Sat": "Szo",
     "Jan": "jan.",
     "Feb": "feb.",
     "Mar": "már.",
@@ -330,7 +330,7 @@
     "Start automatically after system login": "Rendszerindításkor automatikus elindítás",
     "Analytics": "Analitika",
     "Options": "Opciók",
-    "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s személytelen analitikai adatokat gyűjt annak érdekében, hogy fejleszteni tudjuk az alkalmazást.",
+    "%(brand)s collects anonymous analytics to allow us to improve the application.": "A(z) %(brand)s névtelen analitikai adatokat gyűjt annak érdekében, hogy fejleszteni tudjuk az alkalmazást.",
     "Passphrases must match": "A jelmondatoknak meg kell egyezniük",
     "Passphrase must not be empty": "A jelmondat nem lehet üres",
     "Export room keys": "Szoba kulcsok mentése",
@@ -339,7 +339,7 @@
     "File to import": "Fájl betöltése",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "A kimentett fájl jelmondattal van védve. A kibontáshoz add meg a jelmondatot.",
     "You must join the room to see its files": "Ahhoz hogy lásd a fájlokat be kell lépned a szobába",
-    "Reject all %(invitedRooms)s invites": "Minden %(invitedRooms)s meghívó elutasítása",
+    "Reject all %(invitedRooms)s invites": "Mind a(z) %(invitedRooms)s meghívó elutasítása",
     "Failed to invite": "Meghívás sikertelen",
     "Failed to invite the following users to the %(roomName)s room:": "Az alábbi felhasználókat nem sikerült meghívni a(z) %(roomName)s szobába:",
     "Confirm Removal": "Törlés megerősítése",
@@ -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:",
@@ -443,8 +443,8 @@
     "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",
-    "Try using one of the following valid address types: %(validTypesList)s.": "Próbáld meg valamelyik  érvényes cím típust: %(validTypesList)s.",
+    "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",
     "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?",
@@ -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",
@@ -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ó",
@@ -626,12 +626,12 @@
     "Learn more about how we use analytics.": "Tudj meg többet arról hogyan használjuk az analitikai adatokat.",
     "The information being sent to us to help make %(brand)s better includes:": "Az alábbi információk kerülnek elküldésre, amivel jobbá tehetjük a %(brand)sot:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Minden azonosításra alkalmas adat, mint a szoba-, felhasználó- vagy csoportazonosítók, eltávolításra kerülnek, mielőtt elküldenénk a kiszolgálónak.",
-    "The platform you're on": "A platform amit használsz",
+    "The platform you're on": "A platform amit használ",
     "The version of %(brand)s": "%(brand)s verziója",
     "Your language of choice": "A használt nyelv",
-    "Which officially provided instance you are using, if any": "Melyik hivatalosan nyújtott példányt használod",
-    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Használod-e a Richtext módot a szerkesztőben vagy nem",
-    "Your homeserver's URL": "A Matrix kiszolgálód URL-je",
+    "Which officially provided instance you are using, if any": "Melyik hivatalos példányt használja",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Használja-e a Richtext módot a szerkesztőben vagy nem",
+    "Your homeserver's URL": "A ön Matrix kiszolgálója URL-je",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(fullYear)s. %(monthName)s %(day)s, %(weekDayName)s",
     "This room is not public. You will not be able to rejoin without an invite.": "Ez a szoba nem nyilvános. Kilépés után csak újabb meghívóval tudsz újra belépni a szobába.",
     "Community IDs cannot be empty.": "A közösségi azonosító nem lehet üres.",
@@ -645,7 +645,7 @@
     "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.": "A szűrő beállításához húzd a közösség avatarját a szűrő panel fölé a képernyő bal szélén. A szűrő panelen az avatarra kattintva bármikor leszűrheted azokat a szobákat és embereket akik a megadott közösséghez tartoznak.",
     "Key request sent.": "Kulcs kérés elküldve.",
     "Code": "Kód",
-    "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.": "Ha a GitHubon keresztül küldted be a hibát, a hibakeresési napló segíthet nekünk a javításban. A napló felhasználási adatokat tartalmaz mint a felhasználói neved, az általad meglátogatott szobák vagy csoportok azonosítóját vagy alternatív nevét és mások felhasználói nevét. De nem tartalmazzák az üzeneteket.",
+    "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.": "Ha a GitHubon keresztül küldted be a hibát, a hibakeresési napló segíthet nekünk a javításban. A napló felhasználási adatokat tartalmaz, mint például a felhasználói neved, az általad meglátogatott szobák vagy csoportok azonosítóját vagy alternatív nevét és mások felhasználói nevét. De nem tartalmazzák az üzeneteket.",
     "Submit debug logs": "Hibakeresési napló küldése",
     "Opens the Developer Tools dialog": "Megnyitja a fejlesztői eszközök ablakát",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "%(displayName)s (%(userName)s) az alábbi időpontban látta: %(dateTime)s",
@@ -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",
@@ -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)",
@@ -784,9 +784,9 @@
     "Checking for an update...": "Frissítés keresése...",
     "Missing roomId.": "Hiányzó szobaazonosító.",
     "Popout widget": "Kiugró kisalkalmazás",
-    "Every page you use in the app": "Minden oldal, amit az alkalmazásban használsz",
+    "Every page you use in the app": "Minden oldal, amit az alkalmazásban használ",
     "e.g. <CurrentPageURL>": "pl.: <CurrentPageURL>",
-    "Your device resolution": "Eszközöd felbontása",
+    "Your device resolution": "Eszköz felbontása",
     "Always show encryption icons": "Titkosítási ikon folyamatos megjelenítése",
     "Send Logs": "Naplók küldése",
     "Clear Storage and Sign Out": "Tárhely törlése és kijelentkezés",
@@ -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)",
@@ -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.",
@@ -833,7 +833,7 @@
     "Demote": "Lefokozás",
     "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",
+    "You do not have permission to start a conference call in this room": "Nincs jogosultsága konferencia hívást kezdeményezni ebben a szobában",
     "A call is currently being placed!": "A hívás indítás alatt!",
     "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",
@@ -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",
@@ -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:",
@@ -881,7 +881,7 @@
     "Incompatible Database": "Nem kompatibilis adatbázis",
     "Continue With Encryption Disabled": "Folytatás a titkosítás kikapcsolásával",
     "Sign in with single sign-on": "Bejelentkezés „egyszeri bejelentkezéssel”",
-    "Unable to load! Check your network connectivity and try again.": "A betöltés sikertelen! Ellenőrizd a hálózati kapcsolatot és próbáld újra.",
+    "Unable to load! Check your network connectivity and try again.": "A betöltés sikertelen! Ellenőrizze a hálózati kapcsolatot és próbálja újra.",
     "Delete Backup": "Mentés törlése",
     "Unable to load key backup status": "A mentett kulcsok állapotát nem lehet lekérdezni",
     "Backup version: ": "Mentés verzió: ",
@@ -915,12 +915,12 @@
     "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",
-    "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",
@@ -960,15 +960,15 @@
     "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",
     "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",
-    "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",
+    "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",
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s fejlesztette a szobát.",
@@ -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",
@@ -992,10 +992,10 @@
     "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.",
+    "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",
@@ -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.",
@@ -1069,7 +1069,7 @@
     "Homeserver URL": "Matrixszerver URL",
     "Identity Server URL": "Azonosítási Szerver URL",
     "Free": "Szabad",
-    "Join millions for free on the largest public server": "Milliók kapcsolódnak ingyen a legnagyobb nyilvános szerveren",
+    "Join millions for free on the largest public server": "Csatlakozzon több millió felhasználóhoz ingyen a legnagyobb nyilvános szerveren",
     "Premium": "Prémium",
     "Premium hosting for organisations <a>Learn more</a>": "Prémium üzemeltetés szervezetek részére <a>Tudj meg többet</a>",
     "Other": "Más",
@@ -1082,9 +1082,9 @@
     "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",
+    "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ó megenged feltölteni",
     "Gets or sets the room topic": "Lekérdezi vagy beállítja a szoba témáját",
     "This room has no topic.": "A szobának nincs témája.",
     "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s hozzáférhetővé tette a szobát bárkinek, aki ismeri a linket.",
@@ -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í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",
@@ -1126,7 +1126,7 @@
     "Pizza": "Pizza",
     "Cake": "Sütemény",
     "Heart": "Szív",
-    "Smiley": "Smiley",
+    "Smiley": "Mosoly",
     "Robot": "Robot",
     "Hat": "Kalap",
     "Glasses": "Szemüveg",
@@ -1186,13 +1186,13 @@
     "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",
     "%(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",
@@ -1210,7 +1210,7 @@
     "User %(userId)s is already in the room": "%(userId)s felhasználó már a szobában van",
     "The user must be unbanned before they can be invited.": "A felhasználó kitiltását először vissza kell vonni mielőtt újra meghívható lesz.",
     "<a>Upgrade</a> to your own domain": "<a>Frissíts</a> a saját domain-re",
-    "Accept all %(invitedRooms)s invites": "Minden meghívást elfogad: %(invitedRooms)s",
+    "Accept all %(invitedRooms)s invites": "Mind a(z) %(invitedRooms)s meghívás elfogadása",
     "Change room avatar": "Szoba profilképének megváltoztatása",
     "Change room name": "Szoba nevének megváltoztatása",
     "Change main address for the room": "A szoba elsődleges címének megváltoztatása",
@@ -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>.",
@@ -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.",
@@ -1248,16 +1248,16 @@
     "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.",
     "The homeserver may be unavailable or overloaded.": "A Matrix szerver elérhetetlen vagy túlterhelt.",
     "You have %(count)s unread notifications in a prior version of this room.|other": "%(count)s olvasatlan értesítésed van a régi verziójú szobában.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "%(count)s olvasatlan értesítésed van a régi verziójú szobában.",
-    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Használsz-e „morzsákat” (profilképek a szobalista felett)",
+    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Használ-e „morzsákat” (profilképek a szobalista felett)",
     "Replying With Files": "Válasz fájlokkal",
-    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Egyelőre nem lehet fájllal válaszolni. Szeretnéd feltölteni a fájlt úgy, hogy az nem egy válasz lesz?",
+    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Egyelőre nem lehet fájllal válaszolni. Szeretné feltölteni a fájlt úgy, hogy az nem egy válasz lesz?",
     "The file '%(fileName)s' failed to upload.": "A(z) „%(fileName)s” fájl feltöltése sikertelen.",
     "Rotate counter-clockwise": "Óramutató járásával ellentétesen fordít",
     "Rotate clockwise": "Óramutató járásával megegyező irányba fordí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.",
@@ -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",
@@ -1382,7 +1382,7 @@
     "Changes your avatar in all rooms": "Megváltoztatja a profilképed az összes szobában",
     "Removing…": "Eltávolítás…",
     "Clear all data": "Minden adat törlése",
-    "Your homeserver doesn't seem to support this feature.": "A matrix szervered úgy tűnik nem támogatja ezt a szolgáltatást.",
+    "Your homeserver doesn't seem to support this feature.": "A Matrix szervered úgy tűnik nem támogatja ezt a szolgáltatást.",
     "Resend edit": "Szerkesztés újraküldése",
     "Resend %(unsentCount)s reaction(s)": "%(unsentCount)s reakció újraküldése",
     "Resend removal": "Törlés újraküldése",
@@ -1403,8 +1403,8 @@
     "Service": "Szolgáltatás",
     "Summary": "Összefoglaló",
     "Call failed due to misconfigured server": "A hívás a helytelenül beállított kiszolgáló miatt sikertelen",
-    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Kérd meg a Matrix-kiszolgálód (<code>%(homeserverDomain)s</code>) adminisztrátorát, hogy a hívások megfelelő működéséhez állítson be egy TURN-kiszolgálót.",
-    "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.": "Másik lehetőségként használhatod a <code>turn.matrix.org</code> nyilvános kiszolgálót, de ez nem lesz annyira megbízható, és megosztja az IP-címedet a kiszolgálóval. A Beállításokban állíthatod be.",
+    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Kérje meg a Matrix-kiszolgáló (<code>%(homeserverDomain)s</code>) adminisztrátorát, hogy a hívások megfelelő működéséhez állítson be egy TURN-kiszolgálót.",
+    "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.": "Másik lehetőségként használhatja a <code>turn.matrix.org</code> nyilvános kiszolgálót, de ez nem lesz annyira megbízható, és megosztja az IP-címét a kiszolgálóval. A Beállításokban állíthatja be.",
     "Try using turn.matrix.org": "A turn.matrix.org használatának kipróbálása",
     "Messages": "Üzenetek",
     "Actions": "Műveletek",
@@ -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 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. <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á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.",
@@ -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",
@@ -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",
@@ -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",
@@ -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.",
@@ -1693,7 +1693,7 @@
     "in secret storage": "biztonsági tárolóban",
     "Secret storage public key:": "Biztonsági tároló nyilvános kulcs:",
     "in account data": "fiók adatokban",
-    "Cross-signing": "Eszközök közti aláírás",
+    "Cross-signing": "Eszközök közti hitelesítés",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Figyelmeztetés</b>: Csak biztonságos számítógépről állíts be kulcs mentést.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Ha elfelejtetted a visszaállítási kulcsot <button>állíts be új visszaállítási lehetőséget</button>",
     "Set up with a recovery key": "Beállítás visszaállítási kulccsal",
@@ -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,21 +1790,21 @@
     "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",
     "Channel: %(channelName)s": "Csatorna: %(channelName)s",
     "Show less": "Kevesebbet mutat",
     "Securely cache encrypted messages locally for them to appear in search results, using ": "A titkosított üzenetek kereséséhez azokat biztonságos módon helyileg kell tárolnod, felhasználva: ",
-    " to store messages from ": " üzenetek eltárolásához innen ",
-    "rooms.": "szobák.",
-    "Manage": "Kezel",
-    "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.",
+    " 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á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 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 is bridging messages to the following platforms. <a>Learn more.</a>": "Ez a szoba összeköti az üzeneteket a felsorolt 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>",
     "Bridges": "Hidak",
     "New session": "Új munkamenet",
@@ -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",
@@ -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",
@@ -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",
@@ -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.",
@@ -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",
@@ -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,15 +1912,15 @@
     "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",
     "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)",
@@ -1940,15 +1940,15 @@
     "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Eszközök közti hitelesítési kulcsok törlése végleges. Mindenki akit ezzel hitelesítettél biztonsági figyelmeztetéseket fog látni. Hacsak nem vesztetted el az összes eszközödet amivel eszközök közti hitelesítést tudsz végezni, nem valószínű, hogy ezt szeretnéd tenni.",
     "Clear cross-signing keys": "Eszközök közti hitelesítési kulcsok törlése",
     "Reset cross-signing and secret storage": "Eszközök közti hitelesítés és biztonsági tároló alaphelyzetbe állítása",
-    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Olyan eszközön használod-e a %(brand)sot, ahol az érintés az elsődleges beviteli mód",
-    "Whether you're using %(brand)s as an installed Progressive Web App": "Progresszív webalkalmazásként használod-e a %(brand)sot",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Olyan eszközön használja-e a %(brand)sot, ahol az érintés az elsődleges beviteli mód",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "Progresszív webalkalmazásként használja-e a %(brand)sot",
     "Your user agent": "Felhasználói ügynök",
     "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.": "Az ellenőrizni kívánt munkamenet nem támogatja se a QR kód beolvasást se az emodzsi ellenőrzést, amit a %(brand)s támogat. Próbáld meg egy másik klienssel.",
     "You declined": "Elutasítottad",
     "%(name)s declined": "%(name)s elutasította",
     "Cancelling…": "Megszakítás…",
     "Your homeserver does not support cross-signing.": "A matrix szervered nem támogatja az eszközök közti hitelesítést.",
-    "Homeserver feature support:": "Matrix szerver támogatott szolgáltatások:",
+    "Homeserver feature support:": "Matrix szerver támogatja-e a szolgáltatást:",
     "exists": "létezik",
     "Accepting…": "Elfogadás…",
     "Accepting …": "Elfogadás …",
@@ -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",
@@ -2012,9 +2012,9 @@
     "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.",
-    "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.",
+    "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",
     "Verification cancelled": "Ellenőrzés megszakítva",
     "Compare emoji": "Emodzsik összehasonlítá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",
@@ -2077,19 +2077,19 @@
     "Space": "Szóköz",
     "End": "End",
     "Session backup key:": "Munkamenet másolat kulcs:",
-    "Use Single Sign On to continue": "A folytatáshoz használd az egyszeri bejelentkezést (SSO)",
+    "Use Single Sign On to continue": "A folytatáshoz használja 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…",
@@ -2110,18 +2110,18 @@
     "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",
+    "Liberate your communication": "Kommunikálj szabadon",
     "Send a Direct Message": "Közvetlen üzenet küldése",
-    "Explore Public Rooms": "Nyilvános szobák felderíté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",
     "Confirm adding email": "E-mail hozzáadásának megerősítése",
-    "Click the button below to confirm adding this email address.": "Az e-mail cím hozzáadásának megerősítéséhez kattints a gombra lent.",
+    "Click the button below to confirm adding this email address.": "Az e-mail cím hozzáadásának megerősítéséhez kattintson a gombra lent.",
     "Confirm adding phone number": "Telefonszám hozzáadásának megerősítése",
-    "Click the button below to confirm adding this phone number.": "Az telefonszám hozzáadásának megerősítéséhez kattints a gombra lent.",
-    "Confirm adding this email address by using Single Sign On to prove your identity.": "Erősítsd meg, hogy az egyszeri bejelentkezésnél a személyazonosságod bizonyításaként használt e-mail címet hozzáadod.",
-    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Erősítsd meg, hogy az egyszeri bejelentkezésnél a személyazonosságod bizonyításaként használt telefonszámot hozzáadod.",
+    "Click the button below to confirm adding this phone number.": "Az telefonszám hozzáadásának megerősítéséhez kattintson a gombra lent.",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Erősítse meg, hogy az egyszeri bejelentkezésnél a személyazonossága bizonyításaként használt e-mail címet hozzáadja.",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Erősítse meg, hogy az egyszeri bejelentkezésnél a személyazonossága bizonyításaként használt telefonszámot hozzáadja.",
     "If you cancel now, you won't complete your operation.": "A műveletet nem fejezed be, ha ezt most megszakítod.",
     "Failed to set topic": "A téma beállítása sikertelen",
     "Command failed": "A parancs sikertelen",
@@ -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,9 +2179,9 @@
     "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 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",
@@ -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",
-    "%(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 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> ahhoz, hogy az üzenetekben való keresésekkor a titkosított üzenetek is megjelenhessenek.",
+    "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.",
@@ -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",
@@ -2442,14 +2442,14 @@
     "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.",
     "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",
@@ -2481,10 +2481,10 @@
     "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 levesztenéd a hozzáférést a munkameneteidhez. A kulcsok egy egyedi visszaállítási kulccsal lesznek védve.",
+    "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.",
     "Backup key stored:": "Mentési kulcs tár:",
     "Backup key cached:": "Mentési kulcs gyorsítótár:",
     "Secret storage:": "Biztonsági tároló:",
@@ -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",
@@ -2507,14 +2507,14 @@
     "not found in storage": "a tárban nem található",
     "Widgets": "Kisalkalmazások",
     "Edit widgets, bridges & bots": "Kisalkalmazások, hidak és botok szerkesztése",
-    "Use the <a>Desktop app</a> to see all encrypted files": "Minden titkosított fájl eléréséhez használd az <a>Asztali alkalmazást</a>",
+    "Use the <a>Desktop app</a> to see all encrypted files": "Ahhoz, hogy elérd az összes titkosított fájlt, használd az <a>Asztali alkalmazást</a>",
     "Use the <a>Desktop app</a> to search encrypted messages": "A titkosított üzenetek kereséséhez használd az <a>Asztali alkalmazást</a>",
     "This version of %(brand)s does not support viewing some encrypted files": "%(brand)s ezen verziója nem minden titkosított fájl megjelenítését támogatja",
     "This version of %(brand)s does not support searching encrypted messages": "%(brand)s ezen verziója nem támogatja a keresést a titkosított üzenetekben",
     "Cannot create rooms in this community": "A közösségben nem lehet szobát készíteni",
     "You do not have permission to create rooms in this community.": "A közösségben szoba létrehozásához nincs jogosultságod.",
     "End conference": "Konferenciahívás befejezése",
-    "This will end the conference for everyone. Continue?": "Mindenki számára befejeződik a konferencia. Folytatod?",
+    "This will end the conference for everyone. Continue?": "Mindenki számára befejeződik a konferencia. Folytatja?",
     "Offline encrypted messaging using dehydrated devices": "Kapcsolat nélküli titkosított üzenetküldés tartósított eszközökkel",
     "Ignored attempt to disable encryption": "A titkosítás kikapcsolására tett kísérlet figyelmen kívül lett hagyva",
     "Join the conference at the top of this room": "Csatlakozz a konferenciához a szoba tetején",
@@ -2522,7 +2522,543 @@
     "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"
+    "Remove messages sent by others": "Mások által küldött üzenetek törlése",
+    "Starting microphone...": "Mikrofon bekapcsolása…",
+    "Starting camera...": "Kamera bekapcsolása…",
+    "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 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)",
+    "(their device couldn't start the camera / microphone)": "(az ő eszköze nem tudja a kamerát / mikrofont használni)",
+    "(connection failed)": "(kapcsolódás sikertelen)",
+    "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": "Mozgatás jobbra",
+    "Move left": "Balra mozgat",
+    "Revoke permissions": "Jogosultságok visszavonása",
+    "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",
+    "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",
+    "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",
+    "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é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.": "Á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>.",
+    "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, írja le olyan részletesen, amennyire csak szeretné.",
+    "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",
+    "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",
+    "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",
+    "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 beszélgetés kezdete <displayName/> felhasználóval.",
+    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Csak önök 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",
+    "%(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. 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 – kattintson %(displayName)s 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!",
+    "%(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 ",
+    "Send stickers to this room as you": "Matricák küldése ebbe a szobába saját néven",
+    "Change the avatar of this room": "A szoba képének megváltoztatása",
+    "Change the name of this room": "A szoba nevének megváltoztatása",
+    "Change the topic of your active room": "Az aktív szoba témájának megváltoztatása",
+    "Change the topic of this room": "A szoba témájának megváltoztatása",
+    "Change which room you're viewing": "Az ön által nézett szoba megváltoztatása",
+    "Send stickers into your active room": "Matricák küldése az aktív szobába",
+    "Send stickers into this room": "Matricák küldése ebbe a szobába",
+    "Go to Home View": "Irány a Kezdőképernyő",
+    "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s vagy %(usernamePassword)s",
+    "Continue with %(ssoButtons)s": "Folytatás ezzel: %(ssoButtons)s",
+    "That username already exists, please try another.": "Ez a felhasználói név már létezik, kérlek próbálj ki egy másikat.",
+    "New? <a>Create account</a>": "Új vagy? <a>Készíts egy fiókot</a>",
+    "There was a problem communicating with the homeserver, please try again later.": "A szerverrel való kommunikációval probléma történt, kérlek próbáld újra.",
+    "New here? <a>Create an account</a>": "Új vagy? <a>Készíts egy fiókot</a>",
+    "Got an account? <a>Sign in</a>": "Van már fiókod? <a>Jelentkezz be</a>",
+    "Filter rooms and people": "Szobák és emberek szűrése",
+    "Forgot password?": "Elfelejtetted a jelszót?",
+    "That phone number doesn't look quite right, please check and try again": "Ez a telefonszám nem tűnik teljesen helyesnek, kérlek ellenőrizd újra",
+    "Enter phone number": "Telefonszám megadása",
+    "Enter email address": "E-mail cím megadása",
+    "Open the link in the email to continue registration.": "A regisztráció folytatásához nyisd meg a hivatkozást az e-mailben.",
+    "A confirmation email has been sent to %(emailAddress)s": "Megerősítő e-mail elküldve ide: %(emailAddress)s",
+    "Hold": "Várakoztat",
+    "Resume": "Folytatás",
+    "Decline All": "Mindet elutasít",
+    "Approve": "Engedélyez",
+    "This widget would like to:": "A kisalkalmazás ezeket szeretné:",
+    "Approve widget permissions": "Kisalkalmazás engedélyek elfogadása",
+    "Sign into your homeserver": "Bejelentkezés a matrix szerveredbe",
+    "Specify a homeserver": "Matrix szerver megadása",
+    "Invalid URL": "Érvénytelen URL",
+    "Unable to validate homeserver": "A matrix szervert nem lehet ellenőrizni",
+    "Continuing without email": "Folytatás e-mail cím nélkül",
+    "Reason (optional)": "Ok (opcionális)",
+    "Continue with %(provider)s": "Folytatás ezzel a szolgáltatóval: %(provider)s",
+    "Homeserver": "Matrix kiszolgáló",
+    "Role": "Szerepkör",
+    "Start a new chat": "Új beszélgetés indítása",
+    "%(name)s paused": "%(name)s megállítva",
+    "Return to call": "Visszatérés a híváshoz",
+    "Fill Screen": "Képernyő kitöltése",
+    "Voice Call": "Hanghívás",
+    "Video Call": "Videohívás",
+    "%(peerName)s held the call": "%(peerName)s várakoztatja a hívást",
+    "You held the call <a>Resume</a>": "A hívás várakozik, <a>folytatás</a>",
+    "sends fireworks": "tűzijáték küldése",
+    "Sends the given message with fireworks": "Az üzenet elküldése tűzijátékkal",
+    "sends confetti": "konfetti küldése",
+    "Sends the given message with confetti": "Az üzenet elküldése konfettivel",
+    "Show chat effects": "Beszélgetés effektek megjelenítése",
+    "Use Ctrl + Enter to send a message": "Ctrl + Enter használata az üzenet elküldéséhez",
+    "Use Command + Enter to send a message": "Operációs rendszer billentyű + Enter használata az üzenet küldéséhez",
+    "Render LaTeX maths in messages": "LaTeX matematikai kifejezések megjelenítése az üzenetekben",
+    "See <b>%(msgtype)s</b> messages posted to your active room": "<b>%(msgtype)s</b> üzenetek megjelenítése az aktív szobádban",
+    "See <b>%(msgtype)s</b> messages posted to this room": "<b>%(msgtype)s</b> üzenetek megjelenítése ebben a szobában",
+    "See general files posted to your active room": "Az aktív szobádba küldött fájlok megjelenítése",
+    "See general files posted to this room": "Ebbe a szobába küldött fájlok megjelenítése",
+    "See videos posted to your active room": "Az aktív szobádba küldött videók megjelenítése",
+    "See videos posted to this room": "Ebbe a szobába küldött videók megjelenítése",
+    "See images posted to your active room": "Az aktív szobádba küldött képek megjelenítése",
+    "See images posted to this room": "Ebbe a szobába küldött képek megjelenítése",
+    "See text messages posted to your active room": "Az aktív szobádba küldött szöveges üzenetek megjelenítése",
+    "See text messages posted to this room": "Ebbe a szobába küldött szöveges üzenetek megjelenítése",
+    "See messages posted to your active room": "Az aktív szobádba küldött üzenetek megjelenítése",
+    "See messages posted to this room": "Ebbe a szobába küldött üzenetek megjelenítése",
+    "The <b>%(capability)s</b> capability": "<b>%(capability)s</b> képesség",
+    "See <b>%(eventType)s</b> events posted to your active room": "<b>%(eventType)s</b> események megjelenítése az aktív szobában",
+    "Send <b>%(eventType)s</b> events as you in your active room": "<b>%(eventType)s</b> események küldése a nevedben az aktív szobába",
+    "See <b>%(eventType)s</b> events posted to this room": "<b>%(eventType)s</b> események megjelenítése ebben a szobában",
+    "Send <b>%(eventType)s</b> events as you in this room": "<b>%(eventType)s</b> esemény küldése a nevedben a szobába",
+    "with state key %(stateKey)s": "ezzel a státusz kulccsal: %(stateKey)s",
+    "with an empty state key": "üres státusz kulccsal",
+    "See when anyone posts a sticker to your active room": "Bárki által az aktív szobádba küldött matrica megjelenítése",
+    "See when a sticker is posted in this room": "Matrica küldésének megjelenítése ebben a szobában",
+    "See when the avatar changes in your active room": "Profilkép változás megjelenítése az aktív szobában",
+    "Change the avatar of your active room": "Az aktív szoba profilképének megváltoztatása",
+    "See when the avatar changes in this room": "Profilkép változás megjelenítése ebben a szobában",
+    "See when the name changes in your active room": "Név változásának megjelenítése az aktív szobában",
+    "Change the name of your active room": "Az aktív szoba nevének megváltoztatása",
+    "See when the name changes in this room": "Név változásának megjelenítése ebben a szobában",
+    "See when the topic changes in your active room": "Téma változásának megjelenítése az aktív szobában",
+    "See when the topic changes in this room": "Szoba téma változásának megmutatása",
+    "Remain on your screen while running": "Maradjon a képernyőn ameddig amíg fut",
+    "Remain on your screen when viewing another room, when running": "Maradjon a képernyőn ameddig másik szobát nézel, amíg fut",
+    "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "┬──┬ ノ( ゜-゜ノ) -t tesz a szöveg elejére",
+    "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "(╯°□°）╯︵ ┻━┻ -t tesz a szöveg elejére",
+    "Effects": "Effektek",
+    "You've reached the maximum number of simultaneous calls.": "Elérte az egyidejű hívások maximális számát.",
+    "Too Many Calls": "Túl sok hívás",
+    "No other application is using the webcam": "A webkamerát nem használja másik alkalmazás",
+    "Permission is granted to use the webcam": "A webkamera használatának az engedélye megadva",
+    "A microphone and webcam are plugged in and set up correctly": "A mikrofon és webkamera csatlakoztatva van és megfelelően be van állítva",
+    "Unable to access webcam / microphone": "A webkamerát / mikrofont nem lehet használni",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "A hívás meghiúsult mert a mikrofont nem lehet használni. Ellenőrizze, hogy csatlakoztatva van-e és megfelelően be van állítva.",
+    "Unable to access microphone": "A mikrofont nem lehet használni",
+    "Already have an account? <a>Sign in here</a>": "Van már fiókod? <a>Belépés</a>",
+    "Use email to optionally be discoverable by existing contacts.": "Az e-mail (nem kötelező) megadása segíthet abban, hogy az ismerőseid megtaláljanak Matrix-on.",
+    "Use email or phone to optionally be discoverable by existing contacts.": "Az e-mail, vagy telefonszám használatával a jelenlegi ismerőseid is megtalálhatnak.",
+    "Add an email to be able to reset your password.": "Adj meg egy e-mail címet, hogy vissza tudd állítani a jelszavad.",
+    "Just a heads up, if you don't add an email and forget your password, you could <b>permanently lose access to your account</b>.": "Csak egy figyelmeztetés, ha nem adsz meg e-mail címet, és elfelejted a jelszavad, <b>véglegesen elveszítheted a fiókodhoz való hozzáférést</b>.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Element with an existing Matrix account on a different homeserver.": "Megadhatsz egyéni szervert, amit használni szeretnél, a címének beírásával. Ez lehetővé teszi, hogy, ha a fiókod másik szerveren van, be tudj jelentkezni oda.",
+    "Server Options": "Szerver lehetőségek",
+    "Learn more": "Tudj meg többet",
+    "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "A matrix.org a legnagyobb nyilvános Matrix szerver a világon, és sok felhasználónak megfelelő választás.",
+    "About homeservers": "A Matrix szerverekről",
+    "Use your preferred Matrix homeserver if you have one, or host your own.": "Add meg az általad választott Matrix szerver címét, ha van ilyen, vagy üzemeltess egy sajátot!",
+    "Other homeserver": "Másik Matrix szerver",
+    "Host account on": "Fiók létrehozása itt:",
+    "We call the places where you can host your account ‘homeservers’.": "Matrix szervereknek nevezzük azokat a helyeket, ahol fiókot lehet létrehozni.",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "A hívás sikertelen, mert a webkamera, vagy a mikrofon nem érhető el. Ellenőrizze ezt:",
+    "Decide where your account is hosted": "Döntse el, hol szeretne fiókot létrehozni!",
+    "Send <b>%(msgtype)s</b> messages as you in your active room": "<b>%(msgtype)s</b> üzenet küldése az aktív szobádba saját néven",
+    "Send <b>%(msgtype)s</b> messages as you in this room": "<b>%(msgtype)s</b> üzenet küldése ebbe a szobába saját néven",
+    "Send general files as you in your active room": "Fájlok küldése az aktív szobájába saját néven",
+    "Send general files as you in this room": "Fájlok küldése ebbe a szobába saját néven",
+    "Send videos as you in your active room": "Videók küldése az aktív szobájába saját néven",
+    "Send videos as you in this room": "Videók küldése ebbe a szobába saját néven",
+    "Send images as you in your active room": "Képek küldése az aktív szobájába saját néven",
+    "Send images as you in this room": "Képek küldése ebbe a szobába saját néven",
+    "Send emotes as you in your active room": "Emodzsik küldése az aktív szobájába saját néven",
+    "Send emotes as you in this room": "Emodzsik küldése ebbe a szobába saját néven",
+    "Send text messages as you in your active room": "Szöveges üzenetek küldése az aktív szobájába saját néven",
+    "Send text messages as you in this room": "Szöveges üzenetek küldése ebbe a szobába saját néven",
+    "Send messages as you in your active room": "Üzenetek küldése az aktív szobájába saját néven",
+    "Send messages as you in this room": "Üzenetek küldése ebbe a szobába saját néven",
+    "Send stickers to your active room as you": "Matricák küldése az aktív szobába saját néven",
+    "<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 a közössége oldalához</h1>\n<p>\n    Az új tagnak a közösség bemutatásához vagy fontos \n    <a href=\"foo\">hivatkozások</a> megosztásához a hosszú leírást lehet használni.\n</p>\n<p>\n    Képeket Matrix URL-ekkel lehet hozzáadni: <img src=\"mxc://url\" />\n</p>\n",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "A szövegek megjelenítéséhez a keresésekben biztonságosan kell helyileg tárolni a titkosított üzeneteket, ehhez %(size)s méretben tárolódnak az üzenetek %(rooms)s szobából.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "A szövegek megjelenítéséhez a keresésekben biztonságosan kell helyileg tárolni a titkosított üzeneteket, ehhez %(size)s méretben tárolódnak az üzenetek %(rooms)s szobából.",
+    "%(name)s on hold": "%(name)s hívás tartva",
+    "You held the call <a>Switch</a>": "A hívás várakozik, <a>átkapcsolás</a>",
+    "sends snowfall": "hóesés küldése",
+    "Sends the given message with snowfall": "Az üzenet elküldése hóeséssel",
+    "See emotes posted to your active room": "Az aktív szobájába küldött emodzsik megjelenítése",
+    "See emotes posted to this room": "Ebbe a szobába küldött emodzsik megjelenítése",
+    "You have no visible notifications.": "Nincsenek látható értesítések.",
+    "Transfer": "Átadás",
+    "Failed to transfer call": "A hívás átadása nem sikerült",
+    "A call can only be transferred to a single user.": "Csak egy felhasználónak lehet átadni a hívást.",
+    "There was an error finding this widget.": "A kisalkalmazás keresésekor hiba történt.",
+    "Active Widgets": "Aktív kisalkalmazások",
+    "Open dial pad": "Számlap megnyitása",
+    "Start a Conversation": "Beszélgetés megkezdése",
+    "Dial pad": "Tárcsázó számlap",
+    "There was an error looking up the phone number": "A telefonszám megkeresésekor hiba történt",
+    "Unable to look up phone number": "A telefonszámot nem sikerült megtalálni",
+    "Workspace: <networkLink/>": "Munkaterület: <networkLink/>",
+    "Change which room, message, or user you're viewing": "Azon szoba, üzenet vagy felhasználó megváltoztatása amit éppen néz",
+    "Channel: <channelLink/>": "Csatorna: <channelLink/>",
+    "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "A munkamenet észrevette, hogy a Biztonságos üzenetek Biztonsági Jelmondata és Kulcsa törölve lett.",
+    "A new Security Phrase and key for Secure Messages have been detected.": "A Biztonságos üzenetekhez új Biztonsági Jelmondatot és kulcsot észleltünk.",
+    "Make a copy of your Security Key": "Készítsen másolatot a Biztonsági Kulcsról",
+    "Confirm your Security Phrase": "Biztonsági Jelmondat megerősítése",
+    "Secure your backup with a Security Phrase": "Védje a mentését a Biztonsági Jelmondattal",
+    "Your Security Key is in your <b>Downloads</b> folder.": "A Biztonsági Kulcsa a <b>Letöltések</b> mappában van.",
+    "Your Security Key has been <b>copied to your clipboard</b>, paste it to:": "A Biztonsági Kulcsa <b>a vágólapra lett másolva</b>, illessze be ide:",
+    "Your Security Key": "Biztonsági Kulcsa",
+    "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "A Biztonsági Kulcs egy biztonsági háló - arra az esetre ha elfelejti a Biztonsági Jelmondatot - a titkosított üzenetekhez való hozzáférés visszaállításához.",
+    "Repeat your Security Phrase...": "Ismételje meg a Biztonsági Jelmondatát…",
+    "Please enter your Security Phrase a second time to confirm.": "A megerősítéshez kérjük adja meg a Biztonsági Jelmondatot még egyszer.",
+    "Set up with a Security Key": "Beállítás Biztonsági Kulccsal",
+    "Great! This Security Phrase looks strong enough.": "Nagyszerű! Ez a Biztonsági Jelmondat elég erősnek tűnik.",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "A kulcsait titkosított formában tároljuk a szerverünkön. Helyezze biztonságba a mentését a Biztonsági Jelmondattal.",
+    "Use Security Key": "Használjon Biztonsági Kulcsot",
+    "Use Security Key or Phrase": "Használjon Biztonsági Kulcsot vagy Jelmondatot",
+    "If you've forgotten your Security Key you can <button>set up new recovery options</button>": "Ha elfelejtette a Biztonsági Kulcsot <button>állítson be új visszaállítási lehetőséget</button>",
+    "Access your secure message history and set up secure messaging by entering your Security Key.": "A Biztonsági Kulcs megadásával hozzáférhet a régi biztonságos üzeneteihez és beállíthatja a biztonságos üzenetküldést.",
+    "Not a valid Security Key": "Érvénytelen Biztonsági Kulcs",
+    "This looks like a valid Security Key!": "Ez érvényes Biztonsági Kulcsnak tűnik!",
+    "Enter Security Key": "Biztonsági Kulcs megadása",
+    "If you've forgotten your Security Phrase you can <button1>use your Security Key</button1> or <button2>set up new recovery options</button2>": "Ha elfelejtette a Biztonsági Jelmondatot, használhatja a <button1>Biztonsági Kulcsot</button1> vagy <button2>új Biztonsági paramétereket állíthat be</button2>",
+    "Access your secure message history and set up secure messaging by entering your Security Phrase.": "A Biztonsági Jelmondattal hozzáférhet a régi titkosított üzeneteihez és beállíthatja a biztonságos üzenetküldést.",
+    "Enter Security Phrase": "Biztonsági Jelmondat megadása",
+    "Backup could not be decrypted with this Security Phrase: please verify that you entered the correct Security Phrase.": "A mentést nem lehet visszafejteni ezzel a Biztonsági Jelmondattal: kérjük ellenőrizze, hogy a megfelelő Biztonsági Jelmondatot adta-e meg.",
+    "Incorrect Security Phrase": "Helytelen Biztonsági Jelmondat",
+    "Backup could not be decrypted with this Security Key: please verify that you entered the correct Security Key.": "Ezzel a Biztonsági Kulccsal a mentést nem lehet visszafejteni: kérjük ellenőrizze, hogy a Biztonsági Kulcsot jól adta-e meg.",
+    "Security Key mismatch": "A Biztonsági Kulcsok nem egyeznek",
+    "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "A biztonsági tárolóhoz nem lehet hozzáférni. Kérjük ellenőrizze, hogy jó Biztonsági jelmondatot adott-e meg.",
+    "Invalid Security Key": "Érvénytelen Biztonsági Kulcs",
+    "Wrong Security Key": "Hibás Biztonsági Kulcs",
+    "We recommend you change your password and Security Key in Settings immediately": "Javasoljuk, hogy a jelszavát és a Biztonsági kulcsát mihamarabb változtassa meg a Beállításokban",
+    "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 Security Key.": "Mentse el a titkosítási kulcsokat a fiókadatokkal arra az esetre ha elvesztené a hozzáférést a munkameneteihez. A kulcsok egy egyedi Biztonsági Kulccsal lesznek védve.",
+    "Set my room layout for everyone": "A szoba megjelenésének beállítása mindenki számára",
+    "%(senderName)s has updated the widget layout": "%(senderName)s megváltoztatta a kisalkalmazás megjelenését",
+    "Use Ctrl + F to search": "Kereséshez használja a CTRL + F kombinációt",
+    "Use Command + F to search": "Kereséshez használja a Parancs + F kombinációt",
+    "Use app": "Használja az alkalmazást",
+    "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Element Web kísérleti állapotban van mobiltelefonon. A jobb élmény és a legújabb funkciók használatához használja az alkalmazást.",
+    "Use app for a better experience": "A jobb élmény érdekében használjon alkalmazást",
+    "Converts the DM to a room": "A közvetlen beszélgetésből egy szobát készít",
+    "Converts the room to a DM": "A szobát átalakítja közvetlen beszélgetéshez",
+    "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "A Matrix szerver visszautasította a bejelentkezését. Lehet, hogy valami túl sokáig tartott. Próbálja újra. Ha továbbra is fennáll a probléma, kérjük vegye fel a kapcsolatot a Matrix szerver üzemeltetőjével.",
+    "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "A Matrix szerver elérhetetlen és nem tudta bejelentkeztetni. Próbálja újra. Ha továbbra is fennáll a probléma, kérjük vegye fel a kapcsolatot a Matrix szerver üzemeltetőjével.",
+    "Try again": "Próbálja újra",
+    "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "A böngészőt utasítottuk, hogy jegyezze meg, melyik matrix szervert használta a bejelentkezéshez, de elfelejtette. Navigáljon újra a bejelentkezési oldalra.",
+    "We couldn't log you in": "Sajnos nem tudjuk bejelentkeztetni",
+    "Search (must be enabled)": "Keresés (engedélyezve kell lennie)",
+    "Something went wrong in confirming your identity. Cancel and try again.": "A személyazonosság ellenőrzésénél valami hiba történt. Megszakítás és próbálja újra.",
+    "Remember this": "Emlékezzen erre",
+    "The widget will verify your user ID, but won't be able to perform actions for you:": "A kisalkalmazás ellenőrizni fogja a felhasználói azonosítóját, de az alábbi tevékenységeket nem tudja végrehajtani:",
+    "Allow this widget to verify your identity": "A kisalkalmazás ellenőrizheti a személyazonosságot",
+    "Show stickers button": "Matrica gomb megjelenítése",
+    "Windows": "Ablakok",
+    "Screens": "Képernyők",
+    "Share your screen": "Képernyő megosztása",
+    "Show line numbers in code blocks": "Sorszámok megmutatása a kód blokkban",
+    "Expand code blocks by default": "Kód blokk kibontása alapesetben",
+    "Recently visited rooms": "Nemrég meglátogatott szobák",
+    "Upgrade to pro": "Pro verzióra való áttérés",
+    "Minimize dialog": "Dialógus ablak kicsinyítés",
+    "Maximize dialog": "Dialógus ablak nagyítás",
+    "%(hostSignupBrand)s Setup": "%(hostSignupBrand)s Beállítás",
+    "You should know": "Tudnia kell",
+    "Privacy Policy": "Adatvédelmi szabályok",
+    "Cookie Policy": "Süti szabályzat",
+    "Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.": "Tudjon meg többet innen: <privacyPolicyLink />, <termsOfServiceLink /> és <cookiePolicyLink />.",
+    "Continuing temporarily allows the %(hostSignupBrand)s setup process to access your account to fetch verified email addresses. This data is not stored.": "Folytatva %(hostSignupBrand)s beállítási folyamat ideiglenes hozzáférést kap a fiókadatok elérésére az ellenőrzött e-mail cím megszerzésének érdekében. Ezt az adat nincs elmenetve.",
+    "Failed to connect to your homeserver. Please close this dialog and try again.": "A matrix szerverhez való csatlakozás nem sikerült. Zárja be ezt az ablakot és próbálja újra.",
+    "Abort": "Megszakítás",
+    "Are you sure you wish to abort creation of the host? The process cannot be continued.": "Biztos benne, hogy meg kívánja szakítani a gazdagép létrehozásának a folyamatát? A folyamat nem folytatható.",
+    "Confirm abort of host creation": "Erősítse meg a gazdagép készítés megszakítását"
 }
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 83adb8c173..2764863e77 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.",
@@ -805,7 +805,7 @@
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Per continuare a usare l'homeserver %(homeserverDomain)s devi leggere e accettare i nostri termini e condizioni.",
     "Review terms and conditions": "Leggi i termini e condizioni",
     "Muted Users": "Utenti silenziati",
-    "Message Pinning": "Messaggi appuntati",
+    "Message Pinning": "Ancoraggio messaggi",
     "Mirror local video feed": "Feed video dai ripetitori locali",
     "Replying": "Rispondere",
     "Popout widget": "Oggetto a comparsa",
@@ -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",
@@ -2523,5 +2523,547 @@
     "Video conference started by %(senderName)s": "Conferenza video iniziata da %(senderName)s",
     "End conference": "Termina conferenza",
     "This will end the conference for everyone. Continue?": "Verrà terminata la conferenza per tutti. Continuare?",
-    "Ignored attempt to disable encryption": "Tentativo di disattivare la crittografia ignorato"
+    "Ignored attempt to disable encryption": "Tentativo di disattivare la crittografia ignorato",
+    "Failed to save your profile": "Salvataggio del profilo fallito",
+    "The operation could not be completed": "Impossibile completare l'operazione",
+    "Remove messages sent by others": "Rimuovi i messaggi inviati dagli altri",
+    "Calling...": "Chiamata in corso...",
+    "Call connecting...": "In connessione...",
+    "Starting camera...": "Avvio fotocamera...",
+    "Starting microphone...": "Avvio microfono...",
+    "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Tutti i server sono banditi dalla partecipazione! Questa stanza non può più essere usata.",
+    "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s ha cambiato le ACL del server per questa stanza.",
+    "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s ha impostato le ACL del server per questa stanza.",
+    "%(senderName)s declined the call.": "%(senderName)s ha rifiutato la chiamata.",
+    "(an error occurred)": "(si è verificato un errore)",
+    "(their device couldn't start the camera / microphone)": "(il suo dispositivo non ha potuto avviare la fotocamera / il microfono)",
+    "(connection failed)": "(connessione fallita)",
+    "The call could not be established": "Impossibile stabilire la chiamata",
+    "The other party declined the call.": "Il destinatario ha rifiutato la chiamata.",
+    "Call Declined": "Chiamata rifiutata",
+    "Offline encrypted messaging using dehydrated devices": "Messaggistica offline criptata usando dispositivi \"disidratati\"",
+    "Move right": "Sposta a destra",
+    "Move left": "Sposta a sinistra",
+    "Revoke permissions": "Revoca autorizzazioni",
+    "Unpin a widget to view it in this panel": "Sblocca un widget per vederlo in questo pannello",
+    "You can only pin up to %(count)s widgets|other": "Puoi ancorare al massimo %(count)s widget",
+    "Show Widgets": "Mostra i widget",
+    "Hide Widgets": "Nascondi i widget",
+    "The call was answered on another device.": "La chiamata è stata accettata su un altro dispositivo.",
+    "Answered Elsewhere": "Risposto altrove",
+    "Data on this screen is shared with %(widgetDomain)s": "I dati in questa schermata vengono condivisi con %(widgetDomain)s",
+    "Send feedback": "Invia feedback",
+    "PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> to help us track down the problem.": "CONSIGLIO: se segnali un errore, invia <debugLogsLink>i log di debug</debugLogsLink> per aiutarci ad individuare il problema.",
+    "Please view <existingIssuesLink>existing bugs on Github</existingIssuesLink> first. No match? <newIssueLink>Start a new one</newIssueLink>.": "Prima controlla <existingIssuesLink>gli errori esistenti su Github</existingIssuesLink>. Non l'hai trovato? <newIssueLink>Apri una segnalazione</newIssueLink>.",
+    "Report a bug": "Segnala un errore",
+    "There are two ways you can provide feedback and help us improve %(brand)s.": "Ci sono due modi per fornire un feedback ed aiutarci a migliorare %(brand)s.",
+    "Comment": "Commento",
+    "Add comment": "Aggiungi commento",
+    "Please go into as much detail as you like, so we can track down the problem.": "Cerca di aggiungere più dettagli possibile, in modo che possiamo individuare il problema.",
+    "Tell us below how you feel about %(brand)s so far.": "Dicci qua sotto come ti sembra %(brand)s finora.",
+    "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",
+    "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",
+    "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",
+    "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.",
+    "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",
+    "Go to Home View": "Vai alla vista home",
+    "<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 per la pagina della tua comunità</h1>\n<p>\n    Usa la descrizione estesa per introdurre i nuovi membri alla comunità, o distribuisci\n    alcuni <a href=\"foo\">link</a> importanti\n</p>\n<p>\n    Puoi anche aggiungere immagini con gli URL Matrix <img src=\"mxc://url\" />\n</p>\n",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Salva in cache i messaggi cifrati localmente in modo che appaiano nei risultati di ricerca, usando %(size)s per salvarli da %(rooms)s stanza.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Salva in cache i messaggi cifrati localmente in modo che appaiano nei risultati di ricerca, usando %(size)s per salvarli da %(rooms)s stanze.",
+    "See text messages posted to your active room": "Vedi messaggi di testo inviati alla tua stanza attiva",
+    "See text messages posted to this room": "Vedi messaggi di testo inviati a questa stanza",
+    "Send text messages as you in your active room": "Invia messaggi di testo a tuo nome nella tua stanza attiva",
+    "Send text messages as you in this room": "Invia messaggi di testo a tuo nome in questa stanza",
+    "See messages posted to your active room": "Vedi messaggi inviati alla tua stanza attiva",
+    "See messages posted to this room": "Vedi messaggi inviati a questa stanza",
+    "Send messages as you in your active room": "Invia messaggi a tuo nome nella tua stanza attiva",
+    "Send messages as you in this room": "Invia messaggi a tuo nome in questa stanza",
+    "The <b>%(capability)s</b> capability": "La capacità <b>%(capability)s</b>",
+    "See <b>%(eventType)s</b> events posted to your active room": "Vedi eventi <b>%(eventType)s</b> inviati alla tua stanza attiva",
+    "Send <b>%(eventType)s</b> events as you in your active room": "Invia eventi <b>%(eventType)s</b> a tuo nome nella tua stanza attiva",
+    "See <b>%(eventType)s</b> events posted to this room": "Vedi eventi <b>%(eventType)s</b> inviati a questa stanza",
+    "Send <b>%(eventType)s</b> events as you in this room": "Invia eventi <b>%(eventType)s</b> a tuo nome in questa stanza",
+    "with state key %(stateKey)s": "con la chiave di stato %(stateKey)s",
+    "with an empty state key": "con una chiave di stato vuota",
+    "See when anyone posts a sticker to your active room": "Vedi quando qualcuno invia un adesivo alla tua stanza attiva",
+    "Send stickers to this room as you": "Invia adesivi a questa stanza a tuo nome",
+    "Send stickers to your active room as you": "Invia adesivi alla tua stanza attiva a tuo nome",
+    "See when a sticker is posted in this room": "Vedi quando viene inviato un adesivo in questa stanza",
+    "See when the avatar changes in your active room": "Vedi quando l'avatar cambia nella tua stanza attiva",
+    "Change the avatar of your active room": "Cambia l'avatar della tua stanza attiva",
+    "See when the avatar changes in this room": "Vedi quando l'avatar cambia in questa stanza",
+    "Change the avatar of this room": "Cambia l'avatar di questa stanza",
+    "See when the name changes in your active room": "Vedi quando il nome cambia nella tua stanza attiva",
+    "Change the name of your active room": "Cambia il nome della tua stanza attiva",
+    "See when the name changes in this room": "Vedi quando il nome cambia in questa stanza",
+    "Change the name of this room": "Cambia il nome di questa stanza",
+    "See when the topic changes in your active room": "Vedi quando l'argomento cambia nella tua stanza attiva",
+    "Change the topic of your active room": "Cambia l'argomento della tua stanza attiva",
+    "See when the topic changes in this room": "Vedi quando l'argomento cambia in questa stanza",
+    "Change the topic of this room": "Cambia l'argomento di questa stanza",
+    "Change which room you're viewing": "Cambia quale stanza stai vedendo",
+    "Send stickers into your active room": "Invia adesivi nella tua stanza attiva",
+    "Send stickers into this room": "Invia adesivi in questa stanza",
+    "Remain on your screen while running": "Resta sul tuo schermo mentre in esecuzione",
+    "Remain on your screen when viewing another room, when running": "Resta sul tuo schermo quando vedi un'altra stanza, quando in esecuzione",
+    "No other application is using the webcam": "Nessun'altra applicazione sta usando la webcam",
+    "Permission is granted to use the webcam": "Permesso concesso per usare la webcam",
+    "A microphone and webcam are plugged in and set up correctly": "Un microfono e una webcam siano collegati e configurati correttamente",
+    "Unable to access webcam / microphone": "Impossibile accedere alla webcam / microfono",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "Chiamata fallita perchè la webcam o il microfono non sono accessibili. Controlla che:",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Chiamata fallita perchè il microfono non è accessibile. Controlla che ci sia un microfono collegato e configurato correttamente.",
+    "Unable to access microphone": "Impossibile accedere al microfono",
+    "Decide where your account is hosted": "Decidi dove ospitare il tuo account",
+    "Host account on": "Ospita account su",
+    "Already have an account? <a>Sign in here</a>": "Hai già un account? <a>Accedi qui</a>",
+    "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s o %(usernamePassword)s",
+    "Continue with %(ssoButtons)s": "Continua con %(ssoButtons)s",
+    "That username already exists, please try another.": "Quel nome utente esiste già, provane un altro.",
+    "New? <a>Create account</a>": "Prima volta? <a>Crea un account</a>",
+    "There was a problem communicating with the homeserver, please try again later.": "C'è stato un problema nella comunicazione con l'homeserver, riprova più tardi.",
+    "New here? <a>Create an account</a>": "Prima volta qui? <a>Crea un account</a>",
+    "Got an account? <a>Sign in</a>": "Hai un account? <a>Accedi</a>",
+    "Use email to optionally be discoverable by existing contacts.": "Usa l'email per essere facoltativamente trovabile dai contatti esistenti.",
+    "Use email or phone to optionally be discoverable by existing contacts.": "Usa l'email o il telefono per essere facoltativamente trovabile dai contatti esistenti.",
+    "Add an email to be able to reset your password.": "Aggiungi un'email per poter reimpostare la password.",
+    "Forgot password?": "Hai dimenticato la password?",
+    "That phone number doesn't look quite right, please check and try again": "Quel numero di telefono non sembra corretto, controlla e riprova",
+    "Enter phone number": "Inserisci numero di telefono",
+    "Enter email address": "Inserisci indirizzo email",
+    "Decline All": "Rifiuta tutti",
+    "Approve widget permissions": "Approva permessi del widget",
+    "Approve": "Approva",
+    "This widget would like to:": "Il widget vorrebbe:",
+    "About homeservers": "Riguardo gli homeserver",
+    "Learn more": "Maggiori informazioni",
+    "Use your preferred Matrix homeserver if you have one, or host your own.": "Usa il tuo homeserver Matrix preferito se ne hai uno, o ospitane uno tuo.",
+    "Other homeserver": "Altro homeserver",
+    "We call the places where you can host your account ‘homeservers’.": "Chiamiamo \"homeserver\" i posti dove puoi ospitare il tuo account.",
+    "Sign into your homeserver": "Accedi al tuo homeserver",
+    "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "Matrix.org è il più grande homeserver pubblico del mondo, quindi è un buon posto per molti.",
+    "Specify a homeserver": "Specifica un homeserver",
+    "Invalid URL": "URL non valido",
+    "Unable to validate homeserver": "Impossibile validare l'homeserver",
+    "Just a heads up, if you don't add an email and forget your password, you could <b>permanently lose access to your account</b>.": "Solo un avviso, se non aggiungi un'email e dimentichi la password, potresti <b>perdere permanentemente l'accesso al tuo account</b>.",
+    "Continuing without email": "Continuando senza email",
+    "Reason (optional)": "Motivo (facoltativo)",
+    "Continue with %(provider)s": "Continua con %(provider)s",
+    "Homeserver": "Homeserver",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Element with an existing Matrix account on a different homeserver.": "Puoi usare le opzioni di server personalizzato per accedere ad altri server Matrix specificando un URL homeserver diverso. Ciò ti permette di usare Element con un account Matrix esistente su un homeserver differente.",
+    "Server Options": "Opzioni server",
+    "Return to call": "Torna alla chiamata",
+    "Fill Screen": "Riempi schermo",
+    "Voice Call": "Telefonata",
+    "Video Call": "Videochiamata",
+    "sends confetti": "invia coriandoli",
+    "Sends the given message with confetti": "Invia il messaggio in questione con coriandoli",
+    "Show chat effects": "Mostra effetti chat",
+    "Use Ctrl + Enter to send a message": "Usa Ctrl + Invio per inviare un messaggio",
+    "Use Command + Enter to send a message": "Usa Comando + Invio per inviare un messaggio",
+    "Render LaTeX maths in messages": "Renderizza matematica LaTeX nei messaggi",
+    "See <b>%(msgtype)s</b> messages posted to your active room": "Vedi messaggi <b>%(msgtype)s</b> inviati alla tua stanza attiva",
+    "See <b>%(msgtype)s</b> messages posted to this room": "Vedi messaggi <b>%(msgtype)s</b> inviati a questa stanza",
+    "Send <b>%(msgtype)s</b> messages as you in your active room": "Invia messaggi <b>%(msgtype)s</b> a tuo nome nella tua stanza attiva",
+    "Send <b>%(msgtype)s</b> messages as you in this room": "Invia messaggi <b>%(msgtype)s</b> a tuo nome in questa stanza",
+    "See general files posted to your active room": "Vedi file generici inviati alla tua stanza attiva",
+    "See general files posted to this room": "Vedi file generici inviati a questa stanza",
+    "Send general files as you in your active room": "Invia file generici a tuo nome nella tua stanza attiva",
+    "Send general files as you in this room": "Invia file generici a tuo nome in questa stanza",
+    "See videos posted to your active room": "Vedi video inviati alla tua stanza attiva",
+    "See videos posted to this room": "Vedi video inviati a questa stanza",
+    "Send videos as you in your active room": "Invia video a tuo nome nella tua stanza attiva",
+    "Send videos as you in this room": "Invia video a tuo nome in questa stanza",
+    "See images posted to your active room": "Vedi immagini inviate alla tua stanza attiva",
+    "See images posted to this room": "Vedi immagini inviate a questa stanza",
+    "Send images as you in your active room": "Invia immagini a tuo nome nella tua stanza attiva",
+    "Send images as you in this room": "Invia immagini a tuo nome in questa stanza",
+    "See emotes posted to your active room": "Vedi emoticon inviate alla tua stanza attiva",
+    "See emotes posted to this room": "Vedi emoticon inviate a questa stanza",
+    "Send emotes as you in your active room": "Invia emoticon a tuo nome nella tua stanza attiva",
+    "Send emotes as you in this room": "Invia emoticon a tuo nome in questa stanza",
+    "Effects": "Effetti",
+    "Hold": "Sospendi",
+    "Resume": "Riprendi",
+    "%(name)s paused": "%(name)s ha messo in pausa",
+    "%(peerName)s held the call": "%(peerName)s ha sospeso la chiamata",
+    "You held the call <a>Resume</a>": "Hai sospeso la chiamata <a>Riprendi</a>",
+    "You've reached the maximum number of simultaneous calls.": "Hai raggiungo il numero massimo di chiamate simultanee.",
+    "Too Many Calls": "Troppe chiamate",
+    "%(name)s on hold": "%(name)s in sospeso",
+    "You held the call <a>Switch</a>": "Hai sospeso la chiamata <a>Cambia</a>",
+    "sends snowfall": "invia nevicata",
+    "Sends the given message with snowfall": "Invia il messaggio con una nevicata",
+    "sends fireworks": "invia fuochi d'artificio",
+    "Sends the given message with fireworks": "Invia il messaggio con fuochi d'artificio",
+    "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "Antepone ┬──┬ ノ( ゜-゜ノ) ad un messaggio di testo",
+    "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "Antepone (╯°□°）╯︵ ┻━┻ ad un messaggio di testo",
+    "You have no visible notifications.": "Non hai notifiche visibili.",
+    "Transfer": "Trasferisci",
+    "Failed to transfer call": "Trasferimento chiamata fallito",
+    "A call can only be transferred to a single user.": "Una chiamata può essere trasferita solo ad un singolo utente.",
+    "There was an error finding this widget.": "Si è verificato un errore trovando i widget.",
+    "Active Widgets": "Widget attivi",
+    "Open dial pad": "Apri tastierino",
+    "Start a Conversation": "Inizia una conversazione",
+    "Dial pad": "Tastierino",
+    "There was an error looking up the phone number": "Si è verificato un errore nella ricerca del numero di telefono",
+    "Unable to look up phone number": "Impossibile cercare il numero di telefono",
+    "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "Questa sessione ha rilevato che la tua password di sicurezza e la chiave per i messaggi sicuri sono state rimosse.",
+    "A new Security Phrase and key for Secure Messages have been detected.": "Sono state rilevate una nuova password di sicurezza e una chiave per i messaggi sicuri.",
+    "Make a copy of your Security Key": "Fai una copia della chiave di sicurezza",
+    "Confirm your Security Phrase": "Conferma password di sicurezza",
+    "Secure your backup with a Security Phrase": "Proteggi il tuo backup con una password di sicurezza",
+    "Your Security Key is in your <b>Downloads</b> folder.": "La chiave di sicurezza è nella tua cartella <b>Scaricati</b>.",
+    "Your Security Key has been <b>copied to your clipboard</b>, paste it to:": "La tua chiave di sicurezza è stata <b>copiata negli appunti</b>, incollala in:",
+    "Your Security Key": "La tua chiave di sicurezza",
+    "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "La chiave di sicurezza è come una rete di salvataggio - puoi usarla per recuperare l'accesso ai messaggi cifrati se dimentichi la password di sicurezza.",
+    "Repeat your Security Phrase...": "Ripeti la password di sicurezza...",
+    "Please enter your Security Phrase a second time to confirm.": "Inserisci di nuovo la password di sicurezza per confermarla.",
+    "Set up with a Security Key": "Imposta con una chiave di sicurezza",
+    "Great! This Security Phrase looks strong enough.": "Ottimo! Questa password di sicurezza sembra abbastanza robusta.",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "Salveremo una copia cifrata delle tue chiavi sul nostro server. Proteggi il tuo backup con una password di sicurezza.",
+    "Use Security Key": "Usa chiave di sicurezza",
+    "Use Security Key or Phrase": "Usa una chiave o password di sicurezza",
+    "If you've forgotten your Security Key you can <button>set up new recovery options</button>": "Se hai dimenticato la tua chiave di sicurezza puoi <button>impostare nuove opzioni di recupero</button>",
+    "Access your secure message history and set up secure messaging by entering your Security Key.": "Accedi alla cronologia sicura dei messaggi e imposta la messaggistica sicura inserendo la tua chiave di sicurezza.",
+    "Not a valid Security Key": "Chiave di sicurezza non valida",
+    "This looks like a valid Security Key!": "Sembra essere una chiave di sicurezza valida!",
+    "Enter Security Key": "Inserisci chaive di sicurezza",
+    "If you've forgotten your Security Phrase you can <button1>use your Security Key</button1> or <button2>set up new recovery options</button2>": "Se hai dimenticato la password di sicurezza puoi <button1>usare la tua chiave di sicurezza</button1> o <button2>impostare nuove opzioni di recupero</button2>",
+    "Access your secure message history and set up secure messaging by entering your Security Phrase.": "Accedi alla cronologia sicura dei messaggi e imposta la messaggistica sicura inserendo la tua password di sicurezza.",
+    "Enter Security Phrase": "Inserisci password di sicurezza",
+    "Backup could not be decrypted with this Security Phrase: please verify that you entered the correct Security Phrase.": "Impossibile decifrare il backup con questa password di sicurezza: verifica di avere inserito la password di sicurezza corretta.",
+    "Incorrect Security Phrase": "Password di sicurezza sbagliata",
+    "Backup could not be decrypted with this Security Key: please verify that you entered the correct Security Key.": "Impossibile decifrare il backup con questa chiave di sicurezza: verifica di avere inserito la chiave di sicurezza corretta.",
+    "Security Key mismatch": "La chiave di sicurezza non corrisponde",
+    "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "Impossibile accedere all'archivio segreto. Verifica di avere inserito la password di sicurezza giusta.",
+    "Invalid Security Key": "Chiave di sicurezza non valida",
+    "Wrong Security Key": "Chiave di sicurezza sbagliata",
+    "We recommend you change your password and Security Key in Settings immediately": "Ti consigliamo di cambiare immediatamente la password e la chiave di sicurezza nelle impostazioni",
+    "Set my room layout for everyone": "Imposta la disposizione della stanza per tutti",
+    "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 Security Key.": "Fai il backup delle tue chiavi di crittografia con i dati del tuo account in caso perdessi l'accesso alle sessioni. Le tue chiavi saranno protette con una chiave di recupero univoca.",
+    "Channel: <channelLink/>": "Canale: <channelLink/>",
+    "Workspace: <networkLink/>": "Spazio di lavoro: <networkLink/>",
+    "Change which room, message, or user you're viewing": "Cambia quale stanza, messaggio o utente stai vedendo",
+    "%(senderName)s has updated the widget layout": "%(senderName)s ha aggiornato la disposizione del widget",
+    "Converts the room to a DM": "Converte la stanza in un MD",
+    "Converts the DM to a room": "Converte il MD in una stanza",
+    "Use Command + F to search": "Usa Command + F per cercare",
+    "Use Ctrl + F to search": "Usa Ctrl + F per cercare",
+    "Use app for a better experience": "Usa l'app per un'esperienza migliore",
+    "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Element Web è sperimentale su mobile. Per un'esperienza migliore e le ultime funzionalità, usa la nostra app nativa gratuita.",
+    "Use app": "Usa l'app",
+    "Search (must be enabled)": "Cerca (deve essere attivato)",
+    "Allow this widget to verify your identity": "Permetti a questo widget di verificare la tua identità",
+    "The widget will verify your user ID, but won't be able to perform actions for you:": "Il widget verificherà il tuo ID utente, ma non sarà un grado di eseguire azioni per te:",
+    "Remember this": "Ricordalo",
+    "Something went wrong in confirming your identity. Cancel and try again.": "Qualcosa è andato storto confermando la tua identità. Annulla e riprova.",
+    "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "Il tuo homeserver ha rifiutato il tuo tentativo di accesso. Potrebbe essere causato da tempi troppo lunghi. Riprova. Se il problema persiste, contatta l'amministratore dell'homeserver.",
+    "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "Il tuo homeserver è irraggiungibile e non ha potuto farti accedere. Riprova. Se il problema persiste, contatta l'amministratore dell'homeserver.",
+    "Try again": "Riprova",
+    "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "Abbiamo chiesto al browser di ricordare quale homeserver usi per farti accedere, ma sfortunatamente l'ha dimenticato. Vai alla pagina di accesso e riprova.",
+    "We couldn't log you in": "Non abbiamo potuto farti accedere",
+    "Upgrade to pro": "Aggiorna a Pro",
+    "Minimize dialog": "Riduci finestra",
+    "Maximize dialog": "Espandi finestra",
+    "%(hostSignupBrand)s Setup": "Configurazione di %(hostSignupBrand)s",
+    "You should know": "Dovresti sapere",
+    "Privacy Policy": "Informativa sulla privacy",
+    "Cookie Policy": "Informativa sui cookie",
+    "Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.": "Maggiori informazioni nella nostra <privacyPolicyLink />, <termsOfServiceLink /> e <cookiePolicyLink />.",
+    "Continuing temporarily allows the %(hostSignupBrand)s setup process to access your account to fetch verified email addresses. This data is not stored.": "Continuando permetti temporaneamente al processo di configurazione di %(hostSignupBrand)s di accedere al tuo account per rilevare gli indirizzi email verificati. Questi dati non vengono memorizzati.",
+    "Failed to connect to your homeserver. Please close this dialog and try again.": "Connessione al tuo homeserver fallita. Chiudi questo messaggio e riprova.",
+    "Abort": "Annulla",
+    "Are you sure you wish to abort creation of the host? The process cannot be continued.": "Vuoi veramente annullare la creazione dell'host? Il processo non può essere continuato.",
+    "Confirm abort of host creation": "Conferma annullamento creazione host",
+    "Windows": "Finestre",
+    "Screens": "Schermi",
+    "Share your screen": "Condividi lo schermo",
+    "Recently visited rooms": "Stanze visitate di recente",
+    "Show line numbers in code blocks": "Mostra numeri di riga nei blocchi di codice",
+    "Expand code blocks by default": "Espandi blocchi di codice in modo predefinito",
+    "Show stickers button": "Mostra pulsante adesivi"
 }
diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index ca1cf0a200..bab9d94935 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -124,7 +124,7 @@
     "Advanced notification settings": "通知の詳細設定",
     "Notification targets": "通知先",
     "You are not receiving desktop notifications": "デスクトップ通知を受け取っていません",
-    "Update": "アップデート",
+    "Update": "更新",
     "Unable to fetch notification target list": "通知先リストを取得できませんでした",
     "Uploaded on %(date)s by %(user)s": "このファイルは %(date)s に %(user)s によりアップロードされました",
     "Send Custom Event": "カスタムイベントを送信する",
@@ -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": "今有効化する",
@@ -162,7 +162,7 @@
     "State Key": "ステータスキー",
     "Quote": "引用",
     "Send logs": "ログを送信する",
-    "Downloading update...": "アップデート、ダウンロードしています…",
+    "Downloading update...": "更新をダウンロードしています...",
     "You have successfully set a password and an email address!": "パスワードとメールアドレスの設定に成功しました！",
     "Failed to send custom event.": "カスタムイベントの送信に失敗しました。",
     "What's new?": "新着",
@@ -189,7 +189,7 @@
     "Unhide Preview": "プレビューを表示する",
     "Event Content": "イベントの内容",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "現在ご使用のブラウザでは、アプリの外見や使い心地が正常でない可能性があります。また、一部または全部の機能がご使用いただけない可能性があります。このままご使用いただけますが、問題が発生した場合は対応しかねます！",
-    "Checking for an update...": "アップデートを確認しています…",
+    "Checking for an update...": "更新を確認しています...",
     "e.g. <CurrentPageURL>": "凡例: <CurrentPageURL>",
     "Your device resolution": "端末の解像度",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "このページに部屋、ユーザー、グループIDなどの識別可能な情報が含まれている場合、そのデータはサーバーに送信される前に削除されます。",
@@ -393,7 +393,7 @@
     "%(senderName)s sent a video": "%(senderName)s が動画を送信しました",
     "%(senderName)s uploaded a file": "%(senderName)s がファイルをアップロードしました",
     "Options": "オプション",
-    "Key request sent.": "キーリクエストが送信されました。",
+    "Key request sent.": "鍵リクエストが送信されました。",
     "Please select the destination room for this message": "このメッセージを送り先部屋を選択してください",
     "Disinvite": "招待拒否",
     "Kick": "追放する",
@@ -497,7 +497,7 @@
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s' は有効なコミュニティIDではありません",
     "Showing flair for these communities:": "次のコミュニティのバッジを表示:",
     "This room is not showing flair for any communities": "この部屋はどんなコミュニティに対してもバッジを表示していません",
-    "New community ID (e.g. +foo:%(localDomain)s)": "新しいコミュニティID (例 +foo:%(localDomain)s)",
+    "New community ID (e.g. +foo:%(localDomain)s)": "新しいコミュニティ ID (例: +foo:%(localDomain)s)",
     "You have <a>enabled</a> URL previews by default.": "デフォルトで URL プレビューが<a>有効</a>です。",
     "You have <a>disabled</a> URL previews by default.": "デフォルトで URL プレビューが<a>無効</a>です。",
     "URL previews are enabled by default for participants in this room.": "この部屋の参加者は、デフォルトで URL プレビューが有効です。",
@@ -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:": "続行するには、パスワードを入力してください:",
@@ -825,8 +825,8 @@
     "Account": "アカウント",
     "Access Token:": "アクセストークン:",
     "click to reveal": "クリックすると表示されます",
-    "Homeserver is": "ホームサーバーは",
-    "Identity Server is": "アイデンティティ・サーバー",
+    "Homeserver is": "ホームサーバー:",
+    "Identity Server is": "ID サーバー:",
     "%(brand)s version:": "%(brand)s のバージョン:",
     "olm version:": "olm のバージョン:",
     "Failed to send email": "メールを送信できませんでした",
@@ -910,7 +910,7 @@
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "ファイル '%(fileName)s' はこのホームサーバのアップロードのサイズ上限を超えています",
     "The server does not support the room version specified.": "このサーバは指定された部屋バージョンに対応していません。",
     "Name or Matrix ID": "名前またはMatrix ID",
-    "Identity server has no terms of service": "IDサーバーは利用規約を持っていません",
+    "Identity server has no terms of service": "ID サーバーは利用規約を持っていません",
     "Messages": "メッセージ",
     "Actions": "アクション",
     "Other": "その他",
@@ -981,7 +981,7 @@
     "Preferences": "環境設定",
     "Security & Privacy": "セキュリティとプライバシー",
     "Room information": "部屋の情報",
-    "Internal room ID:": "内部 部屋ID:",
+    "Internal room ID:": "内部部屋 ID:",
     "Room version": "部屋のバージョン",
     "Room version:": "部屋のバージョン:",
     "Developer options": "開発者オプション",
@@ -1007,7 +1007,7 @@
     "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "他の Matrix ホームサーバーからの参加を禁止する (この設定はあとから変更できません!)",
     "Room Settings - %(roomName)s": "部屋の設定 - %(roomName)s",
     "Explore": "探索",
-    "Filter": "フィルター",
+    "Filter": "検索",
     "Find a room… (e.g. %(exampleRoom)s)": "部屋を探す… (例: %(exampleRoom)s)",
     "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "もしお探しの部屋が見つからない場合、招待してもらうか<a>部屋を作成</a>しましょう。",
     "Enable room encryption": "部屋の暗号化を有効化",
@@ -1317,7 +1317,7 @@
     "Join the discussion": "話し合いに参加",
     "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s はプレビューできません。部屋に参加しますか？",
     "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "他のユーザーがあなたのホームサーバー (%(localDomain)s) を通じてこの部屋を見つけられるよう、アドレスを設定しましょう",
-    "Enter recovery key": "リカバリキーを入力",
+    "Enter recovery key": "リカバリーキーを入力",
     "Verify this login": "このログインを承認",
     "Signing In...": "サインイン中...",
     "If you've joined lots of rooms, this might take a while": "たくさんの部屋に参加している場合は、時間がかかる可能性があります",
@@ -1423,5 +1423,115 @@
     "Upload files": "ファイルのアップロード",
     "Upload all": "全てアップロード",
     "No files visible in this room": "この部屋にファイルはありません",
-    "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.": "チャットでファイルを添付するか、部屋のどこかにドラッグ＆ドロップするとファイルを追加できます。",
+    "Add widgets, bridges & bots": "ウィジェット、ブリッジ、ボットの追加",
+    "Widgets": "ウィジェット",
+    "Cross-signing is ready for use.": "クロス署名の使用準備が完了しています。",
+    "Secure Backup": "セキュアバックアップ",
+    "Set up Secure Backup": "セキュアバックアップのセットアップ",
+    "Restart": "再起動",
+    "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": "バグ報告とフィードバック",
+    "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": "あなたが検証リクエストを送信しました",
+    "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": "暗号化をアップグレード",
+    "Role": "役割",
+    "Send a reply…": "返信を送信する…",
+    "Send a message…": "メッセージを送信する…",
+    "This is the beginning of your direct message history with <displayName/>.": "ここがあなたと <displayName/> のダイレクトメッセージの履歴の先頭です。",
+    "This is the start of <roomName/>.": "ここが <roomName/> の先頭です。",
+    "<a>Add a topic</a> to help people know what it is about.": "<a>トピックを追加する</a>と参加者がこの部屋の目的を理解しやすくなります。",
+    "Topic: %(topic)s (<a>edit</a>)": "トピック: %(topic)s (<a>編集</a>)",
+    "Topic: %(topic)s ": "トピック: %(topic)s ",
+    "%(displayName)s created this room.": "%(displayName)s がこの部屋を作成しました。",
+    "You created this room.": "あなたがこの部屋を作成しました。",
+    "%(creator)s created this DM.": "%(creator)s がこの DM を作成しました。",
+    "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "ここでのメッセージはエンドツーエンド暗号化されています。%(displayName)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.": "この部屋内でのメッセージの送受信はエンドツーエンド暗号化されています。参加者のアバターをタップして、プロフィールから検証を行うことができます。",
+    "Use default": "既定の設定を使用",
+    "e.g. my-room": "例: my-room",
+    "Room address": "ルームアドレス",
+    "New published address (e.g. #alias:server)": "新しい公開アドレス (例: #alias:server)",
+    "No other published addresses yet, add one below": "現在、公開アドレスがありません。以下から追加可能です。",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "検索結果を表示させるために、暗号化されたメッセージをローカルに安全にキャッシュしています。現在、%(rooms)s 件の部屋のメッセージの保存に %(size)s を使用中です。",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "検索結果を表示させるために、暗号化されたメッセージをローカルに安全にキャッシュしています。現在、%(rooms)s 件の部屋のメッセージの保存に %(size)s を使用中です。",
+    "Mentions & Keywords": "メンションとキーワード",
+    "Security Key": "セキュリティキー",
+    "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.": "ID サーバーの使用は任意です。ID サーバーを使用しない場合、あなたは他のユーザーから発見されなくなり、メールアドレスや電話番号で他のユーザーを招待することもできません。",
+    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "インテグレーションマネージャは設定データを受け取り、ユーザーの代わりにウィジェットの変更、部屋への招待の送信、権限レベルの設定を行うことができます。",
+    "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> を使用して、ボット、ウィジェット、ステッカーパックを管理します。",
+    "Integrations not allowed": "インテグレーションは許可されていません",
+    "Integrations are disabled": "インテグレーションが無効になっています",
+    "Manage integrations": "インテグレーションの管理",
+    "Enter a new identity server": "新しい ID サーバーを入力",
+    "Use Ctrl + Enter to send a message": "Ctrl + Enter でメッセージを送信する",
+    "Show chat effects": "チャットエフェクトを表示",
+    "Backup key cached:": "バックアップキーのキャッシュ:",
+    "Backup key stored:": "バックアップキー保存場所:",
+    "Algorithm:": "アルゴリズム:",
+    "Backup version:": "バックアップバージョン:",
+    "Secret storage:": "機密ストレージ:",
+    "Master private key:": "マスター秘密鍵:",
+    "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.": "セッションにアクセスできなくなる場合に備えて、アカウントデータとともに暗号鍵をバックアップします。あなたの鍵は一意のリカバリーキーで保護されます。",
+    "Add a photo, so people can easily spot your room.": "写真を追加して、あなたの部屋を目立たせましょう。",
+    "Add a photo so people know it's you.": "写真を追加して、あなただとわかるようにしましょう。",
+    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "あなたか宛先が誰かを招待しない限りは、この会話は2人だけのものです。",
+    "Password is allowed, but unsafe": "パスワードの要件は満たしていますが、安全ではありません",
+    "Nice, strong password!": "素晴らしい、強固なパスワードです！",
+    "Enter password": "パスワードを入力",
+    "Forgot password?": "パスワードをお忘れですか？",
+    "Enter email address": "メールアドレスを入力",
+    "Enter phone number (required on this homeserver)": "電話番号を入力 (このホームサーバーでは必須)",
+    "Enter phone number": "電話番号を入力",
+    "Show avatars in user and room mentions": "ユーザーと部屋でのメンションにアバターを表示する",
+    "Use Ctrl + F to search": "Ctrl + F で検索する",
+    "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 Security Key.": "セッションにアクセスできなくなる場合に備えて、アカウントデータと暗号鍵をバックアップします。鍵は一意のセキュリティキーで保護されます。",
+    "New version available. <a>Update now.</a>": "新しいバージョンが利用可能です。<a>今すぐ更新</a>",
+    "Sign In": "サインイン",
+    "Create Account": "アカウントの作成",
+    "Explore rooms": "部屋を探す",
+    "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": "バグの報告",
+    "Update %(brand)s": "%(brand)s の更新",
+    "New version of %(brand)s is available": "%(brand)s の新バージョンが利用可能です",
+    "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.": "鍵共有リクエストが送信されました。あなたの他のセッションで鍵共有リクエストをご確認ください。",
+    "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "あなたの他のセッションに<requestLink>暗号鍵を再リクエストする</requestLink>。",
+    "Block anyone not part of %(serverName)s from ever joining this room.": "%(serverName)s 以外からの参加をブロック",
+    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "プライベートな部屋は招待者のみが参加できます。公開された部屋は誰でも検索・参加できます。",
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Matrix 関連のセキュリティ問題を報告するには、Matrix.org の <a>Security Disclosure Policy</a> をご覧ください。"
 }
diff --git a/src/i18n/strings/kab.json b/src/i18n/strings/kab.json
index 3b9b08ca6a..6c282af33c 100644
--- a/src/i18n/strings/kab.json
+++ b/src/i18n/strings/kab.json
@@ -790,7 +790,7 @@
     "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s yekkes tansa-nni tayeḍ %(addresses)s i texxamt-a.",
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s ibeddel tansa-nni tayeḍ n texxamt-a.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s ibeddel tansa tagejdant d tansa-nni tayeḍ i texxamt-a.",
-    "Sends a message as html, without interpreting it as markdown": "Yuzen izen d html war ma isegza-t s tukksa n tecreḍt",
+    "Sends a message as html, without interpreting it as markdown": "Yuzen izen d html war ma isegza-t belli d tukksa n tecreḍt",
     "Deops user with given id": "Aseqdac Deops s usulay i d-yettunefken",
     "Sends the given message coloured as a rainbow": "Yuzen iznan i d-yettunefken yeɣman s yiniten am teslit n Unẓar",
     "Sends the given emote coloured as a rainbow": "Yuzen tanfalit i d-yettunefken yeɣman s yiniten am teslit n Unẓar",
@@ -2283,7 +2283,7 @@
     "Server did not require any authentication": "Aqeddac ur isuter ara akk asesteb",
     "Server did not return valid authentication information.": "Aqeddac ur d-yerri ara talɣut n usesteb tameɣtut.",
     "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)": "Ttxil-k·m ttu akk iznan i yuzneɣ mi ara senseɣ amiḍan-iw (<b>Ɣur-k·m:</b> iseqdacen ara d-yernun ad walin idiwenniyen ur nemmid ara)",
-    "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Senqed aseqdac-a i wakken ad tcerḍeḍ fell-as d uttkil. Iseqdac uttkilen ad ak·am-d-awin lehna meqqren meqqren i uqerru  mi ara tesseqdaceḍ iznan yettwawgelhen seg yixef ɣer yixef.",
+    "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Senqed aseqdac-a i wakken ad tcerḍeḍ fell-as d uttkil. Iseqdac uttkilen ad ak·am-d-awin lehna meqqren meqqren i uqerru mi ara tesseqdaceḍ iznan yettwawgelhen seg yixef ɣer yixef.",
     "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Asenqed n useqdac-a ad yecreḍ ɣef tɣimit-is tettwattkal, yerna ad yecreḍ ula ɣef tɣimit-ik·im tettwattkal i netta·nettat.",
     "Enable 'Manage Integrations' in Settings to do this.": "Rmed 'imsidaf n usefrek' deg yiɣewwaren i tigin n waya.",
     "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "%(brand)s-ik·im ur ak·am yefki ara tisirag i useqdec n umsefrak n umsidef i wakken ad tgeḍ aya. Ttxil-k·m nermes anedbal.",
@@ -2438,5 +2438,316 @@
     "There was an error updating your community. The server is unable to process your request.": "Tella-d tuccḍa deg uleqqem n temɣiwent-ik•im. Aqeddac ur izmir ara ad isesfer asuter.",
     "Update community": "Leqqem tamɣiwent",
     "May include members not in %(communityName)s": "Yezmer ad d-isseddu iɛeggalen ur nelli deg %(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>.": "Bdu adiwenni akked ḥedd s useqdec n yisem-is, isem uffir (am <userId/>) neɣ tansa imayl. Aya ur ten-iecced ara ɣer %(communityName)s. Akked ad d-tnecdeḍ yiwen ɣer %(communityName)s sit ɣef <a>da</a>."
+    "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>.": "Bdu adiwenni akked ḥedd s useqdec n yisem-is, isem uffir (am <userId/>) neɣ tansa imayl. Aya ur ten-iecced ara ɣer %(communityName)s. Akked ad d-tnecdeḍ yiwen ɣer %(communityName)s sit ɣef <a>da</a>.",
+    "not found in storage": "Ulac-it deg uklas",
+    "Failed to save your profile": "Yecceḍ usekles n umaɣnu-ik•im",
+    "The operation could not be completed": "Tamahilt ur tezmir ara ad tettwasmed",
+    "Backup key cached:": "Tasarut n ukles tettwaffer:",
+    "Secret storage:": "Aklas uffir:",
+    "Remove messages sent by others": "Kkes iznan i uznen wiyaḍ",
+    "%(count)s results|one": "%(count)s n ugmuḍ",
+    "Widgets": "Iwiǧiten",
+    "Unpin app": "Serreḥ i usnas",
+    "Pin to room": "Sentu deg texxamt",
+    "You can only pin 2 widgets at a time": "Tzemreḍ ad tsentuḍ 2 kan n yiwiǧiten ɣef tikkelt",
+    "Call Declined": "Yettwagi usiwel",
+    "Video Call": "Asiwel s tvidyut",
+    "Iraq": "ɛiṛaq",
+    "Bosnia": "Busniya",
+    "Mali": "Mali",
+    "Sweden": "Sswid",
+    "Moldova": "Muldavya",
+    "Sint Maarten": "San Maṛtan",
+    "Morocco": "Meṛṛuk",
+    "British Indian Ocean Territory": "Timura n ugaraw ahendi abṛitani",
+    "Slovakia": "Sluvakya",
+    "Macedonia": "Masidunya",
+    "Zimbabwe": "Zimbabwi",
+    "Antigua & Barbuda": "Antigua & Barbuda",
+    "Forgot password?": "Tettuḍ awal uffir?",
+    "Madagascar": "Madagaskaṛ",
+    "Niue": "Niué",
+    "Central African Republic": "Tafriqt Talemmast",
+    "St. Pierre & Miquelon": "San Pyir & Miklun",
+    "Benin": "Binin",
+    "New Zealand": "Ziland Tamaynut",
+    "Russia": "Rrus",
+    "Tajikistan": "Tajikistan",
+    "Bangladesh": "Bengladic",
+    "Iran": "Iṛan",
+    "St. Lucia": "Sant Lusi",
+    "Rwanda": "Ṛwanda",
+    "Laos": "Lawus",
+    "Guinea": "Ginya",
+    "Bulgaria": "Bulgarya",
+    "Cambodia": "Kambuj",
+    "Guatemala": "Guatemala",
+    "Luxembourg": "Luxembourg",
+    "Guernsey": "Guernsey",
+    "Ukraine": "Ukrin",
+    "Cape Verde": "Cap-Vert",
+    "Add comment": "Rnu awennit",
+    "Kiribati": "Kiribati",
+    "French Southern Territories": "Timura n uwezlu n Fṛansa",
+    "Barbados": "Barbade",
+    "Yemen": "Yaman",
+    "Cook Islands": "Tigzirin n Kuk",
+    "Uganda": "Uganda",
+    "Armenia": "Arminya",
+    "Anguilla": "Anguilla",
+    "Christmas Island": "Tigzrin n Kristmaṣ",
+    "Chad": "Čad",
+    "Turkmenistan": "Turkminya",
+    "Somalia": "Ṣumal",
+    "Lesotho": "Lizuṭu",
+    "Austria": "Tutrict",
+    "Burkina Faso": "Burkina Faso",
+    "Malawi": "Malawi",
+    "Philippines": "Filippin",
+    "Peru": "Piru",
+    "Nicaragua": "Nikaṛagwa",
+    "Libya": "Libya",
+    "Eritrea": "Iritirya",
+    "Uzbekistan": "Uzbikistan",
+    "Guyana": "Guyane",
+    "Kuwait": "Koweït",
+    "Invalid URL": "Yir URL",
+    "Venezuela": "Vinizwila",
+    "Greenland": "Griland",
+    "Jamaica": "Jamaïque",
+    "Ireland": "Irland",
+    "Brazil": "Brizil",
+    "Haiti": "Hayti",
+    "Lithuania": "Litwanya",
+    "Norway": "Nuṛwij",
+    "Botswana": "Butswana",
+    "Guinea-Bissau": "Ginya bisaw",
+    "Netherlands": "Timura n Wadda",
+    "United Arab Emirates": "Tiglednuwin Taεrabin Yedduklen",
+    "Micronesia": "Mikṛunizya",
+    "Cameroon": "Kamirun",
+    "Return to call": "Uɣal ɣer usiwel",
+    "Curaçao": "Kuṛačaw",
+    "Thailand": "Tayland",
+    "Croatia": "Karwaṣiya",
+    "Liechtenstein": "Lictencṭayn",
+    "Panama": "Panama",
+    "Mauritius": "Île Maurice",
+    "St. Vincent & Grenadines": "San Vansun & grinadin",
+    "Estonia": "Isṭuni",
+    "Timor-Leste": "Timur n usamar",
+    "Tokelau": "Ṭuklu",
+    "Guam": "Guam",
+    "Svalbard & Jan Mayen": "Svalbard & Ǧan Mayen",
+    "Uruguay": "Urugway",
+    "Indonesia": "Indunisya",
+    "Congo - Brazzaville": "Kungu - Brazavil",
+    "Montserrat": "Montserrat",
+    "U.S. Virgin Islands": "Tigzirin n Virǧin n Marikan",
+    "Paraguay": "Paṛagway",
+    "Iceland": "Island",
+    "Falkland Islands": "Tugzirin n fakland",
+    "Norfolk Island": "Tigzirtn n Nuṛfulk",
+    "Réunion": "Tigzirt n Riyunyun",
+    "Côte d’Ivoire": "Côte d’Ivoire",
+    "El Salvador": "Salvador",
+    "Belgium": "Biljik",
+    "Senegal": "Sinigal",
+    "Isle of Man": "Île de Man",
+    "Learn more": "Learn more",
+    "Sierra Leone": "Sirra Lyun",
+    "Seychelles": "Sicil",
+    "Niger": "Nigir",
+    "Andorra": "Andorre",
+    "Bolivia": "Bulivya",
+    "Solomon Islands": "Tigzirin n Salumun",
+    "Namibia": "Namibya",
+    "Germany": "Lalman",
+    "Belize": "Belize",
+    "Gambia": "Gambya",
+    "Portugal": "Puṛtugal",
+    "Burundi": "Burundi",
+    "American Samoa": "Samwa n Marikan",
+    "User settings": "Iɣewwaren n useqdac",
+    "Cocos (Keeling) Islands": "Tigzirin n kuku",
+    "Mauritania": "Muritanya",
+    "Gabon": "Gabun",
+    "Poland": "Pulunya",
+    "Comoros": "Kumuṛ",
+    "Taiwan": "Taiwan",
+    "Egypt": "Maṣer",
+    "Qatar": "Qatar",
+    "North Korea": "Kuriya n ugafa",
+    "Czech Republic": "Tagduda Tačikit",
+    "Saudi Arabia": "Tagelda Tasaɛudit taɛrabt",
+    "São Tomé & Príncipe": "Saw Ṭumi & Prinsip",
+    "Chile": "Cili",
+    "Palestine": "Falasṭin",
+    "Send feedback": "Azen takti-inek·inem",
+    "Australia": "Australie",
+    "Belarus": "Bilarus",
+    "Bhutan": "Buṭan",
+    "Mexico": "Miksik",
+    "Cyprus": "Cipr",
+    "Latvia": "Liṭṭunya",
+    "Zambia": "Ẓambya",
+    "Tonga": "Tatungit",
+    "Singapore": "Singapour",
+    "Effects": "Effets",
+    "Djibouti": "Djibouti",
+    "Montenegro": "Muntinigru",
+    "Hungary": "Hungarya",
+    "Cuba": "Kuba",
+    "Monaco": "Monaco",
+    "Antarctica": "Antartique",
+    "Pitcairn Islands": "Tigzirin n Pitkaṛn",
+    "Malaysia": "Malizya",
+    "Unpin": "Kkes asenteḍ",
+    "Jordan": "Urdun",
+    "Safeguard against losing access to encrypted messages & data": "Seḥbiber iman-ik·im mgal asruḥu n unekcum ɣer yiznann & yisefka yettwawgelhen",
+    "Kosovo": "Kuṣuvu",
+    "South Korea": "Kuriya n uwezlu",
+    "Dominica": "Dominique",
+    "Kenya": "Kinya",
+    "Oman": "ɛuman",
+    "Colombia": "Kulumbya",
+    "Canada": "Kanada",
+    "Aruba": "Aruba",
+    "Japan": "Japun",
+    "Fill Screen": "Ačcar agdil",
+    "Fiji": "Fidji",
+    "Unable to access microphone": "Anekcum ɣer usawaḍ ulamek",
+    "Nigeria": "Nijirya",
+    "St. Barthélemy": "St. Barthélemy",
+    "Guadeloupe": "Guadeloupe",
+    "Trinidad & Tobago": "Ṭrindad & Ṭubagu",
+    "Turkey": "Ṭṭerk",
+    "Macau": "Macao",
+    "Mayotte": "Mayotte",
+    "Costa Rica": "Costa Rica",
+    "Afghanistan": "Afɣanistan",
+    "Angola": "Angula",
+    "Approve": "Qbel",
+    "Heard & McDonald Islands": "Tigzirin n Hird d Tigzirin n MakDunald",
+    "Puerto Rico": "Porto Rico",
+    "Suriname": "Surinam",
+    "Tanzania": "Tanẓanya",
+    "Pakistan": "Pakistan",
+    "Bahamas": "Bahamas",
+    "Myanmar": "Myanmaṛ",
+    "San Marino": "Saint-Marin",
+    "Bahrain": "Bahreïn",
+    "Gibraltar": "Gibraltar",
+    "Sri Lanka": "Sri Lanka",
+    "Nepal": "Nipal",
+    "Nauru": "Nauru",
+    "Vanuatu": "Vanuyatu",
+    "Switzerland": "Sswis",
+    "South Africa": "Tafriqt n Wenẓul",
+    "Move left": "Mutti s azelmaḍ",
+    "Cayman Islands": "Tigzirin n Kayman",
+    "Move right": "Mutti s ayfus",
+    "Romania": "Rumanya",
+    "Western Sahara": "Ṣaḥṛa Tutrimt",
+    "Enter phone number": "Sekcem uṭṭun n tiliɣri",
+    "Sudan": "Sudan",
+    "Honduras": "Hunduṛas",
+    "Hong Kong": "Hong Kong",
+    "Congo - Kinshasa": "Kungu - Kincasa",
+    "Brunei": "Brunei",
+    "Finland": "Finland",
+    "Algeria": "Zzayer",
+    "Role": "Tamlit",
+    "Tunisia": "Tunes",
+    "Equatorial Guinea": "Ginya Tasebgast",
+    "Swaziland": "Swis",
+    "Azerbaijan": "Azerbiǧan",
+    "Faroe Islands": "Tigzirin n Fiṛuwi",
+    "India": "Lhend",
+    "South Georgia & South Sandwich Islands": "Tigzirin n Jyuṛjya n Unzul akked Sandwič n Unẓul",
+    "Israel": "Israyil",
+    "Samoa": "Samoa",
+    "St. Kitts & Nevis": "san Kits & Nivis",
+    "St. Helena": "San Ilina",
+    "Albania": "Albaniya",
+    "Syria": "Surya",
+    "Ghana": "Gana",
+    "Argentina": "Argentine",
+    "Spain": "Spenyul",
+    "Resume": "kemmel",
+    "Jersey": "Jersey",
+    "France": "Fransa",
+    "Kyrgyzstan": "Kirgizistan",
+    "Voice Call": "Asiwel aɣectan",
+    "Caribbean Netherlands": "Timura Karaib n hulund",
+    "China": "Ccinwa",
+    "South Sudan": "Sudan n Wenzul",
+    "Mozambique": "Muzumbik",
+    "Martinique": "Martinique",
+    "Ecuador": "Ikwaduṛ",
+    "Marshall Islands": "Tigzirin Marcal",
+    "Wallis & Futuna": "Wallis & Futuna",
+    "Denmark": "Danmark",
+    "Vatican City": "Vatikan",
+    "Vietnam": "Vyiṭnam",
+    "Malta": "Malte",
+    "Papua New Guinea": "Papwazi-Ginya-Tamaynut",
+    "British Virgin Islands": "Tigzirin n Virǧin n gliz",
+    "Georgia": "Georgia",
+    "Bermuda": "Bermudes",
+    "Dominican Republic": "Duminik",
+    "St. Martin": "San Maṛtan",
+    "Serbia": "Ṣirbya",
+    "Italy": "Ṭelyan",
+    "Lebanon": "Liban",
+    "Slovenia": "Sluvinya",
+    "Northern Mariana Islands": "Tigzirin n Maṛyan n  uwezlu",
+    "Kazakhstan": "Kazaxistan",
+    "French Polynesia": "Pulinizya n Fṛansa",
+    "Bouvet Island": "Tigzirin Buvet",
+    "French Guiana": "Giyan n Fṛansa",
+    "Ethiopia": "Ityupya",
+    "Comment": "Awennit",
+    "Turks & Caicos Islands": "Ṭurk & Tegzirin n Kaykus",
+    "Åland Islands": "Tigzirin n Aland",
+    "Tuvalu": "Tuvalu",
+    "Liberia": "Libiriya",
+    "Maldives": "Maldives",
+    "Greece": "Legrig",
+    "Mongolia": "Mungulya",
+    "Togo": "Ṭugu",
+    "United Kingdom": "Tagelda Yeddukklen",
+    "Palau": "Palaos",
+    "Grenada": "Grenade",
+    "United States": "Iwanaken-Yeddukklen-N-Temrikt",
+    "New Caledonia": "Kaliduni amaynut",
+    "You've reached the maximum number of simultaneous calls.": "Tessawḍeḍ amḍan n yisawalen afellay yemseḍfaren.",
+    "Too Many Calls": "Ddeqs n yisawalen",
+    "No other application is using the webcam": "Ulac asnas-nniḍen i iseqdacen takamiṛat",
+    "Permission is granted to use the webcam": "Tettynefk tsiregt i useqdec takamiṛat",
+    "A microphone and webcam are plugged in and set up correctly": "Asawaḍ d tkamiṛat qqnen yerna ttusewlen akken iwata",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "Asiwel ur yeddi ara aku takamiṛat neɣ asawaḍ ulac anekum ɣur-s. Senqed aya:",
+    "Unable to access webcam / microphone": "Anekcum ɣer tkamiṛat / usawaḍ d awezɣi",
+    "The call was answered on another device.": "Tiririt ɣef usiwel tella-d ɣef yibenk-nniḍen.",
+    "Answered Elsewhere": "Yerra-d seg wadeg-nniḍen",
+    "The call could not be established": "Asiwel ur yeqεid ara",
+    "The other party declined the call.": "Amdan-nniḍen yugi asiwel.",
+    "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s isenfel iɣewwaren n unekcum ɣer texxamt-a.",
+    "Decide where your account is hosted": "Wali anida ara yezdeɣ umiḍan-ik·im",
+    "Host account on": "Sezdeɣ amiḍan deg",
+    "Already have an account? <a>Sign in here</a>": "Tesεiḍ yakan amiḍan? <a>Kcem ɣer da</a>",
+    "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s neɣ %(usernamePassword)s",
+    "Continue with %(ssoButtons)s": "Kemmel s %(ssoButtons)s",
+    "That username already exists, please try another.": "Isem-a n useqdac yella yakan, ttxil-k·m εreḍ wayeḍ.",
+    "Go to Home View": "Uɣal ɣer usebter agejdan",
+    "Send videos as you in this room": "Azen tividyutin deg texxamt-a am wakken d kečč",
+    "See images posted to your active room": "Wali tignatin i d-yeffɣen deg texxamt-a iremden",
+    "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s yesbadu ACLs n uqeddac i texxamt-a.",
+    "Takes the call in the current room off hold": "Uɣal ɣer usiwel ara iteddun deg -texxamt-a",
+    "Places the call in the current room on hold": "Seḥbes asiwel deg texxamt-a i kra n wakud",
+    "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "Yerna ┬──┬ ノ( ゜-゜ノ) ɣer tazwara n yizen",
+    "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "Yerna (╯°□°）╯︵ ┻━┻ ɣer tazwara n yizen",
+    "This will end the conference for everyone. Continue?": "Aya ad yeḥbes asarag i yal yiwen. Kemmel?",
+    "End conference": "Kfu asarag",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Tawuri tecceḍ acku asawaḍ ur yessaweḍ ara ad yekcem. Senqed ma yella usawaḍ yeqqnen yerna yettusbadu akken iwata."
 }
diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index 9bdbb7a6f7..7edb8f0c55 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -8,7 +8,7 @@
     "Which officially provided instance you are using, if any": "Kurią oficialiai teikiamą instanciją naudojate, jei tokių yra",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Ar jūs naudojate Raiškiojo Teksto Redaktoriaus Raiškiojo Teksto režimą ar ne",
     "Your homeserver's URL": "Jūsų serverio URL",
-    "Analytics": "Statistika",
+    "Analytics": "Analitika",
     "The information being sent to us to help make %(brand)s better includes:": "Informacija, siunčiama mums siekiant pagerinti %(brand)s, yra:",
     "Fetching third party location failed": "Nepavyko gauti trečios šalies vietos",
     "I understand the risks and wish to continue": "Suprantu šią riziką ir noriu tęsti",
@@ -28,7 +28,7 @@
     "On": "Įjungta",
     "Changelog": "Keitinių žurnalas",
     "Waiting for response from server": "Laukiama atsakymo iš serverio",
-    "Failed to change password. Is your password correct?": "Nepavyko pakeisti slaptažodžio. Ar Jūsų slaptažodis teisingas?",
+    "Failed to change password. Is your password correct?": "Nepavyko pakeisti slaptažodžio. Ar jūsų slaptažodis teisingas?",
     "Uploaded on %(date)s by %(user)s": "Atnaujinta %(date)s vartotojo %(user)s",
     "OK": "Gerai",
     "Send Custom Event": "Siųsti pasirinktinį įvykį",
@@ -46,26 +46,26 @@
     "Downloading update...": "Atsiunčiamas atnaujinimas...",
     "Messages in one-to-one chats": "Žinutės privačiuose pokalbiuose",
     "Unavailable": "Neprieinamas",
-    "Error saving email notification preferences": "Klaida išsaugant pranešimų el. paštu nuostatas",
+    "Error saving email notification preferences": "Klaida saugojant el. pašto pranešimų nuostatas",
     "View Decrypted Source": "Peržiūrėti iššifruotą šaltinį",
     "Failed to update keywords": "Nepavyko atnaujinti raktažodžių",
     "Notifications on the following keywords follow rules which can’t be displayed here:": "Pranešimai šiems raktažodžiams yra uždrausti taisyklėmis:",
     "Please set a password!": "Prašau įrašykite slaptažodį!",
     "powered by Matrix": "veikia su Matrix",
     "You have successfully set a password!": "Jūs sėkmingai įrašėte slaptažodį!",
-    "Favourite": "Favoritai",
+    "Favourite": "Mėgstamas",
     "All Rooms": "Visi pokalbių kambariai",
     "Explore Room State": "Peržiūrėti kambario būseną",
     "Source URL": "Šaltinio URL adresas",
-    "Messages sent by bot": "Roboto siunčiamos žinutės",
+    "Messages sent by bot": "Boto siųstos žinutės",
     "Cancel": "Atšaukti",
     "Filter results": "Išfiltruoti rezultatus",
     "Members": "Nariai",
     "No update available.": "Nėra galimų atnaujinimų.",
     "Noisy": "Triukšmingas",
-    "Collecting app version information": "Renkama programėlės versijos informacija",
+    "Collecting app version information": "Renkama programos versijos informacija",
     "Keywords": "Raktažodžiai",
-    "Unpin Message": "Atsegti žinutę",
+    "Unpin Message": "Atsegti Žinutę",
     "Enable notifications for this account": "Įjungti pranešimus šiai paskyrai",
     "Remove": "Pašalinti",
     "Invite to this community": "Pakviesti į šią bendruomenę",
@@ -79,9 +79,9 @@
     "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s naudoja daug išplėstinių naršyklės funkcijų, kai kurios iš jų yra neprieinamos arba eksperimentinės jūsų esamoje naršyklėje.",
     "Event sent!": "Įvykis išsiųstas!",
     "Unnamed room": "Kambarys be pavadinimo",
-    "Dismiss": "Atmesti",
+    "Dismiss": "Atsisakyti",
     "Explore Account Data": "Peržiūrėti paskyros duomenis",
-    "Remove from Directory": "Pašalinti iš katalogo",
+    "Remove from Directory": "Pašalinti iš Katalogo",
     "Download this file": "Atsisiųsti šį failą",
     "Saturday": "Šeštadienis",
     "Remember, you can always set an email address in user settings if you change your mind.": "Nepamirškite, kad jei persigalvosite, tai bet kada galite nustatyti el. pašto adresą vartotojo nustatymuose.",
@@ -99,7 +99,7 @@
     "You must specify an event type!": "Privalote nurodyti įvykio tipą!",
     "(HTTP status %(httpStatus)s)": "(HTTP būsena %(httpStatus)s)",
     "Failed to forget room %(errCode)s": "Nepavyko pamiršti kambario %(errCode)s",
-    "What's New": "Kas naujo",
+    "What's New": "Kas Naujo",
     "Wednesday": "Trečiadienis",
     "Send": "Siųsti",
     "Error": "Klaida",
@@ -113,7 +113,7 @@
     "What's new?": "Kas naujo?",
     "Notify me for anything else": "Pranešti man apie visa kita",
     "View Source": "Peržiūrėti šaltinį",
-    "Close": "Užverti",
+    "Close": "Uždaryti",
     "Can't update user notification settings": "Nepavyksta atnaujinti naudotojo pranešimų nustatymų",
     "Notify for all other messages/rooms": "Pranešti apie visas kitas žinutes/pokalbių kambarius",
     "Unable to look up room ID from server": "Nepavyko gauti kambario ID iš serverio",
@@ -124,17 +124,17 @@
     "Forward Message": "Persiųsti žinutę",
     "Back": "Atgal",
     "Reply": "Atsakyti",
-    "Show message in desktop notification": "Rodyti žinutes darbalaukio pranešimuose",
+    "Show message in desktop notification": "Rodyti žinutę darbalaukio pranešime",
     "Reject": "Atmesti",
     "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Atleiskite, jūsų naršyklė <b>negali</b> paleisti %(brand)s.",
     "Quote": "Cituoti",
-    "Messages in group chats": "Žinutės grupės pokalbiuose",
+    "Messages in group chats": "Žinutės grupiniuose pokalbiuose",
     "Yesterday": "Vakar",
     "Error encountered (%(errorDetail)s).": "Susidurta su klaida (%(errorDetail)s).",
     "Low Priority": "Žemo prioriteto",
     "%(brand)s does not know how to join a room on this network": "%(brand)s nežino kaip prisijungti prie kambario šiame tinkle",
     "Set Password": "Nustatyti slaptažodį",
-    "An error occurred whilst saving your email notification preferences.": "Išsaugant pranešimų el. paštu nuostatas, įvyko klaida.",
+    "An error occurred whilst saving your email notification preferences.": "Saugojant jūsų el. pašto pranešimų nuostatas, įvyko klaida.",
     "Unable to join network": "Nepavyko prisijungti prie tinklo",
     "Register": "Registruotis",
     "Off": "Išjungta",
@@ -143,7 +143,7 @@
     "remove %(name)s from the directory.": "pašalinti %(name)s iš katalogo.",
     "You can now return to your account after signing out, and sign in on other devices.": "Po atsijungimo galite grįžti prie savo paskyros ir prisijungti kituose įrenginiuose.",
     "Continue": "Tęsti",
-    "Enable email notifications": "Įjungti el. pašto pranešimus",
+    "Enable email notifications": "Įjungti pranešimus el. paštu",
     "Event Type": "Įvykio tipas",
     "No rooms to show": "Nėra kambarių rodymui",
     "Add rooms to this community": "Įtraukti kambarius į šią bendruomenę",
@@ -151,7 +151,7 @@
     "Failed to change settings": "Nepavyko pakeisti nustatymų",
     "Leave": "Išeiti",
     "View Community": "Peržiūrėti bendruomenes",
-    "Developer Tools": "Programuotojo įrankiai",
+    "Developer Tools": "Programuotojo Įrankiai",
     "Unhide Preview": "Rodyti paržiūrą",
     "Custom Server Options": "Pasirinktiniai Serverio Nustatymai",
     "Event Content": "Įvykio turinys",
@@ -160,13 +160,13 @@
     "Checking for an update...": "Tikrinama ar yra atnaujinimų...",
     "e.g. %(exampleValue)s": "pvz., %(exampleValue)s",
     "e.g. <CurrentPageURL>": "pvz., <CurrentPageURL>",
-    "Your device resolution": "Jūsų įrenginio raiška",
-    "Call Failed": "Skambutis nepavyko",
+    "Your device resolution": "Jūsų įrenginio skyra",
+    "Call Failed": "Skambutis Nepavyko",
     "Unable to capture screen": "Nepavyko nufotografuoti ekrano",
-    "You are already in a call.": "Jūs jau dalyvaujate skambutyje.",
+    "You are already in a call.": "Jūs jau esate skambutyje.",
     "VoIP is unsupported": "VoIP yra nepalaikoma",
-    "Permission Required": "Reikalingas leidimas",
-    "Upload Failed": "Įkėlimas nepavyko",
+    "Permission Required": "Reikalingas Leidimas",
+    "Upload Failed": "Įkėlimas Nepavyko",
     "Sun": "Sek",
     "Mon": "Pir",
     "Tue": "Ant",
@@ -192,35 +192,35 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(fullYear)s %(monthName)s %(day)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(fullYear)s %(monthName)s %(day)s %(time)s",
-    "Who would you like to add to this community?": "Ką norėtumėte pridėti į šią bendruomenę?",
+    "Who would you like to add to this community?": "Ką norėtumėte pridėti prie šios bendruomenės?",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Įspėjimas: bet kuris jūsų pridėtas asmuo bus viešai matomas visiems, žinantiems bendruomenės ID",
-    "Invite to Community": "Pakviesti į bendruomenę",
-    "Which rooms would you like to add to this community?": "Kuriuos kambarius norėtumėte pridėti į šią bendruomenę?",
-    "Add rooms to the community": "Pridėti kambarius į bendruomenę",
-    "Add to community": "Pridėti į bendruomenę",
+    "Invite to Community": "Pakviesti į Bendruomenę",
+    "Which rooms would you like to add to this community?": "Kuriuos kambarius norėtumėte pridėti prie šios bendruomenės?",
+    "Add rooms to the community": "Pridėti kambarius prie bendruomenės",
+    "Add to community": "Pridėti prie bendruomenės",
     "Failed to invite the following users to %(groupId)s:": "Nepavyko pakviesti šių vartotojų į %(groupId)s:",
     "Failed to invite users to community": "Nepavyko pakviesti vartotojų į bendruomenę",
     "Failed to invite users to %(groupId)s": "Nepavyko pakviesti vartotojų į %(groupId)s",
-    "Failed to add the following rooms to %(groupId)s:": "Nepavyko pridėti šių kambarių į %(groupId)s:",
+    "Failed to add the following rooms to %(groupId)s:": "Nepavyko pridėti šių kambarių prie %(groupId)s:",
     "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s neturi leidimo siųsti jums pranešimus - patikrinkite savo naršyklės nustatymus",
     "%(brand)s was not given permission to send notifications - please try again": "%(brand)s nebuvo suteiktas leidimas siųsti pranešimus - bandykite dar kartą",
-    "Unable to enable Notifications": "Nepavyko įjungti pranešimų",
-    "This email address was not found": "Šis el. pašto adresas nebuvo rastas",
+    "Unable to enable Notifications": "Nepavyko įjungti Pranešimų",
+    "This email address was not found": "Šis el. pašto adresas buvo nerastas",
     "Admin": "Administratorius",
     "Failed to invite": "Nepavyko pakviesti",
     "Failed to invite the following users to the %(roomName)s room:": "Nepavyko pakviesti šių vartotojų į kambarį %(roomName)s:",
-    "You need to be logged in.": "Turite būti prisijungę.",
+    "You need to be logged in.": "Jūs turite būti prisijungę.",
     "Unable to create widget.": "Nepavyko sukurti valdiklio.",
     "Failed to send request.": "Nepavyko išsiųsti užklausos.",
-    "This room is not recognised.": "Šis kambarys neatpažintas.",
+    "This room is not recognised.": "Šis kambarys yra neatpažintas.",
     "You are not in this room.": "Jūs nesate šiame kambaryje.",
     "You do not have permission to do that in this room.": "Jūs neturite leidimo tai atlikti šiame kambaryje.",
     "Room %(roomId)s not visible": "Kambarys %(roomId)s nematomas",
     "/ddg is not a command": "/ddg nėra komanda",
     "Changes your display nickname": "Pakeičia jūsų rodomą slapyvardį",
-    "Invites user with given id to current room": "Pakviečia naudotoją su nurodytu id į esamą kambarį",
+    "Invites user with given id to current room": "Pakviečia vartotoją su nurodytu id į dabartinį kambarį",
     "You are now ignoring %(userId)s": "Dabar ignoruojate %(userId)s",
-    "Opens the Developer Tools dialog": "Atveria programuotojo įrankių dialogą",
+    "Opens the Developer Tools dialog": "Atveria Programuotojo Įrankių dialogą",
     "Verified key": "Patvirtintas raktas",
     "Displays action": "Rodo veiksmą",
     "Reason": "Priežastis",
@@ -229,9 +229,9 @@
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s pakeitė savo rodomą vardą į %(displayName)s.",
     "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s nustatė savo rodomą vardą į %(displayName)s.",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s pašalino savo rodomą vardą (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s pašalino savo profilio paveikslą.",
-    "%(senderName)s changed their profile picture.": "%(senderName)s pakeitė savo profilio paveikslą.",
-    "%(senderName)s set a profile picture.": "%(senderName)s nustatė profilio paveikslą.",
+    "%(senderName)s removed their profile picture.": "%(senderName)s pašalino savo profilio paveikslėlį.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s pakeitė savo profilio paveikslėlį.",
+    "%(senderName)s set a profile picture.": "%(senderName)s nustatė profilio paveikslėlį.",
     "%(targetName)s rejected the invitation.": "%(targetName)s atmetė pakvietimą.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s pakeitė temą į \"%(topic)s\".",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s pakeitė kambario pavadinimą į %(roomName)s.",
@@ -240,18 +240,18 @@
     "%(senderName)s answered the call.": "%(senderName)s atsiliepė į skambutį.",
     "(unknown failure: %(reason)s)": "(nežinoma klaida: %(reason)s)",
     "%(senderName)s ended the call.": "%(senderName)s užbaigė skambutį.",
-    "Unnamed Room": "Bevardis kambarys",
+    "Unnamed Room": "Bevardis Kambarys",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Rodyti laiko žymes 12 valandų formatu (pvz. 2:30pm)",
     "Always show message timestamps": "Visada rodyti žinučių laiko žymes",
     "Always show encryption icons": "Visada rodyti šifravimo piktogramas",
-    "Room Colour": "Kambario spalva",
+    "Room Colour": "Kambario Spalva",
     "Decline": "Atmesti",
     "Accept": "Priimti",
     "Incorrect verification code": "Neteisingas patvirtinimo kodas",
     "Submit": "Pateikti",
     "Phone": "Telefonas",
     "Add": "Pridėti",
-    "Failed to upload profile picture!": "Nepavyko įkelti profilio paveikslą!",
+    "Failed to upload profile picture!": "Nepavyko įkelti profilio paveikslėlio!",
     "Upload new:": "Įkelti naują:",
     "No display name": "Nėra rodomo vardo",
     "New passwords don't match": "Nauji slaptažodžiai nesutampa",
@@ -260,7 +260,7 @@
     "Do you want to set an email address?": "Ar norite nustatyti el. pašto adresą?",
     "Current password": "Dabartinis slaptažodis",
     "Password": "Slaptažodis",
-    "New Password": "Naujas slaptažodis",
+    "New Password": "Naujas Slaptažodis",
     "Failed to set display name": "Nepavyko nustatyti rodomo vardo",
     "Cannot add any more widgets": "Nepavyksta pridėti daugiau valdiklių",
     "Add a widget": "Pridėti valdiklį",
@@ -272,7 +272,7 @@
     "%(senderName)s uploaded a file": "%(senderName)s įkėlė failą",
     "Options": "Parinktys",
     "Key request sent.": "Rakto užklausa išsiųsta.",
-    "Failed to mute user": "Nepavyko nutildyti naudotoją",
+    "Failed to mute user": "Nepavyko nutildyti vartotojo",
     "Are you sure?": "Ar tikrai?",
     "Ignore": "Ignoruoti",
     "Invite": "Pakviesti",
@@ -347,7 +347,7 @@
     "Sent messages will be stored until your connection has returned.": "Išsiųstos žinutės bus saugomos tol, kol atsiras ryšys.",
     "Active call": "Aktyvus skambutis",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Čia daugiau nieko nėra! Ar norėtumėte <inviteText>pakviesti kitus</inviteText> ar <nowarnText>išjungti įspėjimą apie tuščią kambarį</nowarnText>?",
-    "You seem to be uploading files, are you sure you want to quit?": "Panašu, kad jūs įkelinėjate failus, ar tikrai norite išeiti?",
+    "You seem to be uploading files, are you sure you want to quit?": "Panašu, kad jūs įkeliate failus, ar tikrai norite išeiti?",
     "You seem to be in a call, are you sure you want to quit?": "Panašu, kad jūs dalyvaujate skambutyje, ar tikrai norite išeiti?",
     "Search failed": "Paieška nepavyko",
     "Server may be unavailable, overloaded, or search timed out :(": "Gali būti, kad serveris neprieinamas, perkrautas arba pasibaigė paieškai skirtas laikas :(",
@@ -417,18 +417,18 @@
     "%(widgetName)s widget modified by %(senderName)s": "%(senderName)s modifikavo %(widgetName)s valdiklį",
     "%(widgetName)s widget added by %(senderName)s": "%(senderName)s pridėjo %(widgetName)s valdiklį",
     "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s pašalino %(widgetName)s valdiklį",
-    "Failure to create room": "Nepavyko sukurti kambarį",
+    "Failure to create room": "Nepavyko sukurti kambario",
     "Server may be unavailable, overloaded, or you hit a bug.": "Serveris gali būti neprieinamas, per daug apkrautas, arba susidūrėte su klaida.",
-    "Autoplay GIFs and videos": "Automatiškai atkurti GIF ir vaizdo įrašus",
+    "Autoplay GIFs and videos": "Automatiškai paleisti GIF ir vaizdo įrašus",
     "This event could not be displayed": "Nepavyko parodyti šio įvykio",
     "Kick": "Išmesti",
-    "Kick this user?": "Išmesti šį naudotoją?",
+    "Kick this user?": "Išmesti šį vartotoją?",
     "Failed to kick": "Nepavyko išmesti",
     "Unban": "Atblokuoti",
     "Ban": "Užblokuoti",
-    "Unban this user?": "Atblokuoti šį naudotoją?",
-    "Ban this user?": "Užblokuoti šį naudotoją?",
-    "Failed to ban user": "Nepavyko užblokuoti naudotoją",
+    "Unban this user?": "Atblokuoti šį vartotoją?",
+    "Ban this user?": "Užblokuoti šį vartotoją?",
+    "Failed to ban user": "Nepavyko užblokuoti vartotojo",
     "Invited": "Pakviestas",
     "Filter room members": "Filtruoti kambario dalyvius",
     "Server unavailable, overloaded, or something else went wrong.": "Serveris neprieinamas, perkrautas arba nutiko kažkas kito.",
@@ -436,8 +436,8 @@
     "%(duration)sm": "%(duration)s min",
     "%(duration)sh": "%(duration)s val",
     "%(duration)sd": "%(duration)s d",
-    "Seen by %(userName)s at %(dateTime)s": "%(userName)s matė ties %(dateTime)s",
-    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "%(displayName)s (%(userName)s) matė ties %(dateTime)s",
+    "Seen by %(userName)s at %(dateTime)s": "%(userName)s matė %(dateTime)s",
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "%(displayName)s (%(userName)s) matė %(dateTime)s",
     "Show these rooms to non-members on the community page and room list?": "Rodyti šiuos kambarius ne nariams bendruomenės puslapyje ir kambarių sąraše?",
     "Kicks user with given id": "Išmeta vartotoją su nurodytu id",
     "Bans user with given id": "Užblokuoja vartotoją su nurodytu id",
@@ -446,7 +446,7 @@
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s išmetė %(targetName)s.",
     "(not supported by this browser)": "(nėra palaikoma šios naršyklės)",
     "(no answer)": "(nėra atsakymo)",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s padarė būsimą kambario istoriją matomą visiems kambario dalyviams, nuo pat jų pakvietimo.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s padarė būsimą kambario istoriją matomą visiems kambario dalyviams, nuo jų pakvietimo momento.",
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s padarė būsimą kambario istoriją matomą visiems kambario dalyviams.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s padarė būsimą kambario istoriją matomą bet kam.",
     "Your browser does not support the required cryptography extensions": "Jūsų naršyklė nepalaiko reikalingų kriptografijos plėtinių",
@@ -456,8 +456,8 @@
     "Incoming voice call from %(name)s": "Įeinantis balso skambutis nuo %(name)s",
     "Incoming video call from %(name)s": "Įeinantis vaizdo skambutis nuo %(name)s",
     "Incoming call from %(name)s": "Įeinantis skambutis nuo %(name)s",
-    "Change Password": "Keisti slaptažodį",
-    "Authentication": "Tapatybės nustatymas",
+    "Change Password": "Keisti Slaptažodį",
+    "Authentication": "Autentifikavimas",
     "The maximum permitted number of widgets have already been added to this room.": "Į šį kambarį jau yra pridėtas didžiausias leidžiamas valdiklių skaičius.",
     "Please select the destination room for this message": "Pasirinkite šiai žinutei paskirties kambarį",
     "Hangup": "Padėti ragelį",
@@ -471,11 +471,11 @@
     "Share room": "Bendrinti kambarį",
     "Usage": "Naudojimas",
     "Searches DuckDuckGo for results": "Atlieka rezultatų paiešką sistemoje DuckDuckGo",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Norėdami tai naudoti, tiesiog palaukite, kol bus įkelti automatiškai užbaigti rezultatai, tuomet pereikite per juos naudodami Tab klavišą.",
+    "To use it, just wait for autocomplete results to load and tab through them.": "Norėdami tai naudoti, tiesiog palaukite, kol bus įkelti automatiškai užbaigti rezultatai, tuomet pereikite per juos naudodami tab klavišą.",
     "%(targetName)s left the room.": "%(targetName)s išėjo iš kambario.",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s pakeitė prisegtas kambario žinutes.",
     "Sorry, your homeserver is too old to participate in this room.": "Atleiskite, jūsų serverio versija yra per sena dalyvauti šiame kambaryje.",
-    "Please contact your homeserver administrator.": "Prašome susisiekti su savo serverio administratoriumi.",
+    "Please contact your homeserver administrator.": "Susisiekite su savo serverio administratoriumi.",
     "Enable inline URL previews by default": "Įjungti URL nuorodų peržiūras kaip numatytasias",
     "Enable URL previews for this room (only affects you)": "Įjungti URL nuorodų peržiūras šiame kambaryje (įtakoja tik jus)",
     "Enable URL previews by default for participants in this room": "Įjungti URL nuorodų peržiūras kaip numatytasias šiame kambaryje esantiems dalyviams",
@@ -486,14 +486,14 @@
     "The conversation continues here.": "Pokalbis tęsiasi čia.",
     "Jump to message": "Pereiti prie žinutės",
     "Favourites": "Mėgstami",
-    "Banned users": "Užblokuoti naudotojai",
+    "Banned users": "Užblokuoti vartotojai",
     "This room is not accessible by remote Matrix servers": "Šis kambarys nėra pasiekiamas nuotoliniams Matrix serveriams",
     "Who can read history?": "Kas gali skaityti istoriją?",
     "Only room administrators will see this warning": "Šį įspėjimą matys tik kambario administratoriai",
-    "You have <a>enabled</a> URL previews by default.": "Jūs esate <a>įjungę</a> URL nuorodų peržiūras kaip numatytasias.",
-    "You have <a>disabled</a> URL previews by default.": "Jūs esate <a>išjungę</a> URL nuorodų peržiūras kaip numatytasias.",
-    "URL previews are enabled by default for participants in this room.": "URL nuorodų peržiūros yra įjungtos kaip numatytasios šio kambario dalyviams.",
-    "URL previews are disabled by default for participants in this room.": "URL nuorodų peržiūros yra išjungtos kaip numatytosios šio kambario dalyviams.",
+    "You have <a>enabled</a> URL previews by default.": "Jūs <a>įjungėte</a> URL nuorodų peržiūras kaip numatytasias.",
+    "You have <a>disabled</a> URL previews by default.": "Jūs <a>išjungėte</a> URL nuorodų peržiūras kaip numatytasias.",
+    "URL previews are enabled by default for participants in this room.": "URL nuorodų peržiūros šio kambario dalyviams yra įjungtos kaip numatytosios.",
+    "URL previews are disabled by default for participants in this room.": "URL nuorodų peržiūros šio kambario dalyviams yra išjungtos kaip numatytosios.",
     "Invalid file%(extra)s": "Neteisingas failas %(extra)s",
     "This room is a continuation of another conversation.": "Šis kambarys yra kito pokalbio pratęsimas.",
     "Click here to see older messages.": "Spustelėkite čia, norėdami matyti senesnes žinutes.",
@@ -532,8 +532,8 @@
     "Incorrect password": "Neteisingas slaptažodis",
     "To continue, please enter your password:": "Norėdami tęsti, įveskite savo slaptažodį:",
     "An error has occurred.": "Įvyko klaida.",
-    "Failed to upgrade room": "Nepavyko atnaujinti kambarį",
-    "The room upgrade could not be completed": "Nepavyko užbaigti kambario naujinimo",
+    "Failed to upgrade room": "Nepavyko atnaujinti kambario",
+    "The room upgrade could not be completed": "Nepavyko užbaigti kambario atnaujinimo",
     "Sign out": "Atsijungti",
     "Send Logs": "Siųsti žurnalus",
     "Refresh": "Įkelti iš naujo",
@@ -544,11 +544,11 @@
     "Missing roomId.": "Trūksta kambario ID.",
     "Leave room": "Išeiti iš kambario",
     "(could not connect media)": "(nepavyko prijungti medijos)",
-    "This homeserver has hit its Monthly Active User limit.": "Šis serveris pasiekė savo mėnesinį aktyvių naudotojų limitą.",
+    "This homeserver has hit its Monthly Active User limit.": "Šis serveris pasiekė savo Mėnesinį Aktyvių Vartotojų limitą.",
     "This homeserver has exceeded one of its resource limits.": "Šis serveris viršijo vieno iš savo išteklių limitą.",
     "Unable to connect to Homeserver. Retrying...": "Nepavyksta prisijungti prie serverio. Bandoma iš naujo...",
     "Enable widget screenshots on supported widgets": "Įjungti valdiklių ekrano kopijas palaikomuose valdikliuose",
-    "Export E2E room keys": "Eksportuoti E2E kambarių raktus",
+    "Export E2E room keys": "Eksportuoti E2E (visapusio šifravimo) kambarių raktus",
     "Last seen": "Paskutinį kartą matytas",
     "Unignore": "Nebeignoruoti",
     "and %(count)s others...|other": "ir %(count)s kitų...",
@@ -578,7 +578,7 @@
     "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)s pasikeitė pseudoportretus %(count)s kartų(-us)",
     "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)s pasikeitė pseudoportretą %(count)s kartų(-us)",
     "And %(count)s more...|other": "Ir dar %(count)s...",
-    "Existing Call": "Esamas skambutis",
+    "Existing Call": "Esamas Skambutis",
     "A call is already in progress!": "Skambutis jau vyksta!",
     "Default": "Numatytas",
     "Restricted": "Apribotas",
@@ -599,7 +599,7 @@
     "User %(user_id)s does not exist": "Vartotojas %(user_id)s neegzistuoja",
     "Unknown server error": "Nežinoma serverio klaida",
     "Avoid sequences": "Venkite sekų",
-    "Avoid recent years": "Venkite paskiausių metų",
+    "Avoid recent years": "Venkite pastarųjų metų",
     "Avoid years that are associated with you": "Venkite su jumis susijusių metų",
     "Avoid dates and years that are associated with you": "Venkite su jumis susijusių metų ir datų",
     "Capitalization doesn't help very much": "Rašymas didžiosiomis raidėmis nelabai padeda",
@@ -611,7 +611,7 @@
     "Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"": "Tokius pasikartojimus kaip \"abcabcabc\" yra tik truputėlį sunkiau atspėti nei \"abc\"",
     "Sequences like abc or 6543 are easy to guess": "Tokias sekas kaip \"abc\" ar \"6543\" yra lengva atspėti",
     "Recent years are easy to guess": "Paskiausius metus yra lengva atspėti",
-    "Dates are often easy to guess": "Datas, dažniausiai, yra lengva atspėti",
+    "Dates are often easy to guess": "Datas dažniausiai yra lengva atspėti",
     "This is a top-10 common password": "Tai yra vienas iš 10 dažniausiai naudojamų slaptažodžių",
     "This is a top-100 common password": "Tai yra vienas iš 100 dažniausiai naudojamų slaptažodžių",
     "This is a very common password": "Tai yra labai dažnai naudojamas slaptažodis",
@@ -624,8 +624,8 @@
     "Avoid repeated words and characters": "Venkite pasikartojančių žodžių ir simbolių",
     "Use a few words, avoid common phrases": "Naudokite keletą žodžių, venkite dažnai naudojamų frazių",
     "No need for symbols, digits, or uppercase letters": "Nereikia simbolių, skaitmenų ar didžiųjų raidžių",
-    "Encrypted messages in group chats": "Šifruotos žinutės grupės pokalbiuose",
-    "Delete Backup": "Ištrinti atsarginę kopiją",
+    "Encrypted messages in group chats": "Šifruotos žinutės grupiniuose pokalbiuose",
+    "Delete Backup": "Ištrinti Atsarginę Kopiją",
     "Backup version: ": "Atsarginės kopijos versija: ",
     "Algorithm: ": "Algoritmas: ",
     "Don't ask again": "Daugiau nebeklausti",
@@ -638,7 +638,7 @@
     "That doesn't look like a valid email address": "Tai nepanašu į teisingą el. pašto adresą",
     "Preparing to send logs": "Ruošiamasi išsiųsti žurnalus",
     "Incompatible Database": "Nesuderinama duomenų bazė",
-    "Deactivate Account": "Deaktyvuoti paskyrą",
+    "Deactivate Account": "Deaktyvuoti Paskyrą",
     "Incompatible local cache": "Nesuderinamas vietinis podėlis",
     "Updating %(brand)s": "Atnaujinama %(brand)s",
     "This doesn't appear to be a valid email address": "Tai nepanašu į teisingą el. pašto adresą",
@@ -661,7 +661,7 @@
     "Public Chat": "Viešas pokalbis",
     "There are no visible files in this room": "Šiame kambaryje nėra matomų failų",
     "Add a Room": "Pridėti kambarį",
-    "Add a User": "Pridėti naudotoją",
+    "Add a User": "Pridėti Vartotoją",
     "Long Description (HTML)": "Ilgasis aprašas (HTML)",
     "Description": "Aprašas",
     "Community %(groupId)s not found": "Bendruomenė %(groupId)s nerasta",
@@ -676,8 +676,8 @@
     "This server does not support authentication with a phone number.": "Šis serveris nepalaiko tapatybės nustatymo telefono numeriu.",
     "Download": "Atsisiųsti",
     "Retry": "Bandyti dar kartą",
-    "Add Email Address": "Pridėti el. pašto adresą",
-    "Add Phone Number": "Pridėti telefono numerį",
+    "Add Email Address": "Pridėti El. Pašto Adresą",
+    "Add Phone Number": "Pridėti Telefono Numerį",
     "Whether or not you're logged in (we don't record your username)": "Ar jūs prisijungę ar ne (mes neįrašome jūsų vartotojo vardo)",
     "Chat with %(brand)s Bot": "Kalbėtis su %(brand)s Botu",
     "Sign In": "Prisijungti",
@@ -687,15 +687,15 @@
     "Sign in to your Matrix account on <underlinedServerName />": "Prisijunkite prie savo paskyros <underlinedServerName /> serveryje",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Ar jūs naudojate 'duonos trupinių' funkciją ar ne (pseudoportretai virš kambarių sąrašo)",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Ten, kur šis puslapis įtraukia identifikuojamą informaciją, kaip kambarys, vartotojas ar grupės ID, tie duomenys yra pašalinami prieš siunčiant į serverį.",
-    "The remote side failed to pick up": "Nuotolinėi pusėi nepavyko atsiliepti",
+    "The remote side failed to pick up": "Nuotolinei pusei nepavyko atsiliepti",
     "Call failed due to misconfigured server": "Skambutis nepavyko dėl neteisingai sukonfigūruoto serverio",
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Paprašykite savo serverio administratoriaus (<code>%(homeserverDomain)s</code>) sukonfiguruoti TURN serverį, kad skambučiai veiktų patikimai.",
     "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.": "Alternatyviai, jūs galite bandyti naudoti viešą serverį <code>turn.matrix.org</code>, bet tai nebus taip patikima, ir tai atskleis jūsų IP adresą šiam serveriui. Jūs taip pat galite tvarkyti tai Nustatymuose.",
-    "Try using turn.matrix.org": "Bandykite naudoti turn.matrix.org",
-    "Call in Progress": "Vykstantis skambutis",
+    "Try using turn.matrix.org": "Bandyti naudojant turn.matrix.org",
+    "Call in Progress": "Vykstantis Skambutis",
     "A call is currently being placed!": "Šiuo metu skambinama!",
-    "Replying With Files": "Atsakyti su failais",
-    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Šiuo metu neįmanoma atsakyti su failu. Ar norite įkelti šį failą neatsakydami?",
+    "Replying With Files": "Atsakyti Su Failais",
+    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Šiuo metu neįmanoma atsakyti su failu. Ar norėtumėte įkelti šį failą neatsakydami?",
     "The file '%(fileName)s' failed to upload.": "Failo '%(fileName)s' nepavyko įkelti.",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Failas '%(fileName)s' viršyja šio serverio įkeliamų failų dydžio limitą",
     "The server does not support the room version specified.": "Serveris nepalaiko nurodytos kambario versijos.",
@@ -703,7 +703,7 @@
     "Name or Matrix ID": "Vardas arba Matrix ID",
     "Identity server has no terms of service": "Tapatybės serveris neturi paslaugų teikimo sąlygų",
     "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.": "Šiam veiksmui reikalinga pasiekti numatytąjį tapatybės serverį <server />, kad patvirtinti el. pašto adresą arba telefono numerį, bet serveris neturi jokių paslaugos teikimo sąlygų.",
-    "Only continue if you trust the owner of the server.": "Tęskite tik tada, jei pasitikite serverio savininku.",
+    "Only continue if you trust the owner of the server.": "Tęskite tik tuo atveju, jei pasitikite serverio savininku.",
     "Trust": "Pasitikėti",
     "Failed to invite users to the room:": "Nepavyko pakviesti vartotojų į kambarį:",
     "You need to be able to invite users to do that.": "Norėdami tai atlikti jūs turite turėti galimybę pakviesti vartotojus.",
@@ -711,7 +711,7 @@
     "Messages": "Žinutės",
     "Actions": "Veiksmai",
     "Other": "Kitas",
-    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Prideda ¯\\_(ツ)_/¯ prie paprasto teksto pranešimo",
+    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Prideda ¯\\_(ツ)_/¯ prie paprasto teksto žinutės",
     "Sends a message as plain text, without interpreting it as markdown": "SIunčia žinutę, kaip paprastą tekstą, jo neinterpretuodamas kaip pažymėto",
     "Upgrades a room to a new version": "Atnaujina kambarį į naują versiją",
     "You do not have the required permissions to use this command.": "Jūs neturite reikalingų leidimų naudoti šią komandą.",
@@ -724,7 +724,7 @@
     "This room has no topic.": "Šis kambarys neturi temos.",
     "Sets the room name": "Nustato kambario pavadinimą",
     "Use an identity server": "Naudoti tapatybės serverį",
-    "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Norėdami pakviesti nurodydami el. paštą, naudokite tapatybės serverį. Tam, kad toliau būtų naudojamas numatytasis tapatybės serveris %(defaultIdentityServerName)s, spauskite tęsti, arba tvarkykite nustatymuose.",
+    "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Norėdami pakviesti nurodydami el. paštą, naudokite tapatybės serverį. Tam, kad toliau būtų naudojamas numatytasis tapatybės serveris %(defaultIdentityServerName)s, spauskite tęsti, arba tvarkykite Nustatymuose.",
     "Use an identity server to invite by email. Manage in Settings.": "Norėdami pakviesti nurodydami el. paštą, naudokite tapatybės serverį. Tvarkykite nustatymuose.",
     "Unbans user with given ID": "Atblokuoja vartotoją su nurodytu id",
     "Ignored user": "Ignoruojamas vartotojas",
@@ -733,8 +733,8 @@
     "Define the power level of a user": "Nustatykite vartotojo galios lygį",
     "Deops user with given id": "Deop'ina vartotoją su nurodytu id",
     "Adds a custom widget by URL to the room": "Į kambarį prideda pasirinktinį valdiklį pagal URL",
-    "Please supply a https:// or http:// widget URL": "Prašome pateikti https:// arba http:// valdiklio URL",
-    "You cannot modify widgets in this room.": "Jūs negalite keisti valdiklių šiame kambaryje.",
+    "Please supply a https:// or http:// widget URL": "Pateikite https:// arba http:// valdiklio URL",
+    "You cannot modify widgets in this room.": "Jūs negalite modifikuoti valdiklių šiame kambaryje.",
     "Forces the current outbound group session in an encrypted room to be discarded": "Priverčia išmesti esamą užsibaigiantį grupės seansą užšifruotame kambaryje",
     "Sends the given message coloured as a rainbow": "Išsiunčia nurodytą žinutę nuspalvintą kaip vaivorykštė",
     "Sends the given emote coloured as a rainbow": "Išsiunčia nurodytą emociją nuspalvintą kaip vaivorykštė",
@@ -746,21 +746,21 @@
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s atnaujino šį kambarį.",
     "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s padarė kambarį viešą visiems žinantiems nuorodą.",
     "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s padarė kambarį tik pakviestiems.",
-    "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s pakeitė prisijungimo normą į %(rule)s",
+    "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s pakeitė prisijungimo taisyklę į %(rule)s",
     "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s leido svečiams prisijungti prie kambario.",
     "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s uždraudė svečiams prisijungti prie kambario.",
     "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s pakeitė svečių prieigą prie %(rule)s",
-    "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s įjungė ženkliukus bendruomenėi %(groups)s šiame kambaryje.",
-    "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s išjungė ženkliukus bendruomenėi %(groups)s šiame kambaryje.",
-    "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s įjungė ženkliukus bendruomenėi %(newGroups)s ir išjungė ženkliukus bendruomenėi %(oldGroups)s šiame kambaryje.",
+    "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s įjungė ženkliukus bendruomenei %(groups)s šiame kambaryje.",
+    "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s išjungė ženkliukus bendruomenei %(groups)s šiame kambaryje.",
+    "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s įjungė ženkliukus bendruomenei %(newGroups)s ir išjungė ženkliukus bendruomenei %(oldGroups)s šiame kambaryje.",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s atšaukė pakvietimą %(targetDisplayName)s prisijungti prie kambario.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s išsiuntė pakvietimą %(targetDisplayName)s prisijungti prie kambario.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s padarė būsimą kambario istoriją matomą visiems kambario dalyviams, nuo pat jų prisijungimo.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s padarė būsimą kambario istoriją matomą visiems kambario dalyviams, nuo jų prisijungimo momento.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s padarė būsimą kambario istoriją matomą nežinomam (%(visibility)s).",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s galios lygį iš %(fromPowerLevel)s į %(toPowerLevel)s",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s pakeitė %(powerLevelDiffText)s.",
     "%(displayName)s is typing …": "%(displayName)s rašo …",
-    "%(names)s and %(count)s others are typing …|other": "%(names)s ir %(count)s kiti rašo …",
+    "%(names)s and %(count)s others are typing …|other": "%(names)s ir %(count)s kiti(-ų) rašo …",
     "%(names)s and %(count)s others are typing …|one": "%(names)s ir dar vienas rašo …",
     "%(names)s and %(lastPerson)s are typing …": "%(names)s ir %(lastPerson)s rašo …",
     "Cannot reach homeserver": "Serveris nepasiekiamas",
@@ -771,21 +771,21 @@
     "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.": "Jūs galite iš naujo nustatyti savo slaptažodį, tačiau kai kurios funkcijos bus nepasiekiamos, kol tapatybės serveris prisijungs. Jei ir toliau matote šį įspėjimą, patikrinkite savo konfigūraciją arba susisiekite su serverio administratoriumi.",
     "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.": "Jūs galite prisijungti, tačiau kai kurios funkcijos bus nepasiekiamos, kol tapatybės serveris prisijungs. Jei ir toliau matote šį įspėjimą, patikrinkite savo konfigūraciją arba susisiekite su serverio administratoriumi.",
     "No homeserver URL provided": "Nepateiktas serverio URL",
-    "Unexpected error resolving homeserver configuration": "Netikėta klaida nustatant serverio konfigūraciją",
-    "Unexpected error resolving identity server configuration": "Netikėta klaida nustatant tapatybės serverio konfigūraciją",
-    "%(items)s and %(count)s others|other": "%(items)s ir %(count)s kiti",
+    "Unexpected error resolving homeserver configuration": "Netikėta klaida nusistatant serverio konfigūraciją",
+    "Unexpected error resolving identity server configuration": "Netikėta klaida nusistatant tapatybės serverio konfigūraciją",
+    "%(items)s and %(count)s others|other": "%(items)s ir %(count)s kiti(-ų)",
     "%(items)s and %(count)s others|one": "%(items)s ir dar vienas",
     "%(items)s and %(lastItem)s": "%(items)s ir %(lastItem)s",
     "Unrecognised address": "Neatpažintas adresas",
     "You do not have permission to invite people to this room.": "Jūs neturite leidimo pakviesti žmones į šį kambarį.",
     "User %(userId)s is already in the room": "Vartotojas %(userId)s jau yra kambaryje",
     "User %(user_id)s may or may not exist": "Vartotojas %(user_id)s gali ir neegzistuoti",
-    "The user must be unbanned before they can be invited.": "Norint pakviesti vartotoją, pirmiausia turi būti pašalintas draudimas.",
+    "The user must be unbanned before they can be invited.": "Norint pakviesti vartotoją, prieš tai reikia pašalinti jo draudimą.",
     "The user's homeserver does not support the version of the room.": "Vartotojo serveris nepalaiko kambario versijos.",
     "Use a longer keyboard pattern with more turns": "Naudokite ilgesnį klaviatūros modelį su daugiau vijų",
     "There was an error joining the room": "Prisijungiant prie kambario įvyko klaida",
     "Failed to join room": "Prisijungti prie kambario nepavyko",
-    "Message Pinning": "Žinutės prisegimas",
+    "Message Pinning": "Žinutės Prisegimas",
     "Custom user status messages": "Pasirinktinės vartotojo būsenos žinutės",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Grupuoti ir filtruoti kambarius pagal pasirinktines žymas (atnaujinkite, kad pritaikytumėte pakeitimus)",
     "Render simple counters in room header": "Užkrauti paprastus skaitiklius kambario antraštėje",
@@ -804,7 +804,7 @@
     "<userName/> invited you": "<userName/> jus pakvietė",
     "You're previewing %(roomName)s. Want to join it?": "Jūs peržiūrite %(roomName)s. Norite prie jo prisijungti?",
     "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s negali būti peržiūrėtas. Ar jūs norite prie jo prisijungti?",
-    "This room doesn't exist. Are you sure you're at the right place?": "Šis kambarys neegzistuoja. Ar jūs tikras, kad esate tinkamoje vietoje?",
+    "This room doesn't exist. Are you sure you're at the right place?": "Šis kambarys neegzistuoja. Ar jūs tikri, kad esate tinkamoje vietoje?",
     "Create a public room": "Sukurti viešą kambarį",
     "Make this room public": "Padaryti šį kambarį viešu",
     "Room Settings - %(roomName)s": "Kambario nustatymai - %(roomName)s",
@@ -822,7 +822,7 @@
     "Explore": "Žvalgyti",
     "Filter": "Filtruoti",
     "Filter rooms…": "Filtruoti kambarius…",
-    "This room is not public. You will not be able to rejoin without an invite.": "Šis kambarys nėra viešas. Jūs negalėsite vėl prie jo prisijungti be pakvietimo.",
+    "This room is not public. You will not be able to rejoin without an invite.": "Šis kambarys nėra viešas. Jūs negalėsite prisijungti iš naujo be pakvietimo.",
     "Are you sure you want to leave the room '%(roomName)s'?": "Ar tikrai norite išeiti iš kambario %(roomName)s?",
     "%(creator)s created and configured the room.": "%(creator)s sukūrė ir sukonfigūravo kambarį.",
     "%(brand)s failed to get the public room list.": "%(brand)s nepavyko gauti viešų kambarių sąrašo.",
@@ -941,7 +941,7 @@
     "Show read receipts sent by other users": "Rodyti kitų vartotojų siųstus perskaitymo kvitus",
     "Order rooms by name": "Rūšiuoti kambarius pagal pavadinimą",
     "The other party cancelled the verification.": "Kita šalis atšaukė patvirtinimą.",
-    "Public Name": "Viešas pavadinimas",
+    "Public Name": "Viešas Vardas",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Užšifruotos žinutės yra apsaugotos visapusiu šifravimu. Tik jūs ir gavėjas(-ai) turi raktus šioms žinutėms perskaityti.",
     "Back up your keys before signing out to avoid losing them.": "Prieš atsijungdami sukurkite atsarginę savo raktų kopiją, kad išvengtumėte jų praradimo.",
     "Start using Key Backup": "Pradėti naudoti atsarginę raktų kopiją",
@@ -1016,7 +1016,7 @@
     "Send as message": "Siųsti kaip žinutę",
     "Messages in this room are end-to-end encrypted.": "Žinutės šiame kambaryje yra visapusiškai užšifruotos.",
     "Messages in this room are not end-to-end encrypted.": "Žinutės šiame kambaryje nėra visapusiškai užšifruotos.",
-    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Žinutės šiame kambaryje yra visapusiškai užšifruotos. Sužinokite daugiau ir patvirtinkite vartotojus jų profilyje.",
+    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Žinutės šiame kambaryje yra visapusiškai užšifruotos. Sužinokite daugiau ir patvirtinkite šį vartotoją jo vartotojo profilyje.",
     "Confirm Removal": "Patvirtinkite pašalinimą",
     "Manually export keys": "Eksportuoti raktus rankiniu būdu",
     "Send a Direct Message": "Siųsti tiesioginę žinutę",
@@ -1024,12 +1024,12 @@
     "Go back to set it again.": "Grįžti atgal, kad nustatyti iš naujo.",
     "Click the button below to confirm adding this email address.": "Paspauskite mygtuką žemiau, kad patvirtintumėte šio el. pašto pridėjimą.",
     "Add an email address to configure email notifications": "Pridėkite el. pašto adresą, kad nustatytumėte el. pašto pranešimus",
-    "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Rekomenduojame, prieš atsijungiant, iš tapatybės serverio pašalinti savo el. pašto adresus ir telefono numerius.",
+    "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Prieš atsijungiant rekomenduojame iš tapatybės serverio pašalinti savo el. pašto adresus ir telefono numerius.",
     "Email addresses": "El. pašto adresai",
-    "Account management": "Paskyros valdymas",
+    "Account management": "Paskyros tvarkymas",
     "Deactivating your account is a permanent action - be careful!": "Paskyros deaktyvavimas yra neatšaukiamas veiksmas - būkite atsargūs!",
     "Your email address hasn't been verified yet": "Jūsų el. pašto adresas dar nebuvo patvirtintas",
-    "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Išsiuntėme jums el. laišką, kad patvirtintumėme jūsų adresą. Sekite ten esančiais nurodymais ir tada paspauskite žemiau esantį mygtuką.",
+    "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Išsiuntėme jums el. laišką, kad patvirtintumėme savo adresą. Sekite ten pateiktas instrukcijas ir tada paspauskite žemiau esantį mygtuką.",
     "Email Address": "El. pašto adresas",
     "Enter your custom homeserver URL <a>What does this mean?</a>": "Įveskite pasirinktinio serverio URL <a>Ką tai reiškia?</a>",
     "Homeserver URL": "Serverio URL",
@@ -1076,7 +1076,7 @@
     "Messages containing @room": "Žinutės, kuriose yra @kambarys",
     "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Laukiama, kol jūsų kitas seansas, %(deviceName)s (%(deviceId)s), patvirtins…",
     "Waiting for your other session to verify…": "Laukiama, kol jūsų kitas seansas patvirtins…",
-    "To be secure, do this in person or use a trusted way to communicate.": "Norėdami būti saugūs, darykite tai asmeniškai arba naudodamiesi patikimu bendravimo būdu.",
+    "To be secure, do this in person or use a trusted way to communicate.": "Norėdami užtikrinti saugumą, darykite tai asmeniškai arba naudokite patikimą komunikacijos būdą.",
     "Verify": "Patvirtinti",
     "Verify the new login accessing your account: %(name)s": "Patvirtinkite naują prisijungimą prie jūsų paskyros: %(name)s",
     "Confirm deleting these sessions": "Patvirtinkite šių seansų ištrinimą",
@@ -1085,9 +1085,9 @@
     "Delete %(count)s sessions|other": "Ištrinti %(count)s seansus(-ų)",
     "Delete %(count)s sessions|one": "Ištrinti %(count)s seansą",
     "ID": "ID",
-    "Restore from Backup": "Atkurti iš atsarginės kopijos",
+    "Restore from Backup": "Atkurti iš Atsarginės Kopijos",
     "Flair": "Ženkliukai",
-    "Access Token:": "Prieigos talonas:",
+    "Access Token:": "Prieigos Talonas:",
     "Preferences": "Nuostatos",
     "Cryptography": "Kriptografija",
     "Security & Privacy": "Saugumas ir Privatumas",
@@ -1110,7 +1110,7 @@
     "Waiting for you to accept on your other session…": "Laukiama kol jūs priimsite kitame savo seanse…",
     "Start Verification": "Pradėti patvirtinimą",
     "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "Šifruotuose kambariuose jūsų žinutės yra apsaugotos ir tik jūs ir gavėjas turite unikalius raktus joms atrakinti.",
-    "Verify User": "Patvirtinti vartotoją",
+    "Verify User": "Patvirtinti Vartotoją",
     "For extra security, verify this user by checking a one-time code on both of your devices.": "Dėl papildomo saugumo patvirtinkite šį vartotoją patikrindami vienkartinį kodą abiejuose jūsų įrenginiuose.",
     "%(count)s verified sessions|other": "%(count)s patvirtintų seansų",
     "Hide verified sessions": "Slėpti patvirtintus seansus",
@@ -1135,7 +1135,7 @@
     "Are you sure you want to deactivate your account? This is irreversible.": "Ar tikrai norite deaktyvuoti savo paskyrą? Tai yra negrįžtama.",
     "Verify session": "Patvirtinti seansą",
     "Are you sure you want to sign out?": "Ar tikrai norite atsijungti?",
-    "Use this session to verify your new one, granting it access to encrypted messages:": "Panaudoti šį seansą naujo patvirtinimui, suteikant jam prieigą prie šifruotų žinučių:",
+    "Use this session to verify your new one, granting it access to encrypted messages:": "Panaudoti šį seansą naujo patvirtinimui, suteikiant jam prieigą prie šifruotų žinučių:",
     "If you didn’t sign in to this session, your account may be compromised.": "Jei jūs nesijungėte prie šios sesijos, jūsų paskyra gali būti sukompromituota.",
     "This wasn't me": "Tai ne aš",
     "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Jei jūs susidūrėte su klaidomis arba norėtumėte palikti atsiliepimą, praneškite mums GitHub'e.",
@@ -1153,36 +1153,36 @@
     "Verify this login": "Patvirtinkite šį prisijungimą",
     "Registration has been disabled on this homeserver.": "Registracija šiame serveryje išjungta.",
     "You can now close this window or <a>log in</a> to your new account.": "Jūs galite uždaryti šį langą arba <a>prisijungti</a> į savo naują paskyrą.",
-    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Identifikuokite save patvirtindami šį prisijungimą viename iš kitų jūsų seansų ir suteikdami jam prieigą prie šifruotų žinučių.",
+    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Identifikuokite save, patvirtindami šį prisijungimą viename iš kitų jūsų seansų, ir suteikdami jam prieigą prie šifruotų žinučių.",
     "This requires the latest %(brand)s on your other devices:": "Tam reikia naujausios %(brand)s versijos kituose jūsų įrenginiuose:",
     "or another cross-signing capable Matrix client": "arba kito kryžminį pasirašymą palaikančio Matrix kliento",
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Atnaujinkite šį seansą, kad jam būtų leista patvirtinti kitus seansus, suteikiant jiems prieigą prie šifruotų žinučių ir juos pažymint kaip patikimus kitiems vartotojams.",
-    "Use Single Sign On to continue": "Norėdami tęsti naudokite Vieno Prisijungimo sistemą",
-    "Confirm adding this email address by using Single Sign On to prove your identity.": "Patvirtinkite šio el. pašto adreso pridėjimą naudodami Vieno Prisijungimo sistemą, patvirtinančią jūsų tapatybę.",
-    "Single Sign On": "Vieno Prisijungimo sistema",
+    "Use Single Sign On to continue": "Norėdami tęsti naudokite Vieną Prisijungimą",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Patvirtinkite šio el. pašto adreso pridėjimą naudodami Vieną Prisijungimą, kad įrodytumėte savo tapatybę.",
+    "Single Sign On": "Vienas Prisijungimas",
     "Confirm adding email": "Patvirtinkite el. pašto pridėjimą",
-    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Patvirtinkite šio telefono numerio pridėjimą naudodami Vieno Prisijungimo sistemą, patvirtinančią jūsų tapatybę.",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Patvirtinkite šio tel. nr. pridėjimą naudodami Vieną Prisijungimą, kad įrodytumėte savo tapatybę.",
     "Confirm adding phone number": "Patvirtinkite telefono numerio pridėjimą",
     "Click the button below to confirm adding this phone number.": "Paspauskite žemiau esantį mygtuką, kad patvirtintumėte šio numerio pridėjimą.",
     "Match system theme": "Suderinti su sistemos tema",
-    "Identity Server URL must be HTTPS": "Tapatybės serverio URL privalo būti HTTPS",
-    "Not a valid Identity Server (status code %(code)s)": "Netinkamas tapatybės serveris (statuso kodas %(code)s)",
-    "Could not connect to Identity Server": "Nepavyko prisijungti prie tapatybės serverio",
+    "Identity Server URL must be HTTPS": "Tapatybės Serverio URL privalo būti HTTPS",
+    "Not a valid Identity Server (status code %(code)s)": "Netinkamas Tapatybės Serveris (statuso kodas %(code)s)",
+    "Could not connect to Identity Server": "Nepavyko prisijungti prie Tapatybės Serverio",
     "Disconnect from the identity server <current /> and connect to <new /> instead?": "Atsijungti nuo <current /> tapatybės serverio ir jo vietoje prisijungti prie <new />?",
     "Terms of service not accepted or the identity server is invalid.": "Nesutikta su paslaugų teikimo sąlygomis arba tapatybės serveris yra klaidingas.",
     "The identity server you have chosen does not have any terms of service.": "Jūsų pasirinktas tapatybės serveris neturi jokių paslaugų teikimo sąlygų.",
     "Disconnect identity server": "Atjungti tapatybės serverį",
     "Disconnect from the identity server <idserver />?": "Atsijungti nuo tapatybės serverio <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.": "Prieš atsijungdami jūs turėtumėte <b>pašalinti savo asmeninius duomenis</b> iš tapatybės serverio <idserver />. Deja, tapatybės serveris <idserver /> šiuo metu yra išjungtas arba nepasiekiamas.",
-    "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "patikrinkite ar tarp jūsų naršyklės įskiepių nėra nieko kas galėtų blokuoti tapatybės serverį (pavyzdžiui \"Privacy Badger\")",
-    "contact the administrators of identity server <idserver />": "susisiekite su tapatybės serverio <idserver /> administratoriais",
+    "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "patikrinti ar tarp jūsų naršyklės įskiepių nėra nieko kas galėtų blokuoti tapatybės serverį (pavyzdžiui \"Privacy Badger\")",
+    "contact the administrators of identity server <idserver />": "susisiekti su tapatybės serverio <idserver /> administratoriais",
     "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Jūs vis dar <b>dalijatės savo asmeniniais duomenimis</b> tapatybės serveryje <idserver />.",
-    "Identity Server (%(server)s)": "Tapatybės serveris (%(server)s)",
+    "Identity Server (%(server)s)": "Tapatybės Serveris (%(server)s)",
     "Enter a new identity server": "Pridėkite naują tapatybės serverį",
-    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Naudokite integracijų tvarkytuvą <b>(%(serverName)s)</b> botų, valdiklių ir lipdukų valdymui.",
-    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Naudokite integracijų tvarkytuvą botų, valdiklių ir lipdukų valdymui.",
+    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Naudokite Integracijų Tvarkytuvą <b>(%(serverName)s)</b> botų, valdiklių ir lipdukų pakuočių tvarkymui.",
+    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Naudokite Integracijų Tvarkytuvą botų, valdiklių ir lipdukų pakuočių tvarkymui.",
     "Manage integrations": "Valdyti integracijas",
-    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integracijų valdikliai gauna konfigūracijos duomenis ir jūsų vardu gali keisti valdiklius, siųsti kambario pakvietimus ir nustatyti galios lygius.",
+    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integracijų Tvarkytuvai gauna konfigūracijos duomenis ir jūsų vardu gali keisti valdiklius, siųsti kambario pakvietimus ir nustatyti galios lygius.",
     "Invalid theme schema.": "Klaidinga temos schema.",
     "Error downloading theme information.": "Klaida parsisiunčiant temos informaciją.",
     "Theme added!": "Tema pridėta!",
@@ -1196,13 +1196,13 @@
     "Discovery options will appear once you have added an email above.": "Radimo parinktys atsiras jums aukščiau pridėjus el. pašto adresą.",
     "Unable to revoke sharing for phone number": "Neina atšaukti telefono numerio bendrinimo",
     "Unable to share phone number": "Neina bendrinti telefono numerio",
-    "Unable to verify phone number.": "Neina patvirtinti telefono numerio.",
+    "Unable to verify phone number.": "Nepavyko patvirtinti telefono numerio.",
     "Discovery options will appear once you have added a phone number above.": "Radimo parinktys atsiras jums aukščiau pridėjus telefono numerį.",
     "Phone Number": "Telefono Numeris",
     "Room Topic": "Kambario Tema",
     "Your theme": "Jūsų tema",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Valdiklio ištrinimas pašalina jį visiems kambaryje esantiems vartotojams. Ar tikrai norite ištrinti šį valdiklį?",
-    "Enable 'Manage Integrations' in Settings to do this.": "Įjunkite 'Valdyti integracijas' nustatymuose, kad tai atliktumėte.",
+    "Enable 'Manage Integrations' in Settings to do this.": "Įjunkite 'Valdyti integracijas' Nustatymuose, kad tai atliktumėte.",
     "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Jūsų %(brand)s neleidžia jums naudoti integracijų tvarkytuvo tam atlikti. Susisiekite su administratoriumi.",
     "Enter phone number (required on this homeserver)": "Įveskite telefono numerį (privaloma šiame serveryje)",
     "Doesn't look like a valid phone number": "Tai nepanašu į veikiantį telefono numerį",
@@ -1210,14 +1210,14 @@
     "Invalid identity server discovery response": "Klaidingas tapatybės serverio radimo atsakas",
     "The phone number entered looks invalid": "Įvestas telefono numeris atrodo klaidingas",
     "Double check that your server supports the room version chosen and try again.": "Dar kartą įsitikinkite, kad jūsų serveris palaiko pasirinktą kambario versiją ir bandykite iš naujo.",
-    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Ar naudojate %(brand)s įrenginyje, kuriame pagrindinis įvesties mechanizmas yra lietimas",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Ar jūs naudojate %(brand)s įrenginyje, kuriame pagrindinis įvesties mechanizmas yra lietimas",
     "Session already verified!": "Seansas jau patvirtintas!",
     "WARNING: Session already verified, but keys do NOT MATCH!": "ĮSPĖJIMAS: Seansas jau patvirtintas, bet raktai NESUTAMPA!",
-    "Enable Emoji suggestions while typing": "Įjungti jaustukų pasiūlymus rašant",
+    "Enable Emoji suggestions while typing": "Įjungti Jaustukų pasiūlymus rašant",
     "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Rodyti priminimą įjungti saugių žinučių atgavimą šifruotuose kambariuose",
     "Enable automatic language detection for syntax highlighting": "Įjungti automatinį kalbos aptikimą sintaksės paryškinimui",
     "Enable big emoji in chat": "Įjungti didelius jaustukus pokalbiuose",
-    "Enable Community Filter Panel": "Įjungti bendruomenės filtrų skydelį",
+    "Enable Community Filter Panel": "Įjungti Bendruomenės Filtrų Skydelį",
     "Enable message search in encrypted rooms": "Įjungti žinučių paiešką užšifruotuose kambariuose",
     "Verified!": "Patvirtinta!",
     "You've successfully verified this user.": "Jūs sėkmingai patvirtinote šį vartotoją.",
@@ -1267,7 +1267,7 @@
     "Glasses": "Akiniai",
     "Spanner": "Veržliaraktis",
     "Santa": "Santa",
-    "Thumbs up": "Liuks",
+    "Thumbs up": "Liuksas",
     "Umbrella": "Skėtis",
     "Hourglass": "Smėlio laikrodis",
     "Clock": "Laikrodis",
@@ -1317,7 +1317,7 @@
     "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "Atsarginė kopija turi <validity>negaliojantį</validity> <verify>nepatvirtinto</verify> seanso <device></device> parašą",
     "Enable desktop notifications for this session": "Įjungti darbalaukio pranešimus šiam seansui",
     "Enable audible notifications for this session": "Įjungti garsinius pranešimus šiam seansui",
-    "wait and try again later": "palaukite ir bandykite vėliau dar kartą",
+    "wait and try again later": "palaukti ir bandyti vėliau dar kartą",
     "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Jei jūs nenorite naudoti <server /> serverio radimui ir tam, kad būtumėte randamas esamų, jums žinomų kontaktų, žemiau įveskite kitą tapatybės 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.": "Tapatybės serverio naudojimas yra pasirinktinis. Jei jūs pasirinksite jo nenaudoti, jūs nebūsite randamas kitų vartotojų ir neturėsite galimybės pakviesti kitų nurodydamas el. paštą ar telefoną.",
     "Do not use an identity server": "Nenaudoti tapatybės serverio",
@@ -1346,8 +1346,8 @@
     "Destroy cross-signing keys?": "Sunaikinti kryžminio pasirašymo raktus?",
     "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Kryžminio pasirašymo raktų ištrinimas yra neatšaukiamas. Visi, kurie buvo jais patvirtinti, matys saugumo įspėjimus. Jūs greičiausiai nenorite to daryti, nebent praradote visus įrenginius, iš kurių galite patvirtinti kryžminiu pasirašymu.",
     "Clear cross-signing keys": "Valyti kryžminio pasirašymo raktus",
-    "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.": "Patvirtinkite šį įrenginį, kad pažymėtumėte jį kaip patikimą. Pasitikėjimas šiuo įrenginiu suteikia jums ir kitiems vartotojams papildomos ramybės, kai naudojate visapusiškai užšifruotas žinutes.",
-    "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Šio įrenginio patvirtinimas pažymės jį kaip patikimą ir vartotojai, kurie patvirtino su jumis, pasitikės šiuo įrenginiu.",
+    "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.": "Patvirtinkite šį įrenginį, kad pažymėtumėte jį kaip patikimą. Įrenginio pažymėjimas patikimu jums ir kitiems vartotojams suteikia papildomos ramybės naudojant visapusiškai užšifruotas žinutes.",
+    "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Šio įrenginio patvirtinimas pažymės jį kaip patikimą, ir vartotojai, kurie patvirtino su jumis, pasitikės šiuo įrenginiu.",
     "a new cross-signing key signature": "naujas kryžminio pasirašymo rakto parašas",
     "a device cross-signing signature": "įrenginio kryžminio pasirašymo parašas",
     "Session verified": "Seansas patvirtintas",
@@ -1362,14 +1362,14 @@
     "Almost there! Is %(displayName)s showing the same shield?": "Beveik atlikta! Ar %(displayName)s rodo tokį patį skydą?",
     "No": "Ne",
     "Yes": "Taip",
-    "Interactively verify by Emoji": "Patvirtinti interaktyviai, naudojant jaustukus",
+    "Interactively verify by Emoji": "Patvirtinti interaktyviai, naudojant Jaustukus",
     "The message you are trying to send is too large.": "Žinutė, kurią jūs bandote siųsti, yra per didelė.",
     "Show a placeholder for removed messages": "Rodyti pašalintų žinučių žymeklį",
     "Show join/leave messages (invites/kicks/bans unaffected)": "Rodyti prisijungimo/išėjimo žinutes (pakvietimai/išmetimai/draudimai nepaveikti)",
     "Show avatar changes": "Rodyti pseudoportretų pakeitimus",
     "Show avatars in user and room mentions": "Rodyti pseudoportretus vartotojo ir kambario paminėjimuose",
     "Send typing notifications": "Siųsti spausdinimo pranešimus",
-    "Automatically replace plain text Emoji": "Automatiškai pakeisti paprasto teksto jaustukus",
+    "Automatically replace plain text Emoji": "Automatiškai pakeisti paprasto teksto Jaustukus",
     "Mirror local video feed": "Atkartoti lokalų video tiekimą",
     "Allow Peer-to-Peer for 1:1 calls": "Leisti tiesioginį \"Peer-to-Peer\" sujungimą 1:1 skambučiams",
     "Prompt before sending invites to potentially invalid matrix IDs": "Klausti prieš siunčiant pakvietimus galimai netinkamiems matrix ID",
@@ -1381,8 +1381,8 @@
     "Encrypted messages in one-to-one chats": "Šifruotos žinutės privačiuose pokalbiuose",
     "When rooms are upgraded": "Kai atnaujinami kambariai",
     "My Ban List": "Mano Draudimų Sąrašas",
-    "This is your list of users/servers you have blocked - don't leave the room!": "Tai jūsų užblokuotų vartotojų/serverių sąrašas - nepalikite kambario!",
-    "Verify this user by confirming the following emoji appear on their screen.": "Patvirtinkite šį vartotoją, įsitikindami, kad šie jaustukai rodomi jo ekrane.",
+    "This is your list of users/servers you have blocked - don't leave the room!": "Tai yra jūsų užblokuotų vartotojų/serverių sąrašas - neišeikite iš kambario!",
+    "Verify this user by confirming the following emoji appear on their screen.": "Patvirtinkite šį vartotoją, įsitikindami, kad jo ekrane rodomas toliau esantis jaustukas.",
     "⚠ These settings are meant for advanced users.": "⚠ Šie nustatymai yra skirti pažengusiems vartotojams.",
     "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.": "Jūsų asmeniniame draudimų sąraše yra visi vartotojai/serveriai, iš kurių jūs asmeniškai nenorite matyti pranešimų. Po pirmojo jūsų vartotojo/serverio ignoravimo, jūsų kambarių sąraše pasirodys naujas kambarys pavadinimu 'Mano Draudimų Sąrašas' - likite šiame kambaryje, kad draudimų sąrašas veiktų.",
     "Room list": "Kambarių sąrašas",
@@ -1392,7 +1392,7 @@
     "Read Marker off-screen lifetime (ms)": "Skaitymo žymeklio ne ekraninis veikimo laikas (ms)",
     "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Jūs galite naudoti <code>/help</code>, kad pamatytumėte galimų komandų sąrašą. Ar norėjote siųsti tai kaip žinutę?",
     "Room avatar": "Kambario pseudoportretas",
-    "Verify by comparing unique emoji.": "Patvirtinkite palygindami unikalius jaustukus.",
+    "Verify by comparing unique emoji.": "Patvirtinti palyginant unikalius jaustukus.",
     "Verify by emoji": "Patvirtinti naudojant jaustukus",
     "Compare emoji": "Palyginkite jaustukus",
     "Show image": "Rodyti vaizdą",
@@ -1419,14 +1419,14 @@
     "Failed to reject invitation": "Nepavyko atmesti pakvietimo",
     "Failed to leave room": "Nepavyko išeiti iš kambario",
     "Can't leave Server Notices room": "Negalima išeiti iš Serverio Pranešimų kambario",
-    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Šis kambarys yra naudojamas svarbioms žinutėms iš serverio, todėl jūs negalite jo palikti.",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Šis kambarys yra naudojamas svarbioms žinutėms iš serverio, tad jūs negalite iš jo išeiti.",
     "Terms and Conditions": "Taisyklės ir Sąlygos",
     "Self-verification request": "Savarankiško patvirtinimo užklausa",
     "Logout": "Atsijungti",
     "Reject & Ignore user": "Atmesti ir ignoruoti vartotoją",
     "Reject invitation": "Atmesti pakvietimą",
     "Unable to reject invite": "Nepavyko atmesti pakvietimo",
-    "Whether you're using %(brand)s as an installed Progressive Web App": "Ar naudojate %(brand)s kaip įdiegtą progresyviąją žiniatinklio programą",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "Ar jūs naudojate %(brand)s kaip Įdiegtą Progresyviąją Žiniatinklio Programą",
     "Your user agent": "Jūsų vartotojo agentas",
     "Invite only": "Tik pakviestiems",
     "You can only join it with a working invite.": "Jūs galite prisijungti tik su veikiančiu pakvietimu.",
@@ -1436,11 +1436,11 @@
     "%(name)s is requesting verification": "%(name)s prašo patvirtinimo",
     "Sign In or Create Account": "Prisijungti arba Sukurti Paskyrą",
     "Use your account or create a new one to continue.": "Norėdami tęsti naudokite savo paskyrą arba sukurkite naują.",
-    "Create Account": "Sukurti paskyrą",
+    "Create Account": "Sukurti Paskyrą",
     "Custom (%(level)s)": "Pasirinktinis (%(level)s)",
-    "Ask this user to verify their session, or manually verify it below.": "Paprašykite šio vartotojo patvirtinti savo seansą arba patvirtinkite jį rankiniu būdu žemiau.",
+    "Ask this user to verify their session, or manually verify it below.": "Paprašykite šio vartotojo patvirtinti savo seansą, arba patvirtinkite jį rankiniu būdu žemiau.",
     "Encryption upgrade available": "Galimas šifravimo atnaujinimas",
-    "Verify this user by confirming the following number appears on their screen.": "Patvirtinkite šį vartotoją įsitikindami, kad jo ekrane rodomas toliau esantis skaičius.",
+    "Verify this user by confirming the following number appears on their screen.": "Patvirtinkite šį vartotoją, įsitikindami, kad jo ekrane rodomas toliau esantis skaičius.",
     "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Atsarginė kopija turi <verify>nežinomo</verify> vartotojo parašą su ID %(deviceId)s",
     "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Tvarkykite savo seansų pavadinimus ir iš jų atsijunkite žemiau, arba <a>patvirtinkite juos savo Vartotojo Profilyje</a>.",
     "Please enter verification code sent via text.": "Įveskite patvirtinimo kodą išsiųstą teksto žinute.",
@@ -1455,7 +1455,7 @@
     "You sent a verification request": "Jūs išsiuntėte patvirtinimo užklausą",
     "Widgets do not use message encryption.": "Valdikliai nenaudoja žinučių šifravimo.",
     "Continue With Encryption Disabled": "Tęsti išjungus šifravimą",
-    "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Patvirtinkite šį vartotoją, kad pažymėtumėte jį kaip patikimą. Pažymint vartotojus kaip patikimus suteikia papildomos ramybės naudojant visapusiškai užšifruotas žinutes.",
+    "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Patvirtinkite šį vartotoją, kad pažymėtumėte jį kaip patikimą. Vartotojų pažymėjimas patikimais suteikia jums papildomos ramybės naudojant visapusiškai užšifruotas žinutes.",
     "Waiting for partner to confirm...": "Laukiama kol partneris patvirtins...",
     "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Pradėkite pokalbį su kuo nors naudodami jų vardą, vartotojo vardą (kaip <userId/>) arba el. pašto adresą.",
     "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Pakvieskite ką nors naudodami jų vardą, vartotojo vardą (kaip <userId/>), el. pašto adresą arba <a>bendrinkite šį kambarį</a>.",
@@ -1476,15 +1476,15 @@
     "Session backup key:": "Seanso atsarginės kopijos raktas:",
     "Unable to load key backup status": "Nepavyko įkelti atsarginės raktų kopijos būklės",
     "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Prieš atsijungdami prijunkite šį seansą prie atsarginės raktų kopijos, kad neprarastumėte raktų, kurie gali būti tik šiame seanse.",
-    "Connect this session to Key Backup": "Prijungtii šį seansą prie atsarginės raktų kopijos",
+    "Connect this session to Key Backup": "Prijungti šį seansą prie Atsarginės Raktų Kopijos",
     "Backup key stored: ": "Atsarginės kopijos raktas saugomas: ",
     "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "Tam, kad galėtumėte rasti ir tam, kad būtumėte randamas esamų, jums žinomų kontaktų, jūs šiuo metu naudojate <server></server> tapatybės serverį. Jį pakeisti galite žemiau.",
-    "Identity Server": "Tapatybės serveris",
+    "Identity Server": "Tapatybės Serveris",
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Šiuo metu jūs nenaudojate tapatybės serverio. Tam, kad galėtumėte rasti ir tam, kad būtumėte randamas esamų, jums žinomų kontaktų, pridėkite jį žemiau.",
     "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.": "Atsijungimas nuo tapatybės serverio reikš, kad jūs nebebūsite randamas kitų vartotojų ir jūs nebegalėsite pakviesti kitų, naudodami jų el. paštą arba telefoną.",
     "Appearance": "Išvaizda",
     "Deactivate account": "Deaktyvuoti paskyrą",
-    "Identity Server is": "Tapatybės serveris yra",
+    "Identity Server is": "Tapatybės Serveris yra",
     "Timeline": "Laiko juosta",
     "Key backup": "Atsarginė raktų kopija",
     "Where you’re logged in": "Kur esate prisijungę",
@@ -1502,7 +1502,7 @@
     "No identity server is configured: add one in server settings to reset your password.": "Nesukonfigūruotas joks tapatybės serveris: pridėkite jį serverio nustatymuose, kad iš naujo nustatytumėte slaptažodį.",
     "Identity server URL does not appear to be a valid identity server": "Tapatybės serverio URL neatrodo kaip tinkamas tapatybės serveris",
     "Scroll up/down in the timeline": "Slinkti aukštyn/žemyn laiko juostoje",
-    "Show developer tools": "Rodyti vystytojo įrankius",
+    "Show developer tools": "Rodyti programuotojo įrankius",
     "Low bandwidth mode": "Žemo duomenų pralaidumo režimas",
     "Send read receipts for messages (requires compatible homeserver to disable)": "Siųsti žinučių perskaitymo kvitus (norint išjungti reikalingas suderinamas serveris)",
     "How fast should messages be downloaded.": "Kaip greitai žinutės turi būti parsiųstos.",
@@ -1522,7 +1522,7 @@
     "exists": "yra",
     "This session is backing up your keys. ": "Šis seansas kuria atsargines jūsų raktų kopijas. ",
     "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.": "Šis seansas <b>nekuria atsarginių raktų kopijų</b>, bet jūs jau turite atsarginę kopiją iš kurios galite atkurti ir pridėti.",
-    "All keys backed up": "Atsarginė kopija sukurta visiems raktams",
+    "All keys backed up": "Atsarginės kopijos sukurtos visiems raktams",
     "Backup has a <validity>valid</validity> signature from this user": "Atsarginė kopija turi <validity>galiojantį</validity> šio vartotojo parašą",
     "Backup has a <validity>invalid</validity> signature from this user": "Atsarginė kopija turi <validity>negaliojantį</validity> šio vartotojo parašą",
     "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "Atsarginė kopija turi <verify>nežinomo</verify> seanso parašą su ID %(deviceId)s",
@@ -1544,8 +1544,8 @@
     "Your homeserver does not support session management.": "Jūsų serveris nepalaiko seansų tvarkymo.",
     "Your homeserver has exceeded its user limit.": "Jūsų serveris pasiekė savo vartotojų limitą.",
     "Your homeserver has exceeded one of its resource limits.": "Jūsų serveris pasiekė vieną iš savo resursų limitų.",
-    "Never send encrypted messages to unverified sessions from this session": "Niekada iš šio seanso nesiųsti šifruotų žinučių nepatvirtintiems seansams",
-    "Never send encrypted messages to unverified sessions in this room from this session": "Niekada iš šio seanso nesiųsti šifruotų žinučių šiame kambaryje nepatvirtintiems seansams",
+    "Never send encrypted messages to unverified sessions from this session": "Niekada nesiųsti šifruotų žinučių nepatvirtintiems seansams iš šio seanso",
+    "Never send encrypted messages to unverified sessions in this room from this session": "Niekada nesiųsti šifruotų žinučių nepatvirtintiems seansams šiame kambaryje iš šio seanso",
     "Unable to load session list": "Neįmanoma įkelti seansų sąrašo",
     "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Patvirtinkite šių seansų ištrinimą, naudodamiesi Vienu Prisijungimu, kad įrodytumėte savo tapatybę.",
     "Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "Patvirtinkite šio seanso ištrinimą, naudodamiesi Vienu Prisijungimu, kad įrodytumėte savo tapatybę.",
@@ -1563,13 +1563,13 @@
     "Clear cache and reload": "Išvalyti podėlį ir perkrauti",
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Norėdami pranešti apie su Matrix susijusią saugos problemą, perskaitykite Matrix.org <a>Saugumo Atskleidimo Poliiką</a>.",
     "FAQ": "DUK",
-    "Keyboard Shortcuts": "Spartieji klavišai",
+    "Keyboard Shortcuts": "Spartieji Klavišai",
     "Versions": "Versijos",
     "Homeserver is": "Serveris yra",
-    "Import E2E room keys": "Importuoti E2E kambarių raktus",
+    "Import E2E room keys": "Importuoti E2E (visapusio šifravimo) kambarių raktus",
     "Session ID:": "Seanso ID:",
     "Session key:": "Seanso raktas:",
-    "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s renka anoniminę analizę, kad galėtume patobulinti programą.",
+    "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s renka anoniminius duomenis, kad mes galėtume tobulinti programą.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privatumas mums yra svarbus, todėl mes nerenkame jokių asmeninių ar identifikuojamų duomenų savo analitikai.",
     "Learn more about how we use analytics.": "Sužinokite daugiau apie tai, kaip mes naudojame analitiką.",
     "Reset": "Iš naujo nustatyti",
@@ -1602,7 +1602,7 @@
     "New Recovery Method": "Naujas atgavimo metodas",
     "A new recovery passphrase and key for Secure Messages have been detected.": "Buvo aptikta nauja atgavimo slaptafrazė ir saugių žinučių raktas.",
     "This session is encrypting history using the new recovery method.": "Šis seansas šifruoja istoriją naudodamas naują atgavimo metodą.",
-    "Recovery Method Removed": "Atgavimo metodas pašalintas",
+    "Recovery Method Removed": "Atgavimo Metodas Pašalintas",
     "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Ši seansas aptiko, kad buvo pašalinta jūsų atgavimo slaptafrazė ir saugių žinučių raktas.",
     "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.": "Jei tai padarėte netyčia, šiame seanse galite nustatyti saugias žinutes, kurios pakartotinai užšifruos šio seanso žinučių istoriją nauju atgavimo metodu.",
     "Toggle Bold": "Perjungti paryškinimą",
@@ -1627,5 +1627,467 @@
     "Move autocomplete selection up/down": "Perkelti automatinio užbaigimo pasirinkimą aukštyn/žemyn",
     "Cancel autocomplete": "Atšaukti automatinį užbaigimą",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Geriausiam veikimui suinstaliuokite <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, arba <safariLink>Safari</safariLink>.",
-    "Use Recovery Key or Passphrase": "Naudoti atgavimo raktą arba slaptafrazę"
+    "Use Recovery Key or Passphrase": "Naudoti atgavimo raktą arba slaptafrazę",
+    "Error upgrading room": "Klaida atnaujinant kambarį",
+    "Sends a message as html, without interpreting it as markdown": "SIunčia žinutę, kaip html, jo neinterpretuodamas kaip pažymėto",
+    "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Prideda ( ͡° ͜ʖ ͡°) prie paprasto teksto žinutės",
+    "Are you sure you want to cancel entering passphrase?": "Ar tikrai norite atšaukti slaptafrazės įvedimą?",
+    "Offline encrypted messaging using dehydrated devices": "Šifruoti pranešimai neprisijungus naudojant dehidruotus įrenginius",
+    "Clear notifications": "Išvalyti pranešimus",
+    "Feedback": "Atsiliepimai",
+    "All settings": "Visi nustatymai",
+    "Security & privacy": "Saugumas ir privatumas",
+    "Notification settings": "Pranešimų nustatymai",
+    "Change notification settings": "Keisti pranešimų nustatymus",
+    "<a>Upgrade</a> to your own domain": "<a>Perkelti</a> į savo domeną",
+    "Room Info": "Kambario info",
+    "Open Devtools": "Atverti Įrankius",
+    "Developer options": "Programuotojo parinktys",
+    "View older messages in %(roomName)s.": "Peržiūrėti senesnes žinutes %(roomName)s.",
+    "Room version:": "Kambario versija:",
+    "Room version": "Kambario versija",
+    "Upgrade this room to the recommended room version": "Atnaujinti šį kambarį į rekomenduojamą kambario versiją",
+    "Internal room ID:": "Vidinis kambario ID:",
+    "Room information": "Kambario informacija",
+    "Browse": "Naršyti",
+    "Set a new custom sound": "Nustatyti naują pasirinktinį garsą",
+    "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.": "Paskyros deaktyvavimas, <b>pagal nutylėjimą, nepriverčia mūsų sistemos užmiršti jūsų siųstų žinučių.</b> Jei norite, kad jūsų žinutės mūsų sistemos būtų užmirštos, pažymėkite žemiau esantį laukelį.",
+    "Use default": "Naudoti numatytąjį",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Serverio administratorius išjungė visapusį šifravimą, kaip numatytą, privačiuose kambariuose ir Tiesioginėse Žinutėse.",
+    "Notification sound": "Pranešimo garsas",
+    "Sounds": "Garsai",
+    "Privileged Users": "Privilegijuoti Nariai",
+    "Roles & Permissions": "Rolės ir Leidimai",
+    "Members only (since the point in time of selecting this option)": "Tik nariai (nuo šios parinkties pasirinkimo momento)",
+    "Members only (since they were invited)": "Tik nariai (nuo jų pakvietimo)",
+    "Only visible to community members": "Matoma tik bendruomenės nariams",
+    "Members only (since they joined)": "Tik nariai (nuo jų prisijungimo)",
+    "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Kas gali skaityti istoriją nustatymų pakeitimai bus taikomi tik būsimoms šio kambario žinutėms. Esamos istorijos matomumas nepakis.",
+    "The authenticity of this encrypted message can't be guaranteed on this device.": "Šiame įrenginyje negalima užtikrinti šios užšifruotos žinutės autentiškumo.",
+    "Unencrypted": "Neužšifruota",
+    "Encrypted by an unverified session": "Užšifruota nepatvirtinto seanso",
+    "Encrypted": "Užšifruota",
+    "Securely cache encrypted messages locally for them to appear in search results.": "Šifruotas žinutes saugiai talpinkite lokaliai, kad jos būtų rodomos paieškos rezultatuose.",
+    "Securely cache encrypted messages locally for them to appear in search results, using ": "Šifruotas žinutes saugiai talpinkite lokaliai, kad jos būtų rodomos paieškos rezultatuose, naudojant ",
+    "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Saugios žinutės su šiuo vartotoju yra visapusiškai užšifruotos ir negali būti perskaitytos trečiųjų šalių.",
+    "Safeguard against losing access to encrypted messages & data": "Apsisaugokite nuo prieigos prie šifruotų žinučių ir duomenų praradimo",
+    "Main address": "Pagrindinis adresas",
+    "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Atnaujinant pagrindinį kambario adresą įvyko klaida. Gali būti, kad serveris to neleidžia arba įvyko laikina klaida.",
+    "Error updating main address": "Atnaujinant pagrindinį adresą įvyko klaida",
+    "Published Addresses": "Paskelbti Adresai",
+    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Atnaujinant kambario alternatyvius adresus įvyko klaida. Gali būti, kad serveris to neleidžia arba įvyko laikina klaida.",
+    "Room Addresses": "Kambario Adresai",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s pakeitė šio kambario adresus.",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s pakeitė pagrindinį ir alternatyvius šio kambario adresus.",
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s pakeitė alternatyvius šio kambario adresus.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s pridėjo alternatyvų šio kambario adresą %(addresses)s.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s pridėjo alternatyvius šio kambario adresus %(addresses)s.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s pašalino alternatyvų šio kambario adresą %(addresses)s.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s pašalino alternatyvius šio kambario adresus %(addresses)s.",
+    "Room settings": "Kambario nustatymai",
+    "Link to most recent message": "Nuoroda į naujausią žinutę",
+    "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.": "Pakviesti ką nors naudojant jų vardą, vartotojo vardą (pvz.: <userId/>) arba <a>bendrinti šį kambarį</a>.",
+    "Share Room Message": "Bendrinti Kambario Žinutę",
+    "Share Room": "Bendrinti Kambarį",
+    "Use bots, bridges, widgets and sticker packs": "Naudoti botus, tiltus, valdiklius ir lipdukų pakuotes",
+    "Add widgets, bridges & bots": "Pridėti valdiklius, tiltus ir botus",
+    "Edit widgets, bridges & bots": "Redaguoti valdiklius, tiltus ir botus",
+    "Widgets": "Valdikliai",
+    "You can only pin up to %(count)s widgets|other": "Galite prisegti tik iki %(count)s valdiklių",
+    "Hide Widgets": "Slėpti Valdiklius",
+    "Modify widgets": "Keisti valdiklius",
+    "%(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!": "%(brand)s dabar naudoja 3-5 kartus mažiau atminties, įkeliant vartotojų informaciją tik prireikus. Palaukite, kol mes iš naujo sinchronizuosime su serveriu!",
+    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "Jūs ketinate pašalinti %(count)s %(user)s žinutes(-ų). To negalima anuliuoti. Ar norite tęsti?",
+    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "Jūs ketinate pašalinti 1 %(user)s žinutę. To negalima anuliuoti. Ar norite tęsti?",
+    "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?": "Jūs būsite nukreipti į trečiosios šalies svetainę, kad galėtumėte patvirtinti savo paskyrą naudojimui su %(integrationsUrl)s. Ar norite tęsti?",
+    "About": "Apie",
+    "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>": "Įjungus kambario šifravimą jo išjungti negalima. Žinutės, siunčiamos šifruotame kambaryje, nėra matomos serverio. Jas gali matyti tik kambario dalyviai. Įjungus šifravimą, daugelis botų ir tiltų gali veikti netinkamai. <a>Sužinoti daugiau apie šifravimą.</a>",
+    "about a day from now": "apie dieną nuo dabar",
+    "about an hour from now": "apie valandą nuo dabar",
+    "about a minute from now": "apie minutę nuo dabar",
+    "about a day ago": "maždaug prieš dieną",
+    "about an hour ago": "maždaug prieš valandą",
+    "about a minute ago": "maždaug prieš minutę",
+    "Displays information about a user": "Parodo informaciją apie vartotoją",
+    "Error whilst fetching joined communities": "Gaunant prisijungtas bendruomenes įvyko klaida",
+    "Who can join this community?": "Kas gali prisijungti prie šios bendruomenės?",
+    "Join this community": "Prisijungti prie šios bendruomenės",
+    "%(inviter)s has invited you to join this community": "%(inviter)s pakvietė jus prisijungti prie šios bendruomenės",
+    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Šie kambariai rodomi bendruomenės nariams bendruomenės puslapyje. Bendruomenės nariai gali prisijungti prie kambarių paspausdami ant jų.",
+    "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Jūs esate šios bendruomenės administratorius. Jūs negalėsite prisijungti iš naujo be kito administratoriaus kvietimo.",
+    "Unable to join community": "Nepavyko prisijungti prie bendruomenės",
+    "You must join the room to see its files": "Norėdami pamatyti jo failus, turite prisijungti prie kambario",
+    "Join millions for free on the largest public server": "Prisijunkite prie milijonų didžiausiame viešame serveryje nemokamai",
+    "Block anyone not part of %(serverName)s from ever joining this room.": "Blokuoti bet ką, kas nėra iš %(serverName)s, niekada nebeleidžiant prisijungti prie šio kambario.",
+    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Privačius kambarius rasti ir prie jų prisijungti galima tik su pakvietimu. Viešus kambarius rasti ir prie jų prisijungti gali visi šioje bendruomenėje.",
+    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Privačius kambarius rasti ir prie jų prisijungti galima tik su pakvietimu. Viešus kambarius rasti ir prie jų prisijungti gali visi.",
+    "Join": "Prisijungti",
+    "Join the conference from the room information card on the right": "Prisijunkite prie konferencijos kambario informacijos kortelėje dešinėje",
+    "Join the conference at the top of this room": "Prisijunkite prie konferencijos šio kambario viršuje",
+    "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.": "Paskelbtus adresus gali naudoti bet kas, bet kuriame serveryje, kad prisijungtų prie jūsų kambario. Tam, kad paskelbtumėte adresą, visų pirma jis turi būti nustatytas kaip lokalus adresas.",
+    "Join the discussion": "Prisijungti prie diskusijos",
+    "Joining room …": "Jungiamasi prie kambario …",
+    "Try to join anyway": "Vis tiek bandyti prisijungti",
+    "Re-join": "Prisijungti iš naujo",
+    "Join the conversation with an account": "Prisijunkite prie pokalbio su paskyra",
+    "Join Room": "Prisijungti prie kambario",
+    "Guests cannot join this room even if explicitly invited.": "Svečiai negali prisijungti prie šio kambario, net jei jie yra pakviesti.",
+    "Subscribing to a ban list will cause you to join it!": "Užsiprenumeravus draudimų sąrašą, būsite prie jo prijungtas!",
+    "%(senderName)s joined the call": "%(senderName)s prisijungė prie skambučio",
+    "You joined the call": "Jūs prisijungėte prie skambučio",
+    "Joins room with given address": "Prisijungia prie kambario su nurodytu adresu",
+    "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!": "Jūsų bendruomenė neturi ilgo aprašymo, HTML puslapio, kuris galėtų būti rodomas bendruomenės nariams.<br />Spauskite čia, norėdami atidaryti nustatymus ir tai pridėti!",
+    "Show": "Rodyti",
+    "Show all": "Rodyti viską",
+    "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Jūs ignoravote šį vartotoją, todėl jo žinutė yra paslėpta. <a>Rodyti vistiek.</a>",
+    "Show files": "Rodyti failus",
+    "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.": "Kai kas nors į savo žinutę įtraukia URL, gali būti rodoma URL peržiūra, suteikianti daugiau informacijos apie tą nuorodą, tokios kaip pavadinimas, aprašymas ir vaizdas iš svetainės.",
+    "Show Stickers": "Rodyti Lipdukus",
+    "Show %(count)s more|one": "Rodyti dar %(count)s",
+    "Show %(count)s more|other": "Rodyti dar %(count)s",
+    "Show previews of messages": "Rodyti žinučių peržiūras",
+    "Show rooms with unread messages first": "Pirmiausia rodyti kambarius su neperskaitytomis žinutėmis",
+    "Show Widgets": "Rodyti Valdiklius",
+    "Show tray icon and minimize window to it on close": "Rodyti dėklo piktogramą ir sumažinti langą į jį, kai uždaroma",
+    "Always show the window menu bar": "Visada rodyti lango meniu juostą",
+    "There are advanced notifications which are not shown here.": "Yra išplėstinių pranešimų, kurie čia nerodomi.",
+    "Show less": "Rodyti mažiau",
+    "Show message previews for reactions in all rooms": "Rodyti žinučių peržiūras reakcijoms visuose kambariuose",
+    "Show message previews for reactions in DMs": "Rodyti žinučių peržiūras reakcijoms tiesioginėse žinutėse",
+    "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Neleisti vartotojams kalbėti senoje kambario versijoje ir paskelbti pranešimą, kuriame vartotojams patariama persikelti į naują kambarį",
+    "Update any local room aliases to point to the new room": "Atnaujinkite vietinių kambarių slapyvardžius, kad nurodytumėte į naująjį kambarį",
+    "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:": "Norint atnaujinti šį kambarį, reikia uždaryti esamą kambario instanciją ir vietoje jo sukurti naują kambarį. Norėdami suteikti kambario nariams kuo geresnę patirtį, mes:",
+    "Upgrade Room Version": "Atnaujinti Kambario Versiją",
+    "Upgrade this room to version %(version)s": "Atnaujinti šį kambarį į %(version)s versiją",
+    "Please fill why you're reporting.": "Įrašykite kodėl pranešate.",
+    "Put a link back to the old room at the start of the new room so people can see old messages": "Naujojo kambario pradžioje įdėkite nuorodą į senąjį kambarį, kad žmonės galėtų matyti senas žinutes",
+    "An image will help people identify your community.": "Atvaizdas padės žmonėms atpažinti jūsų bendruomenę.",
+    "Invite people to join %(communityName)s": "Pakviesti žmones jungtis prie %(communityName)s",
+    "People you know on %(brand)s": "Žmonės, kuriuos pažįstate %(brand)s",
+    "Smileys & People": "Šypsenėlės ir Žmonės",
+    "%(count)s people|one": "%(count)s žmogus",
+    "%(count)s people|other": "%(count)s žmonės(-ų)",
+    "People": "Žmonės",
+    "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.": "Žmonių ignoravimas atliekamas naudojant draudimų sąrašus, kuriuose yra taisyklės, nurodančios kas turi būti draudžiami. Užsiprenumeravus draudimų sąrašą, vartotojai/serveriai, užblokuoti šio sąrašo, bus nuo jūsų paslėpti.",
+    "Try out new ways to ignore people (experimental)": "Išbandykite naujus žmonių ignoravimo būdus (eksperimentiniai)",
+    "This will end the conference for everyone. Continue?": "Tai baigs konferenciją visiems. Tęsti?",
+    "End conference": "Baigti konferenciją",
+    "The call was answered on another device.": "Į skambutį buvo atsiliepta kitame įrenginyje.",
+    "Answered Elsewhere": "Atsiliepta Kitur",
+    "The call could not be established": "Nepavyko pradėti skambučio",
+    "The other party declined the call.": "Kita šalis atsisakė skambučio.",
+    "Call Declined": "Skambutis Atmestas",
+    "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Visiems serveriams uždrausta dalyvauti! Šis kambarys nebegali būti naudojamas.",
+    "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s pašalino draudimo taisyklę, sutampančią su %(glob)s",
+    "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s pašalino taisyklę, draudžiančią serverius, sutampančius su %(glob)s",
+    "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s pašalino taisyklę, draudžiančią kambarius, sutampančius su %(glob)s",
+    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s pašalino taisyklę, draudžiančią vartotojus, sutampančius su %(glob)s",
+    "%(senderName)s updated an invalid ban rule": "%(senderName)s atnaujino klaidingą draudimo taisyklę",
+    "%(senderName)s declined the call.": "%(senderName)s atmetė skambutį.",
+    "(an error occurred)": "(įvyko klaida)",
+    "(their device couldn't start the camera / microphone)": "(jų įrenginys negalėjo pradėti kameros / mikrofono)",
+    "(connection failed)": "(prisijungimas nepavyko)",
+    "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s pakeitė serverio prieigos kontrolės sąrašus šiam kambariui.",
+    "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s nustatė serverio prieigos kontrolės sąrašus šiam kambariui.",
+    "Sends a message to the given user": "Siunčia žinutę nurodytam vartotojui",
+    "Opens chat with the given user": "Atidaro pokalbį su nurodytu vartotoju",
+    "Send a bug report with logs": "Siųsti pranešimą apie klaidą kartu su žurnalu",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Jūsų pateiktas pasirašymo raktas sutampa su pasirašymo raktu, gautu iš vartotojo %(userId)s seanso %(deviceId)s. Seansas pažymėtas kaip patikrintas.",
+    "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!": "ĮSPĖJIMAS: RAKTŲ PATIKRINIMAS NEPAVYKO! Pasirašymo raktas vartotojui %(userId)s ir seansui %(deviceId)s yra \"%(fprint)s\", kuris nesutampa su pateiktu raktu \"%(fingerprint)s\". Tai gali reikšti, kad jūsų komunikacijos yra perimamos!",
+    "Unknown (user, session) pair:": "Nežinoma (vartotojo, seanso) pora:",
+    "Verifies a user, session, and pubkey tuple": "Patvirtina vartotojo, seanso ir pubkey daugiadalę duomenų struktūrą",
+    "Please supply a widget URL or embed code": "Pateikite valdiklio URL arba įterpimo kodą",
+    "Could not find user in room": "Vartotojo rasti kambaryje nepavyko",
+    "Command failed": "Komanda nepavyko",
+    "Unrecognised room address:": "Neatpažintas kambario adresas:",
+    "You signed in to a new session without verifying it:": "Jūs prisijungėte prie naujo seanso, jo nepatvirtinę:",
+    "You can also set up Secure Backup & manage your keys in Settings.": "Jūs taip pat galite nustatyti Saugią Atsarginę Kopiją ir tvarkyti savo raktus Nustatymuose.",
+    "Secure Backup": "Saugi Atsarginė Kopija",
+    "Set up Secure Backup": "Nustatyti Saugią Atsarginę Kopiją",
+    "Ok": "Gerai",
+    "Contact your <a>server admin</a>.": "Susisiekite su savo <a>serverio administratoriumi</a>.",
+    "I want to help": "Aš noriu padėti",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Siųsti <UsageDataLink>anoniminius naudojimo duomenis</UsageDataLink>, kurie padeda mums tobulinti %(brand)s. Tam bus naudojamas <PolicyLink>slapukas</PolicyLink>.",
+    "Help us improve %(brand)s": "Padėkite mums tobulinti %(brand)s",
+    "Unknown App": "Nežinoma Programa",
+    "Error leaving room": "Klaida išeinant iš kambario",
+    "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?": "Šio vartotojo deaktyvavimas atjungs juos ir neleis jiems vėl prisijungti atgal. Taip pat jie išeis iš visų kambarių, kuriuose jie yra. Šis veiksmas negali būti atšauktas. Ar tikrai norite deaktyvuoti šį vartotoją?",
+    "Unexpected server error trying to leave the room": "Netikėta serverio klaida bandant išeiti iš kambario",
+    "%(num)s days from now": "%(num)s dienas(-ų) nuo dabar",
+    "%(num)s hours from now": "%(num)s valandas(-ų) nuo dabar",
+    "%(num)s minutes from now": "%(num)s minutes(-ų) nuo dabar",
+    "a few seconds from now": "keletą sekundžių nuo dabar",
+    "%(num)s days ago": "prieš %(num)s dienas(-ų)",
+    "%(num)s hours ago": "prieš %(num)s valandas(-ų)",
+    "%(num)s minutes ago": "prieš %(num)s minutes(-ų)",
+    "a few seconds ago": "prieš kelias sekundes",
+    "Manually Verify by Text": "Patvirtinti rankiniu būdu, naudojant Tekstą",
+    "Not Trusted": "Nepatikimas",
+    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) prisijungė prie naujo seanso jo nepatvirtinę:",
+    "Dark": "Tamsi",
+    "Light": "Šviesi",
+    "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s atnaujino draudimo taisyklę, kuri sutapo su %(oldGlob)s į sutampančią su %(newGlob)s dėl %(reason)s",
+    "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s pakeitė taisyklę, kuri draudė serverius, sutampančius su %(oldGlob)s į sutampančius su %(newGlob)s dėl %(reason)s",
+    "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s pakeitė taisyklę, kuri draudė kambarius, sutampančius su %(oldGlob)s į sutampančius su %(newGlob)s dėl %(reason)s",
+    "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s pakeitė taisyklę, kuri draudė vartotojus, sutampančius su %(oldGlob)s į sutampančius su %(newGlob)s dėl %(reason)s",
+    "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s sukūrė draudimo taisyklę, sutampančią su %(glob)s dėl %(reason)s",
+    "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s sukūrė taisyklę, draudžiančią serverius, sutampančius su %(glob)s dėl %(reason)s",
+    "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s sukūrė taisyklę, draudžiančią kambarius, sutampančius su %(glob)s dėl %(reason)s",
+    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s sukūrė taisyklę, draudžiančią vartotojus, sutampančius su %(glob)s dėl %(reason)s",
+    "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s atnaujino draudimo taisyklę, sutampančią su %(glob)s dėl %(reason)s",
+    "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s atnaujino taisyklę, draudžiančią serverius, sutampančius su %(glob)s dėl %(reason)s",
+    "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s atnaujino taisyklę, draudžiančią kambarius, sutampančius su %(glob)s dėl %(reason)s",
+    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s atnaujino taisyklę, draudžiančią vartotojus, sutampančius su %(glob)s dėl %(reason)s",
+    "Emoji picker": "Jaustukų rinkėjas",
+    "Failed to remove tag %(tagName)s from room": "Nepavyko pašalinti žymos %(tagName)s iš kambario",
+    "The user '%(displayName)s' could not be removed from the summary.": "Vartotojas '%(displayName)s' negali būti pašalintas iš santraukos.",
+    "Failed to remove a user from the summary of %(groupId)s": "Nepavyko pašalinti vartotojo iš %(groupId)s santraukos",
+    "The room '%(roomName)s' could not be removed from the summary.": "Kambarys '%(roomName)s' negali būti pašalintas iš santraukos.",
+    "Failed to remove the room from the summary of %(groupId)s": "Nepavyko pašalinti kambario iš %(groupId)s santraukos",
+    "Your browser likely removed this data when running low on disk space.": "Jūsų naršyklė greičiausiai pašalino šiuos duomenis pritrūkus vietos diske.",
+    "Remove server": "Pašalinti serverį",
+    "Remove %(count)s messages|one": "Pašalinti 1 žinutę",
+    "Remove %(count)s messages|other": "Pašalinti %(count)s žinutes(-ų)",
+    "Remove %(phone)s?": "Pašalinti %(phone)s?",
+    "Remove %(email)s?": "Pašalinti %(email)s?",
+    "Remove messages sent by others": "Pašalinti kitų siųstas žinutes",
+    "Remove for everyone": "Pašalinti visiems",
+    "Popout widget": "Iššokti valdiklį",
+    "Unpin a widget to view it in this panel": "Atsekite valdiklį, kad galėtumėte jį peržiūrėti šiame skydelyje",
+    "Unpin": "Atsegti",
+    "Video conference started by %(senderName)s": "%(senderName)s pradėjo video konferenciją",
+    "Video conference updated by %(senderName)s": "%(senderName)s atnaujino video konferenciją",
+    "Video conference ended by %(senderName)s": "%(senderName)s užbaigė video konferenciją",
+    "Start automatically after system login": "Pradėti automatiškai prisijungus prie sistemos",
+    "Subscribe": "Prenumeruoti",
+    "Room ID or address of ban list": "Kambario ID arba draudimų sąrašo adresas",
+    "If this isn't what you want, please use a different tool to ignore users.": "Jei tai nėra ko jūs norite, naudokite kitą įrankį vartotojams ignoruoti.",
+    "Subscribed lists": "Prenumeruojami sąrašai",
+    "eg: @bot:* or example.org": "pvz.: @botas:* arba pavyzdys.org",
+    "Server or user ID to ignore": "Norimo ignoruoti serverio arba vartotojo ID",
+    "Personal ban list": "Asmeninis draudimų sąrašas",
+    "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.": "Čia pridėkite vartotojus ir serverius, kuriuos norite ignoruoti. Naudokite žvaigždutes, kad %(brand)s atitiktų bet kokius simbolius. Pavyzdžiui, <code>@botas:*</code> ignoruotų visus vartotojus, turinčius vardą 'botas' bet kuriame serveryje.",
+    "Ignored users": "Ignoruojami vartotojai",
+    "View rules": "Peržiūrėti taisykles",
+    "Unsubscribe": "Atsisakyti prenumeratos",
+    "You have not ignored anyone.": "Jūs nieko neignoruojate.",
+    "User rules": "Vartotojo taisyklės",
+    "Server rules": "Serverio taisyklės",
+    "Ban list rules - %(roomName)s": "Draudimo sąrašo taisyklės - %(roomName)s",
+    "None": "Nė vienas",
+    "Please try again or view your console for hints.": "Bandykite dar kartą arba peržiūrėkite konsolę, kad rastumėte užuominų.",
+    "Error unsubscribing from list": "Klaida atsisakant sąrašo prenumeratos",
+    "Error removing ignored user/server": "Klaida pašalinant ignoruojamą vartotoją/serverį",
+    "Error subscribing to list": "Klaida užsiprenumeruojant sąrašą",
+    "Something went wrong. Please try again or view your console for hints.": "Kažkas ne taip. Bandykite dar kartą arba peržiūrėkite konsolę, kad rastumėte užuominų.",
+    "Error adding ignored user/server": "Klaida pridedant ignoruojamą vartotoją/serverį",
+    "Ignored/Blocked": "Ignoruojami/Blokuojami",
+    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Tinkinkite savo patirtį su eksperimentinėmis laboratorijų funkcijomis. <a>Sužinoti daugiau</a>.",
+    "Labs": "Laboratorijos",
+    "Legal": "Teisiniai",
+    "Appearance Settings only affect this %(brand)s session.": "Išvaizdos Nustatymai įtakoja tik šį %(brand)s seansą.",
+    "Customise your appearance": "Tinkinti savo išvaizdą",
+    "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Nustatykite sistemoje įdiegto šrifto pavadinimą ir %(brand)s bandys jį naudoti.",
+    "Modern": "Modernus",
+    "Compact": "Kompaktiškas",
+    "Message layout": "Žinutės išdėstymas",
+    "Use between %(min)s pt and %(max)s pt": "Naudokite dydį tarp %(min)s pt ir %(max)s pt",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "Pasirinktinis šrifto dydis gali būti tik tarp %(min)s pt ir %(max)s pt",
+    "Size must be a number": "Dydis turi būti skaičius",
+    "Hey you. You're the best!": "Labukas. Tu geriausias(-a)!",
+    "New version available. <a>Update now.</a>": "Galima nauja versija. <a>Atnaujinti dabar.</a>",
+    "You should:": "Jūs turėtumėte:",
+    "Checking server": "Tikrinamas serveris",
+    "not ready": "neparuošta",
+    "ready": "paruošta",
+    "Secret storage:": "Slapta saugykla:",
+    "Backup key cached:": "Atsarginis raktas išsaugotas talpykloje:",
+    "not stored": "nesaugomas",
+    "Backup key stored:": "Atsarginis raktas saugomas:",
+    "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.": "Sukurkite šifravimo raktų atsarginę kopiją su savo paskyros duomenimis, jei prarastumėte prieigą prie savo seansų. Jūsų raktai bus apsaugoti unikaliu Atkūrimo Raktu.",
+    "Algorithm:": "Algoritmas:",
+    "Backup version:": "Atsarginės kopijos versija:",
+    "Backup is not signed by any of your sessions": "Atsarginė kopija nepasirašyta nė vieno jūsų seanso",
+    "Backing up %(sessionsRemaining)s keys...": "Daromos atsarginės %(sessionsRemaining)s raktų kopijos...",
+    "Profile picture": "Profilio paveikslėlis",
+    "The operation could not be completed": "Nepavyko užbaigti operacijos",
+    "Failed to save your profile": "Nepavyko išsaugoti jūsų profilio",
+    "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "Galbūt juos sukonfigūravote ne %(brand)s kliente, o kitame. Jūs negalite derinti jų %(brand)s, bet jie vis tiek taikomi.",
+    "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)": "Prašau pamiršti visas mano siųstas žinutes, kai mano paskyra bus deaktyvuota (<b>Įspėjimas:</b> tai neleis būsimiems vartotojams pamatyti pilnų pokalbių vaizdo)",
+    "Forget Room": "Pamiršti Kambarį",
+    "Forget this room": "Pamiršti šį kambarį",
+    "You are a member of this community": "Jūs esate šios bendruomenės narys",
+    "You are an administrator of this community": "Jūs esate šios bendruomenės administratorius",
+    "This homeserver would like to make sure you are not a robot.": "Šis serveris norėtų įsitikinti, kad jūs nesate robotas.",
+    "Your area is experiencing difficulties connecting to the internet.": "Jūsų vietovėje kyla sunkumų prisijungiant prie interneto.",
+    "Your server isn't responding to some of your requests. Below are some of the most likely reasons.": "Jūsų serveris neatsako į kai kurias jūsų užklausas. Žemiau pateikiamos kelios labiausiai tikėtinos priežastys.",
+    "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.": "Žinučių matomumas Matrix yra panašus į el. paštą. Jūsų žinučių užmiršimas reiškia, kad žinutėmis, kurias jūs išsiuntėte, nebus dalijamasi su jokiais naujais arba neregistruotais vartotojais, bet registruoti vartotojai, kurie jau turi prieigą prie šių žinučių, vis tiek turės prieigą prie savo kopijų.",
+    "Your messages are not secure": "Jūsų žinutės nėra saugios",
+    "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.": "Raktų bendrinimo užklausos jūsų kitiems seansams yra siunčiamos automatiškai. Jei jūs atmetėte arba nutraukėte raktų bendrinimo užklausą kitame savo seanse, spauskite čia, kad vėl paprašytumėte šio seanso raktų.",
+    "Your key share request has been sent - please check your other sessions for key share requests.": "Jūsų raktų bendrinimo užklausa buvo išsiųsta - patikrinkite, ar kituose jūsų seansuose nėra raktų bendrinimo užklausų.",
+    "You are currently subscribed to:": "Šiuo metu esate užsiprenumeravę:",
+    "You are not subscribed to any lists": "Nesate užsiprenumeravę jokių sąrašų",
+    "You are currently ignoring:": "Šiuo metu ignoruojate:",
+    "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Ar tikrai? Jūs prarasite savo šifruotas žinutes, jei jūsų raktams nebus tinkamai sukurtos atsarginės kopijos.",
+    "Your keys are <b>not being backed up from this session</b>.": "Jūsų raktams <b>nėra daromos atsarginės kopijos iš šio seanso</b>.",
+    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Bendruomenės ID gali turėti tik šiuos simbolius a-z, 0-9, or '=_-./'",
+    "A-Z": "A-Ž",
+    "Activity": "Aktyvumą",
+    "Sort by": "Rūšiuoti pagal",
+    "List options": "Sąrašo parinktys",
+    "Notification Autocomplete": "Pranešimo Automatinis Užbaigimas",
+    "Room Notification": "Kambario Pranešimas",
+    "You have %(count)s unread notifications in a prior version of this room.|one": "Jūs turite %(count)s neperskaitytą pranešimą ankstesnėje šio kambario versijoje.",
+    "You have %(count)s unread notifications in a prior version of this room.|other": "Jūs turite %(count)s neperskaitytus(-ų) pranešimus(-ų) ankstesnėje šio kambario versijoje.",
+    "You have no visible notifications in this room.": "Šiame kambaryje neturite matomų pranešimų.",
+    "Notification options": "Pranešimų parinktys",
+    "Leave Room": "Išeiti Iš Kambario",
+    "Favourited": "Mėgstamas",
+    "Room options": "Kambario parinktys",
+    "%(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 negali saugiai talpinti šifruotų žinučių lokaliai, kai veikia interneto naršyklėje. Naudokite <desktopLink>%(brand)s Desktop (darbastalio versija)</desktopLink>, kad šifruotos žinutės būtų rodomos paieškos rezultatuose.",
+    "%(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 trūksta kai kurių komponentų, reikalingų saugiai talpinti šifruotas žinutes lokaliai. Jei norite eksperimentuoti su šia funkcija, sukurkite pasirinktinį %(brand)s Desktop (darbastalio versiją), su <nativeLink>pridėtais paieškos komponentais</nativeLink>.",
+    "Manage": "Tvarkyti",
+    "rooms.": "kambarių.",
+    " to store messages from ": " saugoti žinutes iš ",
+    "Master private key:": "Pagrindinis privatus raktas:",
+    "not found in storage": "saugykloje nerasta",
+    "Cross-signing is not set up.": "Kryžminis pasirašymas nenustatytas.",
+    "Cross-signing is ready for use.": "Kryžminis pasirašymas yra paruoštas naudoti.",
+    "Channel: %(channelName)s": "Kanalas: %(channelName)s",
+    "Workspace: %(networkName)s": "Darbo sritis: %(networkName)s",
+    "This bridge is managed by <user />.": "Šis tiltas yra tvarkomas <user />.",
+    "This bridge was provisioned by <user />.": "Šis tiltas buvo parūpintas <user />.",
+    "Your server isn't responding to some <a>requests</a>.": "Jūsų serveris neatsako į kai kurias <a>užklausas</a>.",
+    "Unable to find a supported verification method.": "Nepavyko rasti palaikomo patvirtinimo metodo.",
+    "Start": "Pradėti",
+    "or": "arba",
+    "Incoming call": "Įeinantis skambutis",
+    "Incoming video call": "Įeinantis video skambutis",
+    "Incoming voice call": "Įeinantis balso skambutis",
+    "Unknown caller": "Nežinomas skambintojas",
+    "Downloading logs": "Parsiunčiami žurnalai",
+    "Uploading logs": "Įkeliami žurnalai",
+    "System font name": "Sistemos šrifto pavadinimas",
+    "Use a system font": "Naudoti sistemos šriftą",
+    "Use a more compact ‘Modern’ layout": "Naudoti labiau kompaktišką 'Modernų' išdėstymą",
+    "Use custom size": "Naudoti pasirinktinį dydį",
+    "Font size": "Šrifto dydis",
+    "Enable advanced debugging for the room list": "Įjungti išplėstinį kambarių sąrašo derinimą",
+    "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.": "Jei kita %(brand)s versija vis dar yra atidaryta kitame skirtuke, uždarykite jį, nes %(brand)s naudojimas tame pačiame serveryje, tuo pačiu metu įjungus ir išjungus tingų įkėlimą, sukelks problemų.",
+    "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.": "Jūs anksčiau naudojote %(brand)s ant %(host)s įjungę tingų narių įkėlimą. Šioje versijoje tingus įkėlimas yra išjungtas. Kadangi vietinė talpykla nesuderinama tarp šių dviejų nustatymų, %(brand)s reikia iš naujo sinchronizuoti jūsų paskyrą.",
+    "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Jūs galite tai įjungti, jei kambarys bus naudojamas tik bendradarbiavimui su vidinėmis komandomis jūsų serveryje. Tai negali būti vėliau pakeista.",
+    "Your server requires encryption to be enabled in private rooms.": "Jūsų serveris reikalauja, kad šifravimas būtų įjungtas privačiuose kambariuose.",
+    "You don't currently have any stickerpacks enabled": "Jūs šiuo metu neturite jokių įjungtų lipdukų paketų",
+    "Enable experimental, compact IRC style layout": "Įjungti eksperimentinį, kompaktišką IRC stiliaus išdėstymą",
+    "Support adding custom themes": "Palaikykite pridėdami pasirinktines temas",
+    "New spinner design": "Naujas suktuko dizainas",
+    "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Bendruomenių v2 prototipai. Reikalingas suderinamas serveris. Itin eksperimentiniai - naudokite atsargiai.",
+    "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
+    "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
+    "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
+    "* %(senderName)s %(emote)s": "* %(senderName)s %(emote)s",
+    "%(senderName)s is calling": "%(senderName)s skambina",
+    "Waiting for answer": "Laukiama atsakymo",
+    "%(senderName)s started a call": "%(senderName)s pradėjo skambutį",
+    "You started a call": "Jūs pradėjote skambutį",
+    "Call ended": "Skambutis baigtas",
+    "%(senderName)s left the call": "%(senderName)s paliko skambutį",
+    "You left the call": "Jūs palikote skambutį",
+    "Call in progress": "Vykdomas skambutis",
+    "The person who invited you already left the room, or their server is offline.": "Asmuo, kuris jus pakvietė, jau išėjo iš kambario, arba jo serveris yra neprisijungęs.",
+    "The person who invited you already left the room.": "Asmuo, kuris jus pakvietė, jau išėjo iš kambario.",
+    "Guest": "Svečias",
+    "A new version of %(brand)s is available!": "Galima nauja %(brand)s versija!",
+    "Upgrade your %(brand)s": "Atnaujinti jūsų %(brand)s",
+    "Restart": "Perkrauti",
+    "A widget would like to verify your identity": "Valdiklis nori patvirtinti jūsų tapatybę",
+    "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Patvirtinant šį vartotoją, jo seansas bus pažymėtas kaip patikimas, taip pat jūsų seansas bus pažymėtas kaip patikimas jam.",
+    "In encrypted rooms, verify all users to ensure it’s secure.": "Užšifruotuose kambariuose, patvirtinkite visus vartotojus, kad užtikrintumėte jo saugumą.",
+    "The homeserver the user you’re verifying is connected to": "Serveris, prie kurio yra prisijungęs jūsų tvirtinamas vartotojas",
+    "Verify the link in your inbox": "Patvirtinkite nuorodą savo el. pašto dėžutėje",
+    "Click the link in the email you received to verify and then click continue again.": "Paspauskite nuorodą gautame el. laiške, kad patvirtintumėte, tada dar kartą spustelėkite tęsti.",
+    "Please verify the room ID or address and try again.": "Patikrinkite kambario ID arba adresą ir bandykite dar kartą.",
+    "Verify this session by confirming the following number appears on its screen.": "Patvirtinkite šį seansą, įsitikindami, kad jo ekrane rodomas toliau esantis skaičius.",
+    "Privacy": "Privatumas",
+    "Accept all %(invitedRooms)s invites": "Priimti visus %(invitedRooms)s pakvietimus",
+    "Bulk options": "Grupinės parinktys",
+    "Confirm Security Phrase": "Patvirtinkite Slaptafrazę",
+    "Set a Security Phrase": "Nustatyti Slaptafrazę",
+    "Use a secret phrase only you know, and optionally save a Security Key to use for backup.": "Naudokite slaptafrazę, kurią žinote tik jūs ir pasirinktinai išsaugokite Apsaugos Raktą, naudoti kaip atsarginę kopiją.",
+    "Enter a Security Phrase": "Įveskite Slaptafrazę",
+    "Security Phrase": "Slaptafrazė",
+    "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.": "Įveskite slaptafrazę, kurią žinote tik jūs, nes ji naudojama jūsų duomenims apsaugoti. Tam, kad būtumėte saugūs, neturėtumėte vėl naudoti savo paskyros slaptažodžio.",
+    "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "Įveskite savo Slaptafrazę arba <button>Naudokite savo Apsaugos Raktą</button>, kad tęstumėte.",
+    "%(creator)s created this DM.": "%(creator)s sukūrė šį tiesioginio susirašymo kambarį.",
+    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Šiame pokalbyje esate tik jūs dviese, nebent kuris nors iš jūsų pakvies ką nors prisijungti.",
+    "This is the beginning of your direct message history with <displayName/>.": "Tai yra jūsų tiesioginių žinučių su <displayName/> istorijos pradžia.",
+    "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Žinutės čia yra visapusiškai užšifruotos. Patvirtinkite %(displayName)s jų profilyje - paspauskite ant jų pseudoportreto.",
+    "See when the avatar changes in your active room": "Matyti kada jūsų aktyviame kambaryje pasikeičia pseudoportretas",
+    "Change the avatar of your active room": "Pakeisti jūsų aktyvaus kambario pseudoportretą",
+    "See when the avatar changes in this room": "Matyti kada šiame kambaryje pasikeičia pseudoportretas",
+    "Change the avatar of this room": "Pakeisti šio kambario pseudoportretą",
+    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Žinutės šiame kambaryje yra visapusiškai užšifruotos. Kai žmonės prisijungia, jūs galite patvirtinti juos jų profilyje, tiesiog paspauskite ant jų pseudoportreto.",
+    "Mentions & Keywords": "Paminėjimai ir Raktažodžiai",
+    "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Nepavyksta prisijungti prie serverio - patikrinkite savo ryšį, įsitikinkite, kad jūsų <a>serverio SSL sertifikatas</a> yra patikimas ir, kad naršyklės plėtinys neužblokuoja užklausų.",
+    "Not trusted": "Nepatikimas",
+    "Trusted": "Patikimas",
+    "Role": "Rolė",
+    "You've previously used a newer version of %(brand)s with this session. To use this version again with end to end encryption, you will need to sign out and back in again.": "Anksčiau šiame seanse naudojote naujesnę %(brand)s versiją. Norėdami vėl naudoti šią versiją su visapusiu šifravimu, turėsite atsijungti ir prisijungti iš naujo.",
+    "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of %(brand)s to do this": "Tam, kad neprarastumėte savo pokalbių istorijos, prieš atsijungdami turite eksportuoti kambario raktus. Norėdami tai padaryti, turėsite grįžti į naujesnę %(brand)s versiją",
+    "New version of %(brand)s is available": "Yra nauja %(brand)s versija",
+    "Failed to update community": "Nepavyko atnaujinti bendruomenės",
+    "Update status": "Atnaujinti statusą",
+    "Update community": "Atnaujinti bendruomenę",
+    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "Kambario %(roomName)s matomumas bendruomenėje %(groupId)s negalėjo būti atnaujintas.",
+    "Update %(brand)s": "Atnaujinti %(brand)s",
+    "Someone is using an unknown session": "Kažkas naudoja nežinomą seansą",
+    "PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> to help us track down the problem.": "PRO PATARIMAS: Jei pradėjote klaidos pranešimą, pateikite <debugLogsLink>derinimo žurnalus</debugLogsLink>, kad padėtumėte mums išsiaiškinti problemą.",
+    "Please review and accept the policies of this homeserver:": "Peržiūrėkite ir sutikite su šio serverio politika:",
+    "Please review and accept all of the homeserver's policies": "Peržiūrėkite ir sutikite su visa serverio politika",
+    "Please view <existingIssuesLink>existing bugs on Github</existingIssuesLink> first. No match? <newIssueLink>Start a new one</newIssueLink>.": "Pirmiausia peržiūrėkite <existingIssuesLink>Github'e esančius pranešimus apie klaidas</existingIssuesLink>. Jokio atitikmens? <newIssueLink>Pradėkite naują pranešimą</newIssueLink>.",
+    "This usually only affects how the room is processed on the server. If you're having problems with your %(brand)s, please <a>report a bug</a>.": "Paprastai tai turi įtakos tik kambario apdorojimui serveryje. Jei jūs turite problemų su savo %(brand)s, <a>praneškite apie klaidą</a>.",
+    "Report a bug": "Pranešti apie klaidą",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Pakviesti ką nors, naudojant jų vardą, el. pašto adresą, vartotojo vardą (pvz.: <userId/>) arba <a>bendrinti šį kambarį</a>.",
+    "Azerbaijan": "Azerbaidžanas",
+    "Austria": "Austrija",
+    "Australia": "Australija",
+    "Aruba": "Aruba",
+    "Armenia": "Armėnija",
+    "Argentina": "Argentina",
+    "Antigua & Barbuda": "Antigva ir Barbuda",
+    "Antarctica": "Antarktida",
+    "Anguilla": "Angilija",
+    "Angola": "Angola",
+    "Andorra": "Andora",
+    "American Samoa": "Amerikos Samoa",
+    "Algeria": "Alžyras",
+    "Albania": "Albanija",
+    "Åland Islands": "Alandų Salos",
+    "Afghanistan": "Afganistanas",
+    "United States": "Jungtinės Amerikos Valstijos",
+    "United Kingdom": "Jungtinė Karalystė",
+    "You've reached the maximum number of simultaneous calls.": "Pasiekėte maksimalų vienu metu vykdomų skambučių skaičių.",
+    "Too Many Calls": "Per Daug Skambučių",
+    "No other application is using the webcam": "Jokia kita programa nenaudoja kameros",
+    "Permission is granted to use the webcam": "Suteiktas leidimas naudoti kamerą",
+    "A microphone and webcam are plugged in and set up correctly": "Mikrofonas ir kamera yra prijungti ir tinkamai nustatyti",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "Skambutis nepavyko, nes kamera arba mikrofonas negali būti pasiekta. Patikrinkite tai:",
+    "Unable to access webcam / microphone": "Nepavyksta pasiekti kameros / mikrofono",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Skambutis nepavyko, nes mikrofonas negali būti pasiektas. Patikrinkite, ar mikrofonas yra prijungtas ir tinkamai nustatytas.",
+    "Unable to access microphone": "Nepavyksta pasiekti mikrofono",
+    "Local Addresses": "Vietiniai Adresai",
+    "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.": "Jei anksčiau naudojote naujesnę %(brand)s versiją, jūsų seansas gali būti nesuderinamas su šia versija. Uždarykite šį langą ir grįžkite į naujesnę versiją.",
+    "We encountered an error trying to restore your previous session.": "Bandant atkurti ankstesnį seansą įvyko klaida.",
+    "The internet connection either session is using": "Interneto ryšys, naudojamas bet kurio seanso",
+    "This session, or the other session": "Šis seansas, arba kitas seansas",
+    "Confirm this user's session by comparing the following with their User Settings:": "Patvirtinkite šio vartotojo seansą, palygindami tai, kas nurodyta toliau, su jo Vartotojo Nustatymais:",
+    "Confirm by comparing the following with the User Settings in your other session:": "Patvirtinkite, palygindami tai, kas nurodyta toliau, su Vartotojo Nustatymais kitame jūsų seanse:",
+    "Clear all data in this session?": "Išvalyti visus duomenis šiame seanse?",
+    "%(count)s sessions|one": "%(count)s seansas",
+    "Yours, or the other users’ session": "Jūsų, arba kito vartotojo seansas",
+    "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Iš naujo prašyti šifravimo raktų</requestLink> iš kitų jūsų seansų.",
+    "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Jei jūsų kiti seansai neturi šios žinutės rakto, jūs negalėsite jos iššifruoti.",
+    "Missing session data": "Trūksta seanso duomenų",
+    "Successfully restored %(sessionCount)s keys": "Sėkmingai atkurti %(sessionCount)s raktai",
+    "Warning: Your personal data (including encryption keys) is still stored in this session. Clear it if you're finished using this session, or want to sign in to another account.": "Įspėjimas: Jūsų asmeniniai duomenys (įskaitant šifravimo raktus) vis dar yra saugomi šiame seanse. Išvalykite juos, jei baigėte naudoti šį seansą, arba norite prisijungti prie kitos paskyros."
 }
diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json
index 6369ffed82..d294b38d82 100644
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -1,7 +1,7 @@
 {
     "Accept": "Pieņemt",
-    "%(targetName)s accepted an invitation.": "%(targetName)s apstiprināja uzaicinājumu.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s apstiprināja uzaicinājumu no %(displayName)s.",
+    "%(targetName)s accepted an invitation.": "%(targetName)s pieņēma uzaicinājumu.",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s pieņēma uzaicinājumu no %(displayName)s.",
     "Account": "Konts",
     "Access Token:": "Pieejas tokens:",
     "Active call (%(roomName)s)": "Aktīvs zvans (%(roomName)s)",
@@ -12,49 +12,49 @@
     "No Microphones detected": "Nav mikrofonu",
     "No Webcams detected": "Nav webkameru",
     "No media permissions": "Nav datu nesēju, kuriem atļauta piekļuve",
-    "You may need to manually permit %(brand)s to access your microphone/webcam": "Tev varētu būt nepieciešams manuāli atļaut %(brand)s pieslēgties tavam mikrofonam/webkamerai",
+    "You may need to manually permit %(brand)s to access your microphone/webcam": "Jums varētu būt nepieciešams manuāli atļaut %(brand)s piekļuvi mikrofonam vai tīmekļa kamerai",
     "Default Device": "Noklusējuma ierīce",
     "Microphone": "Mikrofons",
     "Camera": "Kamera",
-    "Advanced": "Papildus",
+    "Advanced": "Papildu",
     "Always show message timestamps": "Vienmēr rādīt ziņojumu laika zīmogu",
     "Authentication": "Autentifikācija",
     "%(items)s and %(lastItem)s": "%(items)s un %(lastItem)s",
     "A new password must be entered.": "Nepieciešams ievadīt jauno paroli.",
-    "%(senderName)s answered the call.": "%(senderName)s atbildēja zvanam.",
+    "%(senderName)s answered the call.": "%(senderName)s atbildēja uz zvanu.",
     "An error has occurred.": "Notikusi kļūda.",
     "Anyone": "Ikviens",
     "Anyone who knows the room's link, apart from guests": "Ikviens, kurš zina adreses saiti uz istabu, izņemot viesus",
     "Anyone who knows the room's link, including guests": "Ikviens, kurš zina adreses saiti uz istabu, tai skaitā arī viesi",
-    "Are you sure?": "Vai tiešām to vēlies?",
-    "Are you sure you want to leave the room '%(roomName)s'?": "Vai tiešām vēlies pamest istabu:  '%(roomName)s'?",
+    "Are you sure?": "Vai tiešām to vēlaties?",
+    "Are you sure you want to leave the room '%(roomName)s'?": "Vai tiešām vēlies pamest istabu: '%(roomName)s'?",
     "Are you sure you want to reject the invitation?": "Vai tiešām vēlies noraidīt šo uzaicinājumu?",
     "Attachment": "Pielikums",
     "Autoplay GIFs and videos": "Automātiski rādīt GIF animācijas un video",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s liedza pieeju %(targetName)s.",
-    "Ban": "Nobanot/liegt pieeju",
-    "Banned users": "Banotie/bloķētie lietotāji (kuriem liegta pieeja)",
-    "Bans user with given id": "Bloķē (liedz pieeju) lietotāju pēc uzdotā ID (nobano)",
+    "Ban": "Liegt pieeju",
+    "Banned users": "Lietotāji, kuriem liegta pieeju",
+    "Bans user with given id": "Liedz pieeju lietotājam ar norādīto id",
     "Call Timeout": "Savienojuma gaidīšanas noilgums",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Neizdodas savienoties ar bāzes serveri. Pārbaudi tīkla savienojumu un pārliecinies, ka <a> bāzes servera SSL sertifikāts</a> ir uzticams, kā arī pārlūkā instalētie paplašinājumi nebloķē pieprasījumus.",
-    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Neizdodas savienoties ar bāzes serveri izmantojot HTTP protokolu, kad Tava pārlūka adreses laukā norādīts HTTPS protokols. Tā vietā izmanto HTTPS vai <a>iespējo nedrošos skriptus</a>.",
-    "Change Password": "Paroles maiņa",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Neizdodas savienoties ar bāzes serveri izmantojot HTTP protokolu, kad pārlūka adreses laukā norādīts HTTPS protokols. Tā vietā izmanto HTTPS vai <a>iespējo nedrošos skriptus</a>.",
+    "Change Password": "Nomainīt paroli",
     "%(senderName)s changed their profile picture.": "%(senderName)s nomainīja profila attēlu.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s nomainīja statusa līmeni %(powerLevelDiffText)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s nomainīja istabas nosaukumu uz %(roomName)s.",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s dzēsa istabas nosaukumu.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s nomainīja tēmas nosaukumu uz \"%(topic)s\".",
-    "Changes your display nickname": "Nomaina Tavu publisko segvārdu (niku)",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s nomainīja istabas tematu uz \"%(topic)s\".",
+    "Changes your display nickname": "Nomaina jūsu parādāmo vārdu",
     "Click here to fix": "Klikšķini šeit, lai salabotu",
     "Click to mute audio": "Klikšķini, lai audio skaņu izslēgtu",
     "Click to mute video": "Klikšķini, lai video skaņu izslēgtu",
-    "click to reveal": "Klikšķini, lai atsegtu",
+    "click to reveal": "nospiediet, lai atsegtu",
     "Click to unmute video": "Klikšķini, lai video skaņu ieslēgtu",
     "Click to unmute audio": "Klikšķini, lai audio skaņu ieslēgtu",
     "Close": "Aizvērt",
     "Command error": "Komandas kļūda",
     "Commands": "Komandas",
-    "Confirm password": "Apstiprini paroli",
+    "Confirm password": "Apstipriniet paroli",
     "Continue": "Turpināt",
     "Create Room": "Izveidot istabu",
     "Cryptography": "Kriptogrāfija",
@@ -62,26 +62,26 @@
     "Custom": "Pielāgots",
     "Custom level": "Īpašais līmenis",
     "/ddg is not a command": "/ddg nav komanda",
-    "Deactivate Account": "Deaktivēt kontu",
+    "Deactivate Account": "Deaktivizēt kontu",
     "Decline": "Noraidīt",
     "Decrypt %(text)s": "Atšifrēt %(text)s",
     "Deops user with given id": "Atceļ operatora statusu lietotājam ar norādīto Id",
     "Default": "Noklusējuma",
     "Disinvite": "Atsaukt",
     "Displays action": "Parāda darbību",
-    "Download %(text)s": "Lejupielādēt tekstu: %(text)s",
+    "Download %(text)s": "Lejupielādēt: %(text)s",
     "Drop File Here": "Ievelc failu šeit",
     "Email": "Epasts",
     "Email address": "Epasta adrese",
-    "Emoji": "Emocīši (emoji)",
-    "%(senderName)s ended the call.": "%(senderName)s beidza zvanu.",
-    "Enter passphrase": "Ievadi paroles frāzi",
+    "Emoji": "Emocijzīmes",
+    "%(senderName)s ended the call.": "%(senderName)s pārtrauca zvanu.",
+    "Enter passphrase": "Ievadiet frāzveida paroli",
     "Error": "Kļūda",
     "Error decrypting attachment": "Kļūda atšifrējot pielikumu",
     "Error: Problem communicating with the given homeserver.": "Kļūda: Saziņas problēma ar norādīto bāzes serveri.",
     "Existing Call": "Pašreizējā saruna (zvans)",
     "Export": "Eksportēt",
-    "Export E2E room keys": "Eksportēt E2E istabas atslēgas",
+    "Export E2E room keys": "Eksportēt istabas šifrēšanas atslēgas",
     "Failed to ban user": "Neizdevās nobanot/bloķēt (liegt pieeju) lietotāju",
     "Failed to change password. Is your password correct?": "Neizdevās nomainīt paroli. Vai tā ir pareiza?",
     "Failed to change power level": "Neizdevās nomainīt statusa līmeni",
@@ -90,7 +90,7 @@
     "Failed to fetch avatar URL": "Neizdevās noteikt avatara URL adresi",
     "Failed to forget room %(errCode)s": "Neizdevās \"aizmirst\" istabu %(errCode)s",
     "Failed to join room": "Neizdevās pievienoties istabai",
-    "Failed to kick": "Neizdevās izspert/padzīt (kick)",
+    "Failed to kick": "Neizdevās padzīt",
     "Failed to leave room": "Neizdevās pamest istabu",
     "Failed to load timeline position": "Neizdevās ielādēt laikpaziņojumu pozīciju",
     "Failed to mute user": "Neizdevās apklusināt lietotāju",
@@ -98,17 +98,17 @@
     "Failed to reject invitation": "Neizdevās noraidīt uzaicinājumu",
     "Failed to send email": "Neizdevās nosūtīt epastu",
     "Failed to send request.": "Neizdevās nosūtīt pieprasījumu.",
-    "Failed to set display name": "Neizdevās iestatīt redzamo vārdu",
+    "Failed to set display name": "Neizdevās iestatīt parādāmo vārdu",
     "Failed to unban": "Neizdevās atbanot/atbloķēt (atcelt pieejas liegumu)",
-    "Failed to upload profile picture!": "Neizdevās augšuplādēt profila attēlu!",
+    "Failed to upload profile picture!": "Neizdevās augšupielādēt profila attēlu!",
     "Failed to verify email address: make sure you clicked the link in the email": "Neizdevās apstiprināt epasta adresi. Pārbaudi, vai Tu esi noklikšķinājis/usi saiti epasta ziņā",
     "Failure to create room": "Neizdevās izveidot istabu",
-    "Favourite": "Favorīti (izlase)",
-    "Favourites": "Favorīti",
+    "Favourite": "Izlase",
+    "Favourites": "Izlase",
     "Fill screen": "Aizpildīt ekrānu",
     "Filter room members": "Filtrēt istabas biedrus",
     "Forget room": "\"Aizmirst\" istabu",
-    "For security, this session has been signed out. Please sign in again.": "Drošības nolūkos, šī sesija ir beigusies. Lūdzu, pieraksties par jaunu.",
+    "For security, this session has been signed out. Please sign in again.": "Drošības nolūkos šī sesija ir pārtraukta. Lūdzu, pieraksties par jaunu.",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s no %(fromPowerLevel)s uz %(toPowerLevel)s",
     "Guests cannot join this room even if explicitly invited.": "Viesi nevar pievienoties šai istabai, pat ja ir uzaicināti.",
     "Hangup": "Beigt zvanu",
@@ -135,15 +135,15 @@
     "Join Room": "Pievienoties istabai",
     "%(targetName)s joined the room.": "%(targetName)s pievienojās istabai.",
     "Jump to first unread message.": "Pāriet uz pirmo neizlasīto ziņu.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s iespēra (kick) %(targetName)s.",
-    "Kick": "Izspert/padzīt no istabas (kick)",
-    "Kicks user with given id": "Padzen (kick) lietotāju ar norādīto Id",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s padzina %(targetName)s.",
+    "Kick": "Padzīt",
+    "Kicks user with given id": "Padzen lietotāju ar norādīto id",
     "Labs": "Izmēģinājumu lauciņš",
     "Last seen": "Pēdējo reizi redzēts/a",
-    "Leave room": "Doties prom no istabas",
-    "%(targetName)s left the room.": "%(targetName)s devās prom no istabas.",
+    "Leave room": "Pamest istabu",
+    "%(targetName)s left the room.": "%(targetName)s pameta istabu.",
     "Logout": "Izrakstīties",
-    "Low priority": "Zemas prioritātes",
+    "Low priority": "Zema prioritāte",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s padarīja istabas ziņu turpmāko vēsturi redzamu visiem istabas biedriem no brīža, kad tie tika uzaicināti.",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s padarīja istabas ziņu turpmāko vēsturi redzamu visiem istabas biedriem ar brīdi, kad tie pievienojās.",
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s padarīja istabas ziņu turpmāko vēsturi redzamu visiem istabas biedriem.",
@@ -153,27 +153,27 @@
     "Missing room_id in request": "Iztrūkstošs room_id pieprasījumā",
     "Missing user_id in request": "Iztrūkstošs user_id pieprasījumā",
     "Moderator": "Moderators",
-    "Mute": "Noklusināt (izslēgt skaņu)",
-    "Name": "Vārds",
+    "Mute": "Apklusināt",
+    "Name": "Nosaukums",
     "New passwords don't match": "Jaunās paroles nesakrīt",
     "New passwords must match each other.": "Jaunajām parolēm ir jāsakrīt vienai ar otru.",
     "not specified": "nav noteikts",
     "Notifications": "Paziņojumi",
     "(not supported by this browser)": "(netiek atbalstīts šajā pārlūkā)",
     "<not supported>": "<netiek atbalstīts>",
-    "No display name": "Nav publiski redzamā vārda",
-    "No more results": "Nav tālāko rezultātu",
+    "No display name": "Nav parādāmā vārda",
+    "No more results": "Vairāk nekādu rezultātu nav",
     "No results": "Nav rezultātu",
     "No users have specific privileges in this room": "Šajā istabā nav lietotāju ar īpašām privilēģijām",
-    "OK": "Lai notiek",
-    "olm version:": "Olm versija:",
-    "Only people who have been invited": "Vienīgi cilvēki, kuri uzaicināti",
+    "OK": "Labi",
+    "olm version:": "olm versija:",
+    "Only people who have been invited": "Vienīgi uzaicināti cilvēki",
     "Operation failed": "Darbība neizdevās",
     "Password": "Parole",
     "Passwords can't be empty": "Paroles nevar būt tukšas",
     "Permissions": "Atļaujas",
     "Phone": "Telefons",
-    "Please check your email and click on the link it contains. Once this is done, click continue.": "Lūdzu pārbaudi savu epastu un noklikšķini tajā esošo saiti. Tiklīdz tas ir izdarīts, klikšķini \"turpināt\".",
+    "Please check your email and click on the link it contains. Once this is done, click continue.": "Lūdzu, pārbaudi savu epastu un noklikšķini tajā esošo saiti. Tiklīdz tas ir izdarīts, klikšķini \"turpināt\".",
     "Private Chat": "Privātais čats",
     "Privileged Users": "Priviliģētie lietotāji",
     "Profile": "Profils",
@@ -188,7 +188,7 @@
     "%(senderName)s requested a VoIP conference.": "%(senderName)s vēlas VoIP konferenci.",
     "Results from DuckDuckGo": "Rezultāti no DuckDuckGo",
     "Return to login screen": "Atgriezties uz pierakstīšanās lapu",
-    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s nav atļauts nosūtīt Tev paziņojumus. Lūdzu pārbaudi sava pārlūka iestatījumus",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s nav atļauts nosūtīt jums paziņojumus. Lūdzu pārbaudi sava pārlūka iestatījumus",
     "%(brand)s was not given permission to send notifications - please try again": "%(brand)s nav piešķirta atļauja nosūtīt paziņojumus. Lūdzu mēģini vēlreiz",
     "%(brand)s version:": "%(brand)s versija:",
     "Unable to enable Notifications": "Nav iespējams iespējot paziņojumus",
@@ -197,16 +197,16 @@
     "Room %(roomId)s not visible": "Istaba %(roomId)s nav redzama",
     "%(roomName)s does not exist.": "%(roomName)s neeksistē.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s šobrīd nav pieejama.",
-    "Seen by %(userName)s at %(dateTime)s": "Redzējis %(userName)s %(dateTime)s",
+    "Seen by %(userName)s at %(dateTime)s": "Lietotājs %(userName)s apskatīja %(dateTime)s",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s nosūtīja attēlu.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s nosūtīja uzaicinājumu %(targetDisplayName)s pievienoties istabai.",
     "%(senderName)s set a profile picture.": "%(senderName)s uzstādīja profila attēlu.",
     "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s nomainīja attēlojamo/redzamo vārdu uz: %(displayName)s.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s atcēla pieejas ierobežojumu (atbanoja) %(targetName)s.",
-    "Uploading %(filename)s and %(count)s others|zero": "Tiek augšuplādēts %(filename)s",
-    "Uploading %(filename)s and %(count)s others|one": "Tiek augšuplādēts %(filename)s un %(count)s citi",
-    "Uploading %(filename)s and %(count)s others|other": "Tiek augšuplādēts %(filename)s un %(count)s citi",
-    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (power %(powerLevelNumber)s)",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s atcēla pieejas liegumu %(targetName)s.",
+    "Uploading %(filename)s and %(count)s others|zero": "Tiek augšupielādēts %(filename)s",
+    "Uploading %(filename)s and %(count)s others|one": "Tiek augšupielādēts %(filename)s un %(count)s citi",
+    "Uploading %(filename)s and %(count)s others|other": "Tiek augšupielādēts %(filename)s un %(count)s citi",
+    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (tiesību līmenis %(powerLevelNumber)s)",
     "Username invalid: %(errMessage)s": "Neatbilstošs lietotājvārds: %(errMessage)s",
     "(unknown failure: %(reason)s)": "(nezināma kļūda: %(reason)s)",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s atsauca %(targetName)s uzaicinājumu.",
@@ -221,19 +221,19 @@
     "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?": "Notiek Tevis novirzīšana uz ārēju trešās puses vietni. Tu vari atļaut savam kontam piekļuvi ar %(integrationsUrl)s. Vai vēlies turpināt?",
     "Ongoing conference call%(supportedText)s.": "Notiekošs konferences zvans %(supportedText)s.",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s dzēsa istabas avataru.",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s nomainīja istabas avataru %(roomName)s",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s nomainīja %(roomName)s istabas avataru",
     "Room Colour": "Istabas krāsa",
     "Rooms": "Istabas",
     "Save": "Saglabāt",
     "Search": "Meklēt",
     "Search failed": "Meklēšana neizdevās",
-    "Searches DuckDuckGo for results": "Meklēšanai izmanto DuckDuckGo",
+    "Searches DuckDuckGo for results": "Meklēšana DuckDuckGo rezultātos",
     "Send Reset Email": "Nosūtīt atiestatīšanas epastu",
     "Server error": "Servera kļūda",
     "Server may be unavailable, overloaded, or search timed out :(": "Serveris izskatās nesasniedzams, ir pārslogots, vai arī meklēšana beigusies ar savienojuma noildzi :(",
-    "Server may be unavailable, overloaded, or you hit a bug.": "Serveris ir nesasniedzams, pārslogots, vai arī esi uzdūries kļūdai programmā.",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Serveris ir nesasniedzams, pārslogots, vai arī esat saskārties ar kļūdu programmā.",
     "Server unavailable, overloaded, or something else went wrong.": "Serveris ir nesasniedzams, pārslogots, vai arī esi uzdūries kļūdai.",
-    "Session ID": "Sesijas Id",
+    "Session ID": "Sesijas ID",
     "Settings": "Iestatījumi",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Rādīt laiku 12 stundu formātā (piemēram 2:30pm)",
     "Signed Out": "Izrakstījās",
@@ -247,41 +247,41 @@
     "The phone number entered looks invalid": "Ievadītais telefona numurs izskatās nepareizs",
     "This email address is already in use": "Šī epasta adrese jau tiek izmantota",
     "This email address was not found": "Šāda epasta adrese nav atrasta",
-    "The email address linked to your account must be entered.": "Ir jāievada Tavam kontam piesaistītā epasta adrese.",
-    "The remote side failed to pick up": "Zvana adresāts  neatbild",
+    "The email address linked to your account must be entered.": "Ir jāievada jūsu kontam piesaistītā epasta adrese.",
+    "The remote side failed to pick up": "Zvana adresāts neatbild",
     "This room has no local addresses": "Šai istabai nav lokālo adrešu",
     "This room is not recognised.": "Šī istaba netika atpazīta.",
     "This doesn't appear to be a valid email address": "Šī neizskatās pēc derīgas epasta adreses",
     "This phone number is already in use": "Šis telefona numurs jau tiek izmantots",
-    "This room": "šajā istabā",
-    "This room is not accessible by remote Matrix servers": "Šī istaba nav pieejama no attālinātajiem Matrix serveriem",
+    "This room": "Šajā istabā",
+    "This room is not accessible by remote Matrix servers": "Šī istaba nav pieejama no citiem Matrix serveriem",
     "To use it, just wait for autocomplete results to load and tab through them.": "Lai to izmantotu, vienkārši gaidi, kamēr ielādējas automātiski ieteiktie rezultāti, un pārvietojies caur tiem.",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Notika mēģinājums ielādēt šīs istabas specifisku laikpaziņojumu sadaļu, bet Tev nav atļaujas skatīt šo ziņu.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Mēģinājums ielādēt šīs istabas čata vēstures izvēlēto posmu neizdevās, jo tas netika atrasts.",
     "Unable to add email address": "Nav iespējams pievienot epasta adresi",
     "Unable to remove contact information": "Nav iespējams dzēst kontaktinformāciju",
     "Unable to verify email address.": "Nav iespējams apstiprināt epasta adresi.",
-    "Unban": "Atbanot/atcelt pieejas liegumu",
+    "Unban": "Atcelt pieejas liegumu",
     "Unable to capture screen": "Neizdevās uzņemt ekrānattēlu",
     "unknown caller": "nezināms zvanītājs",
     "unknown error code": "nezināms kļūdas kods",
-    "Unmute": "Ieslēgt skaņu",
+    "Unmute": "Pārtraukt apklusināšanu",
     "Unnamed Room": "Istaba bez nosaukuma",
     "Cancel": "Atcelt",
     "Create new room": "Izveidot jaunu istabu",
     "Custom Server Options": "Iestatāmās servera opcijas",
-    "Dismiss": "Atteikt",
-    "You have <a>enabled</a> URL previews by default.": "URL priekšskats pēc noklusējuma Tev ir<a>iespējots</a> .",
-    "Upload avatar": "Augšuplādēt avataru (profila attēlu)",
+    "Dismiss": "Aizvērt",
+    "You have <a>enabled</a> URL previews by default.": "URL priekšskatījumi pēc noklusējuma jums ir<a>iespējoti</a> .",
+    "Upload avatar": "Augšupielādēt avataru (profila attēlu)",
     "Upload Failed": "Augšupielāde (nosūtīšana) neizdevās",
-    "Upload file": "Augšuplādēt failu",
-    "Upload new:": "Augšuplādēt jaunu:",
+    "Upload file": "Augšupielādēt failu",
+    "Upload new:": "Augšupielādēt jaunu:",
     "Usage": "Lietojums",
     "Users": "Lietotāji",
     "Verification Pending": "Gaida verifikāciju",
     "Verified key": "Verificēta atslēga",
-    "Video call": "VIDEO zvans",
-    "Voice call": "AUDIO zvans",
+    "Video call": "Video zvans",
+    "Voice call": "Balss zvans",
     "VoIP conference finished.": "VoIP konference beidzās.",
     "VoIP conference started.": "VoIP konference sākās.",
     "VoIP is unsupported": "VoIP netiek atbalstīts",
@@ -294,11 +294,11 @@
     "You cannot place a call with yourself.": "Nav iespējams piezvanīt sev.",
     "You cannot place VoIP calls in this browser.": "VoIP zvani šajā pārlūkā netiek atbalstīti.",
     "You do not have permission to post to this room": "Tev nav vajadzīgo atļauju, lai rakstītu ziņas šajā istabā",
-    "You have <a>disabled</a> URL previews by default.": "URL priekšskats pēc noklusējuma Tev ir <a>atspējots</a>.",
+    "You have <a>disabled</a> URL previews by default.": "URL priekšskatījumi pēc noklusējuma jums ir <a>atspējoti</a>.",
     "You must <a>register</a> to use this functionality": "Lai izmantotu šo funkcionalitāti, Tev ir <a>jāreģistrējas</a>",
     "You need to be able to invite users to do that.": "Lai to darītu, Tev ir jāspēj uzaicināt lietotājus.",
     "You need to be logged in.": "Tev ir jāpierakstās.",
-    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Tava epasta adrese nav piesaistīta pie Matrix Id šajā Bāzes serverī.",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Jūsu epasta adrese nav piesaistīta nevienam Matrix ID šajā bāzes serverī.",
     "You seem to be in a call, are you sure you want to quit?": "Izskatās, ka atrodies zvana režīmā. Vai tiešām vēlies iziet?",
     "You seem to be uploading files, are you sure you want to quit?": "Izskatās, ka šobrīd augšuplādē failus. Vai tiešām vēlies iziet?",
     "Sun": "Sv.",
@@ -306,7 +306,7 @@
     "Tue": "O.",
     "Wed": "T.",
     "Thu": "C.",
-    "Fri": "P.",
+    "Fri": "Pk.",
     "Sat": "S.",
     "Jan": "Jan.",
     "Feb": "Feb.",
@@ -327,7 +327,7 @@
     "There are no visible files in this room": "Nav redzamu failu šajā istabā",
     "Room": "Istaba",
     "Connectivity to the server has been lost.": "Savienojums ar serveri pārtrūka.",
-    "Sent messages will be stored until your connection has returned.": "Nosūtītās ziņas tiks saglabātas tiklīdz savienojums tiks atjaunots.",
+    "Sent messages will be stored until your connection has returned.": "Sūtītās ziņas tiks saglabātas līdz brīdim, kad savienojums tiks atjaunots.",
     "Active call": "Aktīvs zvans",
     "Please select the destination room for this message": "Lūdzu izvēlies šīs ziņas mērķa istabu",
     "Room directory": "Istabu katalogs",
@@ -335,51 +335,51 @@
     "New Password": "Jaunā parole",
     "Start automatically after system login": "Startēt pie ierīces ielādes",
     "Analytics": "Analītika",
-    "Options": "Opcijas/iestatījumi",
+    "Options": "Opcijas",
     "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s ievāc anonīmus analītikas datus, lai varētu uzlabot aplikācijas darbību.",
-    "Passphrases must match": "Paroles frāzēm ir jāsakrīt",
-    "Passphrase must not be empty": "Paroles frāze nevar būt tukša",
+    "Passphrases must match": "Frāzveida parolēm ir jāsakrīt",
+    "Passphrase must not be empty": "Frāzveida parole nevar būt tukša",
     "Export room keys": "Eksportēt istabas atslēgas",
-    "Confirm passphrase": "Apstiprināt paroles frāzi",
+    "Confirm passphrase": "Apstipriniet frāzveida paroli",
     "Import room keys": "Importēt istabas atslēgas",
     "File to import": "Importējamais fails",
     "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.": "Šī darbība ļauj Tev uz lokālo failu eksportēt atslēgas priekš tām ziņām, kuras Tu saņēmi šifrētās istabās. Tu varēsi importēt šo failu citā Matrix klientā, lai tajā būtu iespējams lasīt šīs ziņas atšifrētas.",
-    "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.": "Eksportētais fails ļaus ikvienam, kurš to spēj lasīt, atšifrēt jebkuras Tavas šifrētās ziņas, tāpēc ievēro piesardzību, un glabā šo failu drošā vietā. Lai palīdzētu to nodrošināt, Tev jāievada paroles frāze, kura tiks izmantota eksportēto datu šifrēšanai. Datu importēšana būs iespējama tikai izmantojot šo pašu paroles frāzi.",
+    "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.": "Eksportētais fails ļaus ikvienam, kurš to spēj to nolasīt, atšifrēt jebkuras jūsu šifrētās ziņas. Tādēļ ievērojiet piesardzību un glabājiet šo failu drošā vietā. Lai palīdzētu to nodrošināt, zemāk ievadiet frāzveida paroli eksportējamo datu šifrēšanai. Datu importēšana būs iespējama tikai izmantojot šo pašu frāzveida paroli.",
     "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.": "Šis process ļaus Tev importēt šifrēšanas atslēgas, kuras Tu iepriekš eksportēji no cita Matrix klienta. Tas ļaus Tev atšifrēt čata vēsturi.",
-    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Eksporta fails būs aizsargāts ar paroles frāzi. Tā ir jāievada šeit, lai atšifrētu failu.",
+    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Eksporta fails būs aizsargāts ar frāzveida paroli. Tā ir jāievada šeit, lai atšifrētu failu.",
     "You must join the room to see its files": "Tev ir jāpievienojas istabai, lai redzētu tās failus",
     "Failed to invite": "Neizdevās uzaicināt",
-    "Confirm Removal": "Apstiprini dzēšanu",
+    "Confirm Removal": "Apstipriniet dzēšanu",
     "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.": "Vai tiešām vēlies dzēst šo notikumu? Ņem vērā, ka istabas nosaukuma vai tēmas nosaukuma maiņa var ietekmēt (atsaukt) izmaiņas.",
     "Unknown error": "Nezināma kļūda",
     "Incorrect password": "Nepareiza parole",
     "Unable to restore session": "Nav iespējams atjaunot sesiju",
-    "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.": "Ja Tu iepriekš izmantoji jaunāku %(brand)s versiju, tava sesija var nebūt saderīga ar šo versiju. Aizver šo logu un atgriezies jaunākajā versijā.",
+    "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.": "Ja iepriekš izmantojāt jaunāku %(brand)s versiju, jūsu sesija var nebūt saderīga ar šo versiju. Aizveriet šo logu un atgriezieties jaunākajā versijā.",
     "Unknown Address": "Nezināma adrese",
     "ex. @bob:example.com": "piemēram, @valters:smaidu.lv",
     "Add User": "Pievienot lietotāju",
     "Please check your email to continue registration.": "Lūdzu pārbaudi savu epastu lai turpinātu reģistrāciju.",
     "Token incorrect": "Nepareizs autentifikācijas tokens",
-    "Please enter the code it contains:": "Lūdzu ievadi tajā ietverto kodu:",
-    "powered by Matrix": "Tiek darbināta ar Matrix",
+    "Please enter the code it contains:": "Lūdzu, ievadiet tajā ietverto kodu:",
+    "powered by Matrix": "tiek darbināta ar Matrix",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Ja Tu nenorādīsi epasta adresi, tev nebūs iespējams izmantot paroles atiestatīšanu. Vai to vēlies?",
     "Error decrypting audio": "Kļūda atšifrējot audio",
     "Error decrypting image": "Kļūda atšifrējot attēlu",
     "Error decrypting video": "Kļūda atšifrējot video",
     "Add an Integration": "Pievienot integrāciju",
-    "URL Previews": "URL priekšskats",
-    "Drop file here to upload": "Ievelc failu šeit lai augšuplādētu",
+    "URL Previews": "URL priekšskatījumi",
+    "Drop file here to upload": "Ievelc šeit failu augšupielādei",
     " (unsupported)": " (netiek atbalstīts)",
-    "Online": "Onlainā",
+    "Online": "Tiešsaistē",
     "Idle": "Dīkstāvē",
-    "Offline": "Atsaistē (ārpus tīkla)",
-    "Check for update": "Pārbaudīt, vai ir aktualizācijas",
+    "Offline": "Bezsaistē",
+    "Check for update": "Pārbaudīt atjauninājumus",
     "Username available": "Lietotājvārds ir pieejams",
     "Username not available": "Lietotājvārds nav pieejams",
     "Something went wrong!": "Kaut kas nogāja greizi!",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Šis būs Tavs konta vārds <span></span> Bāzes serverī, vai arī vari izvēlēties <a>citu serveri</a>.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Vai arī, ja Tev jau ir Matrix konts, tu vari  <a>pierakstīties</a> tajā.",
-    "Your browser does not support the required cryptography extensions": "Tavs pārlūks neatbalsta vajadzīgos kriptogrāfijas paplašinājumus",
+    "Your browser does not support the required cryptography extensions": "Jūsu pārlūks neatbalsta vajadzīgos kriptogrāfijas paplašinājumus",
     "Not a valid %(brand)s keyfile": "Nederīgs %(brand)s atslēgfails",
     "Authentication check failed: incorrect password?": "Autentifikācijas pārbaude neizdevās. Nepareiza parole?",
     "Do you want to set an email address?": "Vai vēlies norādīt epasta adresi?",
@@ -409,12 +409,12 @@
     "Failed to upload image": "Neizdevās augšupielādēt attēlu",
     "%(widgetName)s widget added by %(senderName)s": "%(senderName)s pievienoja %(widgetName)s vidžetu",
     "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s dzēsa vidžetu %(widgetName)s",
-    "Unpin Message": "Atkabināt ziņu",
+    "Unpin Message": "Atspraust ziņu",
     "Add rooms to this community": "Pievienot istabas šai kopienai",
     "Failed to set direct chat tag": "Neizdevās tiešajam čatam uzstādīt birku",
     "Warning": "Brīdinājums",
     "Send": "Sūtīt",
-    "Leave": "Doties prom (atstāt)",
+    "Leave": "Pamest",
     "Unnamed room": "Nenosaukta istaba",
     "Guests can join": "Var pievienoties viesi",
     "The platform you're on": "Izmantotā operētājsistēma",
@@ -424,7 +424,7 @@
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Neatkarīgi no tā, vai izmantojat Richtext režīmu redaktorā Rich Text Editor",
     "Your homeserver's URL": "Bāzes servera URL adrese",
     "The information being sent to us to help make %(brand)s better includes:": "Informācija, kura mums tiek nosūtīta, lai ļautu padarīt %(brand)s labāku, ietver:",
-    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Ja šī lapa ietver identificējamu informāciju, tādu kā istaba, lietotājs, grupas Id, šie dati tiek noņemti pirms nosūtīšanas uz serveri.",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Ja šī lapa ietver identificējamu informāciju, tādu kā istaba, lietotājs, grupas Id, tad šie dati tiek noņemti pirms nosūtīšanas uz serveri.",
     "Call Failed": "Zvans neizdevās",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
     "Who would you like to add to this community?": "Kurus cilvēkus Tu vēlētos pievienot šai kopienai?",
@@ -445,39 +445,39 @@
     "Unignored user": "Atignorēts lietotājs",
     "You are no longer ignoring %(userId)s": "Tu vairāk neignorē %(userId)s",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s nomainīja savu attēlojamo/redzamo vārdu uz %(displayName)s.",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s šai istabai nomainīja piestiprinātās ziņas.",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s nomainīja šajā istabā piespraustās ziņas.",
     "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s vidžets, kuru mainīja %(senderName)s",
-    "Message Pinning": "Ziņu piekabināšana",
-    "Mirror local video feed": "Spoguļot vietējā video barotni",
-    "Enable inline URL previews by default": "URL priekšskats pēc noklusējuma",
-    "Enable URL previews for this room (only affects you)": "URL priekšskati šai istabai (ietekmē tikai Tevi pašu)",
-    "Enable URL previews by default for participants in this room": "URL priekšskati pēc noklusējuma visiem šīs istabas dalībniekiem",
-    "%(senderName)s sent an image": "%(senderName)s nosūtīja bildi",
+    "Message Pinning": "Ziņu piespraušana",
+    "Mirror local video feed": "Rādīt spoguļskatā kameras video",
+    "Enable inline URL previews by default": "Iespējot URL priekšskatījumus pēc noklusējuma",
+    "Enable URL previews for this room (only affects you)": "Iespējot URL priekšskatījumus šajā istabā (ietekmē tikai jūs pašu)",
+    "Enable URL previews by default for participants in this room": "Iespējot URL priekšskatījumus pēc noklusējuma visiem šīs istabas dalībniekiem",
+    "%(senderName)s sent an image": "%(senderName)s nosūtīja attēlu",
     "%(senderName)s sent a video": "%(senderName)s nosūtīja video",
     "%(senderName)s uploaded a file": "%(senderName)s augšupielādēja failu",
-    "Disinvite this user?": "Atsaukt ielūgumu šim lietotājam?",
-    "Kick this user?": "Izspert/padzīt (kick) šo lietotāju?",
+    "Disinvite this user?": "Atsaukt uzaicinājumu šim lietotājam?",
+    "Kick this user?": "Padzīt šo lietotāju?",
     "Unban this user?": "Atbanot/atbloķēt šo lietotāju (atcelt liegumu šim lietotājam)?",
     "Ban this user?": "Nobanot/bloķēt šo lietotāju (uzlikt liegumu šim lietotājam)?",
     "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.": "Jūs nevarēsiet atcelt šīs izmaiņas pēc sava statusa pazemināšanas. Gadījumā, ja esat pēdējais priviliģētais lietotājs istabā, būs neiespējami atgūt šīs privilēģijas.",
     "Unignore": "Atcelt ignorēšanu",
     "Ignore": "Ignorēt",
-    "Jump to read receipt": "Pāriet uz izlasīšanas apstiprinājumu",
-    "Mention": "Pieminējums/atsauce",
+    "Jump to read receipt": "Pāriet uz pēdējo skatīto ziņu",
+    "Mention": "Pieminēt",
     "Invite": "Uzaicināt",
-    "Send an encrypted reply…": "sūtīt šifrētu atbildi…",
-    "Send an encrypted message…": "rakstīt ziņu (šifrētu)…",
+    "Send an encrypted reply…": "Sūtīt šifrētu atbildi…",
+    "Send an encrypted message…": "Sūtīt šifrētu ziņu…",
     "Jump to message": "Pāriet uz ziņu",
-    "No pinned messages.": "Nav piekabinātu ziņu.",
+    "No pinned messages.": "Nav piespraustu ziņu.",
     "Loading...": "Ielāde...",
-    "Pinned Messages": "Piekabinātās ziņas",
+    "Pinned Messages": "Piespraustās ziņas",
     "%(duration)ss": "%(duration)s sek",
     "%(duration)sm": "%(duration)smin",
     "%(duration)sh": "%(duration)sstundas",
-    "%(duration)sd": "%(duration)sdienas",
-    "Online for %(duration)s": "Pieslēgumā %(duration)s",
+    "%(duration)sd": "%(duration)s dienas",
+    "Online for %(duration)s": "Tiešsaistē %(duration)s",
     "Idle for %(duration)s": "Dīkstāvē (neaktīvs) %(duration)s",
-    "Offline for %(duration)s": "Atslēgumā %(duration)s",
+    "Offline for %(duration)s": "Bezsaistē %(duration)s",
     "Unknown for %(duration)s": "Neskaidrā statusā %(duration)s",
     "Unknown": "Neskaidrs statuss",
     "Replying": "Atbildot uz",
@@ -486,18 +486,18 @@
     "Failed to remove tag %(tagName)s from room": "Neizdevās istabai noņemt birku %(tagName)s",
     "Failed to add tag %(tagName)s to room": "Neizdevās istabai pievienot birku %(tagName)s",
     "Community Invites": "Uzaicinājums uz kopienu",
-    "Banned by %(displayName)s": "Nobanojis/bloķējis (liedzis piekļuvi) %(displayName)s",
+    "Banned by %(displayName)s": "%(displayName)s liedzis piekļuvi",
     "Members only (since the point in time of selecting this option)": "Tikai biedri (no šī parametra iestatīšanas brīža)",
     "Members only (since they were invited)": "Tikai biedri (no to uzaicināšanas brīža)",
     "Members only (since they joined)": "Tikai biedri (kopš pievienošanās)",
     "Invalid community ID": "Nederīgs kopienas Id",
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s' nav derīgs kopienas Id",
-    "Flair": "Gaidas (nojauta)",
-    "Showing flair for these communities:": "Parādīt Tavas gaidas šajās kopienās:",
-    "This room is not showing flair for any communities": "Šajā istabā neparādās gaidas, kas uzstādītas kopienās",
+    "Flair": "Noskaņa",
+    "Showing flair for these communities:": "Parādīt jūsu noskaņas šajās kopienās:",
+    "This room is not showing flair for any communities": "Šajā istabā neparādās noskaņas, kas uzstādītas kopienās",
     "New community ID (e.g. +foo:%(localDomain)s)": "Jaunās kopienas Id (piem. +foo:%(localDomain)s)",
-    "URL previews are enabled by default for participants in this room.": "URL priekšskats šīs istabas dalībniekiem pēc noklusējuma ir iespējots.",
-    "URL previews are disabled by default for participants in this room.": "ULR priešskats šīs istabas dalībniekiem pēc noklusējuma ir atspējots.",
+    "URL previews are enabled by default for participants in this room.": "URL priekšskatījumi šīs istabas dalībniekiem pēc noklusējuma ir iespējoti.",
+    "URL previews are disabled by default for participants in this room.": "ULR priekšskatījumi šīs istabas dalībniekiem pēc noklusējuma ir atspējoti.",
     "Copied!": "Nokopēts!",
     "Failed to copy": "Nokopēt neizdevās",
     "An email has been sent to %(emailAddress)s": "Vēstule tika nosūtīta uz %(emailAddress)s",
@@ -517,9 +517,9 @@
     "Visible to everyone": "Redzama visiem",
     "Only visible to community members": "Tikai kopienas dalībniekiem",
     "Filter community rooms": "Kopienas istabu filtrs",
-    "Something went wrong when trying to get your communities.": "Kaut kas nogāja greizi, kad tika mēģināts attēlot Tavas kopienas.",
-    "Display your community flair in rooms configured to show it.": "Parādīt Tavas gaidas istabās, kurās to parādīšana iespējota.",
-    "You're not currently a member of any communities.": "Pašreiz Tu neesi neesi nevienas kopienas piederīgais.",
+    "Something went wrong when trying to get your communities.": "Kaut kas nogāja greizi ielasot jūsu kopienu sarakstu.",
+    "Display your community flair in rooms configured to show it.": "Parādīt jūsu kopienas noskaņas istabās, kurās to parādīšana iespējota.",
+    "You're not currently a member of any communities.": "Pašlaik jūs neesat nevienā kopienā.",
     "Delete Widget": "Dzēst vidžetu",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Vidžeta dzēšana to dzēš visiem šīs istabas lietotājiem. Vai tiešām vēlies dzēst šo vidžetu?",
     "Minimize apps": "Minimizēt programmas",
@@ -530,14 +530,14 @@
     "%(oneUser)sjoined %(count)s times|other": "%(oneUser)spievienojās %(count)s reizes",
     "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s pievienojās",
     "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s izgāja %(count)s reizes",
-    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s izgāja (atvienojās)",
-    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s izgāja (atvienojās) %(count)s reizes",
+    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s izgāja",
+    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s izgāja %(count)s reizes",
     "%(oneUser)sleft %(count)s times|one": "%(oneUser)s izgāja",
     "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s pievienojās un izgāja %(count)s reizes",
     "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s pievienojās un izgāja",
     "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s pievienojās un izgāja %(count)s reizes",
     "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s pievienojās un izgāja",
-    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s izgāja un atkalpievienojās %(count)s reizes",
+    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s izgāja un atkal pievienojās %(count)s reizes",
     "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s noraidīja uzaicinājumus %(count)s reizes",
     "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s atsauca izsniegtos uzaicinājumus %(count)s reizes",
     "were banned %(count)s times|other": "tika bloķēti (liegta piekļuve) %(count)s reizes",
@@ -550,7 +550,7 @@
     "And %(count)s more...|other": "Un par %(count)s vairāk...",
     "Matrix ID": "Matrix Id",
     "Matrix Room ID": "Matrix istabas Id",
-    "email address": "e-pasta adrese",
+    "email address": "epasta adrese",
     "Try using one of the following valid address types: %(validTypesList)s.": "Mēģiniet izmantot vienu no sekojošiem pieļautajiem adrešu tipiem: %(validTypesList)s.",
     "You have entered an invalid address.": "Ievadīta nederīga adrese.",
     "Community IDs cannot be empty.": "Kopienu IDs nevar būt tukši.",
@@ -563,16 +563,16 @@
     "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s aizgājuši un atgriezušies",
     "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s aizgājis un atgriezies %(count)s reizes",
     "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s aizgājis un atgriezies",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s nepieņēma uzaicinājumus",
+    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s noraidīja uzaicinājumus",
     "were invited %(count)s times|one": "tika uzaicināti",
     "was invited %(count)s times|other": "tika uzaicināta %(count)s reizes",
     "was invited %(count)s times|one": "tika uzaicināts(a)",
-    "were unbanned %(count)s times|one": "tika atbloķēti (atcelts pieejas liegums)",
+    "were unbanned %(count)s times|one": "tika atcelts pieejas liegums",
     "was unbanned %(count)s times|other": "tika atbloķēts %(count)s reizes",
-    "was banned %(count)s times|one": "tika bloķēts",
-    "were banned %(count)s times|one": "tika bloķēti",
-    "was unbanned %(count)s times|one": "tika atbloķēts",
-    "were kicked %(count)s times|one": "tika padzīti (izsperti)",
+    "was banned %(count)s times|one": "tika liegta pieeja",
+    "were banned %(count)s times|one": "tika liegta pieeja",
+    "was unbanned %(count)s times|one": "tika atcelts pieejas liegums",
+    "were kicked %(count)s times|one": "tika padzīti",
     "was kicked %(count)s times|other": "tika padzīts %(count)s reizes",
     "was kicked %(count)s times|one": "tika padzīts",
     "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s izmainīja savu lietotājvārdu %(count)s reizes",
@@ -585,18 +585,18 @@
     "Add a Room": "Pievienot istabu",
     "Failed to remove the room from the summary of %(groupId)s": "Neizdevās dzēst istabu no %(groupId)s kopsavilkuma",
     "The room '%(roomName)s' could not be removed from the summary.": "Istabu '%(roomName)s' neizdevās dzēst no kopsavilkuma.",
-    "Leave Community": "Atstāt kopienu",
+    "Leave Community": "Pamest kopienu",
     "Community Settings": "Kopienas iestatījumi",
     "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Šīs istabas tiek rādītas kopienas dalībniekiem šīs kopienas lapā. Kopienas dalībnieki var pievienoties istabām, uzklikšķinot uz tām.",
     "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!": "Jūsu kopienai nav plašāka HTML-lapas apraksta ko parādīt dalībniekiem.<br />Klikšķini šeit, lai atvērtu iestatījumus un to pievienotu!",
     "Description": "Apraksts",
     "Failed to load %(groupId)s": "Neizdevās  ielādēt %(groupId)s",
-    "This room is not public. You will not be able to rejoin without an invite.": "Šīs istaba nav publiska. Tu nevari tajā ieiet bez uzaicinājuma.",
+    "This room is not public. You will not be able to rejoin without an invite.": "Šī istaba nav publiska un jūs nevarēsiet atkārtoti pievienoties bez uzaicinājuma.",
     "Old cryptography data detected": "Tika uzieti novecojuši šifrēšanas dati",
     "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.": "Uzieti dati no vecākas %(brand)s versijas. Tas novedīs pie \"end-to-end\" šifrēšanas problēmām vecākajā versijā. Šajā versijā nevar tikt atšifrēti ziņojumi, kuri radīti izmantojot vecākajā versijā \"end-to-end\" šifrētas ziņas. Tas var arī novest pie ziņapmaiņas, kas veikta ar šo versiju, neizdošanās. Ja rodas ķibeles, izraksties un par jaunu pieraksties sistēmā. Lai saglabātu ziņu vēsturi, eksportē un tad importē savas šifrēšanas atslēgas.",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Radi kopienu, lai apvienotu lietotājus un istabas. Izveido mājaslapu, lai iezīmētu Matrix visumā savu klātbūtni, vietu un telpu.",
-    "Error whilst fetching joined communities": "Ielādējot kopienas radās kļūda",
-    "%(count)s of your messages have not been sent.|one": "Tava ziņa netika nosūtīta.",
+    "Error whilst fetching joined communities": "Ielādējot kopienas, radās kļūda",
+    "%(count)s of your messages have not been sent.|one": "Jūsu ziņa netika nosūtīta.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Atkārtoti sūtīt ziņu</resendText> vai <cancelText>atcelt sūtīšanu</cancelText>.",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Šeit neviena nav. Ja vēlies <inviteText>kādu uzaicināt</inviteText> vai <nowarnText>atslēgt paziņojumu par tukšu istabu</nowarnText>?",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privātumu augstu respektējam, tādēļ analītikas mērķiem nevācam nekādus personas un identificējamus datus.",
@@ -609,7 +609,7 @@
     "Room Notification": "Istabas paziņojums",
     "Key request sent.": "Atslēgas pieprasījums nosūtīts.",
     "Code": "Kods",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)snoraidīja viņu uzaicinājumu %(count)s reizes",
+    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)snoraidīja uzaicinājumu %(count)s reizes",
     "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)snoraidīja uzaicinājumu",
     "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)satsauca uzaicinājumus",
     "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)satsauca savus uzaicinājumus %(count)s reizes",
@@ -629,16 +629,16 @@
     "Add a User": "Pievienot lietotāju",
     "Failed to remove a user from the summary of %(groupId)s": "Neizdevās dzēst lietotāju no %(groupId)s kopsavilkuma",
     "The user '%(displayName)s' could not be removed from the summary.": "Lietotājs '%(displayName)s' nevarēja tikt dzēsts no kopsavilkuma.",
-    "Failed to update community": "Neizdevās aktualizēt kopienu",
+    "Failed to update community": "Neizdevās atjaunināt kopienu",
     "Unable to accept invite": "Nav iespējams pieņemt uzaicinājumu",
     "Unable to reject invite": "Nav iespējams noraidīt uzaicinājumu",
-    "Leave %(groupName)s?": "Atstāt %(groupName)s?",
+    "Leave %(groupName)s?": "Pamest %(groupName)s?",
     "%(inviter)s has invited you to join this community": "%(inviter)s uzaicina Tevi pievienoties šai kopienai",
     "You are an administrator of this community": "Tu esi šīs kopienas administrators",
     "You are a member of this community": "Tu esi šīs kopienas biedrs",
     "Long Description (HTML)": "Garais apraksts (HTML)",
     "Community %(groupId)s not found": "Kopiena %(groupId)s nav atrasta",
-    "Your Communities": "Tavas kopienas",
+    "Your Communities": "Jūsu kopienas",
     "Did you know: you can use communities to filter your %(brand)s experience!": "Vai zināji: Tu vari izmantot kopienas, lai filtrētu (atlasītu) savu %(brand)s pieredzi!",
     "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.": "Lai uzstādītu filtru, uzvelc kopienas avataru uz filtru paneļa ekrāna kreisajā malā. Lai redzētu tikai istabas un cilvēkus, kas saistīti ar šo kopienu, Tu vari klikšķināt uz avatara filtru panelī jebkurā brīdī.",
     "Create a new community": "Izveidot jaunu kopienu",
@@ -647,35 +647,35 @@
     "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.": "Ja esi paziņojis par kļūdu caur GitHub, atutošanas logfaili var mums palīdzēt identificēt problēmu. Atutošanas logfaili satur programmas lietošanas datus, tostarp Tavu lietotājvārdu, istabu/grupu Id vai aliases, kuras esi apmeklējis un citu lietotāju lietotājvārdus. Tie nesatur pašas ziņas.",
     "Submit debug logs": "Iesniegt atutošanas logfailus",
     "Opens the Developer Tools dialog": "Atver Izstrādātāja instrumentus",
-    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Skatījis %(displayName)s (%(userName)s) %(dateTime)s",
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Lietotājs %(displayName)s (%(userName)s) apskatīja %(dateTime)s",
     "Fetching third party location failed": "Neizdevās iegūt trešās puses atrašanās vietu",
     "Send Account Data": "Sūtīt konta datus",
     "All notifications are currently disabled for all targets.": "Visiem saņēmējiem visi paziņojumi ir atspējoti.",
     "Uploading report": "Augšuplādē atskaiti",
-    "Sunday": "svētdiena",
-    "Notification targets": "Paziņojuma mērķi",
-    "Today": "šodien",
+    "Sunday": "Svētdiena",
+    "Notification targets": "Paziņojumu adresāti",
+    "Today": "Šodien",
     "You are not receiving desktop notifications": "Darbvirsmas paziņojumi netiek saņemti",
-    "Friday": "piektdiena",
-    "Update": "Aktualizēt",
+    "Friday": "Piektdiena",
+    "Update": "Atjaunināt",
     "What's New": "Kas jauns",
-    "On": "ieslēgts",
+    "On": "Ieslēgt",
     "Changelog": "Izmaiņu saraksts (vēsture)",
-    "Waiting for response from server": "Gaidām atbildi no servera",
+    "Waiting for response from server": "Tiek gaidīta atbilde no servera",
     "Send Custom Event": "Sūtīt individuālu notikumu",
-    "Advanced notification settings": "Paziņojumu papildus iestatījumi",
+    "Advanced notification settings": "Paziņojumu papildu iestatījumi",
     "Failed to send logs: ": "Neizdevās nosūtīt logfailus: ",
     "Forget": "Aizmirst",
     "You cannot delete this image. (%(code)s)": "Šo attēlu nevar izdzēst  (%(code)s)",
     "Cancel Sending": "Atcelt sūtīšanu",
-    "This Room": "šajā istabā",
-    "Noisy": "ar skaņu",
+    "This Room": "Šajā istabā",
+    "Noisy": "Ar skaņu",
     "Error saving email notification preferences": "Kļūda saglabājot epasta notifikāciju paziņojumu uzstādījumus",
-    "Messages containing my display name": "Ziņas, kuras satur manu redzamo vārdu",
+    "Messages containing my display name": "Ziņas, kuras satur manu parādāmo vārdu",
     "Messages in one-to-one chats": "Ziņas viens-pret-vienu čatos",
     "Unavailable": "Nesasniedzams",
-    "View Decrypted Source": "Skatīt atšifrētu avotu",
-    "Failed to update keywords": "Neizdevās aktualizēt atslēgvārdus",
+    "View Decrypted Source": "Skatīt atšifrētu pirmkodu",
+    "Failed to update keywords": "Neizdevās atjaunināt atslēgvārdus",
     "remove %(name)s from the directory.": "dzēst %(name)s no kataloga.",
     "Notifications on the following keywords follow rules which can’t be displayed here:": "Paziņojumi par šādiem atslēgvārdiem atbilst noteikumiem, kurus šeit nevar parādīt:",
     "Please set a password!": "Lūdzu iestati paroli!",
@@ -686,7 +686,7 @@
     "Messages sent by bot": "Botu nosūtītās ziņas",
     "Filter results": "Filtrēt rezultātus",
     "Members": "Biedri",
-    "No update available.": "Nav pieejamu aktualizāciju.",
+    "No update available.": "Nav atjauninājumu.",
     "Resend": "Nosūtīt atkārtoti",
     "Files": "Faili",
     "Collecting app version information": "Tiek iegūta programmas versijas informācija",
@@ -695,9 +695,9 @@
     "Invite to this community": "Uzaicināt šajā kopienā",
     "Messages containing <span>keywords</span>": "Ziņas, kuras satur <span>atslēgvārdus</span>",
     "Room not found": "Istaba netika atrasta",
-    "Tuesday": "otrdiena",
-    "Enter keywords separated by a comma:": "Ievadi atslēgvārdus, atdalītus ar komatu:",
-    "Search…": "Meklēju…",
+    "Tuesday": "Otrdiena",
+    "Enter keywords separated by a comma:": "Ievadiet ar komatu atdalītus atslēgvārdus:",
+    "Search…": "Meklēt…",
     "You have successfully set a password and an email address!": "Esi veiksmīgi iestatījis(usi) paroli un epasta adresi!",
     "Remove %(name)s from the directory?": "Dzēst %(name)s no kataloga?",
     "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s izmanto daudzas advancētas tīmekļa pārlūka iespējas, no kurām dažas var nebūt pieejamas vai ir eksperimentālas Tavā pašreizējajā pārlūkā.",
@@ -705,13 +705,13 @@
     "Preparing to send logs": "Gatavojos nosūtīt atutošanas logfailus",
     "Explore Account Data": "Aplūkot konta datus",
     "All messages (noisy)": "Visas ziņas (ar skaņu)",
-    "Saturday": "sestdiena",
+    "Saturday": "Sestdiena",
     "Remember, you can always set an email address in user settings if you change your mind.": "Atceries, ka vienmēr vari iestatīt epasta adresi lietotāja uzstādījumos, ja pārdomā.",
     "Direct Chat": "Tiešais čats",
     "The server may be unavailable or overloaded": "Serveris nav pieejams vai ir pārslogots",
     "Reject": "Noraidīt",
     "Failed to set Direct Message status of room": "Neizdevās iestatīt istabas tiešās ziņas statusu",
-    "Monday": "pirmdiena",
+    "Monday": "Pirmdiena",
     "Remove from Directory": "Dzēst no kataloga",
     "Enable them now": "Iespējot tos tagad",
     "Forward Message": "Pārsūtīt ziņu",
@@ -719,25 +719,25 @@
     "Collecting logs": "Tiek iegūti logfaili",
     "You must specify an event type!": "Jānorāda notikuma tips!",
     "(HTTP status %(httpStatus)s)": "(HTTP statuss %(httpStatus)s)",
-    "All Rooms": "visās istabās",
-    "Wednesday": "trešdiena",
+    "All Rooms": "Visās istabās",
+    "Wednesday": "Trešdiena",
     "You cannot delete this message. (%(code)s)": "Tu nevari dzēst šo ziņu. (%(code)s)",
-    "Quote": "Citāts",
+    "Quote": "Citēt",
     "Send logs": "Nosūtīt logfailus",
     "All messages": "Visas ziņas",
     "Call invitation": "Uzaicinājuma zvans",
-    "Downloading update...": "Lejupielādēju aktualizāciju...",
+    "Downloading update...": "Atjauninājuma lejupielāde…",
     "State Key": "Stāvokļa atslēga",
     "Failed to send custom event.": "Individuālo notikumu nosūtīt neizdevās.",
     "What's new?": "Kas jauns?",
     "Notify me for anything else": "Paziņot man par jebko citu",
     "When I'm invited to a room": "Kad esmu uzaicināts/a istabā",
-    "Can't update user notification settings": "Neizdodas atjaunot lietotāja paziņojumu iestatījumus",
+    "Can't update user notification settings": "Neizdodas atjaunināt lietotāja paziņojumu iestatījumus",
     "Notify for all other messages/rooms": "Paziņot par visām citām ziņām/istabām",
     "Unable to look up room ID from server": "Nav iespējams no servera iegūt istabas Id",
     "Couldn't find a matching Matrix room": "Atbilstoša Matrix istaba netika atrasta",
     "Invite to this room": "Uzaicināt uz šo istabu",
-    "Thursday": "ceturtdiena",
+    "Thursday": "Ceturtdiena",
     "I understand the risks and wish to continue": "Apzinos riskus un vēlos turpināt",
     "Logs sent": "Logfaili nosūtīti",
     "Back": "Atpakaļ",
@@ -749,36 +749,36 @@
     "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Atvaino, diemžēl tavs tīmekļa pārlūks <b>nespēj</b> darbināt %(brand)s.",
     "Uploaded on %(date)s by %(user)s": "Augšuplādēja %(user)s %(date)s",
     "Messages in group chats": "Ziņas grupas čatos",
-    "Yesterday": "vakar",
+    "Yesterday": "Vakardien",
     "Error encountered (%(errorDetail)s).": "Gadījās kļūda (%(errorDetail)s).",
-    "Low Priority": "Zemas prioritātes",
+    "Low Priority": "Zema prioritāte",
     "Unable to fetch notification target list": "Neizdevās iegūt paziņojumu mērķu sarakstu",
     "Set Password": "Iestatīt paroli",
-    "Off": "izslēgts",
+    "Off": "Izslēgt",
     "%(brand)s does not know how to join a room on this network": "%(brand)s nezin kā pievienoties šajā tīklā esošajai istabai",
     "Mentions only": "Vienīgi atsauces",
     "You can now return to your account after signing out, and sign in on other devices.": "Tagad vari atgriezties savā kontā arī pēc izrakstīšanās, un pierakstīties no citām ierīcēm.",
     "Enable email notifications": "Iespējot paziņojumus pa epastu",
     "Event Type": "Notikuma tips",
     "Download this file": "Lejupielādēt šo failu",
-    "Pin Message": "Piekabināt ziņu",
+    "Pin Message": "Piespraust ziņu",
     "Failed to change settings": "Neizdevās nomainīt iestatījumus",
     "View Community": "Skatīt kopienu",
-    "Developer Tools": "Attīstītāja instrumenti",
-    "View Source": "Skatīt avotu",
+    "Developer Tools": "Izstrādātāja rīki",
+    "View Source": "Skatīt pirmkodu",
     "Event Content": "Notikuma saturs",
     "Thank you!": "Tencinam!",
     "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!": "Tavā pašreizējā pārlūkā aplikācijas izskats un uzvedība var būt pilnīgi neatbilstoša, kā arī dažas no visām funkcijām var nedarboties. Ja vēlies turpināt izmantot šo pārlūku, Tu vari arī turpināt, apzinoties, ka šajā gadījumā esi viens/a ar iespējamo problēmu!",
-    "Checking for an update...": "Lūkojos pēc aktualizācijas...",
+    "Checking for an update...": "Atjauninājumu pārbaude…",
     "e.g. %(exampleValue)s": "piemēram %(exampleValue)s",
     "e.g. <CurrentPageURL>": "piemēram <CurrentPageURL>",
-    "Your device resolution": "Tavas iekārtas izšķirtspēja",
-    "Sign In": "Ienākt",
+    "Your device resolution": "Jūsu iekārtas izšķirtspēja",
+    "Sign In": "Pierakstīties",
     "Whether or not you're logged in (we don't record your username)": "Esat vai neesat pieteicies (mēs nesaglabājam jūsu lietotājvārdu)",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Neatkarīgi no tā, vai izmantojat funkciju \"breadcrumbs\" (avatari virs istabu saraksta)",
     "Every page you use in the app": "Katra lapa, ko lietojat lietotnē",
     "Call in Progress": "Notiek zvans",
-    "A call is currently being placed!": "Pašlaik notiek saruna!",
+    "A call is currently being placed!": "Pašlaik notiek sazvans!",
     "A call is already in progress!": "Zvans jau notiek!",
     "Permission Required": "Nepieciešama atļauja",
     "You do not have permission to start a conference call in this room": "Šajā istabā nav atļaujas sākt konferences zvanu",
@@ -787,5 +787,612 @@
     "Your %(brand)s is misconfigured": "Jūsu %(brand)s ir nepareizi konfigurēts",
     "Add Email Address": "Pievienot e-pasta adresi",
     "Add Phone Number": "Pievienot tālruņa numuru",
-    "Call failed due to misconfigured server": "Zvans neizdevās nekorekti nokonfigurēta servera dēļ"
+    "Call failed due to misconfigured server": "Zvans neizdevās nekorekti nokonfigurēta servera dēļ",
+    "Verify this login": "Verificējiet šo sesiju",
+    "You sent a verification request": "Jūs nosūtījāt verifikācijas pieprasījumu",
+    "Start Verification": "Uzsākt verifikāciju",
+    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Jaunā sesija ir verificēta un ir dota piekļuve jūsu šifrētajām ziņām, kā arī citi lietotāji redzēs, ka šī sesija ir uzticama.",
+    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Apstipriniet savu identitāti, verificējot šo pierakstīšanos no kādas citas savas sesijas, tādējādi ļaujot piekļūt šifrētajām ziņām.",
+    "Hide verified sessions": "Slēpt verificētas sesijas",
+    "%(count)s verified sessions|one": "1 verificēta sesija",
+    "%(count)s verified sessions|other": "%(count)s verificētas sesijas",
+    "Encrypted by an unverified session": "Šifrēts ar neverificētu sesiju",
+    "Waiting for your other session to verify…": "Teik gaidīts uz verificēšanu no citas jūsu sesijas…",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Tiek gaidīts uz citu jūsu sesiju, %(deviceName)s (%(deviceId)s), lai verificētu…",
+    "Verify your other session using one of the options below.": "Verificējiet citas jūsu sesijas, izmantojot kādu no iespējām zemāk.",
+    "%(names)s and %(count)s others are typing …|other": "%(names)s un %(count)s citi raksta…",
+    "%(names)s and %(lastPerson)s are typing …": "%(names)s un %(lastPerson)s raksta…",
+    "Enable Emoji suggestions while typing": "Iespējot emocijzīmju ieteikumus rakstīšanas laikā",
+    "Show typing notifications": "Rādīt paziņojumus par rakstīšanu",
+    "Send typing notifications": "Sūtīt paziņojumus par rakstīšanu",
+    "Philippines": "Filipīnas",
+    "Unpin": "Atspraust",
+    "Pin": "Piespraust",
+    "%(names)s and %(count)s others are typing …|one": "%(names)s un vēl viens raksta…",
+    "%(displayName)s is typing …": "%(displayName)s raksta…",
+    "Got it": "Sapratu",
+    "Got It": "Sapratu",
+    "Verification cancelled": "Verificēšana atcelta",
+    "Waiting for partner to confirm...": "Gaida partnera apstiprinājumu...",
+    "Waiting for %(displayName)s to accept…": "Gaida, kamēr %(displayName)s akceptēs…",
+    "Waiting for answer": "Tiek gaidīta atbilde",
+    "To be secure, do this in person or use a trusted way to communicate.": "Lai tas būtu droši, dariet to klātienē vai lietojiet kādu uzticamu saziņas veidu.",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "Papildu drošībai verificējiet šo lietotāju, pārbaudot vienreizēju kodu abās ierīcēs.",
+    "Not Trusted": "Neuzticama",
+    "Not trusted": "Neuzticama",
+    "Trusted": "Uzticama",
+    "Verify User": "Verificēt lietotāju",
+    "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "Šifrētās istabās jūsu ziņas ir drošībā - tikai jums un saņēmējam ir unikālas atslēgas, lai ziņas atšifrētu.",
+    "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Jūsu ziņas ir drošībā - tikai jums un saņēmējam ir unikālas atslēgas, lai ziņas atšifrētu.",
+    "Direct message": "Uzsākt dialogu",
+    "Direct Messages": "Dialogi",
+    "Delete sessions|one": "Dzēst sesiju",
+    "Delete sessions|other": "Dzēst sesijas",
+    "Hide sessions": "Slēpt sesijas",
+    "%(count)s sessions|one": "%(count)s sesija",
+    "%(count)s sessions|other": "%(count)s sesijas",
+    "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Ziņas šeit ir nodrošinātas ar pilnīgu šifrēšanu. Verificē lietotāju %(displayName)s profilā, klikšķinot uz avatara.",
+    "Once enabled, encryption cannot be disabled.": "Šifrēšana nevar tikt atspējota, ja reiz tikusi iespējota.",
+    "Encryption not enabled": "Šifrēšana nav iespējota",
+    "Encryption enabled": "Šifrēšana iespējota",
+    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Tikai jūs abi esat šajā sarakstē, ja vien kāds no jums neuzaicina citus pievienoties.",
+    "This is the beginning of your direct message history with <displayName/>.": "Šis ir sākums jūsu tiešās sarakstes vēsturei ar <displayName/>.",
+    "Use the <a>Desktop app</a> to search encrypted messages": "Izmantojiet <a>lietotni</a>, lai veiktu šifrētu ziņu meklēšanu",
+    "%(creator)s created this DM.": "%(creator)s uzsāka šo tiešo saraksti.",
+    "None": "Neviena",
+    "Mentions & Keywords": "Pieminēšana un atslēgvārdi",
+    "Use default": "Lietot noklusējumu",
+    "Notification options": "Paziņojumu opcijas",
+    "Room options": "Istabas opcijas",
+    "Show previews of messages": "Rādīt ziņu priekšskatījumus",
+    "Show rooms with unread messages first": "Rādīt istabas ar nelasītām ziņām augšpusē",
+    "Appearance Settings only affect this %(brand)s session.": "Izskata iestatījumi attiecas vienīgi uz %(brand)s sesiju.",
+    "Customise your appearance": "Pielāgot izskatu",
+    "Appearance": "Izskats",
+    "Activity": "Aktivitātes",
+    "Sort by": "Kārtot pēc",
+    "List options": "Saraksta opcijas",
+    "Go Back": "Atgriezties",
+    "Go back": "Atgriezties",
+    "Send feedback": "Nosūtīt atsauksmi",
+    "Feedback sent": "Atsauksme nosūtīta",
+    "Feedback": "Atsauksmes",
+    "All settings": "Visi iestatījumi",
+    "Security & privacy": "Drošība un konfidencialitāte",
+    "Security & Privacy": "Drošība un konfidencialitāte",
+    "Change notification settings": "Mainīt paziņojumu iestatījumus",
+    "Notification settings": "Paziņojumu iestatījumi",
+    "Switch to dark mode": "Pārslēgt tumšo režīmu",
+    "Switch to light mode": "Pārslēgt gaišo režīmu",
+    "Leave Room": "Pamest istabu",
+    "Favourited": "Izlasē",
+    "Message deleted on %(date)s": "Ziņa dzēsta %(date)s",
+    "Message deleted by %(name)s": "%(name)s izdzēsa ziņu",
+    "Message deleted": "Ziņa ir dzēsta",
+    "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Saziņa ar šo lietotāju ir nodrošināta ar pilnīgu šifrēšanu un nav nolasāma trešajām pusēm.",
+    "Encrypted by a deleted session": "Šifrēts ar dzēstu sesiju",
+    "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>reaģēja ar %(shortName)s</reactedWith>",
+    "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
+    "Reactions": "Reaģēšana",
+    "Quick Reactions": "Ātra reaģēšana",
+    "React": "Reaģēt",
+    "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.": "Paroles nomaiņa pašlaik atiestata visas pilnīgās šifrēšanas atslēgas visām sesijām, padarot šifrēto čata vēsturi nelasāmu, ja vien pirms tam netiek eksportētas istabas atslēgas un vēlāk atkal importētas. Nākotnē šis tiks uzlabots.",
+    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Ziņas šajā istabā ir nodrošinātas ar pilnīgu šifrēšanu. Kad cilvēki pievienojas, jūs varat verificēt viņus profilā, klikšķinot uz avatara.",
+    "Messages in this room are not end-to-end encrypted.": "Ziņām šajā istabā netiek piemērota pilnīga šifrēšana.",
+    "This room is end-to-end encrypted": "Šajā istabā tiek veikta pilnīga šifrēšana",
+    "Emoji picker": "Emocijzīmes",
+    "Show Stickers": "Rādīt uzlīmes",
+    "Room Info": "Istabas info",
+    "Room information": "Informācija par istabu",
+    "Security": "Drošība",
+    "The server is offline.": "Serveris bezsaistē.",
+    "If you've forgotten your Security Phrase you can <button1>use your Security Key</button1> or <button2>set up new recovery options</button2>": "Ja ir aizmirsta slepenā frāze, jūs varat <button1>izmantot drošības atslēgu</button1> vai<button2>iestatīt jaunus atkopšanas veidus</button2>",
+    "If you've forgotten your Security Key you can <button>set up new recovery options</button>": "Ja ir aizmirsta drošības atslēga, jūs varat <button>iestatīt jaunus atkopšanas veidus</button>",
+    "Messages in this room are end-to-end encrypted.": "Ziņas šajā istabā ir nodrošinātas ar pilnīgu šifrēšanu.",
+    "Share Permalink": "Dalīties ar pastāvīgo saiti",
+    "Share Link to User": "Dalīties ar saiti uz lietotāju",
+    "Remove recent messages by %(user)s": "Dzēst nesenās ziņas no %(user)s",
+    "Remove recent messages": "Dzēst nesenās ziņas",
+    "Banana": "Banāns",
+    "You were banned from %(roomName)s by %(memberName)s": "%(memberName)s liedza jums pieeju %(roomName)s",
+    "Ban users": "Pieejas liegumi lietotājiem",
+    "The user must be unbanned before they can be invited.": "Lietotājam jābūt atceltam pieejas liegumam pirms uzaicināšanas.",
+    "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s izveidoja noteikumu pieejas liegšanai, kas atbilst %(glob)s dēļ %(reason)s",
+    "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s izveidoja noteikumu pieejas liegšanai serveriem, kas atbilst %(glob)s dēļ %(reason)s",
+    "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s izveidoja noteikumu pieejas liegšanai istabām, kas atbilst %(glob)s dēļ %(reason)s",
+    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s izveidoja noteikumu pieejas liegšanai lietotājiem, kas atbilst %(glob)s dēļ %(reason)s",
+    "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s izmainīja noteikumu pieejas liegšanai, kas atbilst %(glob)s dēļ %(reason)s",
+    "%(senderName)s updated an invalid ban rule": "%(senderName)s izmainīja kļūdainu pieejas liegšanas noteikumu",
+    "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s izmainīja noteikumu pieejas liegšanai serveriem, kas atbilst %(glob)s dēļ %(reason)s",
+    "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s izmainīja noteikumu pieejas liegšanai istabām, kas atbilst %(glob)s dēļ %(reason)s",
+    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s izmainīja noteikumu pieejas liegšanai lietotājiem, kas atbilst %(glob)s dēļ %(reason)s",
+    "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s dzēsa noteikumu pieejas liegšanai atbilstoši %(glob)s",
+    "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s dzēsa noteikumu pieejas liegšanai serveriem, kas atbilst %(glob)s",
+    "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s dzēsa noteikumu pieejas liegšanai istabām, kas atbilst %(glob)s",
+    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s dzēsa noteikumu pieejas liegšanai lietotājiem, kas atbilst %(glob)s",
+    "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Visiem serveriem ir liegta pieeja dalībai! Šī istaba vairs nevar tikt izmantota.",
+    "Unbans user with given ID": "Atceļ pieejas liegumu lietotājam ar norādīto id",
+    "Lebanon": "Libāna",
+    "Bangladesh": "Bangladeša",
+    "Albania": "Albānija",
+    "You were kicked from %(roomName)s by %(memberName)s": "%(memberName)s padzina jūs no %(roomName)s",
+    "Kick users": "Padzīt lietotājus",
+    "Show join/leave messages (invites/kicks/bans unaffected)": "Rādīt pievienošanās un pamešanas ziņojumus (neatttiecas uz uzaicinājumiem, padzīšanu un aizliegumiem)",
+    "Toggle microphone mute": "Ieslēgt/izslēgt mikrofonu",
+    "Muted Users": "Apklusinātie lietotāji",
+    "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Atkārtoti pieprasīt šifrēšanas atslēgas</requestLink> no citām jūsu sesijām.",
+    "Confirm to continue": "Apstipriniet, lai turpinātu",
+    "Confirm account deactivation": "Apstipriniet konta deaktivizēšanu",
+    "Enter username": "Ievadiet lietotājvārdu",
+    "Confirm your recovery passphrase": "Apstipriniet atkopšanas frāzveida paroli",
+    "Enter your recovery passphrase a second time to confirm it.": "Ievadiet savu atkopšanas frāzveida paroli otreiz, lai to apstiprinātu.",
+    "Use a different passphrase?": "Izmantot citu frāzveida paroli?",
+    "Are you sure you want to cancel entering passphrase?": "Vai tiešām vēlaties atcelt frāzveida paroles ievadi?",
+    "Cancel entering passphrase?": "Atcelt frāzveida paroles ievadi?",
+    "Click the button below to confirm adding this phone number.": "Nospiediet pogu zemāk, lai apstiprinātu šī tālruņa numura pievienošanu.",
+    "Confirm adding phone number": "Apstipriniet tālruņa numura pievienošanu",
+    "Confirm adding email": "Apstipriniet epasta adreses pievienošanu",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Apstipriniet šīs epasta adreses pievienošanu, lietojot vienoto pierakstīšanos savas identitātes pierādīšanai.",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Apstipriniet šī tālruņa numura pievienošanu, lietojot vienoto pierakstīšanos savas identitātes pierādīšanai.",
+    "Click the button below to confirm adding this email address.": "Nospiediet pogu zemāk, lai apstiprinātu šīs epasta adreses pievienošanu.",
+    "Single Sign On": "Vienotā pierakstīšanās",
+    "Use Single Sign On to continue": "Lietot vienoto pierakstīšanos, lai turpinātu",
+    "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s nomainīja servera ACL piekļuves šai istabai.",
+    "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s iestatīja servera ACL piekļuves šai istabai.",
+    "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s nomainīja viesu piekļuvi uz %(rule)s",
+    "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s aizliedza viesiem pievienoties istabai.",
+    "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s atļāva viesiem pievienoties istabai.",
+    "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s nomainīja pievienošanās noteikumu uz %(rule)s",
+    "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s padarīja istabu pieejamu tikai ar ielūgumiem.",
+    "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s padarīja istabu publiski pieejamu visiem, kas zina saiti.",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s nomainīja istabas nosaukumu no %(oldRoomName)s uz %(newRoomName)s.",
+    "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Ja nevarat atrast meklēto istabu, jautājiet ielūgumu vai <a>Izveidojiet jaunu istabu</a>.",
+    "Explore all public rooms": "Pārlūkot visas publiskās istabas",
+    "Start a new chat": "Sākt jaunu čatu",
+    "Use the + to make a new room or explore existing ones below": "Lietojiet +, lai izveidotu jaunu istabu vai pārskatiet esošās zemāk",
+    "Welcome %(name)s": "Laipni lūdzam %(name)s",
+    "Welcome to %(appName)s": "Laipni lūdzam %(appName)s",
+    "Liberate your communication": "Padari savu saziņu brīvu",
+    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s no %(totalRooms)s",
+    "Done": "Gatavs",
+    "Please enter your Security Phrase a second time to confirm.": "Lūdzu, ievadiet savu slepeno frāzi otreiz, lai apstiprinātu.",
+    "Secure your backup with a Security Phrase": "Nodrošiniet savu rezerves kopiju ar slepeno frāzi",
+    "Great! This Security Phrase looks strong enough.": "Lieliski! Šī slepenā frāze šķiet pietiekami sarežgīta.",
+    "Use Security Key or Phrase": "Izmantojiet drošības atslēgu vai slepeno frāzi",
+    "Confirm your Security Phrase": "Apstipriniet savu slepeno frāzi",
+    "Repeat your Security Phrase...": "Atkārtojiet savu slepeno frāzi...",
+    "Set a Security Phrase": "Iestatiet slepeno frāzi",
+    "Enter a Security Phrase": "Ievadiet slepeno frāzi",
+    "Incorrect Security Phrase": "Nepareiza slepenā frāze",
+    "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "Ievadiet savu slepeno frāzi vai <button>izmantojiet savu drošības atslēgu</button>, lai turpinātu.",
+    "Security Phrase": "Slepenā frāze",
+    "or another cross-signing capable Matrix client": "vai kāda cita Matrix lietotne ar cross-signing atbalstu",
+    "This requires the latest %(brand)s on your other devices:": "Tam nepieciešama jaunākā %(brand)s versija citās jūsu ierīcēs:",
+    "Confirm": "Apstiprināt",
+    "Set a new password": "Iestati jaunu paroli",
+    "Set a new account password...": "Iestatiet jaunu konta paroli...",
+    "Sign in instead": "Pierakstīties",
+    "A verification email will be sent to your inbox to confirm setting your new password.": "Apstiprinājuma vēstule tiks nosūtīta uz tavu epasta adresi, lai apstiprinātu paroles nomaiņu.",
+    "Forgot password?": "Aizmirsi paroli?",
+    "No homeserver URL provided": "Nav iestatīts bāzes servera URL",
+    "Cannot reach homeserver": "Neizdodas savienoties ar bāzes serveri",
+    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Fails '%(fileName)s pārsniedz augšupielādējama faila izmēra limitu šajā bāzes serverī",
+    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Lūdzu, jautājiet sava bāzes servera administratoram (<code>%(homeserverDomain)s</code>) sakonfigurēt TURN serveri, lai zvani strādātu stabili.",
+    "Join millions for free on the largest public server": "Pievienojieties bez maksas miljoniem lietotāju lielākajā publiskajā serverī",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Element with an existing Matrix account on a different homeserver.": "Jūs varat pielāgot servera parametrus, lai pierakstītos citos Matrix bāzes serveros, norādot atbilstošu bāzes servera URL. Tas ļauj jums izmantot Element ar eksistējošu Matrix kontu uz cita bāzes servera.",
+    "Server Options": "Servera parametri",
+    "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s vai %(usernamePassword)s",
+    "That username already exists, please try another.": "Šis lietotājvārds jau eksistē, mēģiniet citu.",
+    "Username": "Lietotājvārds",
+    "<userName/> invited you": "<userName/> uzaicināja jūs",
+    "<userName/> wants to chat": "<userName/> vēlas sarakstīties",
+    "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Radās kļūda, atjauninot noskaņu šai istabai. Serveris var neatļaut to vai arī notikusi pagaidu kļūda.",
+    "Error updating flair": "Radās kļūda, atjauninot noskaņu",
+    "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s iespējoja noskaņu priekš %(newGroups)s un atspējoja noskaņu priekš %(oldGroups)s šajā istabā.",
+    "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s atspējoja noskaņu priekš %(groups)s šajā grupā.",
+    "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s iespējoja noskaņu priekš %(groups)s šajā istabā.",
+    "An image will help people identify your community.": "Attēls palīdzēs cilvēkiem atpazīt jūsu kopienu.",
+    "Invite people to join %(communityName)s": "Aiciniet cilvēkus pievienoties %(communityName)s",
+    "People you know on %(brand)s": "Cilvēki %(brand)s, kurus jūs pazīstat",
+    "Smileys & People": "Smaidiņi & cilvēki",
+    "%(count)s people|one": "%(count)s cilvēki",
+    "%(count)s people|other": "%(count)s cilvēki",
+    "People": "Cilvēki",
+    "Add a photo, so people can easily spot your room.": "Pievienojiet foto, lai padarītu istabu vieglāk pamanāmu citiem cilvēkiem.",
+    "<a>Add a topic</a> to help people know what it is about.": "<a>Pievienot tematu</a>, lai dotu cilvēkiem priekšstatu.",
+    "A session's public name is visible to people you communicate with": "Sesijas publiskais nosaukums ir redzams cilvēkiem, ar kuriem jūs komunicējat",
+    "Try out new ways to ignore people (experimental)": "Izmēģiniet jauno veidus, kā ignorēt cilvēkus (eksperimentāls)",
+    "You do not have permission to invite people to this room.": "Jums nav atļaujas uzaicināt cilvēkus šajā istabā.",
+    "Clear room list filter field": "Attīrīt istabu saraksta filtru",
+    "Filter rooms and people": "Filtrēt istabas un cilvēkus",
+    "Filter": "Filtrēt",
+    "Interactively verify by Emoji": "Abpusēji verificēt ar emocijzīmēm",
+    "Manually Verify by Text": "Manuāli verificēt ar tekstu",
+    "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s atsauca uzaicinājumu %(targetDisplayName)s pievienoties istabai.",
+    "%(senderName)s declined the call.": "%(senderName)s noraidīja zvanu.",
+    "(connection failed)": "(savienojums neizdevās)",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s izmainīja istabas adreses.",
+    "%(senderName)s removed the main address for this room.": "%(senderName)s dzēsa galveno adresi šai istabai.",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s iestatīja istabas galveno adresi kā %(address)s.",
+    "%(senderName)s made no change.": "%(senderName)s neko neizmainīja.",
+    "Afghanistan": "Afganistāna",
+    "United States": "Amerikas Savienotās Valstis",
+    "United Kingdom": "Lielbritānija",
+    "Room name or address": "Istabas nosaukums vai adrese",
+    "Name or Matrix ID": "Nosaukums vai Matrix ID",
+    "The file '%(fileName)s' failed to upload.": "'%(fileName)s' augšupielāde neizdevās.",
+    "This will end the conference for everyone. Continue?": "Šī darbība pātrauks konferenci visiem. Turpināt?",
+    "End conference": "Pārtraukt konferenci",
+    "You've reached the maximum number of simultaneous calls.": "Ir sasniegts maksimālais vienaicīgu zvanu skaits.",
+    "Too Many Calls": "Pārāk daudz zvanu",
+    "Try using turn.matrix.org": "Mēģiniet izmantot turn.matrix.org",
+    "The other party declined the call.": "Otra puse noraidīja zvanu.",
+    "Call Declined": "Zvans noraidīts",
+    "Session key:": "Sesijas atslēga:",
+    "Session ID:": "Sesijas ID:",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Uzskatīt par uzticamām tikai individuāli verificētas lietotāja sesijas, nepaļaujoties uz ierīču cross-signing funkcionalitāti.",
+    "Manually verify all remote sessions": "Manuāli verificēt visas pārējās sesijas",
+    "Never send encrypted messages to unverified sessions from this session": "Nesūtīt šifrētas ziņas no šīs sesijas neverificētām sesijām",
+    "Delete %(count)s sessions|one": "Dzēst %(count)s sesiju",
+    "Delete %(count)s sessions|other": "Dzēst %(count)s sesijas",
+    "Public Name": "Publiskais nosaukums",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Pārskatiet nosaukumus un izrakstieties no savām sesijām zemāk vai <a>verificējiet tās savā lietotāja profilā</a>.",
+    "Review where you’re logged in": "Pārskatiet savas pierakstīšanās",
+    "Where you’re logged in": "Jūsu pierakstīšanās",
+    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Notikusi kļūda, mēģinot atjaunināt istabas alternatīvās adreses. Iespējams, tas ir liegts servera iestatījumos vai arī notikusi kāda pagaidu kļūme.",
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s nomainīja šīs istabas alternatīvās adreses.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s dzēsa šīs istabas alternatīvo adresi %(addresses)s.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s dzēsa šīs istabas alternatīvās adreses %(addresses)s.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s pievienoja alternatīvo adresi %(addresses)s šai istabai.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s pievienoja alternatīvās adreses %(addresses)s šai istabai.",
+    "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Izmantojiet identitātes serveri, lai uzaicinātu ar epastu. Pārvaldiet <settings>iestatījumos</settings>.",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Uzaiciniet kādu personu, izmantojot vārdu, epasta adresi, lietotājvārdu (piemēram, <userId/>) vai <a>dalieties ar šo istabu</a>.",
+    "Verified": "Verificēts",
+    "Verified!": "Verificēts!",
+    "Verify all users in a room to ensure it's secure.": "Verificējiet visus istabā esošos lietotājus, lai nodrošinātu tās drošību.",
+    "You've successfully verified your device!": "Jūs veiksmīgi verificējāt savu ierīci!",
+    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Jūs veiksmīgi verificējāt %(deviceName)s (%(deviceId)s)!",
+    "You've successfully verified this user.": "Jūs veiksmīgi verificējāt šo lietotāju.",
+    "You've successfully verified %(displayName)s!": "Jūs veiksmīgi verificējāt %(displayName)s!",
+    "Session already verified!": "Sesija jau verificēta!",
+    "You verified %(name)s": "Jūs verificējāt %(name)s",
+    "%(name)s accepted": "%(name)s akceptēja",
+    "You accepted": "Jūs akceptējāt",
+    "Rotate clockwise": "Rotēt pulksteņrādītāja kustības virzienā",
+    "Rotate Right": "Rotēt pa labi",
+    "Rotate counter-clockwise": "Rotēt pretēji pulksteņrādītāja kustības virzienam",
+    "Rotate Left": "Rotēt pa kreisi",
+    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s uzsāka video zvanu. (Netiek atbalstīts šajā pārlūkā)",
+    "%(senderName)s placed a video call.": "%(senderName)s uzsāka video zvanu.",
+    "Encrypted messages in group chats": "Šifrētas ziņas grupas čatos",
+    "Encrypted messages in one-to-one chats": "Šifrētas ziņas viens-pret-vienu čatos",
+    "Messages containing @room": "Ziņas, kuras satur @room",
+    "Messages containing my username": "Ziņas, kuras satur manu lietotājvārdu",
+    "%(displayName)s created this room.": "%(displayName)s izveidoja šo istabu.",
+    "IRC display name width": "IRC parādāmā vārda platums",
+    "Show display name changes": "Rādīt parādāmā vārda izmaiņas",
+    "%(displayName)s cancelled verification.": "%(displayName)s atcēla verificēšanu.",
+    "Your display name": "Jūsu parādāmais vārds",
+    "Add an email address to configure email notifications": "Pievienojiet e-pasta adresi, lai konfigurētu e-pasta paziņojumus",
+    "Enable audible notifications for this session": "Iespējot dzirdamus paziņojumus šai sesijai",
+    "Enable desktop notifications for this session": "Iespējot darbvirsmas paziņojumus šai sesijai",
+    "Enable 'Manage Integrations' in Settings to do this.": "Iespējojiet 'Pārvaldīt integrācijas' iestatījumos, lai to izdarītu.",
+    "Manage integrations": "Pārvaldīt integrācijas",
+    "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "Pašlaik jūs izmantojat <server></server>, lai atklātu esošos kontaktus un jūs būtu atklājams citiem. Jūs varat mainīt identitātes serveri zemāk.",
+    "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Pašlaik jūs neizmantojat nevienu identitātes serveri. Lai atklātu esošos kontaktus un jūs būtu atklājams citiem, pievienojiet kādu identitātes serveri zemāk.",
+    "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.": "Ziņu redzamība Matrix ir līdzīga e-pastam. Jūsu ziņu aizmiršana nozīmē, ka jūsu nosūtītās ziņas netiks kopīgotas ar nevienu jaunu vai nereģistrētu lietotāju, tomēr reģistrētiem lietotājiem, kuriem jau šobrīd ir piekļuve šīm ziņām, joprojām būs piekļuve viņu kopijai.",
+    "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.": "Konta deaktivizēšana <b>pēc noklusējuma neliek aizmirst jūsu nosūtītās ziņas.</b> Ja vēlaties, lai mēs aizmirstam jūsu ziņas, lūdzu, atzīmējiet zemāk esošo lodziņu.",
+    "Deactivating your account is a permanent action - be careful!": "Konta deaktivizēšana ir neatgriezeniska darbība - esiet piesardzīgi!",
+    "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>": "Tas padarīs jūsu kontu nelietojamu uz visiem laikiem. Jūs nevarēsit pierakstīties, kā arī neviens nevarēs atkārtoti reģistrēt to pašu lietotāja ID. Jūsu konts pametīs visas istabas, kurās tas piedalās, un tiks dzēsta jūsu konta informācija no jūsu identitātes servera. <b> Šī darbība ir neatgriezeniska. </b>",
+    "Confirm your identity by entering your account password below.": "Apstipriniet savu identitāti, ievadot sava konta paroli.",
+    "To continue, please enter your password:": "Lai turpinātu, lūdzu, ievadiet savu paroli:",
+    "This account has been deactivated.": "Šis konts ir deaktivizēts.",
+    "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)": "Lūdzu, aizmirstiet visas manis sūtītās ziņas pēc mana konta ir deaktivizēšanas (<b> Brīdinājums: </b> nākotnes lietotāji redzēs nepilnīgu sarunu skatu)",
+    "Are you sure you want to deactivate your account? This is irreversible.": "Vai tiešām vēlaties deaktivizēt savu kontu? Tas ir neatgriezeniski.",
+    "Deactivate account": "Deaktivizēt kontu",
+    "Language and region": "Valoda un reģions",
+    "Enter phone number": "Ievadiet tālruņa numuru",
+    "Phone Number": "Tālruņa numurs",
+    "Phone numbers": "Tālruņa numuri",
+    "Email Address": "Epasta adrese",
+    "Email addresses": "Epasta adreses",
+    "Change topic": "Mainīt tematu",
+    "Change room avatar": "Mainīt istabas avataru",
+    "Change main address for the room": "Mainīt istabas galveno adresi",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s nomainīja istabas galveno un alternatīvo adresi.",
+    "Change history visibility": "Mainīt vēstures redzamību",
+    "Change permissions": "Mainīt atļaujas",
+    "Notify everyone": "Apziņot visus",
+    "Remove messages sent by others": "Dzēst citu sūtītas ziņas",
+    "Change settings": "Mainīt iestatījumus",
+    "Invite users": "Uzaicināt lietotājus",
+    "Send messages": "Sūtīt ziņas",
+    "Default role": "Noklusējuma loma",
+    "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Izmaiņas attiecībā uz to, kas var lasīt vēsturi, attieksies tikai uz nākamajiem ziņojumiem šajā istabā. Esošās vēstures redzamība nemainīsies.",
+    "Never send encrypted messages to unverified sessions in this room from this session": "Nesūtīt šifrētas ziņas no šīs sesijas neverificētām sesijām šajā istabā",
+    "Encrypted": "Šifrēts",
+    "Enable room encryption": "Iespējot istabas šifrēšanu",
+    "Enable encryption?": "Iespējot šifrēšanu?",
+    "Encryption": "Šifrēšana",
+    "Roles & Permissions": "Lomas un atļaujas",
+    "Room version:": "Istabas versija:",
+    "The server does not support the room version specified.": "Serveris neatbalsta norādīto istabas versiju.",
+    "Internal room ID:": "Iekšējais istabas ID:",
+    "Browse": "Pārlūkot",
+    "Notification sound": "Paziņojumu skaņas signāli",
+    "Uploaded sound": "Augšupielādētie skaņas signāli",
+    "Sounds": "Skaņas signāli",
+    "Set a new custom sound": "Iestatīt jaunu pielāgotu skaņas signālu",
+    "Reset": "Atiestatīt",
+    "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.": "Šifrētās istabās, ieskaitot arī šo, URL priekšskatījumi pēc noklusējuma ir atspējoti, lai nodrošinātu, ka jūsu bāzes serveris, kurā notiek priekšskatījumu ģenerēšana, nevar apkopot informāciju par saitēm, kuras redzat šajā istabā.",
+    "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.": "Kad kāds savā ziņā ievieto URL, priekšskatījums ar virsrakstu, aprakstu un vietnes attēlu var tikt parādīts, tādējādi sniedzot vairāk informācijas par šo vietni.",
+    "No": "Nē",
+    "Yes": "Jā",
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Iestatiet istabai adresi, lai lietotāji var atrast šo istabu jūsu bāzes serverī (%(localDomain)s)",
+    "Local Addresses": "Lokālās adreses",
+    "New published address (e.g. #alias:server)": "Jauna publiska adrese (piemēram, #alias:server)",
+    "No other published addresses yet, add one below": "Pagaidām nav nevienas publiskotas adreses, pievienojiet zemāk",
+    "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.": "Publiskotas adreses ikviens var izmantot jebkurā serverī, lai pievienotos jūsu istabai. Lai varētu publiskot adresi, tai vispirms jābūt iestatītai kā lokālajai adresei.",
+    "Published Addresses": "Publiskotās adreses",
+    "Other published addresses:": "Citas publiskotās adreses:",
+    "This address is already in use": "Šī adrese jau tiek izmantota",
+    "User %(userId)s is already in the room": "Lietotājs %(userId)s jau atrodas istabā",
+    "Other": "Citi",
+    "Show less": "Rādīt mazāk",
+    "Show more": "Rādīt vairāk",
+    "Show %(count)s more|one": "Rādīt vēl %(count)s",
+    "Show %(count)s more|other": "Rādīt vēl %(count)s",
+    "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Notikusi kļūda, mēģinot atjaunināt istabas galveno adresi. Iespējams, tas ir liegts servera iestatījumos vai arī notikusi kāda pagaidu kļūme.",
+    "Error updating main address": "Kļūda galvenās adreses atjaunināšanā",
+    "This address is available to use": "Šī adrese ir pieejama",
+    "Room Addresses": "Istabas adreses",
+    "This room has no topic.": "Istabai nav temata.",
+    "Room Topic": "Istabas temats",
+    "Change room name": "Nomainīt istabas nosaukumu",
+    "%(networkName)s rooms": "%(networkName)s istabas",
+    "Room %(name)s": "Istaba %(name)s",
+    "Room Name": "Istabas nosaukums",
+    "General failure": "Vispārīga kļūda",
+    "General": "Vispārīgi",
+    "Recently Direct Messaged": "Nesenās tiešās sarakstes",
+    "Topic (optional)": "Temats (izvēles)",
+    "Topic: %(topic)s (<a>edit</a>)": "Temats: %(topic)s (<a>redigēt</a>)",
+    "Topic: %(topic)s ": "Temats: %(topic)s ",
+    "This is the start of <roomName/>.": "Šis ir <roomName/> istabas pats sākums.",
+    "You created this room.": "Jūs izveidojāt šo istabu.",
+    "%(creator)s created and configured the room.": "%(creator)s izveidoja un nokonfigurēja istabu.",
+    "Please provide a room address": "Lūdzu, ievadiet istabas adresi",
+    "e.g. my-room": "piem., mana-istaba",
+    "Room address": "Istabas adrese",
+    "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Jūs varat iespējot šo situācijā, kad istaba paredzēta izmantošanai tikai saziņai starp jūsu bāzes serverī esošajām komandām. Tas nav maināms vēlāk.",
+    "Block anyone not part of %(serverName)s from ever joining this room.": "Liegt pievienoties šai istabai ikvienam, kas nav reģistrēts %(serverName)s serverī.",
+    "Show advanced": "Rādīt papildu iestatījumus",
+    "Hide advanced": "Slēpt papildu iestatījumus",
+    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Privātas istabas nav atrodamas ikvienam un ļauj pievienoties tikai ar ielūgumiem. Publiskas istabas parādās meklējumu rezultātos ikvienam un ļauj pievienoties ikvienam.",
+    "Your server requires encryption to be enabled in private rooms.": "Jūsu serveris pieprasa iespējotu šifrēšānu privātās istabās.",
+    "Enable end-to-end encryption": "Iespējot pilnīgu šifrēšanu",
+    "Make this room public": "Padarīt istabu publiski pieejamu",
+    "Create a private room": "Privātas istabas izveidošana",
+    "Create a public room": "Publiskas istabas izveidošana",
+    "Add a new server...": "Pievienot jaunu serveri...",
+    "Add a new server": "Pievienot jaunu serveri",
+    "Your homeserver": "Jūsu bāzes serveris",
+    "Your server": "Jūsu serveris",
+    "Matrix rooms": "Matrix istabas",
+    "Find a room…": "Meklēt istabu…",
+    "Find a room… (e.g. %(exampleRoom)s)": "Meklēt istabu… (piemēram, %(exampleRoom)s)",
+    "Integrations are disabled": "Integrācijas ir atspējotas",
+    "Room Settings - %(roomName)s": "Istabas iestatījumi - %(roomName)s",
+    "Room settings": "Istabas iestatījumi",
+    "Share room": "Dalīties ar istabu",
+    "Show files": "Rādīt failus",
+    "Help & About": "Palīdzība un par lietotni",
+    "About homeservers": "Par bāzes serveriem",
+    "About": "Detaļas",
+    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s uzsāka balss zvanu. (Netiek atbalstīts šajā pārlūkā)",
+    "%(senderName)s placed a voice call.": "%(senderName)s uzsāka balss zvanu.",
+    "Incoming voice call": "Ienākošais balss zvans",
+    "Voice Call": "Balss zvans",
+    "Enable message search in encrypted rooms": "Iespējot ziņu meklēšanu šifrētās istabās",
+    "Search (must be enabled)": "Meklēšana (jābūt iespējotai)",
+    "Jump to room search": "Pāriet uz istabu meklēšanu",
+    "Message search": "Ziņu meklēšana",
+    "Cancel search": "Atcelt meklējumu",
+    "Flags": "Karogi",
+    "Flag": "Karogs",
+    "Symbols": "Simboli",
+    "Objects": "Objekti",
+    "Travel & Places": "Ceļojumi un vietas",
+    "Activities": "Aktivitātes",
+    "Food & Drink": "Pārtika un dzērieni",
+    "Animals & Nature": "Dzīvnieki un daba",
+    "Frequently Used": "Bieži lietotas",
+    "The authenticity of this encrypted message can't be guaranteed on this device.": "Šīs šifrētās ziņas autentiskums nevar tikt garantēts šajā ierīcē.",
+    "Go": "Aiziet",
+    "%(num)s days ago": "%(num)s dienas iepriekš",
+    "about a day ago": "aptuveni dienu iepriekš",
+    "%(num)s hours ago": "%(num)s stundas iepriekš",
+    "about an hour ago": "aptuveni stundu iepriekš",
+    "%(num)s minutes ago": "%(num)s minūtes iepriekš",
+    "about a minute ago": "aptuveni minūti iepriekš",
+    "a few seconds ago": "pirms dažām sekundēm",
+    "Recent Conversations": "Nesenās sarunas",
+    "Start a conversation with someone using their name or username (like <userId/>).": "Uzsāciet sarunu ar citiem, izmantojot vārdu vai lietotājvārdu (piemērs - <userId/>).",
+    "Start a conversation with someone using their name, email address or username (like <userId/>).": "Uzsāciet sarunu ar citiem, izmantojot vārdu, epasta adresi vai lietotājvārdu (piemērs - <userId/>).",
+    "Session verified": "Sesija verificēta",
+    "Upload": "Augšupielādēt",
+    "Use your Security Key to continue.": "Izmantojiet savu drošības atslēgu, lai turpinātu.",
+    "Save your Security Key": "Saglabājiet savu drošības atslēgu",
+    "Generate a Security Key": "Ģenerēt drošības atslēgu",
+    "Your Security Key": "Jūsu drošības atslēga",
+    "Enter Security Key": "Ievadiet drošības atslēgu",
+    "Security Key mismatch": "Drošības atslēgas atšķiras",
+    "Invalid Security Key": "Kļūdaina drošības atslēga",
+    "Wrong Security Key": "Nepareiza drošības atslēga",
+    "Security Key": "Drošības atslēga",
+    "Start chatting": "Uzsākt saraksti",
+    "Reject & Ignore user": "Noraidīt un ignorēt lietotāju",
+    "Do you want to chat with %(user)s?": "Vai vēlaties sarakstīties ar %(user)s?",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Šis bāzes serveris neatbalsta nevienu pierakstīšanās metodi, kuru atbalstītu šis klients.",
+    "Explore rooms": "Pārlūkot istabas",
+    "Confirm Security Phrase": "Apstipriniet slepeno frāzi",
+    "Safeguard against losing access to encrypted messages & data by backing up encryption keys on your server.": "Nodrošinieties pret piekļuves zaudēšanu šifrētām ziņām un datiem, dublējot šifrēšanas atslēgas savā serverī.",
+    "Use a secret phrase only you know, and optionally save a Security Key to use for backup.": "Izmantojiet tikai jums zināmu slepeno frāzi un pēc izvēles saglabājiet drošības atslēgu, lai to izmantotu dublēšanai.",
+    "We’ll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": "Mēs saģenerēsim drošības atslēgu, lai jūs to varētu glabāt drošā vietā, piemēram, paroļu pārvaldniekā vai seifā.",
+    "Go back to set it again.": "Atgriezties, lai iestatītu atkārtoti.",
+    "That doesn't match.": "Nesakrīt.",
+    "That matches!": "Sakrīt!",
+    "For maximum security, this should be different from your account password.": "Lai nodrošinātu maksimālu drošību, tai jāatšķiras no jūsu konta paroles.",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "Atslēgu kopiju šifrētā veidā mēs glabāsim mūsu serverī. Nodrošiniet dublējumu ar drošības frāzi.",
+    "User Autocomplete": "Lietotāju automātiska pabeigšana",
+    "Room Autocomplete": "Istabu automātiska pabeigšana",
+    "Notification Autocomplete": "Paziņojumu automātiska pabeigšana",
+    "Emoji Autocomplete": "Emocijzīmju automātiska pabeigšana",
+    "DuckDuckGo Results": "DuckDuckGo rezultāti",
+    "Community Autocomplete": "Kopienu automātiska pabeigšana",
+    "Command Autocomplete": "Komandu automātiska pabeigšana",
+    "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.": "Brīdinājums: šajā sesijā joprojām tiek glabāti jūsu personas dati (ieskaitot šifrēšanas atslēgas). Notīriet to, ja esat beidzis izmantot šo sesiju vai vēlaties pierakstīties citā kontā.",
+    "Clear personal data": "Dzēst personas datus",
+    "You're signed out": "Jūs izrakstījāties",
+    "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Jūs nevarat pierakstīties savā kontā. Lūdzu, sazinieties ar sava bāzes servera administratoru, lai iegūtu vairāk informācijas.",
+    "Sign in and regain access to your account.": "Pierakstieties un atgūstiet piekļuvi savam kontam.",
+    "Forgotten your password?": "Aizmirsāt paroli?",
+    "Enter your password to sign in and regain access to your account.": "Ievadiet paroli, lai pierakstītos un atgūtu piekļuvi savam kontam.",
+    "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.": "Atgūstiet piekļuvi savam kontam un atjaunojiet šajā sesijā saglabātās šifrēšanas atslēgas. Bez tām nevienā sesijā nevarēsiet izlasīt visas šifrētās ziņas.",
+    "Failed to re-authenticate": "Neizdevās atkārtoti autentificēties",
+    "Failed to re-authenticate due to a homeserver problem": "Bāzes servera problēmas dēļ atkārtoti autentificēties neizdevās",
+    "Without completing security on this session, it won’t have access to encrypted messages.": "Nepabeidzot šīs sesijas drošību, tai nebūs piekļuves šifrētām ziņām.",
+    "Your new session is now verified. Other users will see it as trusted.": "Jūsu jaunā sesija tagad ir verificēta. Citi lietotāji to redzēs kā uzticamu.",
+    "%(brand)s Android": "%(brand)s Android",
+    "%(brand)s iOS": "%(brand)s iOS",
+    "%(brand)s Desktop": "%(brand)s Desktop",
+    "%(brand)s Web": "%(brand)s Web",
+    "Use Security Key": "Izmantojiet drošības atslēgu",
+    "Create account": "Izveidot kontu",
+    "Registration Successful": "Reģistrācija ir veiksmīga",
+    "You can now close this window or <a>log in</a> to your new account.": "Tagad varat aizvērt šo logu vai <a>pierakstīties</a> savā jaunajā kontā.",
+    "<a>Log in</a> to your new account.": "<a>Pierakstīties</a> jaunajā kontā.",
+    "Continue with previous account": "Turpināt ar iepriekšējo kontu",
+    "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Jūsu jaunais konts (%(newAccountId)s) ir reģistrēts, bet jūs jau esat pierakstījies citā kontā (%(loggedInUserId)s).",
+    "Already have an account? <a>Sign in here</a>": "Jau ir konts? <a>Pierakstieties šeit</a>",
+    "Continue with %(ssoButtons)s": "Turpināt ar %(ssoButtons)s",
+    "Registration has been disabled on this homeserver.": "Šajā bāzes serverī reģistrācija ir atspējota.",
+    "Unable to query for supported registration methods.": "Nevar pieprasīt atbalstītās reģistrācijas metodes.",
+    "New? <a>Create account</a>": "Pirmā reize? <a>Izveidojiet kontu</a>",
+    "If you've joined lots of rooms, this might take a while": "Ja esat pievienojies daudzām istabām, tas var aizņemt kādu laiku",
+    "Signing In...": "Pierakstīšanās…",
+    "Syncing...": "Sihnronizējas…",
+    "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.": "Jūs esat izrakstījies no visām sesijām un vairs nesaņemsit push paziņojumus. Lai atkārtoti iespējotu paziņojumus, vēlreiz pierakstieties katrā ierīcē.",
+    "Your password has been reset.": "Jūsu parole ir atiestatīta.",
+    "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Mainot paroli, tiks atiestatītas visas pilnīgas šifrēšanas atslēgas visās jūsu sesijās, padarot šifrēto tērzēšanas vēsturi neizlasāmu. Pirms paroles atiestatīšanas iestatiet atslēgu dublēšanu vai eksportējiet istabas atslēgas no citas sesijas.",
+    "Could not load user profile": "Nevarēja ielādēt lietotāja profilu",
+    "Community and user menu": "Kopienas un lietotāja izvēlne",
+    "User menu": "Lietotāja izvēlne",
+    "User settings": "Lietotāja iestatījumi",
+    "Community settings": "Kopienas iestatījumi",
+    "New here? <a>Create an account</a>": "Pirmo reizi šeit? <a>Izveidojiet kontu</a>",
+    "Got an account? <a>Sign in</a>": "Vai jums ir konts? <a>Pierakstieties</a>",
+    "You have %(count)s unread notifications in a prior version of this room.|one": "Jums ir %(count)s nelasīts paziņojums iepriekšējā šīs istabas versijā.",
+    "You have %(count)s unread notifications in a prior version of this room.|other": "Jums ir %(count)s nelasīti paziņojumi iepriekšējā šīs istabas versijā.",
+    "Explore rooms in %(communityName)s": "Pārlūkot %(communityName)s istabas",
+    "delete the address.": "dzēst adresi.",
+    "Delete the room address %(alias)s and remove %(name)s from the directory?": "Dzēst istabas adresi %(alias)s un izņemt %(name)s no kataloga?",
+    "The homeserver may be unavailable or overloaded.": "Iespējams, bāzes serveris nav pieejams vai ir pārslogots.",
+    "%(brand)s failed to get the public room list.": "%(brand)s neizdevās iegūt publisko istabu sarakstu.",
+    "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s neizdevās iegūt protokolu sarakstu no bāzes servera. Iespējams, bāzes serveris ir pārāk vecs, lai atbalstītu trešo pušu tīklus.",
+    "Add a photo so people know it's you.": "Pievienot foto, lai cilvēki zina, ka tas esi tu.",
+    "Great, that'll help people know it's you": "Lieliski, tas ļaus cilvēkiem tevi atpazīt",
+    "This homeserver does not support communities": "Šis bāzes serveris neatbalsta kopienas",
+    "Everyone": "Jebkurš",
+    "Who can join this community?": "Kas var pievienoties šai kopienai?",
+    "Leave this community": "Pamest šo kopienu",
+    "Join this community": "Pievienoties šai kopienai",
+    "Unable to leave community": "Neizdodas pamest kopienu",
+    "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Jūs esat šīs kopienas administrators. Jūs nevarēsit atkārtoti pievienoties bez cita administratora ielūguma.",
+    "Unable to join community": "Neizdodas pievienoties kopienai",
+    "Create community": "Izveidot kopienu",
+    "Couldn't load page": "Neizdevās ielādēt lapu",
+    "Sign in with SSO": "Pierakstieties, izmantojot SSO",
+    "Use email to optionally be discoverable by existing contacts.": "Izmantojiet epasta adresi, lai pēc izvēles jūs varētu atrast esošie kontakti.",
+    "Use email or phone to optionally be discoverable by existing contacts.": "Izmantojiet epasta adresi vai tālruņa numuru, lai pēc izvēles jūs varētu atrast esošie kontakti.",
+    "Add an email to be able to reset your password.": "Pievienojiet epasta adresi, lai varētu atiestatīt paroli.",
+    "Phone (optional)": "Tālruņa numurs (izvēles)",
+    "Use lowercase letters, numbers, dashes and underscores only": "Izmantojiet tikai mazos burtus, ciparus, domuzīmes un pasvītrojumus",
+    "Enter phone number (required on this homeserver)": "Ievadiet tālruņa numuru (obligāts šajā bāzes serverī)",
+    "Other users can invite you to rooms using your contact details": "Citi lietotāji var jūs uzaicināt uz istabām, izmantojot jūsu kontaktinformāciju",
+    "Enter email address (required on this homeserver)": "Ievadiet epasta adresi (obligāta šajā bāzes serverī)",
+    "Use an email address to recover your account": "Izmantojiet epasta adresi konta atkopšanai",
+    "That phone number doesn't look quite right, please check and try again": "Šis tālruņa numurs neizskatās pareizs. Lūdzu, pārbaudiet un mēģiniet vēlreiz",
+    "Enter email address": "Ievadiet epasta adresi",
+    "Keep going...": "Uz priekšu…",
+    "Password is allowed, but unsafe": "Parole ir atļauta, tomēr nedroša",
+    "Nice, strong password!": "Lieliski, sarežģīta parole!",
+    "Enter password": "Ievadiet paroli",
+    "Something went wrong in confirming your identity. Cancel and try again.": "Kaut kas nogāja greizi, mēģinot apstiprināt jūsu identitāti. Atceliet un mēģiniet vēlreiz.",
+    "Session key": "Sesijas atslēga",
+    "Secure Backup": "Droša reze",
+    "Accept all %(invitedRooms)s invites": "Pieņemt visus %(invitedRooms)s uzaicinājumus",
+    "Bulk options": "Lielapjoma opcijas",
+    "Clear cache and reload": "Notīrīt kešatmiņu un pārlādēt",
+    "Versions": "Versijas",
+    "Keyboard Shortcuts": "Klaviatūras saīsnes",
+    "FAQ": "BUJ",
+    "For help with using %(brand)s, click <a>here</a>.": "Palīdzībai %(brand)s izmantošanā, spiediet <a>šeit</a>.",
+    "Account management": "Konta pārvaldība",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Jūsu parole tika veiksmīgi nomainīta. Jūs nesaņemsit push paziņojumus citās sesijās, kamēr atkārtoti nepierakstīsieties tajās",
+    "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Iestaties uz jūsu sistēmas instalēta fonta nosaukumu, kuru & %(brand)s vajadzētu mēģināt izmantot.",
+    "New version available. <a>Update now.</a>": "Pieejama jauna versija. <a>Atjaunināt.</a>",
+    "Failed to save your profile": "Neizdevās salabāt jūsu profilu",
+    "Passwords don't match": "Paroles nesakrīt",
+    "Compare unique emoji": "Salīdziniet unikālās emocijzīmes",
+    "or": "vai",
+    "Scan this unique code": "Noskenējiet šo unikālo kodu",
+    "Verify this session by completing one of the following:": "Verificējiet šo sesiju, veicot vienu no šīm darbībām:",
+    "The other party cancelled the verification.": "Pretējā puse pārtrauca verificēšanu.",
+    "Incoming call": "Ienākošais zvans",
+    "Incoming video call": "Ienākošais video zvans",
+    "Video Call": "Video zvans",
+    "Show shortcuts to recently viewed rooms above the room list": "Rādīt saīsnes uz nesen skatītajām istabām istabu saraksta augšpusē",
+    "Show rooms with unread notifications first": "Rādīt istabas ar nelasītiem paziņojumiem vispirms",
+    "Order rooms by name": "Kārtot istabas pēc nosaukuma",
+    "Send analytics data": "Sūtīt analītikas datus",
+    "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
+    "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
+    "* %(senderName)s %(emote)s": "* %(senderName)s %(emote)s",
+    "%(senderName)s is calling": "%(senderName)s zvana",
+    "%(senderName)s started a call": "%(senderName)s uzsāka zvanu",
+    "You started a call": "Jūs uzsākāt zvanu",
+    "%(senderName)s joined the call": "%(senderName)s pievienojās zvanam",
+    "You joined the call": "Jūs pievienojāties zvanam",
+    "New version of %(brand)s is available": "Pieejama jauna %(brand)s versija",
+    "Update %(brand)s": "Atjaunināt %(brand)s",
+    "New login. Was this you?": "Jauna pierakstīšanās. Vai tas bijāt jūs?",
+    "Set up Secure Backup": "Iestatīt drošu rezerves dublēšanu",
+    "Ok": "Labi",
+    "Contact your <a>server admin</a>.": "Sazinieties ar <a>servera administratoru</a>.",
+    "Your homeserver has exceeded one of its resource limits.": "Jūsu bāzes serverī ir pārsniegts limits kādam no resursiem.",
+    "Your homeserver has exceeded its user limit.": "Jūsu bāzes serverī ir pārsniegts lietotāju limits.",
+    "Enable": "Iespējot",
+    "Enable desktop notifications": "Iespējot darbvirsmas paziņojumus",
+    "Don't miss a reply": "Nepalaidiet garām atbildi",
+    "Later": "Vēlāk",
+    "Review": "Pārlūkot",
+    "Verify all your sessions to ensure your account & messages are safe": "Verificējiet visas savas sesijas, lai nodrošinātos, ka jūsu konts un ziņas ir drošībā",
+    "Ensure you have a stable internet connection, or get in touch with the server admin": "Pārliecinieties par stabilu internet savienojumu vai sazinieties ar servera administratoru",
+    "Could not find user in room": "Lietotājs istabā netika atrasts",
+    "Unrecognised room address:": "Neatpazīta istabas adrese:",
+    "You do not have the required permissions to use this command.": "Jums trūkst šīs komandas lietošanai nepieciešamo atļauju.",
+    "Missing roomId.": "Trūkst roomId.",
+    "Failed to invite users to the room:": "Neizdevās uzaicināt lietotājus uz istabu:",
+    "Custom (%(level)s)": "Pielāgots (%(level)s)",
+    "Create Account": "Izveidot kontu",
+    "Use your account or create a new one to continue.": "Izmantojiet esošu kontu vai izveidojiet jaunu, lai turpinātu.",
+    "Sign In or Create Account": "Pierakstīties vai izveidot kontu",
+    "Malawi": "Malāvija",
+    "Madagascar": "Madagaskara",
+    "Macedonia": "Maķedonija",
+    "Macau": "Makao",
+    "Luxembourg": "Luksemburga",
+    "Lithuania": "Lietuva",
+    "Latvia": "Latvija"
 }
diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json
index f8f0d890be..6388983f77 100644
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -1422,8 +1422,8 @@
     "Compact": "Kompakt",
     "Modern": "Moderne",
     "Server or user ID to ignore": "Tjener- eller bruker-ID-en som skal ignoreres",
-    "Show %(count)s more|other": "Vis %(count) til",
-    "Show %(count)s more|one": "Vis %(count) til",
+    "Show %(count)s more|other": "Vis %(count)s til",
+    "Show %(count)s more|one": "Vis %(count)s til",
     "Use default": "Bruk standarden",
     "Notification options": "Varselsinnstillinger",
     "Room options": "Rominnstillinger",
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 1ec887c364..101d997d9c 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -24,7 +24,7 @@
     "Banned users": "Verbannen gebruikers",
     "Bans user with given id": "Verbant de gebruiker met de gegeven ID",
     "Call Timeout": "Oproeptime-out",
-    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Kan geen verbinding maken met de thuisserver via HTTP wanneer er een HTTPS-URL in uw browserbalk staat. Gebruik HTTPS of <a>schakel onveilige scripts in</a>.",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Kan geen verbinding maken met de homeserver via HTTP wanneer er een HTTPS-URL in uw browserbalk staat. Gebruik HTTPS of <a>schakel onveilige scripts in</a>.",
     "Change Password": "Wachtwoord veranderen",
     "%(senderName)s changed their profile picture.": "%(senderName)s heeft een nieuwe profielfoto ingesteld.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s heeft het machtsniveau van %(powerLevelDiffText)s gewijzigd.",
@@ -87,10 +87,10 @@
     "olm version:": "olm-versie:",
     "Password": "Wachtwoord",
     "Passwords can't be empty": "Wachtwoorden kunnen niet leeg zijn",
-    "Permissions": "Toestemmingen",
+    "Permissions": "Rechten",
     "Phone": "Telefoonnummer",
     "Private Chat": "Privégesprek",
-    "Privileged Users": "Bevoorrechte gebruikers",
+    "Privileged Users": "Bevoegde gebruikers",
     "Profile": "Profiel",
     "Public Chat": "Openbaar gesprek",
     "Reason": "Reden",
@@ -124,7 +124,7 @@
     "%(weekDayName)s %(time)s": "%(weekDayName)s, %(time)s",
     "Set a display name:": "Stel een weergavenaam in:",
     "Upload an avatar:": "Upload een avatar:",
-    "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Geen verbinding met de thuisserver - controleer uw verbinding, zorg ervoor dat het <a>SSL-certificaat van de thuisserver</a> vertrouwd is en dat er geen browserextensies verzoeken blokkeren.",
+    "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Geen verbinding met de homeserver - controleer uw verbinding, zorg ervoor dat het <a>SSL-certificaat van de homeserver</a> vertrouwd is en dat er geen browserextensies verzoeken blokkeren.",
     "Cryptography": "Cryptografie",
     "Current password": "Huidig wachtwoord",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s heeft de gespreksnaam verwijderd.",
@@ -143,14 +143,14 @@
     "Deops user with given id": "Ontmachtigt gebruiker met de gegeven ID",
     "Default": "Standaard",
     "Displays action": "Toont actie",
-    "Emoji": "Emoticons",
+    "Emoji": "Emoji",
     "%(senderName)s ended the call.": "%(senderName)s heeft opgehangen.",
     "Enter passphrase": "Voer wachtwoord in",
     "Error decrypting attachment": "Fout bij het ontsleutelen van de bijlage",
     "Error: Problem communicating with the given homeserver.": "Fout: probleem bij communicatie met de gegeven thuisserver.",
     "Existing Call": "Bestaande oproep",
     "Export": "Wegschrijven",
-    "Export E2E room keys": "E2E-gesprekssleutels wegschrijven",
+    "Export E2E room keys": "E2E-gesprekssleutels exporteren",
     "Failed to ban user": "Verbannen van gebruiker is mislukt",
     "Failed to change power level": "Wijzigen van machtsniveau is mislukt",
     "Failed to fetch avatar URL": "Ophalen van avatar-URL is mislukt",
@@ -181,7 +181,7 @@
     "Identity Server is": "Identiteitsserver is",
     "I have verified my email address": "Ik heb mijn e-mailadres geverifieerd",
     "Import": "Inlezen",
-    "Import E2E room keys": "E2E-gesprekssleutels inlezen",
+    "Import E2E room keys": "E2E-gesprekssleutels importeren",
     "Incoming call from %(name)s": "Inkomende oproep van %(name)s",
     "Incoming video call from %(name)s": "Inkomende video-oproep van %(name)s",
     "Incoming voice call from %(name)s": "Inkomende spraakoproep van %(name)s",
@@ -202,7 +202,7 @@
     "Last seen": "Laatst gezien",
     "Leave room": "Gesprek verlaten",
     "%(targetName)s left the room.": "%(targetName)s heeft het gesprek verlaten.",
-    "Logout": "Afmelden",
+    "Logout": "Uitloggen",
     "Low priority": "Lage prioriteit",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s heeft de toekomstige gespreksgeschiedenis zichtbaar gemaakt voor alle gespreksleden, vanaf het moment dat ze uitgenodigd zijn.",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s heeft de toekomstige gespreksgeschiedenis zichtbaar gemaakt voor alle gespreksleden, vanaf het moment dat ze toegetreden zijn.",
@@ -222,7 +222,7 @@
     "Failed to kick": "Uit het gesprek zetten is mislukt",
     "%(senderName)s requested a VoIP conference.": "%(senderName)s heeft een VoIP-vergadering aangevraagd.",
     "Results from DuckDuckGo": "Resultaten van DuckDuckGo",
-    "Return to login screen": "Terug naar het aanmeldscherm",
+    "Return to login screen": "Terug naar het loginscherm",
     "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s heeft geen toestemming u meldingen te sturen - controleer uw browserinstellingen",
     "%(brand)s was not given permission to send notifications - please try again": "%(brand)s kreeg geen toestemming u meldingen te sturen - probeer het opnieuw",
     "%(brand)s version:": "%(brand)s-versie:",
@@ -230,7 +230,7 @@
     "Room Colour": "Gesprekskleur",
     "%(roomName)s does not exist.": "%(roomName)s bestaat niet.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s is op dit moment niet toegankelijk.",
-    "Rooms": "Groepsgesprekken",
+    "Rooms": "Groepen",
     "Save": "Opslaan",
     "Search failed": "Zoeken mislukt",
     "Searches DuckDuckGo for results": "Zoekt op DuckDuckGo voor resultaten",
@@ -248,7 +248,7 @@
     "Kicks user with given id": "Stuurt de gebruiker met de gegeven ID uit het gesprek",
     "%(senderName)s set a profile picture.": "%(senderName)s heeft een profielfoto ingesteld.",
     "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s heeft %(displayName)s als weergavenaam aangenomen.",
-    "Show timestamps in 12 hour format (e.g. 2:30pm)": "Tijd in 12-uursformaat weergeven (bv. 2:30pm)",
+    "Show timestamps in 12 hour format (e.g. 2:30pm)": "Tijd in 12-uursformaat tonen (bv. 2:30pm)",
     "Signed Out": "Afgemeld",
     "Sign in": "Aanmelden",
     "Sign out": "Afmelden",
@@ -265,7 +265,7 @@
     "This phone number is already in use": "Dit telefoonnummer is al in gebruik",
     "This room": "Dit gesprek",
     "This room is not accessible by remote Matrix servers": "Dit gesprek is niet toegankelijk vanaf externe Matrix-servers",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Om het te gebruiken, wacht u tot de automatisch aangevulde resultaten geladen zijn en tabt u erdoorheen.",
+    "To use it, just wait for autocomplete results to load and tab through them.": "Om het te gebruiken, wacht u tot de autoaanvullen resultaten geladen zijn en tabt u erdoorheen.",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "U heeft gepoogd een gegeven punt in de tijdslijn van dit gesprek te laden, maar u bent niet bevoegd het desbetreffende bericht te zien.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Geprobeerd een gegeven punt in de tijdslijn van dit gesprek te laden, maar kon dit niet vinden.",
     "Unable to add email address": "Kan e-mailadres niet toevoegen",
@@ -312,8 +312,8 @@
     "You have no visible notifications": "U heeft geen zichtbare meldingen",
     "You must <a>register</a> to use this functionality": "U dient u te <a>registreren</a> om deze functie te gebruiken",
     "You need to be able to invite users to do that.": "Dit vereist de bevoegdheid gebruikers uit te nodigen.",
-    "You need to be logged in.": "Hiervoor dient u aangemeld te zijn.",
-    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Zo te zien is uw e-mailadres op deze thuisserver niet aan een Matrix-ID gekoppeld.",
+    "You need to be logged in.": "Hiervoor dient u ingelogd te zijn.",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Zo te zien is uw e-mailadres op deze homeserver niet aan een Matrix-ID gekoppeld.",
     "You seem to be in a call, are you sure you want to quit?": "Het ziet er naar uit dat u in gesprek bent, weet u zeker dat u wilt afsluiten?",
     "You seem to be uploading files, are you sure you want to quit?": "Het ziet er naar uit dat u bestanden aan het uploaden bent, weet u zeker dat u wilt afsluiten?",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "U zult deze veranderingen niet terug kunnen draaien, daar u de gebruiker tot uw eigen niveau promoveert.",
@@ -328,7 +328,7 @@
     "Active call": "Actieve oproep",
     "Please select the destination room for this message": "Selecteer het bestemmingsgesprek voor dit bericht",
     "New Password": "Nieuw wachtwoord",
-    "Start automatically after system login": "Automatisch starten na systeemaanmelding",
+    "Start automatically after system login": "Automatisch starten na systeemlogin",
     "Analytics": "Statistische gegevens",
     "Options": "Opties",
     "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s verzamelt anonieme analysegegevens die het mogelijk maken de toepassing te verbeteren.",
@@ -340,7 +340,7 @@
     "File to import": "In te lezen bestand",
     "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.": "Hiermee kunt u de sleutels van uw ontvangen berichten in versleutelde gesprekken naar een lokaal bestand wegschrijven. Als u dat bestand dan in een andere Matrix-cliënt inleest kan die ook die berichten ontcijferen.",
     "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.": "Wie het weggeschreven bestand kan lezen, kan daarmee ook alle versleutelde berichten die u kunt zien ontcijferen - ga er dus zorgvuldig mee om! Daartoe kunt u hieronder een wachtwoord invoeren, dat dan gebruikt zal worden om het bestand te versleutelen. Het is dan enkel mogelijk de gegevens in te lezen met hetzelfde wachtwoord.",
-    "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.": "Hiermee kunt u  vanuit een andere Matrix-cliënt weggeschreven versleutelingssleutels inlezen, zodat u alle berichten die de andere cliënt kon ontcijferen ook hier kunt lezen.",
+    "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.": "Hiermee kunt u vanuit een andere Matrix-cliënt weggeschreven versleutelingssleutels inlezen, zodat u alle berichten die de andere cliënt kon ontcijferen ook hier kunt lezen.",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Het weggeschreven bestand is beveiligd met een wachtwoord. Voer dat wachtwoord hier in om het bestand te ontsleutelen.",
     "You must join the room to see its files": "Slechts na toetreding tot het gesprek zult u de bestanden kunnen zien",
     "Reject all %(invitedRooms)s invites": "Alle %(invitedRooms)s de uitnodigingen weigeren",
@@ -405,7 +405,7 @@
     "Create": "Aanmaken",
     "Featured Rooms:": "Prominente gesprekken:",
     "Featured Users:": "Prominente gebruikers:",
-    "Automatically replace plain text Emoji": "Tekst automatisch vervangen door emoticons",
+    "Automatically replace plain text Emoji": "Tekst automatisch vervangen door emoji",
     "Failed to upload image": "Uploaden van afbeelding is mislukt",
     "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s-widget toegevoegd door %(senderName)s",
     "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s-widget verwijderd door %(senderName)s",
@@ -440,7 +440,7 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s %(day)s %(monthName)s %(fullYear)s",
     "Enable inline URL previews by default": "Inline URL-voorvertoning standaard inschakelen",
     "Enable URL previews for this room (only affects you)": "URL-voorvertoning in dit gesprek inschakelen (geldt alleen voor u)",
-    "Enable URL previews by default for participants in this room": "URL-voorvertoning standaard voor alle deelnemers aan dit gesprek inschakelen",
+    "Enable URL previews by default for participants in this room": "URL-voorvertoning voor alle deelnemers aan dit gesprek standaard inschakelen",
     "%(senderName)s sent an image": "%(senderName)s heeft een afbeelding gestuurd",
     "%(senderName)s sent a video": "%(senderName)s heeft een video gestuurd",
     "%(senderName)s uploaded a file": "%(senderName)s heeft een bestand geüpload",
@@ -449,7 +449,7 @@
     "Unban this user?": "Deze gebruiker ontbannen?",
     "Ban this user?": "Deze gebruiker verbannen?",
     "Mirror local video feed": "Lokale videoaanvoer ook elders opslaan (spiegelen)",
-    "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.": "Zelfdegradatie is onomkeerbaar.  Als u de laatste bevoorrechte gebruiker in het gesprek bent zullen deze rechten voorgoed verloren gaan.",
+    "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.": "Zelfdegradatie is onomkeerbaar. Als u de laatste bevoorrechte gebruiker in het gesprek bent zullen deze rechten voorgoed verloren gaan.",
     "Unignore": "Niet meer negeren",
     "Ignore": "Negeren",
     "Jump to read receipt": "Naar het laatst gelezen bericht gaan",
@@ -484,10 +484,10 @@
     "'%(groupId)s' is not a valid community ID": "‘%(groupId)s’ is geen geldige gemeenschaps-ID",
     "Flair": "Badge",
     "Showing flair for these communities:": "Badges voor deze gemeenschappen weergeven:",
-    "This room is not showing flair for any communities": "Dit gesprek geeft geen badges voor gemeenschappen weer",
+    "This room is not showing flair for any communities": "Dit gesprek geeft geen gemeenschapsbadges weer",
     "New community ID (e.g. +foo:%(localDomain)s)": "Nieuwe gemeenschaps-ID (bv. +foo:%(localDomain)s)",
-    "URL previews are enabled by default for participants in this room.": "URL-voorvertoningen zijn voor leden van dit gesprek standaard ingeschakeld.",
-    "URL previews are disabled by default for participants in this room.": "URL-voorvertoningen zijn voor leden van dit gesprek standaard uitgeschakeld.",
+    "URL previews are enabled by default for participants in this room.": "URL-voorvertoningen zijn voor deelnemers van dit gesprek standaard ingeschakeld.",
+    "URL previews are disabled by default for participants in this room.": "URL-voorvertoningen zijn voor deelnemers van dit gesprek standaard uitgeschakeld.",
     "An email has been sent to %(emailAddress)s": "Er is een e-mail naar %(emailAddress)s verstuurd",
     "A text message has been sent to %(msisdn)s": "Er is een sms naar %(msisdn)s verstuurd",
     "Remove from community": "Verwijderen uit gemeenschap",
@@ -607,7 +607,7 @@
     "Community %(groupId)s not found": "Gemeenschap %(groupId)s is niet gevonden",
     "Failed to load %(groupId)s": "Laden van %(groupId)s is mislukt",
     "Old cryptography data detected": "Oude cryptografiegegevens gedetecteerd",
-    "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.": "Er zijn gegevens van een oudere versie van %(brand)s gevonden, die problemen veroorzaakt hebben met de eind-tot-eind-versleuteling in de oude versie. Onlangs vanuit de oude versie verzonden eind-tot-eind-versleutelde berichten zijn mogelijk onontsleutelbaar in deze versie. Ook kunnen berichten die met deze versie uitgewisseld zijn falen. Mocht u problemen ervaren, meld u dan opnieuw aan.  Schrijf uw sleutels weg en lees ze weer in om uw berichtgeschiedenis te behouden.",
+    "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.": "Er zijn gegevens van een oudere versie van %(brand)s gevonden, die problemen veroorzaakt hebben met de eind-tot-eind-versleuteling in de oude versie. Onlangs vanuit de oude versie verzonden eind-tot-eind-versleutelde berichten zijn mogelijk onontsleutelbaar in deze versie. Ook kunnen berichten die met deze versie uitgewisseld zijn falen. Mocht u problemen ervaren, log dan opnieuw in. Exporteer uw sleutels en importeer ze weer om uw berichtgeschiedenis te behouden.",
     "Your Communities": "Uw gemeenschappen",
     "Error whilst fetching joined communities": "Er is een fout opgetreden bij het ophalen van de gemeenschappen waarvan u lid bent",
     "Create a new community": "Maak een nieuwe gemeenschap aan",
@@ -620,8 +620,8 @@
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privacy is belangrijk voor ons, dus we verzamelen geen persoonlijke of identificeerbare gegevens voor onze gegevensanalyse.",
     "Learn more about how we use analytics.": "Lees meer over hoe we uw gegevens gebruiken.",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Er is een e-mail naar %(emailAddress)s verstuurd. Klik hieronder van zodra u de koppeling erin hebt gevolgd.",
-    "Please note you are logging into the %(hs)s server, not matrix.org.": "Merk op dat u zich aanmeldt bij de %(hs)s-server, niet matrix.org.",
-    "This homeserver doesn't offer any login flows which are supported by this client.": "Deze thuisserver heeft geen aanmeldmethodes die door deze cliënt worden ondersteund.",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Let op dat u inlogt bij de %(hs)s-server, niet matrix.org.",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Deze homeserver heeft geen loginmethodes die door deze cliënt worden ondersteund.",
     "Ignores a user, hiding their messages from you": "Negeert een gebruiker, waardoor de berichten ervan onzichtbaar voor u worden",
     "Stops ignoring a user, showing their messages going forward": "Stopt het negeren van een gebruiker, hierdoor worden de berichten van de gebruiker weer zichtbaar",
     "Notify the whole room": "Laat dit aan het hele groepsgesprek weten",
@@ -633,16 +633,16 @@
     "Your language of choice": "De door u gekozen taal",
     "Which officially provided instance you are using, if any": "Welke officieel aangeboden instantie u eventueel gebruikt",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Of u de tekstverwerker al dan niet in de modus voor opgemaakte tekst gebruikt",
-    "Your homeserver's URL": "De URL van uw thuisserver",
+    "Your homeserver's URL": "De URL van uw homeserver",
     "<a>In reply to</a> <pill>": "<a>Als antwoord op</a> <pill>",
-    "This room is not public. You will not be able to rejoin without an invite.": "Dit is geen openbaar gesprek.  Slechts op uitnodiging zult u opnieuw kunnen toetreden.",
+    "This room is not public. You will not be able to rejoin without an invite.": "Dit is geen openbaar gesprek. Slechts op uitnodiging zult u opnieuw kunnen toetreden.",
     "were unbanned %(count)s times|one": "zijn ontbannen",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s heeft %(displayName)s als weergavenaam aangenomen.",
     "Key request sent.": "Sleutelverzoek verstuurd.",
-    "Did you know: you can use communities to filter your %(brand)s experience!": "Wist u dat: u gemeenschappen kunt gebruiken om uw %(brand)s-beleving te filteren!",
+    "Did you know: you can use communities to filter your %(brand)s experience!": "Tip: u kunt gemeenschappen gebruiken om uw %(brand)s-beleving te filteren!",
     "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.": "Versleep een gemeenschapsavatar naar het filterpaneel helemaal links op het scherm om een filter in te stellen. Daarna kunt u op de avatar in het filterpaneel klikken wanneer u zich wilt beperken tot de gesprekken en mensen uit die gemeenschap.",
     "Clear filter": "Filter wissen",
-    "Failed to set direct chat tag": "Instellen van tweegesprekslabel is mislukt",
+    "Failed to set direct chat tag": "Instellen van direct gespreklabel is mislukt",
     "Failed to remove tag %(tagName)s from room": "Verwijderen van %(tagName)s-label van gesprek is mislukt",
     "Failed to add tag %(tagName)s to room": "Toevoegen van %(tagName)s-label aan gesprek is mislukt",
     "Stickerpack": "Stickerpakket",
@@ -658,7 +658,7 @@
     "Who can join this community?": "Wie kan er tot deze gemeenschap toetreden?",
     "Everyone": "Iedereen",
     "Leave this community": "Deze gemeenschap verlaten",
-    "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.": "Voor het oplossen van in GitHub gemelde problemen helpen foutopsporingslogboeken ons enorm. Deze bevatten wel gebruiksgegevens (waaronder uw gebruikersnaam, de ID’s of bijnamen van de gesprekken en groepen die u heeft bezocht, en de namen van andere gebruikers), maar geen berichten.",
+    "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.": "Voor het oplossen van, via GitHub, gemelde problemen helpen foutopsporingslogboeken ons enorm. Deze bevatten wel gebruiksgegevens (waaronder uw gebruikersnaam, de ID’s of bijnamen van de gesprekken en groepen die u heeft bezocht, en de namen van andere gebruikers), maar geen berichten.",
     "Submit debug logs": "Foutopsporingslogboeken indienen",
     "Opens the Developer Tools dialog": "Opent het dialoogvenster met ontwikkelaarsgereedschap",
     "Fetching third party location failed": "Het ophalen van de locatie van de derde partij is mislukt",
@@ -686,7 +686,7 @@
     "Resend": "Opnieuw versturen",
     "Error saving email notification preferences": "Fout bij het opslaan van de meldingsvoorkeuren voor e-mail",
     "Messages containing my display name": "Berichten die mijn weergavenaam bevatten",
-    "Messages in one-to-one chats": "Berichten in tweegesprekken",
+    "Messages in one-to-one chats": "Berichten in één-op-één gesprekken",
     "Unavailable": "Niet beschikbaar",
     "View Decrypted Source": "Ontsleutelde bron bekijken",
     "Failed to update keywords": "Bijwerken van trefwoorden is mislukt",
@@ -697,14 +697,14 @@
     "An error occurred whilst saving your email notification preferences.": "Er is een fout opgetreden tijdens het opslaan van uw e-mailmeldingsvoorkeuren.",
     "Explore Room State": "Gesprekstoestand verkennen",
     "Source URL": "Bron-URL",
-    "Messages sent by bot": "Berichten verzonden door een robot",
+    "Messages sent by bot": "Berichten verzonden door een bot",
     "Filter results": "Resultaten filteren",
     "Members": "Leden",
     "No update available.": "Geen update beschikbaar.",
     "Noisy": "Lawaaierig",
     "Collecting app version information": "App-versieinformatie wordt verzameld",
     "Keywords": "Trefwoorden",
-    "Enable notifications for this account": "Meldingen inschakelen voor deze account",
+    "Enable notifications for this account": "Meldingen voor dit account inschakelen",
     "Invite to this community": "Uitnodigen in deze gemeenschap",
     "Messages containing <span>keywords</span>": "Berichten die <span>trefwoorden</span> bevatten",
     "Room not found": "Gesprek niet gevonden",
@@ -730,7 +730,7 @@
     "Collecting logs": "Logboeken worden verzameld",
     "You must specify an event type!": "U dient een gebeurtenistype op te geven!",
     "(HTTP status %(httpStatus)s)": "(HTTP-status %(httpStatus)s)",
-    "Invite to this room": "Uitnodigen tot dit gesprek",
+    "Invite to this room": "Uitnodigen voor dit gesprek",
     "Send logs": "Logboeken versturen",
     "All messages": "Alle berichten",
     "Call invitation": "Oproep-uitnodiging",
@@ -750,7 +750,7 @@
     "Forward Message": "Bericht doorsturen",
     "Back": "Terug",
     "Reply": "Beantwoorden",
-    "Show message in desktop notification": "Bericht tonen in bureaubladmelding",
+    "Show message in desktop notification": "Bericht in bureaubladmelding tonen",
     "Unhide Preview": "Voorvertoning weergeven",
     "Unable to join network": "Kon niet toetreden tot dit netwerk",
     "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Sorry, uw browser werkt <b>niet</b> met %(brand)s.",
@@ -788,12 +788,12 @@
     "Your device resolution": "De resolutie van uw apparaat",
     "Missing roomId.": "roomId ontbreekt.",
     "Always show encryption icons": "Versleutelingspictogrammen altijd tonen",
-    "Send analytics data": "Statistische gegevens (analytics) versturen",
+    "Send analytics data": "Statistische gegevens versturen",
     "Enable widget screenshots on supported widgets": "Widget-schermafbeeldingen inschakelen op ondersteunde widgets",
     "Muted Users": "Gedempte gebruikers",
     "Popout widget": "Widget in nieuw venster openen",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Kan de gebeurtenis waarop gereageerd was niet laden. Wellicht bestaat die niet, of heeft u geen toestemming die te bekijken.",
-    "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>": "Dit zal uw account voorgoed onbruikbaar maken. U zult zich niet meer kunnen aanmelden, en niemand anders zal zich met dezelfde gebruikers-ID kunnen registreren. Hierdoor zal uw account alle gesprekken waaraan ze deelneemt verlaten, en worden de accountgegevens verwijderd van de identiteitsserver. <b>Deze stap is onomkeerbaar.</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>": "Dit zal uw account voorgoed onbruikbaar maken. U zult niet meer kunnen inloggen, en niemand anders zal zich met dezelfde gebruikers-ID kunnen registreren. Hierdoor zal uw account alle gesprekken waaraan u deelneemt verlaten, en worden de accountgegevens verwijderd van de identiteitsserver. <b>Deze stap is onomkeerbaar.</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.": "Het sluiten van uw account <b>maakt op zich niet dat wij de door u verstuurde berichten vergeten.</b> Als u wilt dat wij uw berichten vergeten, vink dan het vakje hieronder aan.",
     "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.": "De zichtbaarheid van berichten in Matrix is zoals bij e-mails. Het vergeten van uw berichten betekent dat berichten die u heeft verstuurd niet meer gedeeld worden met nieuwe of ongeregistreerde gebruikers, maar geregistreerde gebruikers die al toegang hebben tot deze berichten zullen alsnog toegang hebben tot hun eigen kopie ervan.",
     "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)": "Vergeet bij het sluiten van mijn account alle door mij verstuurde berichten (<b>Let op:</b> hierdoor zullen gebruikers een onvolledig beeld krijgen van gesprekken)",
@@ -805,9 +805,9 @@
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Het legen van de opslag van uw browser zal het probleem misschien verhelpen, maar zal u ook afmelden en uw gehele versleutelde gespreksgeschiedenis onleesbaar maken.",
     "Collapse Reply Thread": "Reactieketting dichtvouwen",
     "Can't leave Server Notices room": "Kan servermeldingsgesprek niet verlaten",
-    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Dit gesprek is bedoeld voor belangrijke berichten van de thuisserver, dus u kunt het niet verlaten.",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Dit gesprek is bedoeld voor belangrijke berichten van de homeserver, dus u kunt het niet verlaten.",
     "Terms and Conditions": "Gebruiksvoorwaarden",
-    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Om de %(homeserverDomain)s-thuisserver te blijven gebruiken, zult u de gebruiksvoorwaarden moeten bestuderen en aanvaarden.",
+    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Om de %(homeserverDomain)s-homeserver te blijven gebruiken, zult u de gebruiksvoorwaarden moeten bestuderen en aanvaarden.",
     "Review terms and conditions": "Gebruiksvoorwaarden lezen",
     "Call in Progress": "Lopend gesprek",
     "A call is currently being placed!": "Er wordt al een oproep gemaakt!",
@@ -820,7 +820,7 @@
     "Share Link to User": "Koppeling naar gebruiker delen",
     "Share room": "Gesprek delen",
     "System Alerts": "Systeemmeldingen",
-    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "In versleutelde gesprekken zoals deze zijn URL-voorvertoningen standaard uitgeschakeld, om te voorkomen dat uw thuisserver (waar de voorvertoningen worden gemaakt) informatie kan verzamelen over de koppelingen die u hier ziet.",
+    "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "In versleutelde gesprekken zoals deze zijn URL-voorvertoningen standaard uitgeschakeld, om te voorkomen dat uw homeserver (waar de voorvertoningen worden gemaakt) informatie kan verzamelen over de koppelingen die u hier ziet.",
     "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.": "Als iemand een URL in een bericht invoegt, kan er een URL-voorvertoning weergegeven worden met meer informatie over de koppeling, zoals de titel, omschrijving en een afbeelding van de website.",
     "The email field must not be blank.": "Het e-mailveld mag niet leeg zijn.",
     "The phone number field must not be blank.": "Het telefoonnummerveld mag niet leeg zijn.",
@@ -840,20 +840,20 @@
     "Audio Output": "Geluidsuitgang",
     "Ignored users": "Genegeerde gebruikers",
     "Bulk options": "Bulkopties",
-    "This homeserver has hit its Monthly Active User limit.": "Deze thuisserver heeft zijn limiet voor maandelijks actieve gebruikers bereikt.",
-    "This homeserver has exceeded one of its resource limits.": "Deze thuisserver heeft één van zijn systeembronlimieten overschreden.",
-    "Whether or not you're logged in (we don't record your username)": "Of u al dan niet aangemeld bent (we slaan uw gebruikersnaam niet op)",
-    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Het bestand ‘%(fileName)s’ is groter dan de uploadlimiet van de thuisserver",
+    "This homeserver has hit its Monthly Active User limit.": "Deze homeserver heeft zijn limiet voor maandelijks actieve gebruikers bereikt.",
+    "This homeserver has exceeded one of its resource limits.": "Deze homeserver heeft één van zijn systeembronlimieten overschreden.",
+    "Whether or not you're logged in (we don't record your username)": "Of u al dan niet ingelogd bent (we slaan uw gebruikersnaam niet op)",
+    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Het bestand ‘%(fileName)s’ is groter dan de uploadlimiet van de homeserver",
     "Unable to load! Check your network connectivity and try again.": "Laden mislukt! Controleer uw netwerktoegang en probeer het nogmaals.",
     "Failed to invite users to the room:": "Kon de volgende gebruikers hier niet uitnodigen:",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Plakt ¯\\_(ツ)_/¯ vóór een bericht zonder opmaak",
     "Upgrades a room to a new version": "Actualiseert het gesprek tot een nieuwe versie",
-    "Changes your display nickname in the current room only": "Stelt uw weergavenaam enkel in het huidige gesprek in",
+    "Changes your display nickname in the current room only": "Stelt uw weergavenaam alleen in het huidige gesprek in",
     "Gets or sets the room topic": "Verkrijgt het onderwerp van het gesprek of stelt het in",
     "This room has no topic.": "Dit gesprek heeft geen onderwerp.",
     "Sets the room name": "Stelt de gespreksnaam in",
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s heeft dit gesprek bijgewerkt.",
-    "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s heeft het gesprek toegankelijk gemaakt voor iedereen die de verwijzing kent.",
+    "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s heeft het gesprek toegankelijk gemaakt voor iedereen die de koppeling kent.",
     "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s heeft het gesprek enkel op uitnodiging toegankelijk gemaakt.",
     "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s heeft de toegangsregel veranderd naar ‘%(rule)s’",
     "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s heeft gasten toegestaan het gesprek te betreden.",
@@ -869,12 +869,12 @@
     "%(names)s and %(count)s others are typing …|one": "%(names)s en nog iemand zijn aan het typen…",
     "%(names)s and %(lastPerson)s are typing …": "%(names)s en %(lastPerson)s zijn aan het typen…",
     "Please <a>contact your service administrator</a> to continue using the service.": "Gelieve <a>contact op te nemen met uw systeembeheerder</a> om deze dienst te blijven gebruiken.",
-    "Unable to connect to Homeserver. Retrying...": "Kon geen verbinding met de thuisserver maken. Nieuwe poging…",
+    "Unable to connect to Homeserver. Retrying...": "Kon geen verbinding met de homeserver maken. Nieuwe poging…",
     "Unrecognised address": "Adres niet herkend",
     "You do not have permission to invite people to this room.": "U bent niet bevoegd anderen tot dit gesprek uit te nodigen.",
     "User %(userId)s is already in the room": "De gebruiker %(userId)s is al aanwezig",
-    "User %(user_id)s does not exist": "Er bestaat geen gebruiker ‘%(user_id)s’",
-    "User %(user_id)s may or may not exist": "Er bestaat mogelijk geen gebruiker ‘%(user_id)s’",
+    "User %(user_id)s does not exist": "Er bestaat geen gebruiker %(user_id)s",
+    "User %(user_id)s may or may not exist": "Er bestaat mogelijk geen gebruiker %(user_id)s",
     "The user must be unbanned before they can be invited.": "De gebruiker kan niet uitgenodigd worden voordat diens ban teniet is gedaan.",
     "Unknown server error": "Onbekende serverfout",
     "Use a few words, avoid common phrases": "Gebruik enkele woorden - maar geen bekende uitdrukkingen",
@@ -905,28 +905,28 @@
     "Straight rows of keys are easy to guess": "Zo’n aaneengesloten rijtje toetsen is eenvoudig te raden",
     "Short keyboard patterns are easy to guess": "Korte patronen op het toetsenbord worden gemakkelijk geraden",
     "There was an error joining the room": "Er is een fout opgetreden bij het betreden van het gesprek",
-    "Sorry, your homeserver is too old to participate in this room.": "Helaas - uw thuisserver is te oud voor dit gesprek.",
-    "Please contact your homeserver administrator.": "Gelieve contact op te nemen met de beheerder van uw thuisserver.",
+    "Sorry, your homeserver is too old to participate in this room.": "Helaas - uw homeserver is te oud voor dit gesprek.",
+    "Please contact your homeserver administrator.": "Gelieve contact op te nemen met de beheerder van uw homeserver.",
     "Custom user status messages": "Aangepaste gebruikersstatusberichten",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Gesprekken groeperen en filteren volgens eigen labels (herlaad om de verandering te zien)",
     "Render simple counters in room header": "Eenvoudige tellers bovenaan het gesprek tonen",
     "Enable Emoji suggestions while typing": "Emoticons voorstellen tijdens het typen",
-    "Show a placeholder for removed messages": "Vulling tonen voor verwijderde berichten",
+    "Show a placeholder for removed messages": "Verwijderde berichten vulling tonen",
     "Show join/leave messages (invites/kicks/bans unaffected)": "Berichten over toe- en uittredingen tonen (dit heeft geen effect op uitnodigingen, berispingen of verbanningen)",
     "Show avatar changes": "Veranderingen van avatar tonen",
     "Show display name changes": "Veranderingen van weergavenamen tonen",
     "Show read receipts sent by other users": "Door andere gebruikers verstuurde leesbevestigingen tonen",
     "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Herinnering tonen om veilig berichtherstel in te schakelen in versleutelde gesprekken",
-    "Show avatars in user and room mentions": "Avatars tonen wanneer gebruikers of gesprekken vermeld worden",
-    "Enable big emoji in chat": "Grote emoticons in gesprekken inschakelen",
+    "Show avatars in user and room mentions": "Vermelde gebruikers- of gesprekkenavatars tonen",
+    "Enable big emoji in chat": "Grote emoji in gesprekken inschakelen",
     "Send typing notifications": "Typmeldingen versturen",
     "Enable Community Filter Panel": "Gemeenschapsfilterpaneel inschakelen",
-    "Allow Peer-to-Peer for 1:1 calls": "Peer-to-peer toestaan voor tweegesprekken",
-    "Prompt before sending invites to potentially invalid matrix IDs": "Bevestiging vragen voordat uitnodigingen naar mogelijk ongeldige Matrix-ID’s worden verstuurd",
+    "Allow Peer-to-Peer for 1:1 calls": "Peer-to-peer voor één-op-één oproepen toestaan",
+    "Prompt before sending invites to potentially invalid matrix IDs": "Uitnodigingen naar mogelijk ongeldige Matrix-ID’s bevestigen",
     "Show developer tools": "Ontwikkelgereedschap tonen",
     "Messages containing my username": "Berichten die mijn gebruikersnaam bevatten",
     "Messages containing @room": "Berichten die ‘@room’ bevatten",
-    "Encrypted messages in one-to-one chats": "Versleutelde berichten in tweegesprekken",
+    "Encrypted messages in one-to-one chats": "Versleutelde berichten in één-op-één gesprekken",
     "Encrypted messages in group chats": "Versleutelde berichten in groepsgesprekken",
     "The other party cancelled the verification.": "De tegenpartij heeft de verificatie geannuleerd.",
     "Verified!": "Geverifieerd!",
@@ -998,7 +998,7 @@
     "Anchor": "Anker",
     "Headphones": "Koptelefoon",
     "Folder": "Map",
-    "Pin": "Speld",
+    "Pin": "Vastmaken",
     "Yes": "Ja",
     "No": "Nee",
     "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "We hebben u een e-mail gestuurd om uw adres te verifiëren. Gelieve de daarin gegeven aanwijzingen op te volgen en dan op de knop hieronder te klikken.",
@@ -1007,7 +1007,7 @@
     "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Weet u het zeker? U zult uw versleutelde berichten verliezen als uw sleutels niet correct geback-upt zijn.",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Versleutelde berichten zijn beveiligd met eind-tot-eind-versleuteling. Enkel de ontvanger(s) en u hebben de sleutels om deze berichten te lezen.",
     "Unable to load key backup status": "Kan sleutelback-upstatus niet laden",
-    "Restore from Backup": "Herstellen uit back-up",
+    "Restore from Backup": "Uit back-up herstellen",
     "Back up your keys before signing out to avoid losing them.": "Maak een back-up van uw sleutels vooraleer u zich afmeldt om ze niet te verliezen.",
     "Backing up %(sessionsRemaining)s keys...": "%(sessionsRemaining)s sleutels worden geback-upt…",
     "All keys backed up": "Alle sleutels zijn geback-upt",
@@ -1029,7 +1029,7 @@
     "Language and region": "Taal en regio",
     "Theme": "Thema",
     "Account management": "Accountbeheer",
-    "Deactivating your account is a permanent action - be careful!": "Pas op!  Het sluiten van uw account is onherroepelijk!",
+    "Deactivating your account is a permanent action - be careful!": "Pas op! Het sluiten van uw account is onherroepelijk!",
     "General": "Algemeen",
     "Legal": "Wettelijk",
     "Credits": "Met dank aan",
@@ -1037,19 +1037,19 @@
     "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "Klik <a>hier</a> voor hulp bij het gebruiken van %(brand)s, of begin een gesprek met onze robot met de knop hieronder.",
     "Help & About": "Hulp & Info",
     "Bug reporting": "Foutmeldingen",
-    "FAQ": "VGV",
+    "FAQ": "FAQ",
     "Versions": "Versies",
     "Preferences": "Instellingen",
     "Composer": "Opsteller",
     "Timeline": "Tijdslijn",
     "Room list": "Gesprekslijst",
-    "Autocomplete delay (ms)": "Vertraging voor automatisch aanvullen (ms)",
+    "Autocomplete delay (ms)": "Vertraging voor autoaanvullen (ms)",
     "Accept all %(invitedRooms)s invites": "Alle %(invitedRooms)s de uitnodigingen aannemen",
     "Key backup": "Sleutelback-up",
-    "Security & Privacy": "Veiligheid & privacy",
+    "Security & Privacy": "Veiligheid & Privacy",
     "Missing media permissions, click the button below to request.": "Mediatoestemmingen ontbreken, klik op de knop hieronder om deze aan te vragen.",
     "Request media permissions": "Mediatoestemmingen verzoeken",
-    "Voice & Video": "Spraak & video",
+    "Voice & Video": "Spraak & Video",
     "Room information": "Gespreksinformatie",
     "Internal room ID:": "Interne gespreks-ID:",
     "Room version": "Gespreksversie",
@@ -1061,7 +1061,7 @@
     "Change room name": "Gespreksnaam wijzigen",
     "Change main address for the room": "Hoofdadres voor het gesprek wijzigen",
     "Change history visibility": "Zichtbaarheid van geschiedenis wijzigen",
-    "Change permissions": "Toestemmingen wijzigen",
+    "Change permissions": "Rechten wijzigen",
     "Change topic": "Onderwerp wijzigen",
     "Modify widgets": "Widgets aanpassen",
     "Default role": "Standaardrol",
@@ -1073,8 +1073,8 @@
     "Remove messages": "Berichten verwijderen",
     "Notify everyone": "Iedereen melden",
     "Send %(eventType)s events": "%(eventType)s-gebeurtenissen versturen",
-    "Roles & Permissions": "Rollen & toestemmingen",
-    "Select the roles required to change various parts of the room": "Selecteer de rollen vereist om verschillende delen van het gesprek te wijzigen",
+    "Roles & Permissions": "Rollen & rechten",
+    "Select the roles required to change various parts of the room": "Selecteer de vereiste rollen om verschillende delen van het gesprek te wijzigen",
     "Enable encryption?": "Versleuteling inschakelen?",
     "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>": "Gespreksversleuteling is onomkeerbaar. Berichten in versleutelde gesprekken zijn niet leesbaar voor de server; enkel voor de gespreksdeelnemers. Veel robots en overbruggingen werken niet correct in versleutelde gesprekken. <a>Lees meer over versleuteling.</a>",
     "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Wijzigingen aan wie de geschiedenis kan lezen gelden enkel voor toekomstige berichten in dit gesprek. De zichtbaarheid van de bestaande geschiedenis blijft ongewijzigd.",
@@ -1094,7 +1094,7 @@
     "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Er is een fout opgetreden bij het bijwerken van het hoofdadres van het gesprek. Dit wordt mogelijk niet toegestaan door de server, of er is een tijdelijk probleem opgetreden.",
     "Main address": "Hoofdadres",
     "Error updating flair": "Fout bij bijwerken van badge",
-    "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Er is een fout opgetreden bij het bijwerken van de badge voor dit gesprek.  Wellicht ondersteunt de server dit niet, of er is een tijdelijke fout opgetreden.",
+    "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Er is een fout opgetreden bij het bijwerken van de badge voor dit gesprek. Wellicht ondersteunt de server dit niet, of er is een tijdelijke fout opgetreden.",
     "Room avatar": "Gespreksavatar",
     "Room Name": "Gespreksnaam",
     "Room Topic": "Gespreksonderwerp",
@@ -1108,9 +1108,9 @@
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Kan geen profielen voor de Matrix-ID’s hieronder vinden - wilt u ze toch uitnodigen?",
     "Invite anyway and never warn me again": "Alsnog uitnodigen en mij nooit meer waarschuwen",
     "Invite anyway": "Alsnog uitnodigen",
-    "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Vooraleer u logboeken indient, dient u uw probleem te <a>melden op GitHub</a>.",
+    "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Voor u logboeken indient, dient u uw probleem te <a>melden op GitHub</a>.",
     "Unable to load commit detail: %(msg)s": "Kan commitdetail niet laden: %(msg)s",
-    "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of %(brand)s to do this": "Schrijf om uw gespreksgeschiedenis niet te verliezen vóór het afmelden uw gesprekssleutels weg. Dat moet vanuit de nieuwere versie van %(brand)s",
+    "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of %(brand)s to do this": "Om uw gespreksgeschiedenis niet te verliezen vóór het uitloggen dient u uw veiligheidssleutel te exporteren. Dat moet vanuit de nieuwere versie van %(brand)s",
     "Incompatible Database": "Incompatibele database",
     "Continue With Encryption Disabled": "Verdergaan met versleuteling uitgeschakeld",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verifieer deze gebruiker om hem/haar als vertrouwd te markeren. Gebruikers vertrouwen geeft u extra gemoedsrust bij het gebruik van eind-tot-eind-versleutelde berichten.",
@@ -1158,9 +1158,9 @@
     "Set status": "Status instellen",
     "Set a new status...": "Stel een nieuwe status in…",
     "Hide": "Verbergen",
-    "This homeserver would like to make sure you are not a robot.": "Deze thuisserver wil graag weten of u geen robot bent.",
-    "Please review and accept all of the homeserver's policies": "Gelieve het beleid van de thuisserver door te nemen en te aanvaarden",
-    "Please review and accept the policies of this homeserver:": "Gelieve het beleid van deze thuisserver door te nemen en te aanvaarden:",
+    "This homeserver would like to make sure you are not a robot.": "Deze homeserver wil graag weten of u geen robot bent.",
+    "Please review and accept all of the homeserver's policies": "Gelieve het beleid van de homeserver door te nemen en te aanvaarden",
+    "Please review and accept the policies of this homeserver:": "Gelieve het beleid van deze homeserver door te nemen en te aanvaarden:",
     "Your Modular server": "Uw Modular-server",
     "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Voer de locatie van uw Modular-thuisserver in. Deze kan uw eigen domeinnaam gebruiken, of een subdomein van <a>modular.im</a> zijn.",
     "Server Name": "Servernaam",
@@ -1186,9 +1186,9 @@
     "Couldn't load page": "Kon pagina niet laden",
     "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "U bent een beheerder van deze gemeenschap. U zult niet opnieuw kunnen toetreden zonder een uitnodiging van een andere beheerder.",
     "Want more than a community? <a>Get your own server</a>": "Wilt u meer dan een gemeenschap? <a>Verkrijg uw eigen server</a>",
-    "This homeserver does not support communities": "Deze thuisserver biedt geen ondersteuning voor gemeenschappen",
-    "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.": "Uw bericht is niet verstuurd omdat deze thuisserver zijn limiet voor maandelijks actieve gebruikers heeft bereikt. Gelieve <a>contact op te nemen met uw dienstbeheerder</a> om de dienst te blijven gebruiken.",
-    "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.": "Uw bericht is niet verstuurd omdat deze thuisserver een systeembronlimiet heeft overschreden. Gelieve <a>contact op te nemen met uw dienstbeheerder</a> om de dienst te blijven gebruiken.",
+    "This homeserver does not support communities": "Deze homeserver biedt geen ondersteuning voor gemeenschappen",
+    "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.": "Uw bericht is niet verstuurd omdat deze homeserver zijn limiet voor maandelijks actieve gebruikers heeft bereikt. <a>Neem contact op met uw dienstbeheerder</a> om de dienst te blijven gebruiken.",
+    "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.": "Uw bericht is niet verstuurd omdat deze homeserver een systeembronlimiet heeft overschreden. <a>Neem contact op met uw dienstbeheerder</a> om de dienst te blijven gebruiken.",
     "Guest": "Gast",
     "Could not load user profile": "Kon gebruikersprofiel niet laden",
     "Your Matrix account on %(serverName)s": "Uw Matrix-account op %(serverName)s",
@@ -1196,15 +1196,15 @@
     "Sign in instead": "Aanmelden",
     "Your password has been reset.": "Uw wachtwoord is opnieuw ingesteld.",
     "Set a new password": "Stel een nieuw wachtwoord in",
-    "Invalid homeserver discovery response": "Ongeldig thuisserverontdekkingsantwoord",
+    "Invalid homeserver discovery response": "Ongeldig homeserver-ontdekkingsantwoord",
     "Invalid identity server discovery response": "Ongeldig identiteitsserverontdekkingsantwoord",
     "General failure": "Algemene fout",
-    "This homeserver does not support login using email address.": "Deze thuisserver biedt geen ondersteuning voor aanmelden met e-mailadres.",
+    "This homeserver does not support login using email address.": "Deze homeserver biedt geen ondersteuning voor inloggen met e-mailadres.",
     "Please <a>contact your service administrator</a> to continue using this service.": "Gelieve <a>contact op te nemen met uw dienstbeheerder</a> om deze dienst te blijven gebruiken.",
-    "Failed to perform homeserver discovery": "Ontdekken van thuisserver is mislukt",
-    "Sign in with single sign-on": "Aanmelden met enkele aanmelding",
+    "Failed to perform homeserver discovery": "Ontdekken van homeserver is mislukt",
+    "Sign in with single sign-on": "Aanmelden met eenmalige aanmelding",
     "Create account": "Account aanmaken",
-    "Registration has been disabled on this homeserver.": "Registratie is uitgeschakeld op deze thuisserver.",
+    "Registration has been disabled on this homeserver.": "Registratie is uitgeschakeld op deze homeserver.",
     "Unable to query for supported registration methods.": "Kan ondersteunde registratiemethoden niet opvragen.",
     "Create your account": "Maak uw account aan",
     "Keep going...": "Doe verder…",
@@ -1228,18 +1228,18 @@
     "Don't ask again": "Niet opnieuw vragen",
     "New Recovery Method": "Nieuwe herstelmethode",
     "A new recovery passphrase and key for Secure Messages have been detected.": "Er zijn een nieuw herstelwachtwoord en een nieuwe herstelsleutel voor beveiligde berichten gedetecteerd.",
-    "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.": "Als u deze nieuwe herstelmethode niet heeft ingesteld, is het mogelijk dat er een aanvaller toegang tot uw account probeert te verkrijgen. Wijzig onmiddellijk uw accountwachtwoord en stel een nieuwe herstelmethode in in de instellingen.",
+    "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.": "Als u deze nieuwe herstelmethode niet heeft ingesteld, is het mogelijk dat een aanvaller toegang tot uw account probeert te krijgen. Wijzig onmiddellijk uw accountwachtwoord en stel in het instellingenmenu een nieuwe herstelmethode in.",
     "Go to Settings": "Ga naar instellingen",
     "Set up Secure Messages": "Beveiligde berichten instellen",
     "Recovery Method Removed": "Herstelmethode verwijderd",
-    "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.": "Als u de herstelmethode niet heeft verwijderd, is het mogelijk dat er een aanvaller toegang tot uw account probeert te verkrijgen. Wijzig onmiddellijk uw accountwachtwoord en stel een nieuwe herstelmethode in in de instellingen.",
+    "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.": "Als u de herstelmethode niet heeft verwijderd, is het mogelijk dat er een aanvaller toegang tot uw account probeert te verkrijgen. Wijzig onmiddellijk uw accountwachtwoord en stel in het instellingenmenu een nieuwe herstelmethode in.",
     "<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>Let op</b>: gesprekken bijwerken <i>voegt gespreksleden niet automatisch toe aan de nieuwe versie van het gesprek</i>. Er komt in het oude gesprek een koppeling naar het nieuwe, waarop gespreksleden moeten klikken om aan het nieuwe gesprek deel te nemen.",
     "Adds a custom widget by URL to the room": "Voegt met een URL een aangepaste widget toe aan het gesprek",
     "Please supply a https:// or http:// widget URL": "Voer een https://- of http://-widget-URL in",
     "You cannot modify widgets in this room.": "U kunt de widgets in dit gesprek niet aanpassen.",
-    "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s heeft de uitnodiging aan %(targetDisplayName)s  toe te treden tot het gesprek ingetrokken.",
+    "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s heeft de uitnodiging aan %(targetDisplayName)s toe te treden tot het gesprek ingetrokken.",
     "Upgrade this room to the recommended room version": "Werk dit gesprek bij tot de aanbevolen versie",
-    "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Dit gesprek draait op groepsgespreksversie <roomVersion />, die door deze thuisserver als <i>onstabiel</i> is gemarkeerd.",
+    "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Dit gesprek draait op groepsgespreksversie <roomVersion />, die door deze homeserver als <i>onstabiel</i> is gemarkeerd.",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Bijwerken zal de huidige versie van dit gesprek sluiten, en onder dezelfde naam een bijgewerkte versie starten.",
     "Failed to revoke invite": "Intrekken van uitnodiging is mislukt",
     "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Kon de uitnodiging niet intrekken. De server ondervindt mogelijk een tijdelijk probleem, of u heeft niet het recht de uitnodiging in te trekken.",
@@ -1250,9 +1250,9 @@
     "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.": "Een widget op %(widgetUrl)s wil uw identiteit nagaan. Staat u dit toe, dan zal de widget wel uw gebruikers-ID kunnen nagaan, maar niet als u kunnen handelen.",
     "Remember my selection for this widget": "Onthoud mijn keuze voor deze widget",
     "Deny": "Weigeren",
-    "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s kon de protocollijst niet ophalen van de thuisserver. Mogelijk is de thuisserver te oud om derdepartijnetwerken te ondersteunen.",
+    "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s kon de protocollijst niet ophalen van de homeserver. Mogelijk is de homeserver te oud om derde-partij-netwerken te ondersteunen.",
     "%(brand)s failed to get the public room list.": "%(brand)s kon de lijst met openbare gesprekken niet verkrijgen.",
-    "The homeserver may be unavailable or overloaded.": "De thuisserver is mogelijk onbereikbaar of overbelast.",
+    "The homeserver may be unavailable or overloaded.": "De homeserver is mogelijk onbereikbaar of overbelast.",
     "You have %(count)s unread notifications in a prior version of this room.|other": "U heeft %(count)s ongelezen meldingen in een vorige versie van dit gesprek.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "U heeft %(count)s ongelezen meldingen in een vorige versie van dit gesprek.",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Of u de icoontjes voor recente gesprekken (boven de gesprekkenlijst) al dan niet gebruikt",
@@ -1285,9 +1285,9 @@
     "Unbans user with given ID": "Ontbant de gebruiker met de gegeven ID",
     "Sends the given message coloured as a rainbow": "Verstuurt het gegeven bericht in regenboogkleuren",
     "Sends the given emote coloured as a rainbow": "Verstuurt de gegeven emoticon in regenboogkleuren",
-    "No homeserver URL provided": "Geen thuisserver-URL opgegeven",
-    "Unexpected error resolving homeserver configuration": "Onverwachte fout bij het controleren van de thuisserverconfiguratie",
-    "The user's homeserver does not support the version of the room.": "De thuisserver van de gebruiker biedt geen ondersteuning voor de gespreksversie.",
+    "No homeserver URL provided": "Geen homeserver-URL opgegeven",
+    "Unexpected error resolving homeserver configuration": "Onverwachte fout bij het controleren van de homeserverconfiguratie",
+    "The user's homeserver does not support the version of the room.": "De homeserver van de gebruiker biedt geen ondersteuning voor de gespreksversie.",
     "Show hidden events in timeline": "Verborgen gebeurtenissen op de tijdslijn weergeven",
     "When rooms are upgraded": "Wanneer gesprekken bijgewerkt worden",
     "this room": "dit gesprek",
@@ -1326,14 +1326,14 @@
     "Unable to validate homeserver/identity server": "Kan thuis-/identiteitsserver niet valideren",
     "Sign in to your Matrix account on <underlinedServerName />": "Meld u met uw Matrix-account op <underlinedServerName /> aan",
     "Use an email address to recover your account": "Gebruik een e-mailadres om uw account te herstellen",
-    "Enter email address (required on this homeserver)": "Voer een e-mailadres in (vereist op deze thuisserver)",
+    "Enter email address (required on this homeserver)": "Voer een e-mailadres in (vereist op deze homeserver)",
     "Doesn't look like a valid email address": "Dit lijkt geen geldig e-mailadres",
     "Enter password": "Voer wachtwoord in",
     "Password is allowed, but unsafe": "Wachtwoord is toegestaan, maar onveilig",
     "Nice, strong password!": "Dit is een sterk wachtwoord!",
     "Passwords don't match": "Wachtwoorden komen niet overeen",
     "Other users can invite you to rooms using your contact details": "Andere gebruikers kunnen u in gesprekken uitnodigen op basis van uw contactgegevens",
-    "Enter phone number (required on this homeserver)": "Voer telefoonnummer in (vereist op deze thuisserver)",
+    "Enter phone number (required on this homeserver)": "Voer telefoonnummer in (vereist op deze homeserver)",
     "Doesn't look like a valid phone number": "Dit lijkt geen geldig telefoonnummer",
     "Enter username": "Voer gebruikersnaam in",
     "Some characters not allowed": "Sommige tekens zijn niet toegestaan",
@@ -1343,7 +1343,7 @@
     "Your Matrix account on <underlinedServerName />": "Uw Matrix-account op <underlinedServerName />",
     "Failed to get autodiscovery configuration from server": "Ophalen van auto-ontdekkingsconfiguratie van server is mislukt",
     "Invalid base_url for m.homeserver": "Ongeldige base_url voor m.homeserver",
-    "Homeserver URL does not appear to be a valid Matrix homeserver": "De thuisserver-URL lijkt geen geldige Matrix-thuisserver",
+    "Homeserver URL does not appear to be a valid Matrix homeserver": "De homeserver-URL lijkt geen geldige Matrix-homeserver",
     "Invalid base_url for m.identity_server": "Ongeldige base_url voor m.identity_server",
     "Identity server URL does not appear to be a valid identity server": "De identiteitsserver-URL lijkt geen geldige identiteitsserver",
     "Low bandwidth mode": "Lagebandbreedtemodus",
@@ -1353,7 +1353,7 @@
     "Reset": "Opnieuw instellen",
     "Set a new custom sound": "Stel een nieuw aangepast geluid in",
     "Browse": "Bladeren",
-    "Cannot reach homeserver": "Kan thuisserver niet bereiken",
+    "Cannot reach homeserver": "Kan homeserver niet bereiken",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Zorg dat u een stabiele internetverbinding heeft, of neem contact op met de systeembeheerder",
     "Your %(brand)s is misconfigured": "Uw %(brand)s is onjuist geconfigureerd",
     "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "Vraag uw %(brand)s-beheerder <a>uw configuratie</a> na te kijken op onjuiste of dubbele items.",
@@ -1362,12 +1362,12 @@
     "Cannot reach identity server": "Kan identiteitsserver niet bereiken",
     "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.": "U kunt zich registreren, maar sommige functies zullen pas beschikbaar zijn wanneer de identiteitsserver weer online is. Als u deze waarschuwing blijft zien, controleer dan uw configuratie of neem contact op met een serverbeheerder.",
     "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.": "U kunt uw wachtwoord opnieuw instellen, maar sommige functies zullen pas beschikbaar komen wanneer de identiteitsserver weer online is. Als u deze waarschuwing blijft zien, controleer dan uw configuratie of neem contact op met een serverbeheerder.",
-    "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.": "U kunt zich aanmelden, maar sommige functies zullen pas beschikbaar zijn wanneer de identiteitsserver weer online is. Als u deze waarschuwing blijft zien, controleer dan uw configuratie of neem contact op met een systeembeheerder.",
-    "<a>Log in</a> to your new account.": "<a>Meld u aan</a> met uw nieuwe account.",
-    "You can now close this window or <a>log in</a> to your new account.": "U kunt dit venster nu sluiten, of u met uw nieuwe account <a>aanmelden</a>.",
+    "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.": "U kunt inloggen, maar sommige functies zullen pas beschikbaar zijn wanneer de identiteitsserver weer online is. Als u deze waarschuwing blijft zien, controleer dan uw configuratie of neem contact op met een systeembeheerder.",
+    "<a>Log in</a> to your new account.": "<a>Login</a> met uw nieuwe account.",
+    "You can now close this window or <a>log in</a> to your new account.": "U kunt dit venster nu sluiten, of <a>login</a> met uw nieuwe account.",
     "Registration Successful": "Registratie geslaagd",
     "Upload all": "Alles versturen",
-    "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Uw nieuwe account (%(newAccountId)s) is geregistreerd, maar u bent reeds aangemeld met een andere account (%(loggedInUserId)s).",
+    "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Uw nieuwe account (%(newAccountId)s) is geregistreerd, maar u bent al ingelogd met een andere account (%(loggedInUserId)s).",
     "Continue with previous account": "Doorgaan met vorige account",
     "Loading room preview": "Gespreksweergave wordt geladen",
     "Edited at %(date)s. Click to view edits.": "Bewerkt op %(date)s. Klik om de bewerkingen te bekijken.",
@@ -1382,11 +1382,11 @@
     "Changes your avatar in all rooms": "Verandert uw avatar in alle gesprekken",
     "Removing…": "Bezig met verwijderen…",
     "Clear all data": "Alle gegevens wissen",
-    "Your homeserver doesn't seem to support this feature.": "Uw thuisserver biedt geen ondersteuning voor deze functie.",
+    "Your homeserver doesn't seem to support this feature.": "Uw homeserver biedt geen ondersteuning voor deze functie.",
     "Resend edit": "Bewerking opnieuw versturen",
     "Resend %(unsentCount)s reaction(s)": "%(unsentCount)s reactie(s) opnieuw versturen",
     "Resend removal": "Verwijdering opnieuw versturen",
-    "Failed to re-authenticate due to a homeserver problem": "Opnieuw aanmelden is mislukt wegens een probleem met de thuisserver",
+    "Failed to re-authenticate due to a homeserver problem": "Opnieuw aanmelden is mislukt wegens een probleem met de homeserver",
     "Failed to re-authenticate": "Opnieuw aanmelden is mislukt",
     "Enter your password to sign in and regain access to your account.": "Voer uw wachtwoord in om u aan te melden en toegang tot uw account te herkrijgen.",
     "Forgotten your password?": "Wachtwoord vergeten?",
@@ -1401,7 +1401,7 @@
     "Service": "Dienst",
     "Summary": "Samenvatting",
     "Sign in and regain access to your account.": "Meld u aan en herkrijg toegang tot uw account.",
-    "You cannot sign in to your account. Please contact your homeserver admin for more information.": "U kunt zich niet aanmelden met uw account. Neem voor meer informatie contact op met de beheerder van uw thuisserver.",
+    "You cannot sign in to your account. Please contact your homeserver admin for more information.": "U kunt zich niet aanmelden met uw account. Neem voor meer informatie contact op met de beheerder van uw homeserver.",
     "This account has been deactivated.": "Deze account is gesloten.",
     "Messages": "Berichten",
     "Actions": "Acties",
@@ -1433,10 +1433,10 @@
     "Command Help": "Hulp bij opdrachten",
     "No identity server is configured: add one in server settings to reset your password.": "Er is geen identiteitsserver geconfigureerd: voeg er één toe in de serverinstellingen om uw wachtwoord opnieuw in te stellen.",
     "Call failed due to misconfigured server": "Oproep mislukt door verkeerd geconfigureerde server",
-    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Vraag uw thuisserverbeheerder (<code>%(homeserverDomain)s</code>) een TURN-server te configureren teneinde oproepen betrouwbaar te doen werken.",
+    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Vraag uw homeserverbeheerder (<code>%(homeserverDomain)s</code>) een TURN-server te configureren voor de betrouwbaarheid van de oproepen.",
     "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.": "U kunt ook de publieke server op <code>turn.matrix.org</code> gebruiken, maar dit zal minder betrouwbaar zijn, en zal uw IP-adres met die server delen. U kunt dit ook beheren in de Instellingen.",
     "Try using turn.matrix.org": "Probeer turn.matrix.org te gebruiken",
-    "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Sta de terugvalserver voor oproepbijstand turn.matrix.org toe wanneer uw thuisserver er geen aanbiedt (uw IP-adres wordt gedeeld gedurende een oproep)",
+    "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Sta de terugvalserver voor oproepbijstand turn.matrix.org toe wanneer uw homeserver er geen aanbiedt (uw IP-adres wordt gedeeld gedurende een oproep)",
     "Identity server has no terms of service": "De identiteitsserver heeft geen dienstvoorwaarden",
     "The identity server you have chosen does not have any terms of service.": "De identiteitsserver die u heeft gekozen heeft geen dienstvoorwaarden.",
     "Only continue if you trust the owner of the server.": "Ga enkel verder indien u de eigenaar van de server vertrouwt.",
@@ -1461,7 +1461,7 @@
     "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "U deelt nog steeds <b>uw persoonlijke gegevens</b> op de identiteitsserver <idserver />.",
     "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "We raden u aan uw e-mailadressen en telefoonnummers van de identiteitsserver te verwijderen vooraleer u de verbinding verbreekt.",
     "Disconnect anyway": "Verbinding toch verbreken",
-    "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Mocht u om bekenden te zoeken en zelf vindbaar te zijn <server /> niet willen gebruiken, voer dan hieronder een andere identiteitsserver in.",
+    "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Mocht u, om bekenden te zoeken en zelf vindbaar te zijn, <server /> niet willen gebruiken, voer dan hieronder een andere identiteitsserver in.",
     "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.": "Een identiteitsserver is niet verplicht, maar zonder identiteitsserver zult u geen bekenden op e-mailadres of telefoonnummer kunnen zoeken, noch door hen vindbaar zijn.",
     "Do not use an identity server": "Geen identiteitsserver gebruiken",
     "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Aanvaard de gebruiksvoorwaarden van de identiteitsserver (%(serverName)s) om vindbaar te zijn op e-mailadres of telefoonnummer.",
@@ -1482,7 +1482,7 @@
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Bij een groot aantal berichten kan dit even duren. Herlaad uw cliënt niet gedurende deze tijd.",
     "Remove %(count)s messages|other": "%(count)s berichten verwijderen",
     "Deactivate user?": "Gebruiker deactiveren?",
-    "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?": "Deze gebruiker deactiveren zal hem/haar afmelden en verhinderen dat hij/zij zich weer aanmeldt. Bovendien zal hij/zij alle gesprekken waaraan hij/zij deelneemt verlaten. Deze actie is onherroepelijk. Weet u zeker dat u deze gebruiker wilt deactiveren?",
+    "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?": "Deze gebruiker deactiveren zal deze gebruiker uitloggen en verhinderen dat de gebruiker weer inlogt. Bovendien zal de gebruiker alle gesprekken waaraan de gebruiker deelneemt verlaten. Deze actie is onherroepelijk. Weet u zeker dat u deze gebruiker wilt deactiveren?",
     "Deactivate user": "Gebruiker deactiveren",
     "Remove recent messages": "Recente berichten verwijderen",
     "Bold": "Vet",
@@ -1498,8 +1498,8 @@
     "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Gebruik een identiteitsserver om uit te nodigen op e-mailadres. <default>Gebruik de standaardserver (%(defaultIdentityServerName)s)</default> of beheer de server in de <settings>Instellingen</settings>.",
     "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Gebruik een identiteitsserver om anderen uit te nodigen via e-mail. Beheer de server in de <settings>Instellingen</settings>.",
     "Please fill why you're reporting.": "Gelieve aan te geven waarom u deze melding indient.",
-    "Report Content to Your Homeserver Administrator": "Inhoud melden aan de beheerder van uw thuisserver",
-    "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Dit bericht melden zal zijn unieke ‘gebeurtenis-ID’ versturen naar de beheerder van uw thuisserver. Als de berichten in dit gesprek versleuteld zijn, zal de beheerder van uw thuisserver het bericht niet kunnen lezen, noch enige bestanden of afbeeldingen zien.",
+    "Report Content to Your Homeserver Administrator": "Inhoud melden aan de beheerder van uw homeserver",
+    "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Dit bericht melden zal zijn unieke ‘gebeurtenis-ID’ versturen naar de beheerder van uw homeserver. Als de berichten in dit gesprek versleuteld zijn, zal de beheerder van uw homeserver het bericht niet kunnen lezen, noch enige bestanden of afbeeldingen zien.",
     "Send report": "Rapport versturen",
     "Report Content": "Inhoud melden",
     "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Stel een e-mailadres voor accountherstel in. Gebruik eventueel een e-mailadres of telefoonnummer om vindbaar te zijn voor bestaande contacten.",
@@ -1515,7 +1515,7 @@
     "Find a room… (e.g. %(exampleRoom)s)": "Zoek een gesprek… (bv. %(exampleRoom)s)",
     "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Als u het gesprek dat u zoekt niet kunt vinden, vraag dan een uitnodiging, of <a>Maak een nieuw gesprek aan</a>.",
     "Explore rooms": "Gesprekken ontdekken",
-    "Show previews/thumbnails for images": "Toon voorbeelden voor afbeeldingen",
+    "Show previews/thumbnails for images": "Miniaturen voor afbeeldingen tonen",
     "Clear cache and reload": "Cache wissen en herladen",
     "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "U staat op het punt 1 bericht door %(user)s te verwijderen. Dit is onherroepelijk. Wilt u doorgaan?",
     "Remove %(count)s messages|one": "1 bericht verwijderen",
@@ -1531,18 +1531,18 @@
     "Create a public room": "Maak een openbaar gesprek aan",
     "Create a private room": "Maak een privégesprek aan",
     "Topic (optional)": "Onderwerp (optioneel)",
-    "Make this room public": "Dit gesprek publiek maken",
+    "Make this room public": "Dit gesprek openbaar maken",
     "Hide advanced": "Geavanceerde info verbergen",
     "Show advanced": "Geavanceerde info tonen",
     "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Verhinder gebruikers op andere Matrix-thuisservers de toegang tot dit gesprek (Deze instelling kan later niet meer aangepast worden!)",
     "To continue you need to accept the terms of this service.": "Om door te gaan dient u de dienstvoorwaarden te aanvaarden.",
     "Document": "Document",
-    "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Publieke sleutel van captcha ontbreekt in thuisserverconfiguratie. Gelieve dit te melden aan de beheerder van uw thuisserver.",
-    "Community Autocomplete": "Gemeenschappen automatisch aanvullen",
-    "Emoji Autocomplete": "Emoji’s automatisch aanvullen",
-    "Notification Autocomplete": "Meldingen automatisch voltooien",
-    "Room Autocomplete": "Gesprekken automatisch aanvullen",
-    "User Autocomplete": "Gebruikers automatisch aanvullen",
+    "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Publieke sleutel van captcha ontbreekt in homeserverconfiguratie. Meld dit aan de beheerder van uw homeserver.",
+    "Community Autocomplete": "Gemeenschappen autoaanvullen",
+    "Emoji Autocomplete": "Emoji autoaanvullen",
+    "Notification Autocomplete": "Meldingen autoaanvullen",
+    "Room Autocomplete": "Gesprekken autoaanvullen",
+    "User Autocomplete": "Gebruikers autoaanvullen",
     "Add Email Address": "E-mailadres toevoegen",
     "Add Phone Number": "Telefoonnummer toevoegen",
     "Your email address hasn't been verified yet": "Uw e-mailadres is nog niet geverifieerd",
@@ -1551,7 +1551,7 @@
     "Setting up keys": "Sleutelconfiguratie",
     "Verify this session": "Deze sessie verifiëren",
     "Encryption upgrade available": "Er is een bijgewerkte versleuteling beschikbaar",
-    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Typ <code>/help</code> om alle opdrachten te zien.  Was het uw bedoeling dit als bericht te sturen?",
+    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Typ <code>/help</code> om alle opdrachten te zien. Was het uw bedoeling dit als bericht te sturen?",
     "Help": "Hulp",
     "Set up encryption": "Versleuteling instellen",
     "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.": "Dit vergt validatie van een e-mailadres of telefoonnummer middels de standaardidentiteitsserver <server />, maar die server heeft geen gebruiksvoorwaarden.",
@@ -1605,12 +1605,12 @@
     "Try out new ways to ignore people (experimental)": "Nieuwe manieren om mensen te negeren uitproberen (nog in ontwikkeling)",
     "Show info about bridges in room settings": "Toon bruginformatie in gespreksinstellingen",
     "Match system theme": "Aanpassen aan systeemthema",
-    "Never send encrypted messages to unverified sessions from this session": "Zend vanaf deze sessie nooit versleutelde berichten naar ongeverifieerde sessies",
-    "Never send encrypted messages to unverified sessions in this room from this session": "Zend vanaf deze sessie nooit versleutelde berichten naar ongeverifieerde sessies in dit gesprek",
-    "Enable message search in encrypted rooms": "Sta zoeken in versleutelde gesprekken toe",
+    "Never send encrypted messages to unverified sessions from this session": "Vanaf deze sessie nooit versleutelde berichten naar ongeverifieerde sessies versturen",
+    "Never send encrypted messages to unverified sessions in this room from this session": "Vanaf deze sessie nooit versleutelde berichten naar ongeverifieerde sessies in dit gesprek versturen",
+    "Enable message search in encrypted rooms": "Zoeken in versleutelde gesprekken inschakelen",
     "How fast should messages be downloaded.": "Ophaalfrequentie van berichten.",
     "My Ban List": "Mijn banlijst",
-    "This is your list of users/servers you have blocked - don't leave the room!": "Dit is de lijst van door u geblokkeerde servers/gebruikers.  Verlaat dit gesprek niet!",
+    "This is your list of users/servers you have blocked - don't leave the room!": "Dit is de lijst van door u geblokkeerde servers/gebruikers. Verlaat dit gesprek niet!",
     "Waiting for %(displayName)s to verify…": "Wachten tot %(displayName)s geverifieerd heeft…",
     "They match": "Ze komen overeen",
     "They don't match": "Ze komen niet overeen",
@@ -1632,7 +1632,7 @@
     "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.": "Momenteel stelt een wachtwoordswijziging alle berichtsleutels in alle sessies opnieuw in, en maakt zo oude versleutelde berichten onleesbaar - tenzij u uw sleutels eerst wegschrijft, en na afloop weer inleest. Dit zal verbeterd worden.",
     "in memory": "in het geheugen",
     "not found": "niet gevonden",
-    "Your homeserver does not support session management.": "Uw thuisserver ondersteunt geen sessiebeheer.",
+    "Your homeserver does not support session management.": "Uw homeserver ondersteunt geen sessiebeheer.",
     "Unable to load session list": "Kan sessielijst niet laden",
     "Delete %(count)s sessions|other": "%(count)s sessies verwijderen",
     "Delete %(count)s sessions|one": "%(count)s sessie verwijderen",
@@ -1653,10 +1653,10 @@
     "Enable": "Inschakelen",
     "Connecting to integration manager...": "Verbinding maken met de integratiebeheerder…",
     "Cannot connect to integration manager": "Kan geen verbinding maken met de integratiebeheerder",
-    "The integration manager is offline or it cannot reach your homeserver.": "De integratiebeheerder is offline of kan uw thuisserver niet bereiken.",
+    "The integration manager is offline or it cannot reach your homeserver.": "De integratiebeheerder is offline of kan uw homeserver niet bereiken.",
     "This session is backing up your keys. ": "Deze sessie maakt back-ups van uw sleutels. ",
     "not stored": "niet opgeslagen",
-    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Uw wachtwoord is gewijzigd. U zult geen pushmeldingen op uw andere sessies meer ontvangen, totdat u zichzelf daarop opnieuw aanmeldt",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Uw wachtwoord is gewijzigd. U zult geen pushmeldingen op uw andere sessies meer ontvangen, totdat u zichzelf daar opnieuw inlogt",
     "Ignored/Blocked": "Genegeerd/geblokkeerd",
     "Error adding ignored user/server": "Fout bij het toevoegen van een genegeerde gebruiker/server",
     "Something went wrong. Please try again or view your console for hints.": "Er is iets fout gegaan. Probeer het opnieuw of bekijk de console om voor meer informatie.",
@@ -1681,8 +1681,8 @@
     "Subscribing to a ban list will cause you to join it!": "Wanneer u zich abonneert op een banlijst zal u eraan worden toegevoegd!",
     "If this isn't what you want, please use a different tool to ignore users.": "Als u dit niet wilt kunt u een andere methode gebruiken om gebruikers te negeren.",
     "Subscribe": "Abonneren",
-    "Enable desktop notifications for this session": "Bureaubladmeldingen inschakelen voor deze sessie",
-    "Enable audible notifications for this session": "Meldingen met geluid inschakelen voor deze sessie",
+    "Enable desktop notifications for this session": "Bureaubladmeldingen voor deze sessie inschakelen",
+    "Enable audible notifications for this session": "Meldingen met geluid voor deze sessie inschakelen",
     "You should:": "U zou best:",
     "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "uw browserextensies bekijken voor extensies die mogelijk de identiteitsserver blokkeren (zoals Privacy Badger)",
     "contact the administrators of identity server <idserver />": "contact opnemen met de beheerders van de identiteitsserver <idserver />",
@@ -1711,7 +1711,7 @@
     "Mod": "Mod",
     "rooms.": "gesprekken.",
     "Recent rooms": "Actuele gesprekken",
-    "Direct Messages": "Tweegesprekken",
+    "Direct Messages": "Direct gesprek",
     "If disabled, messages from encrypted rooms won't appear in search results.": "Dit moet aan staan om te kunnen zoeken in versleutelde gesprekken.",
     "Indexed rooms:": "Geïndexeerde gesprekken:",
     "Cross-signing and secret storage are enabled.": "Kruiselings ondertekenen en sleutelopslag zijn ingeschakeld.",
@@ -1745,9 +1745,9 @@
     "Your keys are <b>not being backed up from this session</b>.": "Uw sleutels worden <b>niet geback-upt van deze sessie</b>.",
     "Clear notifications": "Meldingen wissen",
     "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.": "U moet uw <b>persoonlijke informatie</b> van de identiteitsserver <idserver /> <b>verwijderen</b> voordat u zich ontkoppelt. Helaas kan de identiteitsserver <idserver /> op dit moment niet worden bereikt. Mogelijk is hij offline.",
-    "Your homeserver does not support cross-signing.": "Uw thuisserver biedt geen ondersteuning voor kruiselings ondertekenen.",
-    "Homeserver feature support:": "Functies ondersteund door thuisserver:",
-    "exists": "bestaat",
+    "Your homeserver does not support cross-signing.": "Uw homeserver biedt geen ondersteuning voor kruiselings ondertekenen.",
+    "Homeserver feature support:": "Homeserver ondersteund deze functies:",
+    "exists": "aanwezig",
     "Sign In or Create Account": "Meld u aan of maak een account aan",
     "Use your account or create a new one to continue.": "Gebruik uw bestaande account of maak een nieuwe aan om verder te gaan.",
     "Create Account": "Account aanmaken",
@@ -1756,7 +1756,7 @@
     "Show rooms with unread notifications first": "Gesprekken met ongelezen meldingen eerst tonen",
     "Show shortcuts to recently viewed rooms above the room list": "Snelkoppelingen naar de gesprekken die u recent heeft bekeken bovenaan de gesprekslijst weergeven",
     "Cancelling…": "Bezig met annuleren…",
-    "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.": "In %(brand)s ontbreken enige modulen vereist voor het veilig lokaal bewaren van versleutelde berichten.  Wilt u deze functie uittesten, compileer dan een aangepaste versie van %(brand)s Desktop <nativeLink>die de zoekmodulen bevat</nativeLink>.",
+    "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.": "In %(brand)s ontbreken enige modulen vereist voor het veilig lokaal bewaren van versleutelde berichten. Wilt u deze functie uittesten, compileer dan een aangepaste versie van %(brand)s Desktop <nativeLink>die de zoekmodulen bevat</nativeLink>.",
     "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.": "Deze sessie <b>maakt geen back-ups van uw sleutels</b>, maar u beschikt over een reeds bestaande back-up waaruit u kunt herstellen en waaraan u nieuwe sleutels vanaf nu kunt toevoegen.",
     "Customise your experience with experimental labs features. <a>Learn more</a>.": "Personaliseer uw ervaring met experimentele functies. <a>Klik hier voor meer informatie</a>.",
     "Cross-signing": "Kruiselings ondertekenen",
@@ -1794,8 +1794,8 @@
     "For extra security, verify this user by checking a one-time code on both of your devices.": "Als extra beveiliging kunt u deze gebruiker verifiëren door een eenmalige code op uw toestellen te controleren.",
     "Your messages are not secure": "Uw berichten zijn niet veilig",
     "One of the following may be compromised:": "Eén van volgende onderdelen kan gecompromitteerd zijn:",
-    "Your homeserver": "Uw thuisserver",
-    "The homeserver the user you’re verifying is connected to": "De thuisserver waarmee de gebruiker die u tracht te verifiëren verbonden is",
+    "Your homeserver": "Uw homeserver",
+    "The homeserver the user you’re verifying is connected to": "De homeserver waarmee de gebruiker die u probeert te verifiëren verbonden is",
     "Yours, or the other users’ internet connection": "De internetverbinding van uzelf of de andere gebruiker",
     "Yours, or the other users’ session": "De sessie van uzelf of de andere gebruiker",
     "Not Trusted": "Niet vertrouwd",
@@ -1810,7 +1810,7 @@
     "%(count)s sessions|other": "%(count)s sessies",
     "%(count)s sessions|one": "%(count)s sessie",
     "Hide sessions": "Sessies verbergen",
-    "Direct message": "Tweegesprek",
+    "Direct message": "Direct gesprek",
     "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> in %(roomName)s",
     "This client does not support end-to-end encryption.": "Deze cliënt biedt geen ondersteuning voor eind-tot-eind-versleuteling.",
     "Messages in this room are not end-to-end encrypted.": "De berichten in dit gesprek worden niet eind-tot-eind-versleuteld.",
@@ -1846,7 +1846,7 @@
     "Reactions": "Reacties",
     "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> heeft gereageerd met %(content)s</reactedWith>",
     "Frequently Used": "Vaak gebruikt",
-    "Smileys & People": "Emoticons en personen",
+    "Smileys & People": "Smileys & mensen",
     "Animals & Nature": "Dieren en natuur",
     "Food & Drink": "Eten en drinken",
     "Activities": "Activiteiten",
@@ -1875,7 +1875,7 @@
     "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Het verwijderen van sleutels voor kruiselings ondertekenen is onherroepelijk. Iedereen waarmee u geverifieerd heeft zal beveiligingswaarschuwingen te zien krijgen. U wilt dit hoogstwaarschijnlijk niet doen, tenzij u alle apparaten heeft verloren waarmee u kruiselings kon ondertekenen.",
     "Clear cross-signing keys": "Sleutels voor kruiselings ondertekenen wissen",
     "Clear all data in this session?": "Alle gegevens in deze sessie verwijderen?",
-    "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Het verwijderen van alle gegevens in deze sessie is onherroepelijk. Versleutelde berichten zullen verloren gaan, tenzij u een back-up van hun sleutels heeft.",
+    "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Het verwijderen van alle gegevens in deze sessie is onherroepelijk. Versleutelde berichten zullen verloren gaan, tenzij u een back-up van de sleutels heeft.",
     "Verify session": "Sessie verifiëren",
     "Session name": "Sessienaam",
     "Session key": "Sessiesleutel",
@@ -1884,18 +1884,18 @@
     "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.": "Verifieer dit apparaat om het als vertrouwd te markeren. Door dit apparaat te vertrouwen geeft u extra gemoedsrust aan uzelf en andere gebruikers bij het gebruik van eind-tot-eind-versleutelde berichten.",
     "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Dit apparaat verifiëren zal het als vertrouwd markeren, en gebruikers die met u geverifieerd hebben zullen het vertrouwen.",
     "Integrations are disabled": "Integraties zijn uitgeschakeld",
-    "Enable 'Manage Integrations' in Settings to do this.": "Schakel ‘Beheer integraties’ in in de instellingen om dit te doen.",
+    "Enable 'Manage Integrations' in Settings to do this.": "Schakel in het Algemene Instellingenmenu ‘Beheer integraties’ in om dit te doen.",
     "Integrations not allowed": "Integraties niet toegestaan",
     "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Uw %(brand)s laat u geen integratiebeheerder gebruiken om dit te doen. Neem contact op met een beheerder.",
     "Failed to invite the following users to chat: %(csvUsers)s": "Het uitnodigen van volgende gebruikers voor gesprek is mislukt: %(csvUsers)s",
-    "We couldn't create your DM. Please check the users you want to invite and try again.": "Uw tweegesprek kon niet aangemaakt worden. Controleer de gebruikers die u wilt uitnodigen en probeer het opnieuw.",
+    "We couldn't create your DM. Please check the users you want to invite and try again.": "Uw direct gesprek kon niet aangemaakt worden. Controleer de gebruikers die u wilt uitnodigen en probeer het opnieuw.",
     "Something went wrong trying to invite the users.": "Er is een fout opgetreden bij het uitnodigen van de gebruikers.",
     "We couldn't invite those users. Please check the users you want to invite and try again.": "Deze gebruikers konden niet uitgenodigd worden. Controleer de gebruikers die u wilt uitnodigen en probeer het opnieuw.",
     "Failed to find the following users": "Kon volgende gebruikers niet vinden",
     "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Volgende gebruikers bestaan mogelijk niet of zijn ongeldig, en kunnen dan ook niet uitgenodigd worden: %(csvNames)s",
     "Recent Conversations": "Recente gesprekken",
     "Suggestions": "Suggesties",
-    "Recently Direct Messaged": "Recente tweegesprekken",
+    "Recently Direct Messaged": "Recente gesprekken",
     "Go": "Start",
     "Your account is not secure": "Uw account is onveilig",
     "Your password": "Uw wachtwoord",
@@ -1937,10 +1937,10 @@
     "Without completing security on this session, it won’t have access to encrypted messages.": "Als u de beveiliging van deze sessie niet vervolledigt, zal ze geen toegang hebben tot uw versleutelde berichten.",
     "Go Back": "Terugkeren",
     "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Door uw wachtwoord te wijzigen stelt u alle eind-tot-eind-versleutelingssleutels op al uw sessies opnieuw in, waardoor uw versleutelde gespreksgeschiedenis onleesbaar wordt. Stel sleutelback-up in of schrijf uw gesprekssleutels van een andere sessie weg vooraleer u een nieuw wachtwoord instelt.",
-    "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.": "U bent afgemeld bij al uw sessies en zult geen pushberichten meer ontvangen. Meld u op elk apparaat opnieuw aan om meldingen opnieuw in te schakelen.",
+    "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.": "U bent uitgelogd bij al uw sessies en zult geen pushberichten meer ontvangen. Meld u op elk apparaat opnieuw aan om meldingen opnieuw in te schakelen.",
     "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.": "Herwin toegang tot uw account en herstel de tijdens deze sessie opgeslagen versleutelingssleutels, zonder welke sommige van uw beveiligde berichten in al uw sessies onleesbaar zijn.",
     "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.": "Let op: uw persoonlijke gegevens (waaronder versleutelingssleutels) zijn nog steeds opgeslagen in deze sessie. Wis ze wanneer u klaar bent met deze sessie, of wanneer u zich wilt aanmelden met een andere account.",
-    "Command Autocomplete": "Opdrachten automatisch aanvullen",
+    "Command Autocomplete": "Opdrachten autoaanvullen",
     "DuckDuckGo Results": "DuckDuckGo-resultaten",
     "Enter your account password to confirm the upgrade:": "Voer uw accountwachtwoord in om het bijwerken te bevestigen:",
     "Restore your key backup to upgrade your encryption": "Herstel uw sleutelback-up om uw versleuteling bij te werken",
@@ -1955,8 +1955,8 @@
     "Your recovery key is in your <b>Downloads</b> folder.": "Uw herstelsleutel bevindt zich in uw <b>Downloads</b>-map.",
     "Upgrade your encryption": "Werk uw versleuteling bij",
     "Make a copy of your recovery key": "Maak een kopie van uw herstelsleutel",
-    "Unable to set up secret storage": "Kan geheime opslag niet instellen",
-    "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.": "Zonder veilig berichtherstel in te stellen zult u uw versleutelde berichtgeschiedenis niet kunnen herstellen als u zich afmeldt of een andere sessie gebruikt.",
+    "Unable to set up secret storage": "Kan sleutelopslag niet instellen",
+    "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.": "Zonder veilig berichtherstel in te stellen zult u uw versleutelde berichtgeschiedenis niet kunnen herstellen als u uitlogt of een andere sessie gebruikt.",
     "Create key backup": "Sleutelback-up aanmaken",
     "This session is encrypting history using the new recovery method.": "Deze sessie versleutelt uw geschiedenis aan de hand van de nieuwe herstelmethode.",
     "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Deze sessie heeft gedetecteerd dat uw herstelwachtwoord en -sleutel voor beveiligde berichten verwijderd zijn.",
@@ -1970,19 +1970,19 @@
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Bekijk eerst het <a>beveiligingsopenbaarmakingsbeleid</a> van Matrix.org als u een probleem met de beveiliging van Matrix wilt melden.",
     "Not currently indexing messages for any room.": "Er worden momenteel voor geen enkel gesprek berichten geïndexeerd.",
     "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s van %(totalRooms)s",
-    "Where you’re logged in": "Waar u aangemeld bent",
+    "Where you’re logged in": "Waar u ingelogd bent",
     "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Beheer hieronder de namen van uw sessies en meld ze af. <a>Of verifieer ze in uw gebruikersprofiel</a>.",
-    "Use Single Sign On to continue": "Ga verder met Eenmalige Aanmelding",
-    "Confirm adding this email address by using Single Sign On to prove your identity.": "Bevestig uw identiteit met Eenmalige Aanmelding om dit emailadres toe te voegen.",
-    "Single Sign On": "Eenmalige Aanmelding",
+    "Use Single Sign On to continue": "Ga verder met eenmalige aanmelding",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Bevestig uw identiteit met uw eenmalige aanmelding om dit e-mailadres toe te voegen.",
+    "Single Sign On": "Eenmalige aanmelding",
     "Confirm adding email": "Bevestig toevoegen van het e-mailadres",
     "Click the button below to confirm adding this email address.": "Klik op de knop hieronder om dit e-mailadres toe te voegen.",
-    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Bevestig uw identiteit met Eenmalige Aanmelding om dit telefoonnummer toe te voegen.",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Bevestig uw identiteit met uw eenmalige aanmelding om dit telefoonnummer toe te voegen.",
     "Confirm adding phone number": "Bevestig toevoegen van het telefoonnummer",
     "Click the button below to confirm adding this phone number.": "Klik op de knop hieronder om het toevoegen van dit telefoonnummer te bevestigen.",
     "If you cancel now, you won't complete your operation.": "Als u de operatie afbreekt kunt u haar niet voltooien.",
-    "Review where you’re logged in": "Kijk na waar u aangemeld bent",
-    "New login. Was this you?": "Nieuwe aanmelding - was u dat?",
+    "Review where you’re logged in": "Kijk na waar u ingelogd bent",
+    "New login. Was this you?": "Nieuwe login - was u dat?",
     "%(name)s is requesting verification": "%(name)s verzoekt om verificatie",
     "Sends a message as html, without interpreting it as markdown": "Stuurt een bericht als HTML, zonder markdown toe te passen",
     "Failed to set topic": "Kon onderwerp niet instellen",
@@ -2003,29 +2003,952 @@
     "Manually Verify by Text": "Handmatig middels een tekst",
     "Interactively verify by Emoji": "Interactief middels emojis",
     "Support adding custom themes": "Sta maatwerkthema's toe",
-    "Opens chat with the given user": "Start een tweegesprek met die gebruiker",
+    "Opens chat with the given user": "Start een gesprek met die gebruiker",
     "Sends a message to the given user": "Zendt die gebruiker een bericht",
     "Font scaling": "Lettergrootte",
     "Verify all your sessions to ensure your account & messages are safe": "Controleer al uw sessies om zeker te zijn dat uw account & berichten veilig zijn",
-    "Verify the new login accessing your account: %(name)s": "Verifieer de nieuwe aanmelding op uw account: %(name)s",
-    "Confirm your account deactivation by using Single Sign On to prove your identity.": "Bevestig uw intentie deze account te sluiten door met Single Sign On uw identiteit te bewijzen.",
-    "Are you sure you want to deactivate your account? This is irreversible.": "Weet u zeker dat u uw account wil sluiten?  Dit is onomkeerbaar.",
+    "Verify the new login accessing your account: %(name)s": "Verifieer de nieuwe login op uw account: %(name)s",
+    "Confirm your account deactivation by using Single Sign On to prove your identity.": "Bevestig de deactivering van uw account door gebruik te maken van eenmalige aanmelding om uw identiteit te bewijzen.",
+    "Are you sure you want to deactivate your account? This is irreversible.": "Weet u zeker dat u uw account wil sluiten? Dit is onomkeerbaar.",
     "Confirm account deactivation": "Bevestig accountsluiting",
     "Room name or address": "Gespreksnaam of -adres",
     "Joins room with given address": "Neem aan het gesprek met dat adres deel",
     "Unrecognised room address:": "Gespreksadres niet herkend:",
     "Help us improve %(brand)s": "Help ons %(brand)s nog beter te maken",
-    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Stuur <UsageDataLink>anonieme gebruiksinformatie</UsageDataLink> waarmee we %(brand)s kunnen verbeteren.  Dit plaatst een <PolicyLink>cookie</PolicyLink>.",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Stuur <UsageDataLink>anonieme gebruiksinformatie</UsageDataLink> waarmee we %(brand)s kunnen verbeteren. Dit plaatst een <PolicyLink>cookie</PolicyLink>.",
     "I want to help": "Ik wil helpen",
-    "Your homeserver has exceeded its user limit.": "Uw thuisserver heeft het maximaal aantal gebruikers overschreden.",
-    "Your homeserver has exceeded one of its resource limits.": "Uw thuisserver heeft een van zijn limieten overschreden.",
+    "Your homeserver has exceeded its user limit.": "Uw homeserver heeft het maximaal aantal gebruikers overschreden.",
+    "Your homeserver has exceeded one of its resource limits.": "Uw homeserver heeft een van zijn limieten overschreden.",
     "Ok": "Oké",
     "Light": "Helder",
     "Dark": "Donker",
     "Set password": "Stel wachtwoord in",
     "To return to your account in future you need to set a password": "Zonder wachtwoord kunt u later niet tot uw account terugkeren",
     "Restart": "Herstarten",
-    "People": "Tweegesprekken",
+    "People": "Personen",
     "Set a room address to easily share your room with other people.": "Geef het gesprek een adres om het gemakkelijk met anderen te kunnen delen.",
-    "Invite people to join %(communityName)s": "Stuur uitnodigingen voor %(communityName)s"
+    "Invite people to join %(communityName)s": "Stuur uitnodigingen voor %(communityName)s",
+    "Unable to access microphone": "Je microfoon lijkt niet beschikbaar",
+    "The call was answered on another device.": "De oproep werd op een ander toestel beantwoord.",
+    "Answered Elsewhere": "Ergens anders beantwoord",
+    "The call could not be established": "De oproep kon niet worden volbracht",
+    "The other party declined the call.": "De tegenpartij heeft je oproep afgewezen.",
+    "Call Declined": "Oproep Afgewezen",
+    "Bahrain": "Bahrein",
+    "Bahamas": "Bahama's",
+    "Azerbaijan": "Azerbeidzjan",
+    "Austria": "Oostenrijk",
+    "Australia": "Australië",
+    "Aruba": "Aruba",
+    "Armenia": "Armenië",
+    "Argentina": "Argentinië",
+    "Antigua & Barbuda": "Antigua & Barbuda",
+    "Antarctica": "Antarctica",
+    "Anguilla": "Anguilla",
+    "Angola": "Angola",
+    "Andorra": "Andorra",
+    "American Samoa": "Amerikaans Samoa",
+    "Algeria": "Algerije",
+    "Albania": "Albanië",
+    "Åland Islands": "Åland",
+    "Afghanistan": "Afghanistan",
+    "United States": "Verenigde Staten",
+    "United Kingdom": "Verenigd Koninkrijk",
+    "This will end the conference for everyone. Continue?": "Dit beëindigt de vergadering voor iedereen. Doorgaan?",
+    "End conference": "Beëindig vergadering",
+    "You've reached the maximum number of simultaneous calls.": "Je hebt het maximum aantal van gelijktijdige oproepen bereikt.",
+    "Too Many Calls": "Te veel oproepen",
+    "No other application is using the webcam": "Geen andere applicatie de camera gebruikt",
+    "Permission is granted to use the webcam": "Toegang tot de webcam is toegestaan",
+    "A microphone and webcam are plugged in and set up correctly": "Een microfoon en webcam zijn aangesloten en juist ingesteld",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "Oproep mislukt omdat er geen toegang is tot de webcam of de microfoon. Kijk na dat:",
+    "Unable to access webcam / microphone": "Je webcam of microfoon lijkt niet beschikbaar",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Oproep mislukt omdat er geen toegang is tot de microfoon. Kijk na dat de microfoon juist is aangesloten en ingesteld.",
+    "Video conference started by %(senderName)s": "Videovergadering gestart door %(senderName)s",
+    "Video conference updated by %(senderName)s": "Videovergadering geüpdatet door %(senderName)s",
+    "Video conference ended by %(senderName)s": "Videovergadering beëindigd door %(senderName)s",
+    "Join the conference from the room information card on the right": "Neem deel aan de vergadering via de informatiekaart rechts",
+    "List options": "Lijstopties",
+    "A-Z": "A-Z",
+    "Activity": "Activiteit",
+    "Sort by": "Sorteer op",
+    "Compare emoji": "Vergelijk de emoji's",
+    "Verification cancelled": "Verificatie geannuleerd",
+    "You cancelled verification.": "Je hebt de verificatie geannuleerd.",
+    "%(displayName)s cancelled verification.": "%(displayName)s heeft de verificatie geannuleerd.",
+    "You cancelled verification on your other session.": "Je hebt de verificatie vanuit jouw andere sessie beëindigt.",
+    "Verification timed out.": "Verificatie verlopen.",
+    "Start verification again from their profile.": "Begin verificatie opnieuw vanaf hun profiel.",
+    "Romania": "Roemenië",
+    "St. Martin": "Sint Maarten/Sint-Maarten",
+    "St. Kitts & Nevis": "Saint Kitts en Nevis",
+    "St. Barthélemy": "Saint-Barthélemy",
+    "South Korea": "Zuid-Korea",
+    "Somalia": "Somalië",
+    "Papua New Guinea": "Papoea-Nieuw-Guinea",
+    "North Korea": "Noord-Korea",
+    "Netherlands": "Nederland",
+    "Malta": "Malta",
+    "Mali": "Mali",
+    "Macau": "Macau",
+    "Laos": "Laos",
+    "Kosovo": "Kosovo",
+    "India": "India",
+    "Guinea": "Guinee",
+    "Guinea-Bissau": "Guinee-Bissau",
+    "Gibraltar": "Gibraltar",
+    "Georgia": "Georgië",
+    "Equatorial Guinea": "Equatoriaal-Guinea",
+    "Dominican Republic": "Dominicaanse Republiek",
+    "Dominica": "Dominica",
+    "Czech Republic": "Tsjechië",
+    "Congo - Kinshasa": "Congo-Kinshasa",
+    "Congo - Brazzaville": "Congo-Brazzaville",
+    "Caribbean Netherlands": "Caribisch Nederland",
+    "Cape Verde": "Kaapverdië",
+    "British Indian Ocean Territory": "Brits Indische Oceaanterritorium",
+    "Zimbabwe": "Zimbabwe",
+    "Zambia": "Zambia",
+    "Yemen": "Jemen",
+    "Western Sahara": "Westelijke Sahara",
+    "Wallis & Futuna": "Wallis en Futuna",
+    "U.S. Virgin Islands": "Amerikaanse Maagdeneilanden",
+    "British Virgin Islands": "Britse Maagdeneilanden",
+    "Vietnam": "Vietnam",
+    "Venezuela": "Venezuela",
+    "Vanuatu": "Vanuatu",
+    "Uzbekistan": "Oezbekistan",
+    "Uruguay": "Uruguay",
+    "Ireland": "Verenigd Koninkrijk",
+    "United Arab Emirates": "Verenigde Arabische Emiraten",
+    "Ukraine": "Oekraïne",
+    "Uganda": "Oeganda",
+    "Tuvalu": "Tuvalu",
+    "Turks & Caicos Islands": "Turks- en Caicoseilanden",
+    "Turkmenistan": "Turkmenistan",
+    "Turkey": "Turkije",
+    "Tunisia": "Tunesië",
+    "Trinidad & Tobago": "Trinidad en Tobago",
+    "Tonga": "Tonga",
+    "Tokelau": "Tokelau",
+    "Togo": "Togo",
+    "Timor-Leste": "Oost-Timor",
+    "Thailand": "Thailand",
+    "Tanzania": "Tanzania",
+    "Tajikistan": "Tadzjikistan",
+    "Syria": "Syrië",
+    "Switzerland": "Zwitserland",
+    "Sweden": "Zweden",
+    "Svalbard & Jan Mayen": "Spitsbergen en Jan Mayen",
+    "Suriname": "Suriname",
+    "Sri Lanka": "Sri Lanka",
+    "Spain": "Spanje",
+    "South Africa": "Zuid-Afrika",
+    "Solomon Islands": "Salomonseilanden",
+    "Slovenia": "Slovenië",
+    "Slovakia": "Slowakije",
+    "Sint Maarten": "Sint Maarten",
+    "Singapore": "Singapore",
+    "Sierra Leone": "Sierra Leone",
+    "Seychelles": "Seychellen",
+    "Serbia": "Servië",
+    "Senegal": "Senegal",
+    "Saudi Arabia": "Saoedi-Arabië",
+    "San Marino": "San Marino",
+    "Samoa": "Samoa",
+    "Rwanda": "Rwanda",
+    "Russia": "Rusland",
+    "Réunion": "Réunion",
+    "Qatar": "Qatar",
+    "Puerto Rico": "Puerto Rico",
+    "Portugal": "Portugal",
+    "Poland": "Polen",
+    "Pitcairn Islands": "Pitcairneilanden",
+    "Philippines": "Filipijnen",
+    "Peru": "Peru",
+    "Paraguay": "Paraguay",
+    "Panama": "Panama",
+    "Palestine": "Palestina",
+    "Palau": "Palau",
+    "Pakistan": "Pakistan",
+    "Norway": "Noorwegen",
+    "Northern Mariana Islands": "Noordelijke Marianen",
+    "Macedonia": "Noord-Macedonië",
+    "Norfolk Island": "Norfolk",
+    "Niue": "Niue",
+    "Nigeria": "Nigeria",
+    "Niger": "Niger",
+    "Nicaragua": "Nicaragua",
+    "New Zealand": "Nieuw-Zeeland",
+    "New Caledonia": "Nieuw-Caledonië",
+    "Nepal": "Nepal",
+    "Nauru": "Nauru",
+    "Namibia": "Namibië",
+    "Myanmar": "Myanmar",
+    "Mozambique": "Mozambique",
+    "Morocco": "Marokko",
+    "Montserrat": "Montserrat",
+    "Montenegro": "Montenegro",
+    "Mongolia": "Mongolië",
+    "Monaco": "Monaco",
+    "Moldova": "Moldavië",
+    "Micronesia": "Micronesia",
+    "Mexico": "Mexico",
+    "Mayotte": "Mayotte",
+    "Mauritius": "Mauritius",
+    "Mauritania": "Mauritanië",
+    "Martinique": "Martinique",
+    "Marshall Islands": "Marshalleilanden",
+    "Maldives": "Maldiven",
+    "Malaysia": "Maleisië",
+    "Malawi": "Malawi",
+    "Madagascar": "Madagaskar",
+    "Luxembourg": "Luxemburg",
+    "Lithuania": "Litouwen",
+    "Liechtenstein": "Liechtenstein",
+    "Libya": "Libië",
+    "Liberia": "Liberia",
+    "Lesotho": "Lesotho",
+    "Lebanon": "Libanon",
+    "Latvia": "Letland",
+    "Kyrgyzstan": "Kirgizië",
+    "Kuwait": "Koeweit",
+    "Kiribati": "Kiribati",
+    "Kenya": "Kenia",
+    "Kazakhstan": "Kazachstan",
+    "Jordan": "Jordanië",
+    "Jersey": "Jersey",
+    "Japan": "Japan",
+    "Jamaica": "Jamaica",
+    "Italy": "Italië",
+    "Israel": "Israël",
+    "Isle of Man": "Man",
+    "Iraq": "Irak",
+    "Iran": "Iran",
+    "Indonesia": "Indonesië",
+    "Iceland": "IJsland",
+    "Hungary": "Hongarije",
+    "Hong Kong": "Hongkong",
+    "Honduras": "Honduras",
+    "Heard & McDonald Islands": "Heard en McDonaldeilanden",
+    "Haiti": "Haïti",
+    "Guyana": "Guyana",
+    "Guernsey": "Guernsey",
+    "Guatemala": "Guatemala",
+    "Guam": "Guam",
+    "Guadeloupe": "Guadeloupe",
+    "Grenada": "Grenada",
+    "Greenland": "Groenland",
+    "Greece": "Griekenland",
+    "Ghana": "Ghana",
+    "Germany": "Duitsland",
+    "Gambia": "Gambia",
+    "Gabon": "Gabon",
+    "French Southern Territories": "Franse Zuidelijke en Antarctische Gebieden",
+    "French Polynesia": "Frans-Polynesië",
+    "French Guiana": "Frans-Guyana",
+    "France": "Frankrijk",
+    "Finland": "Finland",
+    "Fiji": "Fiji",
+    "Faroe Islands": "Faeröer",
+    "Falkland Islands": "Falklandeilanden",
+    "Ethiopia": "Ethiopië",
+    "Estonia": "Estland",
+    "Eritrea": "Eritrea",
+    "El Salvador": "El Salvador",
+    "Egypt": "Egypte",
+    "Ecuador": "Ecuador",
+    "Djibouti": "Djibouti",
+    "Denmark": "Denemarken",
+    "Cyprus": "Cyprus",
+    "Curaçao": "Curaçao",
+    "Cuba": "Cuba",
+    "Croatia": "Kroatië",
+    "Côte d’Ivoire": "Ivoorkust",
+    "Costa Rica": "Costa Rica",
+    "Cook Islands": "Cookeilanden",
+    "Comoros": "Comoren",
+    "Colombia": "Colombia",
+    "Cocos (Keeling) Islands": "Cocoseilanden",
+    "Christmas Island": "Christmaseiland",
+    "China": "China",
+    "Chile": "Chili",
+    "Chad": "Tsjaad",
+    "Central African Republic": "Centraal-Afrikaanse Republiek",
+    "Cayman Islands": "Kaaimaneilanden",
+    "Canada": "Canada",
+    "Cameroon": "Kameroen",
+    "Cambodia": "Cambodja",
+    "Burundi": "Burundi",
+    "Burkina Faso": "Burkina Faso",
+    "Bulgaria": "Bulgarije",
+    "Brunei": "Brunei",
+    "Brazil": "Brazilië",
+    "Bouvet Island": "Bouveteiland",
+    "Botswana": "Botswana",
+    "Bosnia": "Bosnië en Herzegovina",
+    "Bolivia": "Bolivia",
+    "Bhutan": "Bhutan",
+    "Bermuda": "Bermuda",
+    "Benin": "Benin",
+    "Belize": "Belize",
+    "Belgium": "België",
+    "Belarus": "Wit-Rusland",
+    "Barbados": "Barbados",
+    "Bangladesh": "Bangladesh",
+    "See when the name changes in your active room": "Zien wanneer de naam in uw actieve gesprek veranderd",
+    "Change the name of your active room": "Verander de naam van uw actieve gesprek",
+    "See when the name changes in this room": "Zien wanneer de naam in dit gesprek veranderd",
+    "Change the name of this room": "Verander de naam van dit gesprek",
+    "See when the topic changes in your active room": "Zien wanneer het onderwerp veranderd van uw actieve gesprek",
+    "Change the topic of your active room": "Verander het onderwerp van uw actieve gesprek",
+    "See when the topic changes in this room": "Zien wanneer het onderwerp van dit gesprek veranderd",
+    "Change the topic of this room": "Verander het onderwerp van dit gesprek",
+    "Change which room, message, or user you're viewing": "Verander welk gesprek, bericht of welke gebruiker u ziet",
+    "Change which room you're viewing": "Verander welk gesprek u ziet",
+    "(connection failed)": "(verbinden mislukt)",
+    "Places the call in the current room on hold": "De huidige oproep in de wacht zetten",
+    "Effects": "Effecten",
+    "Are you sure you want to cancel entering passphrase?": "Weet u zeker, dat u het invoeren van uw wachtwoord wilt afbreken?",
+    "Vatican City": "Vaticaanstad",
+    "Taiwan": "Taiwan",
+    "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "Uw homeserver wees uw inlogpoging af. Dit kan zijn doordat het te lang heeft geduurd. Probeer het opnieuw. Als dit probleem zich blijft voordoen, neem contact op met de beheerder van uw homeserver.",
+    "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "Uw homeserver was onbereikbaar en kon u niet inloggen, probeer het opnieuw. Wanneer dit probleem zich blijft voordoen, neem contact op met de beheerder van uw homeserver.",
+    "Try again": "Probeer opnieuw",
+    "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "De browser is verzocht uw homeserver te onthouden die u gebruikt om zich aan te melden, maar is deze vergeten. Ga naar de aanmeldpagina en probeer het opnieuw.",
+    "We couldn't log you in": "We konden u niet inloggen",
+    "Room Info": "Gespreksinfo",
+    "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "Matrix.org is de grootste openbare homeserver van de wereld, dus het is een goede plek voor vele.",
+    "Explore Public Rooms": "Verken openbare groepen",
+    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Privégesprekken zijn alleen zichtbaar en toegankelijk met een uitnodiging. Openbare gesprekken zijn zichtbaar en toegankelijk voor iedereen in deze gemeenschap.",
+    "This room is public": "Dit gesprek is openbaar",
+    "Show previews of messages": "Voorvertoning van berichten inschakelen",
+    "Show message previews for reactions in all rooms": "Toon berichtvoorbeelden voor reacties in alle gesprekken",
+    "Explore public rooms": "Verken openbare groepen",
+    "Leave Room": "Gesprek verlaten",
+    "Room options": "Gesprekopties",
+    "Start a conversation with someone using their name, email address or username (like <userId/>).": "Start een gesprek met iemand door hun naam, emailadres of gebruikersnaam (zoals <userId/>) te typen.",
+    "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Berichten hier zijn eind-tot-eind versleuteld. Verifieer %(displayName)s op hun profiel - klik op hun avatar.",
+    "%(creator)s created this DM.": "%(creator)s maakte deze DM.",
+    "Switch to dark mode": "Wissel naar donkere modus",
+    "Switch to light mode": "Wissel naar lichte modus",
+    "Appearance": "Weergave",
+    "All settings": "Alle instellingen",
+    "Error removing address": "Fout bij verwijderen van adres",
+    "There was an error removing that address. It may no longer exist or a temporary error occurred.": "Er is een fout opgetreden bij het verwijderen van dit adres. Deze bestaat mogelijk niet meer, of er is een tijdelijke fout opgetreden.",
+    "You don't have permission to delete the address.": "U heeft geen toestemming om het adres te verwijderen.",
+    "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "Er is een fout opgetreden bij het aanmaken van dit adres. Dit wordt mogelijk niet toegestaan door de server, of er is een tijdelijk probleem opgetreden.",
+    "Error creating address": "Fout bij aanmaken van het adres",
+    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Er is een fout opgetreden bij het bijwerken van het nevenadres van het gesprek. Dit wordt mogelijk niet toegestaan door de server, of er is een tijdelijk probleem opgetreden.",
+    "Favourited": "Favoriet",
+    "Forget Room": "Gesprek vergeten",
+    "Notification options": "Meldingsinstellingen",
+    "Use default": "Gebruik standaardinstelling",
+    "Show %(count)s more|one": "Toon %(count)s meer",
+    "Show %(count)s more|other": "Toon %(count)s meer",
+    "Show rooms with unread messages first": "Gesprekken met ongelezen berichten als eerste tonen",
+    "%(count)s results|one": "%(count)s resultaten",
+    "%(count)s results|other": "%(count)s resultaten",
+    "Explore all public rooms": "Verken alle openbare groepen",
+    "Start a new chat": "Een nieuw gesprek beginnen",
+    "Can't see what you’re looking for?": "Niet kunnen vinden waar u naar zocht?",
+    "Custom Tag": "Aangepast label",
+    "Explore community rooms": "Gemeenschapsgesprekken verkennen",
+    "Start a Conversation": "Begin een gesprek",
+    "Show Widgets": "Widgets tonen",
+    "Hide Widgets": "Widgets verbergen",
+    "This is the start of <roomName/>.": "Dit is het begin van <roomName/>.",
+    "%(displayName)s created this room.": "%(displayName)s heeft dit gesprek aangemaakt.",
+    "You created this room.": "U heeft dit gesprek gemaakt.",
+    "Topic: %(topic)s ": "Onderwerp: %(topic)s ",
+    "Topic: %(topic)s (<a>edit</a>)": "Onderwerp: %(topic)s (<a>bewerken</a>)",
+    "This is the beginning of your direct message history with <displayName/>.": "Dit is het begin van de geschiedenis van uw direct gesprek met <displayName/>.",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "De beheerder van uw server heeft eind-tot-eind-versleuteling standaard uitgeschakeld in alle privégesprekken en directe gesprekken.",
+    "Scroll to most recent messages": "Spring naar meest recente bericht",
+    "The authenticity of this encrypted message can't be guaranteed on this device.": "De echtheid van dit versleutelde bericht kan op dit apparaat niet worden gegarandeerd.",
+    "To link to this room, please add an address.": "Voeg een adres toe om naar deze kamer te verwijzen.",
+    "Remove messages sent by others": "Berichten van anderen verwijderen",
+    "Privacy": "Privacy",
+    "Keyboard Shortcuts": "Sneltoetsen",
+    "Appearance Settings only affect this %(brand)s session.": "Weergave-instellingen zijn alleen van toepassing op deze %(brand)s sessie.",
+    "Customise your appearance": "Weergave aanpassen",
+    "Modern": "Modern",
+    "Compact": "Compact",
+    "Use between %(min)s pt and %(max)s pt": "Gebruik een getal tussen %(min)s pt en %(max)s pt",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "Aangepaste lettergrootte kan alleen een getal tussen %(min)s pt en %(max)s pt zijn",
+    "Size must be a number": "Grootte moet een getal zijn",
+    "New version available. <a>Update now.</a>": "Nieuwe versie beschikbaar. <a>Nu bijwerken.</a>",
+    "not ready": "Niet gereed",
+    "ready": "Gereed",
+    "unexpected type": "Onverwacht type",
+    "Algorithm:": "Algoritme:",
+    "Backup version:": "Versie reservekopie:",
+    "The operation could not be completed": "De handeling kon niet worden voltooid",
+    "Failed to save your profile": "Profiel opslaan mislukt",
+    "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "U heeft ze mogelijk ingesteld in een andere cliënt dan %(brand)s. U kunt ze niet aanpassen in %(brand)s, maar ze zijn wel actief.",
+    "There are advanced notifications which are not shown here.": "Er zijn geavanceerde meldingen die hier niet getoond worden.",
+    "Delete sessions|one": "Verwijder sessie",
+    "Delete sessions|other": "Verwijder sessies",
+    "Click the button below to confirm deleting these sessions.|one": "Bevestig het verwijderen van deze sessie door op de knop hieronder te drukken.",
+    "Click the button below to confirm deleting these sessions.|other": "Bevestig het verwijderen van deze sessies door op de knop hieronder te drukken.",
+    "Confirm deleting these sessions": "Bevestig dat u deze sessies wilt verwijderen",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "Bevestig uw identiteit met uw eenmalige aanmelding om deze sessies te verwijderen.",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Bevestig uw identiteit met uw eenmalige aanmelding om deze sessies te verwijderen.",
+    "not found locally": "lokaal niet gevonden",
+    "cached locally": "lokaal opgeslagen",
+    "not found in storage": "Niet gevonden in de opslag",
+    "Channel: <channelLink/>": "Kanaal: <channelLink/>",
+    "From %(deviceName)s (%(deviceId)s)": "Van %(deviceName)s %(deviceId)s",
+    "Waiting for your other session to verify…": "Wachten op uw andere sessie om te verifiëren…",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Wachten op uw andere sessie, %(deviceName)s (%(deviceId)s), om te verifiëren…",
+    "Verify this session by confirming the following number appears on its screen.": "Verifieer deze sessie door te bevestigen dat het scherm het volgende getal toont.",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "Bevestig dat de emoji's hieronder op beide sessies in dezelfde volgorde worden getoond:",
+    "Incoming call": "Inkomende oproep",
+    "Incoming video call": "Inkomende video-oproep",
+    "Incoming voice call": "Inkomende spraakoproep",
+    "Unknown caller": "Onbekende beller",
+    "There was an error looking up the phone number": "Bij het zoeken naar het telefoonnummer is een fout opgetreden",
+    "Unable to look up phone number": "Kan telefoonnummer niet opzoeken",
+    "Return to call": "Terug naar oproep",
+    "Fill Screen": "Scherm vullen",
+    "Voice Call": "Spraakoproep",
+    "Video Call": "Video-oproep",
+    "sends snowfall": "Stuur sneeuwvlokken",
+    "sends confetti": "verstuurt confetti",
+    "sends fireworks": "Stuur vuurwerk",
+    "Downloading logs": "Logboeken downloaden",
+    "Uploading logs": "Logboeken versturen",
+    "Use Ctrl + Enter to send a message": "Gebruik Ctrl + Enter om een bericht te sturen",
+    "Use Command + Enter to send a message": "Gebruik Command (⌘) + Enter om een bericht te sturen",
+    "Use Ctrl + F to search": "Ctrl + F om te zoeken gebruiken",
+    "Use Command + F to search": "Command (⌘) + F om te zoeken gebruiken",
+    "Use a more compact ‘Modern’ layout": "Compacte 'Modern'-layout inschakelen",
+    "Use custom size": "Aangepaste lettergrootte gebruiken",
+    "Font size": "Lettergrootte",
+    "Enable advanced debugging for the room list": "Geavanceerde foutopsporing voor de gesprekkenlijst inschakelen",
+    "Render LaTeX maths in messages": "Weergeef LaTeX-wiskundenotatie in berichten",
+    "Change notification settings": "Meldingsinstellingen wijzigen",
+    "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
+    "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
+    "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
+    "* %(senderName)s %(emote)s": "* %(senderName)s %(emote)s",
+    "%(senderName)s is calling": "%(senderName)s belt",
+    "Waiting for answer": "Wachten op antwoord",
+    "%(senderName)s started a call": "%(senderName)s heeft een oproep gestart",
+    "You started a call": "U heeft een oproep gestart",
+    "Call ended": "Oproep beëindigd",
+    "%(senderName)s ended the call": "%(senderName)s heeft opgehangen",
+    "You ended the call": "U heeft opgehangen",
+    "Call in progress": "Oproep gaande",
+    "%(senderName)s joined the call": "%(senderName)s neemt deel aan de oproep",
+    "You joined the call": "U heeft deelgenomen aan de oproep",
+    "The person who invited you already left the room, or their server is offline.": "De persoon door wie u ben uitgenodigd heeft het gesprek al verlaten, of hun server is offline.",
+    "The person who invited you already left the room.": "De persoon door wie u ben uitgenodigd, heeft het gesprek reeds verlaten.",
+    "New version of %(brand)s is available": "Nieuwe versie van %(brand)s is beschikbaar",
+    "Update %(brand)s": "%(brand)s bijwerken",
+    "%(senderName)s has updated the widget layout": "%(senderName)s heeft de widget-indeling bijgewerkt",
+    "%(senderName)s declined the call.": "%(senderName)s heeft de oproep afgewezen.",
+    "(an error occurred)": "(een fout is opgetreden)",
+    "You've previously used a newer version of %(brand)s with this session. To use this version again with end to end encryption, you will need to sign out and back in again.": "U heeft eerder een nieuwere versie van %(brand)s in deze sessie gebruikt. Om deze versie opnieuw met eind-tot-eind-versleuteling te gebruiken, zult u zich moeten afmelden en opnieuw aanmelden.",
+    "Block anyone not part of %(serverName)s from ever joining this room.": "Weiger iedereen die geen deel uitmaakt van %(serverName)s aan dit gesprek deel te nemen.",
+    "Create a room in %(communityName)s": "Een gesprek aanmaken in %(communityName)s",
+    "Enable end-to-end encryption": "Eind-tot-eind-versleuteling inschakelen",
+    "Your server requires encryption to be enabled in private rooms.": "Uw server vereist dat versleuteling in een privégesprek is ingeschakeld.",
+    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Privégesprekken zijn alleen zichtbaar en toegankelijk met een uitnodiging. Openbare gesprekken zijn zichtbaar en toegankelijk voor iedereen.",
+    "An image will help people identify your community.": "Een afbeelding zal anderen helpen uw gemeenschap te vinden.",
+    "Add image (optional)": "Afbeelding toevoegen (niet vereist)",
+    "Enter name": "Naam invoeren",
+    "What's the name of your community or team?": "Welke naam heeft uw gemeenschap of team?",
+    "You can change this later if needed.": "Indien nodig kunt u dit later nog veranderen.",
+    "Community ID: +<localpart />:%(domain)s": "Gemeenschaps-ID: +<localpart />:%(domain)s",
+    "Reason (optional)": "Reden (niet vereist)",
+    "Send %(count)s invites|one": "Stuur %(count)s uitnodiging",
+    "Send %(count)s invites|other": "Stuur %(count)s uitnodigingen",
+    "Show": "Toon",
+    "People you know on %(brand)s": "Mensen die u kent van %(brand)s",
+    "Add another email": "Nog een e-mailadres toevoegen",
+    "Download logs": "Download logboeken",
+    "Add a new server...": "Een nieuwe server toevoegen…",
+    "Server name": "Servernaam",
+    "Add a new server": "Een nieuwe server toevoegen",
+    "Matrix": "Matrix",
+    "Are you sure you want to remove <b>%(serverName)s</b>": "Weet u zeker dat u <b>%(serverName)s</b> wilt verwijderen",
+    "Your server": "Uw server",
+    "Can't find this server or its room list": "Kan deze server of de gesprekkenlijst niet vinden",
+    "Looks good": "Ziet er goed uit",
+    "Enter a server name": "Geef een servernaam",
+    "Continue with %(provider)s": "Doorgaan met %(provider)s",
+    "Homeserver": "Homeserver",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Element with an existing Matrix account on a different homeserver.": "U kunt de aangepaste serverinstellingen gebruiken om u aan te melden bij andere Matrix-servers, door een andere homeserver-URL in te voeren. Dit laat u toe Element te gebruiken met een bestaande Matrix-account bij een andere homeserver.",
+    "Server Options": "Serverinstellingen",
+    "This address is already in use": "Dit adres is al in gebruik",
+    "This address is available to use": "Dit adres kan worden gebruikt",
+    "Please provide a room address": "Geef een gespreksadres",
+    "Room address": "Gespreksadres",
+    "QR Code": "QR-code",
+    "Information": "Informatie",
+    "This version of %(brand)s does not support searching encrypted messages": "Deze versie van %(brand)s ondersteunt niet het doorzoeken van versleutelde berichten",
+    "This version of %(brand)s does not support viewing some encrypted files": "Deze versie van %(brand)s ondersteunt niet de mogelijkheid sommige versleutelde bestanden te weergeven",
+    "Use the <a>Desktop app</a> to search encrypted messages": "Gebruik de <a>Desktop-toepassing</a> om alle versleutelde berichten te zien",
+    "Categories": "Categorieën",
+    "Can't load this message": "Dit bericht kan niet geladen worden",
+    "Click to view edits": "Klik om bewerkingen te zien",
+    "Edited at %(date)s": "Bewerkt op %(date)s",
+    "Message deleted on %(date)s": "Bericht verwijderd op %(date)s",
+    "Message deleted by %(name)s": "Bericht verwijderd door %(name)s",
+    "Message deleted": "Bericht verwijderd",
+    "Join the conference at the top of this room": "Deelnemen aan de vergadering bovenaan dit gesprek",
+    "Ignored attempt to disable encryption": "Poging om versleuteling uit te schakelen genegeerd",
+    "Start verification again from the notification.": "Verificatie opnieuw beginnen vanuit de melding.",
+    "Verified": "Geverifieerd",
+    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "U heeft %(deviceName)s (%(deviceId)s) geverifieerd!",
+    "You've successfully verified your device!": "U heeft uw apparaat geverifieerd!",
+    "Almost there! Is %(displayName)s showing the same shield?": "Bijna klaar! Toont %(displayName)s hetzelfde schild?",
+    "Almost there! Is your other session showing the same shield?": "Bijna klaar! Toont uw andere sessie hetzelfde schild?",
+    "Role": "Rol",
+    "Room settings": "Gespreksinstellingen",
+    "Show files": "Bestanden tonen",
+    "%(count)s people|other": "%(count)s mensen",
+    "About": "Over",
+    "Not encrypted": "Niet versleuteld",
+    "Widgets": "Widgets",
+    "Unpin a widget to view it in this panel": "Maak een widget los om het in dit deel te weergeven",
+    "Unpin": "Losmaken",
+    "You can only pin up to %(count)s widgets|other": "U kunt maar %(count)s widgets vastzetten",
+    "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "In versleutelde gesprekken zijn uw berichten beveiligd, enkel de ontvanger en u hebben de unieke sleutels om ze te ontsleutelen.",
+    "Waiting for you to accept on your other session…": "Wachten totdat u uw uitnodiging in uw andere sessie aanneemt…",
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Stel een adres in zodat gebruikers dit gesprek via uw homeserver (%(localDomain)s) kunnen vinden",
+    "Local Addresses": "Lokale adressen",
+    "Local address": "Lokaal adres",
+    "The server has denied your request.": "De server heeft uw verzoek afgewezen.",
+    "The server is offline.": "De server is offline.",
+    "A browser extension is preventing the request.": "Een invoertoepassing van uw browser verhindert de aanvraag.",
+    "The server (%(serverName)s) took too long to respond.": "De server (%(serverName)s) deed er te lang over om te antwoorden.",
+    "Server isn't responding": "Server reageert niet",
+    "You're all caught up.": "U bent helemaal bij.",
+    "Just a heads up, if you don't add an email and forget your password, you could <b>permanently lose access to your account</b>.": "Let op, wanneer u geen e-mailadres toevoegt en uw wachtwoord vergeet, kunt u <b>toegang tot uw account permanent verliezen</b>.",
+    "Continuing without email": "Doorgaan zonder e-mail",
+    "If they don't match, the security of your communication may be compromised.": "Als deze niet overeenkomen, dan wordt deze sessie mogelijk door iemand anders onderschept.",
+    "Confirm by comparing the following with the User Settings in your other session:": "Om te verifiëren dat deze sessie vertrouwd kan worden, contacteert u de eigenaar via een andere methode (bv. persoonlijk of via een telefoontje) en vraagt u hem/haar of de sleutel die hij/zij ziet in zijn/haar Gebruikersinstellingen van deze sessie overeenkomt met de sleutel hieronder:",
+    "Signature upload failed": "Versturen van ondertekening mislukt",
+    "Signature upload success": "Ondertekening succesvol verstuurd",
+    "Unable to upload": "Versturen niet mogelijk",
+    "Transfer": "Overdragen",
+    "Start a conversation with someone using their name or username (like <userId/>).": "Start een gesprek met iemand door hun naam of gebruikersnaam (zoals <userId/>) te typen.",
+    "May include members not in %(communityName)s": "Mag deelnemers bevatten die geen deel uitmaken van %(communityName)s",
+    "Invite by email": "Via e-mail uitnodigen",
+    "Click the button below to confirm your identity.": "Druk op de knop hieronder om uw identiteit te bevestigen.",
+    "Confirm to continue": "Bevestig om door te gaan",
+    "Report a bug": "Een fout rapporteren",
+    "Comment": "Opmerking",
+    "Add comment": "Opmerking toevoegen",
+    "Tell us below how you feel about %(brand)s so far.": "Vertel ons hoe %(brand)s u tot dusver bevalt.",
+    "Rate %(brand)s": "%(brand)s beoordelen",
+    "Update community": "Gemeenschap bijwerken",
+    "Active Widgets": "Ingeschakelde widgets",
+    "Manually verify all remote sessions": "Handmatig alle externe sessies verifiëren",
+    "System font name": "Systeemlettertypenaam",
+    "Use a system font": "Gebruik een systeemlettertype",
+    "Show line numbers in code blocks": "Regelnummers in codeblokken tonen",
+    "Expand code blocks by default": "Standaard codeblokken uitvouwen",
+    "Show stickers button": "Stickers-knop tonen",
+    "Offline encrypted messaging using dehydrated devices": "Offline versleutelde berichten met gebruik van uitgedroogde apparaten",
+    "Show message previews for reactions in DMs": "Toon berichtvoorbeelden voor reacties in DM's",
+    "New spinner design": "Nieuw laadicoonontwerp",
+    "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Gemeenschappen v2 prototypes. Vereist een compatibele homeserver. Zeer experimenteel - gebruik met voorzichtigheid.",
+    "Safeguard against losing access to encrypted messages & data": "Beveiliging tegen verlies van toegang tot versleutelde berichten en gegevens",
+    "Set up Secure Backup": "Beveiligde back-up instellen",
+    "Contact your <a>server admin</a>.": "Neem contact op met uw <a>serverbeheerder</a>.",
+    "Use app": "Gebruik app",
+    "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Element Web is experimenteel op mobiel. Voor een betere ervaring en de nieuwste functies kunt u onze gratis app gebruiken.",
+    "Use app for a better experience": "Gebruik de app voor een betere ervaring",
+    "Enable desktop notifications": "Bureaubladmeldingen inschakelen",
+    "Don't miss a reply": "Mis geen antwoord",
+    "Unknown App": "Onbekende App",
+    "Error leaving room": "Fout bij verlaten gesprek",
+    "Unexpected server error trying to leave the room": "Onverwachte serverfout bij het verlaten van dit gesprek",
+    "See <b>%(msgtype)s</b> messages posted to your active room": "Zie <b>%(msgtype)s</b>-berichten verstuurd in uw actieve gesprek",
+    "See <b>%(msgtype)s</b> messages posted to this room": "Zie <b>%(msgtype)s</b>-berichten verstuurd in dit gesprek",
+    "Send <b>%(msgtype)s</b> messages as you in your active room": "Stuur <b>%(msgtype)s</b>-berichten als uzelf in uw actieve gesprek",
+    "Send <b>%(msgtype)s</b> messages as you in this room": "Stuur <b>%(msgtype)s</b>-berichten als uzelf in dit gesprek",
+    "See general files posted to your active room": "Zie bestanden verstuurd naar uw actieve gesprek",
+    "See general files posted to this room": "Zie bestanden verstuurd naar dit gesprek",
+    "Send general files as you in your active room": "Stuur bestanden als uzelf in uw actieve gesprek",
+    "Send general files as you in this room": "Stuur bestanden als uzelf in dit gesprek",
+    "See videos posted to your active room": "Zie videos verstuurd naar uw actieve gesprek",
+    "See videos posted to this room": "Zie videos verstuurd naar dit gesprek",
+    "Send videos as you in your active room": "Stuur videos als uzelf in uw actieve gesprek",
+    "Send videos as you in this room": "Stuur videos als uzelf in dit gesprek",
+    "See images posted to your active room": "Zie afbeeldingen verstuurd in uw actieve gesprek",
+    "See images posted to this room": "Zie afbeeldingen verstuurd in dit gesprek",
+    "Send images as you in your active room": "Stuur afbeeldingen als uzelf in uw actieve gesprek",
+    "Send images as you in this room": "Stuur afbeeldingen als uzelf in dit gesprek",
+    "See emotes posted to your active room": "Zie emoticons verstuurd naar uw actieve gesprek",
+    "See emotes posted to this room": "Zie emoticons verstuurd naar dit gesprek",
+    "Send emotes as you in your active room": "Stuur emoticons als uzelf in uw actieve gesprek",
+    "Send emotes as you in this room": "Stuur emoticons als uzelf in dit gesprek",
+    "See text messages posted to your active room": "Zie tekstberichten verstuurd naar uw actieve gesprek",
+    "See text messages posted to this room": "Zie tekstberichten verstuurd naar dit gesprek",
+    "Send text messages as you in your active room": "Stuur tekstberichten als uzelf in uw actieve gesprek",
+    "Send text messages as you in this room": "Stuur tekstberichten als uzelf in dit gesprek",
+    "See messages posted to your active room": "Zie berichten verstuurd naar uw actieve gesprek",
+    "See messages posted to this room": "Zie berichten verstuurd naar dit gesprek",
+    "Send messages as you in your active room": "Stuur berichten als uzelf in uw actieve gesprek",
+    "Send messages as you in this room": "Stuur berichten als uzelf in dit gesprek",
+    "End": "End",
+    "The <b>%(capability)s</b> capability": "De <b>%(capability)s</b> mogelijkheid",
+    "See <b>%(eventType)s</b> events posted to your active room": "Stuur <b>%(eventType)s</b> gebeurtenissen verstuurd in uw actieve gesprek",
+    "Send <b>%(eventType)s</b> events as you in your active room": "Stuur <b>%(eventType)s</b> gebeurtenissen als uzelf in uw actieve gesprek",
+    "See <b>%(eventType)s</b> events posted to this room": "Zie <b>%(eventType)s</b> gebeurtenissen verstuurd in dit gesprek",
+    "Send <b>%(eventType)s</b> events as you in this room": "Stuur <b>%(eventType)s</b> gebeurtenis als uzelf in dit gesprek",
+    "with state key %(stateKey)s": "met statussleutel %(stateKey)s",
+    "with an empty state key": "met een lege statussleutel",
+    "See when anyone posts a sticker to your active room": "Zien wanneer iemand een sticker in uw actieve gesprek verstuurd",
+    "Send stickers to your active room as you": "Stuur stickers naar uw actieve gesprek als uzelf",
+    "See when a sticker is posted in this room": "Zien wanneer stickers in dit gesprek zijn verstuurd",
+    "Send stickers to this room as you": "Stuur stickers in dit gesprek als uzelf",
+    "See when the avatar changes in your active room": "Zien wanneer de avatar in uw actieve gesprek veranderd",
+    "Change the avatar of your active room": "Wijzig de avatar van uw actieve gesprek",
+    "See when the avatar changes in this room": "Zien wanneer de avatar in dit gesprek veranderd",
+    "Change the avatar of this room": "Wijzig de gespreksavatar",
+    "Send stickers into your active room": "Stuur stickers in uw actieve gesprek",
+    "Send stickers into this room": "Stuur stickers in dit gesprek",
+    "Remain on your screen while running": "Blijft op uw scherm terwijl het beschikbaar is",
+    "Remain on your screen when viewing another room, when running": "Blijft op uw scherm wanneer u een andere gesprek bekijkt, zolang het beschikbaar is",
+    "(their device couldn't start the camera / microphone)": "(hun toestel kon de camera / microfoon niet starten)",
+    "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Alle servers zijn verbannen van deelname! Dit gesprek kan niet langer gebruikt worden.",
+    "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s vernaderde de server ACL's voor dit gesprek.",
+    "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s stelde de server ACL's voor dit gesprek in.",
+    "Converts the room to a DM": "Verandert dit groepsgesprek in een DM",
+    "Converts the DM to a room": "Verandert deze DM in een groepsgesprek",
+    "Takes the call in the current room off hold": "De huidige oproep in huidige gesprek in de wacht zetten",
+    "São Tomé & Príncipe": "Sao Tomé en Principe",
+    "Swaziland": "Swaziland",
+    "Sudan": "Soedan",
+    "St. Vincent & Grenadines": "Sint Vincent en de Grenadines",
+    "South Georgia & South Sandwich Islands": "Zuid-Georgia en de Zuidelijke Sandwicheilanden",
+    "St. Pierre & Miquelon": "Sint Pierre en Miquelon",
+    "St. Helena": "Sint Helena",
+    "St. Lucia": "Sint Lucia",
+    "South Sudan": "Zuid-Soedan",
+    "Oman": "Oman",
+    "Theme added!": "Thema toegevoegd!",
+    "Add theme": "Thema toevoegen",
+    "No recently visited rooms": "Geen onlangs bezochte gesprekken",
+    "Use the <a>Desktop app</a> to see all encrypted files": "Gebruik de <a>Desktop-app</a> om alle versleutelde bestanden te zien",
+    "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Herinnering: Uw browser wordt niet ondersteund. Dit kan een negatieve impact hebben op uw ervaring.",
+    "Use this when referencing your community to others. The community ID cannot be changed.": "Gebruik dit om anderen naar uw gemeenschap te verwijzen. De gemeenschaps-ID kan later niet meer veranderd worden.",
+    "Please go into as much detail as you like, so we can track down the problem.": "Gebruik a.u.b. zoveel mogelijk details, zodat wij uw probleem kunnen vinden.",
+    "There are two ways you can provide feedback and help us improve %(brand)s.": "U kunt op twee manieren feedback geven en ons helpen %(brand)s te verbeteren.",
+    "Please view <existingIssuesLink>existing bugs on Github</existingIssuesLink> first. No match? <newIssueLink>Start a new one</newIssueLink>.": "Bekijk eerst de <existingIssuesLink>bestaande problemen op Github</existingIssuesLink>. <newIssueLink>Maak een nieuwe aan</newIssueLink> wanneer u uw probleem niet heeft gevonden.",
+    "Invite someone using their name, email address, username (like <userId/>) or <a>share this room</a>.": "Nodig iemand uit door gebruik te maken van hun naam, e-mailadres, gebruikersnaam (zoals <userId/>) of <a>deel dit gesprek</a>.",
+    "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.": "Nodig iemand uit door gebruik te maken van hun naam, gebruikersnaam (zoals <userId/>) of <a>deel dit gesprek</a>.",
+    "Send feedback": "Feedback versturen",
+    "Feedback": "Feedback",
+    "Feedback sent": "Feedback verstuurd",
+    "Workspace: <networkLink/>": "Werkplaats: <networkLink/>",
+    "Your firewall or anti-virus is blocking the request.": "Uw firewall of antivirussoftware blokkeert de aanvraag.",
+    "Show chat effects": "Gesprekseffecten tonen",
+    "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Stel de naam in van een lettertype dat op uw systeem is geïnstalleerd en %(brand)s zal proberen het te gebruiken.",
+    "Toggle this dialog": "Dit dialoogvenster in- of uitschakelen",
+    "Toggle right panel": "Rechterpaneel in- of uitschakelen",
+    "Toggle the top left menu": "Het menu linksboven in- of uitschakelen",
+    "Toggle video on/off": "Video in- of uitschakelen",
+    "Toggle microphone mute": "Microfoon dempen in- of uitschakelen",
+    "Toggle Quote": "Quote in- of uitschakelen",
+    "Toggle Italics": "Cursief in- of uitschakelen",
+    "Toggle Bold": "Vetgedrukt in- of uitschakelen",
+    "Go to Home View": "Ga naar welkomscherm",
+    "Activate selected button": "Geselecteerde knop activeren",
+    "Close dialog or context menu": "Dialoogvenster of contextmenu sluiten",
+    "Previous/next room or DM": "Vorige/volgende gesprek",
+    "Previous/next unread room or DM": "Vorige/volgende ongelezen gesprek",
+    "Clear room list filter field": "Gespreklijst filter wissen",
+    "Expand room list section": "Gespreklijst selectie uitvouwen",
+    "Collapse room list section": "Gespreklijst selectie invouwen",
+    "Select room from the room list": "Gesprek uit de gespreklijst selecteren",
+    "Navigate up/down in the room list": "Omhoog/omlaag in de gespreklijst navigeren",
+    "Jump to room search": "Ga naar gesprek zoeken",
+    "Search (must be enabled)": "Zoeken (moet zijn ingeschakeld)",
+    "Upload a file": "Bestand uploaden",
+    "Jump to oldest unread message": "Ga naar het oudste ongelezen bericht",
+    "Dismiss read marker and jump to bottom": "Verlaat de leesmarkering en spring naar beneden",
+    "Scroll up/down in the timeline": "Omhoog/omlaag in de tijdlijn scrollen",
+    "Cancel replying to a message": "Antwoord op bericht annuleren",
+    "Navigate composer history": "Berichtveldgeschiedenis navigeren",
+    "Jump to start/end of the composer": "Ga naar begin/eind van de berichtveld",
+    "Navigate recent messages to edit": "Navigeer recente berichten om te bewerken",
+    "New line": "Nieuwe regel",
+    "Page Up": "Page Up",
+    "Page Down": "Page Down",
+    "Esc": "Esc",
+    "Enter": "Enter",
+    "Space": "Spatie",
+    "Ctrl": "Ctrl",
+    "Super": "Super",
+    "Shift": "Shift",
+    "Alt Gr": "Alt Gr",
+    "Alt": "Alt",
+    "Cancel autocomplete": "Autoaanvullen annuleren",
+    "Move autocomplete selection up/down": "Autoaanvullen selectie omhoog/omlaag verplaatsen",
+    "Autocomplete": "Autoaanvullen",
+    "Room List": "Gespreklijst",
+    "Calls": "Oproepen",
+    "Navigation": "Navigatie",
+    "Currently indexing: %(currentRoom)s": "Momenteel indexeren: %(currentRoom)s",
+    "Enter your recovery passphrase a second time to confirm it.": "Voer uw herstel wachtwoord een tweede keer in om te bevestigen.",
+    "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "Deze sessie heeft ontdekt dat uw veiligheidszin en sleutel voor versleutelde berichten zijn verwijderd.",
+    "A new Security Phrase and key for Secure Messages have been detected.": "Er is een nieuwe veiligheidszin en sleutel voor versleutelde berichten gedetecteerd.",
+    "Save your Security Key": "Uw veiligheidssleutel opslaan",
+    "Confirm Security Phrase": "Veiligheidszin bevestigen",
+    "Set a Security Phrase": "Een veiligheidszin instellen",
+    "You can also set up Secure Backup & manage your keys in Settings.": "U kunt ook een beveiligde back-up instellen en uw sleutels beheren via instellingen.",
+    "Secure Backup": "Beveiligde back-up",
+    "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "Geen toegang tot sleutelopslag. Controleer of u de juiste veiligheidszin hebt ingevoerd.",
+    "Secret storage:": "Sleutelopslag:",
+    "Unable to query secret storage status": "Kan status sleutelopslag niet opvragen",
+    "Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.": "Bewaar uw veiligheidssleutel op een veilige plaats, zoals in een wachtwoordmanager of een kluis, aangezien deze wordt gebruikt om uw versleutelde gegevens te beveiligen.",
+    "Confirm your recovery passphrase": "Bevestig uw herstel wachtwoord",
+    "Use a different passphrase?": "Gebruik een ander wachtwoord?",
+    "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.": "Voer een veiligheidszin in die alleen u kent, aangezien deze wordt gebruikt om uw gegevens te versleutelen. Om veilig te zijn, moet u het wachtwoord van uw account niet opnieuw gebruiken.",
+    "Safeguard against losing access to encrypted messages & data by backing up encryption keys on your server.": "Bescherm uw server tegen toegangsverlies tot versleutelde berichten en gegevens door een back-up te maken van de versleutelingssleutels.",
+    "Use a secret phrase only you know, and optionally save a Security Key to use for backup.": "Gebruik een veiligheidszin die alleen u kent, en sla optioneel een veiligheidssleutel op om te gebruiken als back-up.",
+    "We’ll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": "Wij maken een veiligheidssleutel voor u aan die u ergens veilig kunt opbergen, zoals in een wachtwoordmanager of een kluis.",
+    "Generate a Security Key": "Genereer een veiligheidssleutel",
+    "Make a copy of your Security Key": "Maak een kopie van uw veiligheidssleutel",
+    "Confirm your Security Phrase": "Bevestig uw veiligheidszin",
+    "Secure your backup with a Security Phrase": "Beveilig uw back-up met een veiligheidszin",
+    "Your Security Key is in your <b>Downloads</b> folder.": "Uw veiligheidssleutel staat in uw <b>Downloads</b>-map.",
+    "Your Security Key has been <b>copied to your clipboard</b>, paste it to:": "Uw veiligheidssleutel is <b>gekopieerd naar uw klembord</b>, plak het in:",
+    "Your Security Key": "Uw veiligheidssleutel",
+    "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "Uw veiligheidssleutel is een vangnet - u kunt hem gebruiken om de toegang tot uw versleutelde berichten te herstellen als u uw veiligheidszin bent vergeten.",
+    "Repeat your Security Phrase...": "Herhaal uw veiligheidszin...",
+    "Please enter your Security Phrase a second time to confirm.": "Voer uw veiligheidszin een tweede keer in om te bevestigen.",
+    "Set up with a Security Key": "Instellen met een veiligheidssleutel",
+    "Great! This Security Phrase looks strong enough.": "Geweldig. Deze veiligheidszin ziet er sterk genoeg uit.",
+    "Enter a Security Phrase": "Veiligheidszin invoeren",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "Wij bewaren een versleutelde kopie van uw sleutels op onze server. Beveilig uw back-up met een veiligheidszin.",
+    "or another cross-signing capable Matrix client": "of een andere Matrix-client die kruislings kan ondertekenen",
+    "%(brand)s Android": "%(brand)s Android",
+    "%(brand)s iOS": "%(brand)s iOS",
+    "%(brand)s Desktop": "%(brand)s Desktop",
+    "%(brand)s Web": "%(brand)s Web",
+    "This requires the latest %(brand)s on your other devices:": "Dit vereist de nieuwste %(brand)s op uw andere toestellen:",
+    "Use Security Key": "Gebruik veiligheidssleutel",
+    "Use Security Key or Phrase": "Gebruik veiligheidssleutel of -zin",
+    "Decide where your account is hosted": "Kies waar uw account wordt gehost",
+    "Host account on": "Host uw account op",
+    "Already have an account? <a>Sign in here</a>": "Heeft u al een account? <a>Aanmelden</a>",
+    "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s of %(usernamePassword)s",
+    "Continue with %(ssoButtons)s": "Ga verder met %(ssoButtons)s",
+    "That username already exists, please try another.": "Die gebruikersnaam bestaat al, probeer een andere.",
+    "New? <a>Create account</a>": "Nieuw? <a>Maak een account aan</a>",
+    "If you've joined lots of rooms, this might take a while": "Als u zich bij veel gesprekken heeft aangesloten, kan dit een tijdje duren",
+    "Signing In...": "Aanmelden...",
+    "Syncing...": "Synchroniseren...",
+    "There was a problem communicating with the homeserver, please try again later.": "Er was een communicatieprobleem met de homeserver, probeer het later opnieuw.",
+    "Community and user menu": "Gemeenschaps- en gebruikersmenu",
+    "User menu": "Gebruikersmenu",
+    "Switch theme": "Thema wisselen",
+    "Community settings": "Gemeenschapsinstellingen",
+    "User settings": "Gebruikersinstellingen",
+    "Security & privacy": "Veiligheid & privacy",
+    "New here? <a>Create an account</a>": "Nieuw hier? <a>Maak een account</a>",
+    "Got an account? <a>Sign in</a>": "Heeft u een account? <a>Aanmelden</a>",
+    "Failed to find the general chat for this community": "De algemene chat voor deze gemeenschap werd niet gevonden",
+    "Filter rooms and people": "Gespreken en personen filteren",
+    "Explore rooms in %(communityName)s": "Ontdek de gesprekken van %(communityName)s",
+    "delete the address.": "het adres verwijderen.",
+    "Delete the room address %(alias)s and remove %(name)s from the directory?": "Het gespreksadres %(alias)s en %(name)s uit de catalogus verwijderen?",
+    "You have no visible notifications.": "U hebt geen zichtbare meldingen.",
+    "You’re all caught up": "U bent helemaal bij",
+    "Self-verification request": "Verzoek om zelfverificatie",
+    "You do not have permission to create rooms in this community.": "U hebt geen toestemming om gesprekken te maken in deze gemeenschap.",
+    "Cannot create rooms in this community": "Kan geen gesprek maken in deze gemeenschap",
+    "Upgrade to pro": "Upgrade naar pro",
+    "Now, let's help you get started": "Laten we u helpen om te beginnen",
+    "Welcome %(name)s": "Welkom %(name)s",
+    "Add a photo so people know it's you.": "Voeg een foto toe zodat mensen weten dat u het bent.",
+    "Great, that'll help people know it's you": "Geweldig, dat zal mensen helpen te weten dat u het bent",
+    "<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 voor de pagina van uw gemeenschap</h1>\n<p>\nGebruik de lange beschrijving om nieuwe deelnemers voor te stellen aan de gemeenschap, of verspreid enkele belangrijke <a href=\"foo\">links</a>\n</p>\n<p>\nU kunt zelfs afbeeldingen toevoegen met Matrix URL's <img src=\"mxc://url\" />\n</p>\n",
+    "Create community": "Gemeenschap aanmaken",
+    "Attach files from chat or just drag and drop them anywhere in a room.": "Voeg bestanden toe vanuit het gesprek of sleep ze in een gesprek.",
+    "No files visible in this room": "Geen bestanden zichtbaar in dit gesprek",
+    "Sign in with SSO": "Aanmelden met SSO",
+    "Use email to optionally be discoverable by existing contacts.": "Gebruik e-mail om optioneel ontdekt te worden door bestaande contacten.",
+    "Use email or phone to optionally be discoverable by existing contacts.": "Gebruik e-mail of telefoon om optioneel ontdekt te kunnen worden door bestaande contacten.",
+    "Add an email to be able to reset your password.": "Voeg een e-mail toe om uw wachtwoord te kunnen resetten.",
+    "Forgot password?": "Wachtwoord vergeten?",
+    "That phone number doesn't look quite right, please check and try again": "Dat telefoonnummer ziet er niet goed uit, controleer het en probeer het opnieuw",
+    "Enter phone number": "Telefoonnummer invoeren",
+    "Enter email address": "E-mailadres invoeren",
+    "Something went wrong in confirming your identity. Cancel and try again.": "Er is iets misgegaan bij het bevestigen van uw identiteit. Annuleer en probeer het opnieuw.",
+    "Open the link in the email to continue registration.": "Open de link in de e-mail om verder te gaan met de registratie.",
+    "A confirmation email has been sent to %(emailAddress)s": "Er is een bevestigingsmail verzonden naar %(emailAddress)s",
+    "Away": "Afwezig",
+    "Move right": "Ga naar rechts",
+    "Move left": "Ga naar links",
+    "Revoke permissions": "Machtigingen intrekken",
+    "Take a picture": "Neem een foto",
+    "Hold": "Vasthouden",
+    "Resume": "Hervatten",
+    "If you've forgotten your Security Key you can <button>set up new recovery options</button>": "Als u uw veiligheidssleutel bent vergeten, kunt u <button>nieuwe herstelopties instellen</button>",
+    "Access your secure message history and set up secure messaging by entering your Security Key.": "Ga naar uw veilige berichtengeschiedenis en stel veilige berichten in door uw veiligheidssleutel in te voeren.",
+    "Not a valid Security Key": "Geen geldige veiligheidssleutel",
+    "This looks like a valid Security Key!": "Dit lijkt op een geldige veiligheidssleutel!",
+    "Enter Security Key": "Veiligheidssleutel invoeren",
+    "If you've forgotten your Security Phrase you can <button1>use your Security Key</button1> or <button2>set up new recovery options</button2>": "Als u uw veiligheidszin bent vergeten, kunt u <button1>uw veiligheidssleutel gebruiken</button1> of <button2>nieuwe herstelopties instellen</button2>",
+    "Access your secure message history and set up secure messaging by entering your Security Phrase.": "Ga naar uw veilige berichtengeschiedenis en stel veilige berichten in door uw veiligheidszin in te voeren.",
+    "Enter Security Phrase": "Voer veiligheidszin in",
+    "Successfully restored %(sessionCount)s keys": "Succesvol %(sessionCount)s sleutels hersteld",
+    "Keys restored": "Sleutels hersteld",
+    "Backup could not be decrypted with this Security Phrase: please verify that you entered the correct Security Phrase.": "Back-up kon niet worden gedecodeerd met deze veiligheidszin: controleer of u de juiste veiligheidszin hebt ingevoerd.",
+    "Incorrect Security Phrase": "Onjuiste veiligheidszin",
+    "Backup could not be decrypted with this Security Key: please verify that you entered the correct Security Key.": "Back-up kon niet worden ontcijferd met deze veiligheidssleutel: controleer of u de juiste veiligheidssleutel hebt ingevoerd.",
+    "Security Key mismatch": "Verkeerde veiligheidssleutel",
+    "%(completed)s of %(total)s keys restored": "%(completed)s van %(total)s sleutels hersteld",
+    "Fetching keys from server...": "Sleutels ophalen van server...",
+    "Restoring keys from backup": "Sleutels herstellen vanaf back-up",
+    "Unable to set up keys": "Kan geen sleutels instellen",
+    "Click the button below to confirm setting up encryption.": "Klik op de knop hieronder om het instellen van de versleuting te bevestigen.",
+    "Confirm encryption setup": "Bevestig versleuting instelling",
+    "Use your Security Key to continue.": "Gebruik uw veiligheidssleutel om verder te gaan.",
+    "Security Key": "Veiligheidssleutel",
+    "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "Voer uw veiligheidszin in of <button>gebruik uw veiligheidssleutel</button> om verder te gaan.",
+    "Security Phrase": "Veiligheidszin",
+    "Invalid Security Key": "Ongeldige veiligheidssleutel",
+    "Wrong Security Key": "Verkeerde veiligheidssleutel",
+    "Looks good!": "Ziet er goed uit!",
+    "Wrong file type": "Verkeerd bestandstype",
+    "Remember this": "Onthoud dit",
+    "The widget will verify your user ID, but won't be able to perform actions for you:": "De widget zal uw gebruikers-ID verifiëren, maar zal geen acties voor u kunnen uitvoeren:",
+    "Allow this widget to verify your identity": "Sta deze widget toe om uw identiteit te verifiëren",
+    "Decline All": "Alles weigeren",
+    "Approve": "Goedkeuren",
+    "This widget would like to:": "Deze widget zou willen:",
+    "Approve widget permissions": "Machtigingen voor widgets goedkeuren",
+    "Use your preferred Matrix homeserver if you have one, or host your own.": "Gebruik de Matrix-homeserver van uw voorkeur als u er een hebt, of host uw eigen.",
+    "We call the places where you can host your account ‘homeservers’.": "Wij noemen de plaatsen waar u uw account kunt hosten 'homeservers'.",
+    "Unable to validate homeserver": "Kan homeserver niet valideren",
+    "Recent changes that have not yet been received": "Recente wijzigingen die nog niet zijn ontvangen",
+    "The server is not configured to indicate what the problem is (CORS).": "De server is niet geconfigureerd om aan te geven wat het probleem is (CORS).",
+    "A connection error occurred while trying to contact the server.": "Er is een verbindingsfout opgetreden tijdens het contact maken met de server.",
+    "Your area is experiencing difficulties connecting to the internet.": "Uw regio ondervindt problemen bij de verbinding met het internet.",
+    "Your server isn't responding to some of your requests. Below are some of the most likely reasons.": "Uw server reageert niet op sommige van uw verzoeken. Hieronder staan enkele van de meest waarschijnlijke redenen.",
+    "We recommend you change your password and Security Key in Settings immediately": "Wij raden u aan uw wachtwoord en veiligheidssleutel in de instellingen onmiddellijk te wijzigen",
+    "Data on this screen is shared with %(widgetDomain)s": "Gegevens op dit scherm worden gedeeld met %(widgetDomain)s",
+    "Modal Widget": "Modale widget",
+    "Confirm this user's session by comparing the following with their User Settings:": "Bevestig de sessie van deze gebruiker door het volgende te vergelijken met zijn gebruikersinstellingen:",
+    "Cancelled signature upload": "Geannuleerde ondertekening upload",
+    "%(brand)s encountered an error during upload of:": "%(brand)s is een fout tegengekomen tijdens het uploaden van:",
+    "a key signature": "een sleutel ondertekening",
+    "a device cross-signing signature": "een apparaat kruiselings ondertekenen ondertekening",
+    "a new cross-signing key signature": "een nieuwe kruiselings ondertekenen ondertekening",
+    "a new master key signature": "een nieuwe hoofdsleutel ondertekening",
+    "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>": "Dit zal ze niet uitnodigen voor %(communityName)s. Als u iemand wilt uitnodigen voor %(communityName)s, klik <a>hier</a>",
+    "Failed to transfer call": "Gesprek niet doorverbonden",
+    "A call can only be transferred to a single user.": "Een oproep kan slechts naar één gebruiker worden doorverbonden.",
+    "Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.": "Meer informatie vindt u in onze <privacyPolicyLink />, <termsOfServiceLink /> en <cookiePolicyLink />.",
+    "Continuing temporarily allows the %(hostSignupBrand)s setup process to access your account to fetch verified email addresses. This data is not stored.": "Door tijdelijk door te gaan, krijgt het installatieproces van %(hostSignupBrand)s toegang tot uw account om geverifieerde e-mailadressen op te halen. Deze gegevens worden niet opgeslagen.",
+    "Failed to connect to your homeserver. Please close this dialog and try again.": "Kan geen verbinding maken met uw homeserver. Sluit dit dialoogvenster en probeer het opnieuw.",
+    "Are you sure you wish to abort creation of the host? The process cannot be continued.": "Weet u zeker dat u het aanmaken van de host wilt afbreken? Het proces kan niet worden voortgezet.",
+    "PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> to help us track down the problem.": "PRO TIP: Als u een bug start, stuur ons dan <debugLogsLink>debug logs</debugLogsLink> om ons te helpen het probleem op te sporen.",
+    "There was an error updating your community. The server is unable to process your request.": "Er is een fout opgetreden bij het updaten van uw gemeenschap. De server is niet in staat om uw verzoek te verwerken.",
+    "There was an error finding this widget.": "Er is een fout opgetreden bij het vinden van deze widget.",
+    "Server did not return valid authentication information.": "Server heeft geen geldige verificatiegegevens teruggestuurd.",
+    "Server did not require any authentication": "Server heeft geen authenticatie nodig",
+    "There was a problem communicating with the server. Please try again.": "Er was een communicatie probleem met de server. Probeer het opnieuw.",
+    "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.": "U zou dit kunnen uitschakelen als dit gesprek gebruikt zal worden om samen te werken met externe teams die hun eigen homeserver hebben. Dit kan later niet meer veranderd worden.",
+    "Verify other session": "Verifier andere sessies",
+    "About homeservers": "Over homeservers",
+    "Learn more": "Lees verder",
+    "Other homeserver": "Andere homeserver",
+    "Sign into your homeserver": "Login op uw homeserver",
+    "Specify a homeserver": "Specificeer een homeserver",
+    "Invalid URL": "Ongeldige URL",
+    "Upload completed": "Upload voltooid",
+    "Maximize dialog": "Maximaliseer dialoog",
+    "%(hostSignupBrand)s Setup": "%(hostSignupBrand)s Installatie",
+    "You should know": "U moet weten",
+    "Privacy Policy": "Privacystatement",
+    "Cookie Policy": "Cookiebeleid",
+    "Abort": "Annuleren",
+    "Confirm abort of host creation": "Bevestig het annuleren van de host creatie",
+    "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "U zou dit kunnen aanzetten als dit gesprek alleen gebruikt zal worden voor samenwerking met interne teams op uw homeserver. Dit kan later niet meer veranderd worden.",
+    "You can’t disable this later. Bridges & most bots won’t work yet.": "U kunt dit later niet uitschakelen. Bruggen en de meeste bots zullen nog niet werken.",
+    "There was an error creating your community. The name may be taken or the server is unable to process your request.": "Er is een fout opgetreden bij het aanmaken van uw gemeenschap. De naam kan bezet zijn of de server is niet in staat om uw aanvraag te verwerken.",
+    "Preparing to download logs": "Klaarmaken om logs te downloaden",
+    "Matrix rooms": "Matrix-gesprekken",
+    "%(networkName)s rooms": "%(networkName)s gesprekken",
+    "Enter the name of a new server you want to explore.": "Voer de naam in van een nieuwe server die u wilt verkennen.",
+    "Remove server": "Server verwijderen",
+    "All rooms": "Alle gesprekken",
+    "Windows": "Windows",
+    "Screens": "Schermen",
+    "Share your screen": "Uw scherm delen",
+    "Submit logs": "Logs versturen",
+    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Berichten in dit gesprek zijn eind-tot-eind-versleuteld. Als mensen deelnemen, kan u ze verifiëren in hun profiel, tik gewoon op hun avatar.",
+    "In encrypted rooms, verify all users to ensure it’s secure.": "Controleer alle gebruikers in versleutelde gesprekken om er zeker van te zijn dat het veilig is.",
+    "Verify all users in a room to ensure it's secure.": "Controleer alle gebruikers in een gesprek om er zeker van te zijn dat hij veilig is.",
+    "%(count)s people|one": "%(count)s persoon",
+    "Add widgets, bridges & bots": "Widgets, bruggen & bots toevoegen",
+    "Edit widgets, bridges & bots": "Widgets, bruggen & bots bewerken",
+    "Set my room layout for everyone": "Stel mijn gesprekindeling in voor iedereen",
+    "New published address (e.g. #alias:server)": "Nieuw gepubliceerd adres (b.v. #alias:server)",
+    "No other published addresses yet, add one below": "Nog geen andere gepubliceerde adressen, voeg er hieronder een toe",
+    "Other published addresses:": "Andere gepubliceerde adressen:",
+    "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.": "Gepubliceerde adressen kunnen door iedereen op elke server gebruikt worden om aan je groep deel te nemen. Om een adres te publiceren moet het eerste ingesteld worden als lokaaladres.",
+    "Published Addresses": "Gepubliceerde adressen",
+    "Mentions & Keywords": "Vermeldingen & Trefwoorden",
+    "Use the + to make a new room or explore existing ones below": "Gebruik de + om een nieuw gesprek te starten of ontdek de bestaande groepen hieronder",
+    "Open dial pad": "Kiestoetsen openen",
+    "Recently visited rooms": "Onlangs geopende gesprekken",
+    "Add a photo, so people can easily spot your room.": "Voeg een foto toe, zodat mensen je gemakkelijk kunnen herkennen in het gesprek.",
+    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Alleen u beiden nemen deel aan dit gesprek, tenzij een van u beiden iemand uitnodigt om deel te nemen.",
+    "Emoji picker": "Emoji kiezer",
+    "Room ID or address of ban list": "Gesprek-ID of het adres van de banlijst",
+    "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.": "Voeg hier gebruikers en servers toe die u wilt negeren. Gebruik asterisken om %(brand)s met alle tekens te laten overeenkomen. Bijvoorbeeld, <code>@bot:*</code> zou alle gebruikers negeren die de naam 'bot' hebben op elke server.",
+    "Please verify the room ID or address and try again.": "Controleer het gesprek-ID of het adres en probeer het opnieuw.",
+    "Message layout": "Berichtlayout",
+    "Custom theme URL": "Aangepaste thema-URL",
+    "Error downloading theme information.": "Fout bij het downloaden van de thema-informatie.",
+    "Invalid theme schema.": "Ongeldig themaschema.",
+    "Hey you. You're the best!": "Hey. U bent de beste!",
+    "Backup key cached:": "Back-up sleutel cached:",
+    "Backup key stored:": "Back-up sleutel bewaard:",
+    "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 Security Key.": "Maak een back-up van uw encryptiesleutels met uw accountgegevens voor het geval u de toegang tot uw sessies verliest. Uw sleutels worden beveiligd met een unieke veiligheidssleutel.",
+    "well formed": "goed gevormd",
+    "%(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 kan versleutelde berichten niet veilig lokaal opslaan in een webbrowser. Gebruik <desktopLink>%(brand)s Desktop</desktopLink> om versleutelde berichten in zoekresultaten te laten verschijnen.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Veilig lokaal opslaan van versleutelde berichten zodat ze in de zoekresultaten verschijnen, gebruik %(size)s voor het opslaan van berichten uit %(rooms)s gesprek.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Veilig lokaal opslaan van versleutelde berichten zodat ze in de zoekresultaten verschijnen, gebruik %(size)s voor het opslaan van berichten uit %(rooms)s gesprekken.",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Elke sessie die door een gebruiker wordt gebruikt, afzonderlijk verifiëren om deze als vertrouwd aan te merken, waarbij geen vertrouwen wordt gesteld in kruiselings ondertekende apparaten.",
+    "User signing private key:": "Gebruiker ondertekening privésleutel:",
+    "Master private key:": "Hoofd privésleutel:",
+    "Self signing private key:": "Zelfondertekenende privésleutel:",
+    "Cross-signing is not set up.": "Kruiselings ondertekenen is niet ingesteld.",
+    "Cross-signing is ready for use.": "Kruiselings ondertekenen is klaar voor gebruik.",
+    "Your server isn't responding to some <a>requests</a>.": "Uw server reageert niet op sommige <a>verzoeken</a>.",
+    "Dial pad": "Kiestoetsen",
+    "%(name)s on hold": "%(name)s in de wacht",
+    "%(peerName)s held the call": "%(peerName)s heeft de oproep in de wacht",
+    "You held the call <a>Resume</a>": "U heeft een oproep in de wacht <a>Hervat</a>",
+    "You held the call <a>Switch</a>": "U heeft een oproep in de wacht <a>Wissel</a>",
+    "Sends the given message with snowfall": "Verstuur het bericht met sneeuwval",
+    "Sends the given message with fireworks": "Verstuur het bericht met vuurwerk",
+    "Sends the given message with confetti": "Verstuur het bericht met confetti",
+    "IRC display name width": "Breedte IRC-weergavenaam",
+    "Enable experimental, compact IRC style layout": "Compacte IRC-layout (experimenteel) inschakelen",
+    "Minimize dialog": "Dialoog minimaliseren",
+    "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "Als u nu annuleert, kunt u versleutelde berichten en gegevens verliezen als u geen toegang meer heeft tot uw login.",
+    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Bevestig uw identiteit door deze login te verifiëren vanuit een van uw andere sessies, waardoor u toegang krijgt tot uw versleutelde berichten.",
+    "Verify this login": "Controleer deze login",
+    "To continue, use Single Sign On to prove your identity.": "Om verder te gaan, gebruik uw eenmalige aanmelding om uw identiteit te bewijzen.",
+    "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Plakt ( ͡° ͜ʖ ͡°) vóór een bericht zonder opmaak",
+    "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "Plakt ┬──┬ ノ( ゜-゜ノ) vóór een bericht zonder opmaak",
+    "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "Plakt (╯°□°）╯︵ ┻━┻ vóór een bericht zonder opmaak",
+    "Liberate your communication": "Bevrijd uw communicatie",
+    "Create a Group Chat": "Maak een groepsgesprek aan",
+    "Send a Direct Message": "Start een direct gesprek",
+    "Welcome to %(appName)s": "Welkom bij %(appName)s",
+    "<a>Add a topic</a> to help people know what it is about.": "<a>Stel een gespreksonderwerp in</a> zodat mensen weten waar het over gaat."
 }
diff --git a/src/i18n/strings/nn.json b/src/i18n/strings/nn.json
index 52cbfc75e1..478f05b5cb 100644
--- a/src/i18n/strings/nn.json
+++ b/src/i18n/strings/nn.json
@@ -744,7 +744,7 @@
     "Labs": "Labben",
     "Check for update": "Sjå etter oppdateringar",
     "Reject all %(invitedRooms)s invites": "Kanseller alle invitasjonar frå %(invitedRooms)s",
-    "Start automatically after system login": "Start automagisk etter systeminnlogging",
+    "Start automatically after system login": "Start automatisk etter systeminnlogging",
     "No media permissions": "Ingen mediatilgang",
     "You may need to manually permit %(brand)s to access your microphone/webcam": "Det kan henda at du må gje %(brand)s tilgang til mikrofonen/nettkameraet for hand",
     "No Audio Outputs detected": "Ingen ljodavspelingseiningar funne",
@@ -1331,5 +1331,50 @@
     "Join millions for free on the largest public server": "Kom ihop med millionar av andre på den største offentlege tenaren",
     "Order rooms by name": "Sorter rom etter namn",
     "Show rooms with unread notifications first": "Vis rom med ulesne varsel fyrst",
-    "Show rooms with unread messages first": "Vis rom med ulesne meldingar fyrst"
+    "Show rooms with unread messages first": "Vis rom med ulesne meldingar fyrst",
+    "People": "Folk",
+    "Show tray icon and minimize window to it on close": "Vis ikon i systemstatusfeltet og minimer vindauget dit ved lukking",
+    "Always show the window menu bar": "Vis alltid menyfeltet i toppen av vindauget",
+    "Report a bug": "Send inn feilrapport",
+    "%(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>.": "Feilkode %(errcode)s vart returnert under lasting av rommet. Viss du trur dette er ein feil, <issueLink>send inn ein feilrapport</issueLink>.",
+    "Feedback": "Tilbakemeldingar",
+    "Security & privacy": "Sikkerheit og personvern",
+    "All settings": "Alle innstillingar",
+    "Use default": "Bruk standard",
+    "Delete Backup": "Slett sikkerheitskopi",
+    "Restore from Backup": "Gjenopprett frå sikkerheitskopi",
+    "This session is backing up your keys. ": "Denne økta har aktivert sikkerheitskopiering av nøklane dine ",
+    "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.": "Lag sikkerheitskopiar av krypteringsnøklane saman med kontoinnstillingane, slik at du kan gjenopprette data viss det skulle skje at du å mister tilgang til øktene dine. Sikkerheitskopiane er beskytta med ein unik gjenopprettingsnøkkel (Recovery Key).",
+    "Encryption": "Kryptografi",
+    "Use Ctrl + Enter to send a message": "Bruk Ctrl + Enter for å sende meldingar",
+    "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Skriv  namnet på skrifttypen(fonten) og %(brand)s forsøka å henta den frå operativsystemet.",
+    "Use a system font": "Bruk tilpassa skrifttype henta frå operativsystemet",
+    "System font name": "Namn på skrifttype",
+    "Enable experimental, compact IRC style layout": "Bruk ei kompakt, IRC-liknande visning (eksperimentell)",
+    "Use a more compact ‘Modern’ layout": "Bruk 'Modern layout' -  ei meir kompakt visning",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "Tilpassa skriftstorleik må vere mellom %(min)s og %(max)s punkt",
+    "Font size": "Skriftstorleik",
+    "Dark": "Mørkt tema",
+    "Light": "Lyst tema",
+    "Appearance": "Utsjånad",
+    "Appearance Settings only affect this %(brand)s session.": "Innstillingane gjeld berre for denne %(brand)s-økta.",
+    "Customise your appearance": "Tilpass utsjånad",
+    "Change notification settings": "Endra varslingsinnstillingar",
+    "Enable desktop notifications": "Aktiver skrivebordsvarsel",
+    "Toggle video on/off": "Slå video på/av",
+    "Video conference started by %(senderName)s": "Videokonferanse starta av %(senderName)s",
+    "Video conference updated by %(senderName)s": "Videokonferanse oppdatert av %(senderName)s",
+    "Video conference ended by %(senderName)s": "Videokonferanse avslutta av %(senderName)s",
+    "Show previews of messages": "Vis førehandsvisningar for meldingar",
+    "Activity": "Aktivitet",
+    "Sort by": "Sorter etter",
+    "List options": "Sjå alternativ",
+    "Explore Public Rooms": "Utforsk offentlege rom",
+    "Explore all public rooms": "Utforsk alle offentlege rom",
+    "Explore public rooms": "Utforsk offentlege rom",
+    "Use Ctrl + F to search": "Bruk Ctrl + F for søk",
+    "Identity Server": "Identitetstenar",
+    "Email Address": "E-postadresse",
+    "Go Back": "Gå attende",
+    "Notification settings": "Varslingsinnstillingar"
 }
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 1343405781..7a98a8f003 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -385,7 +385,7 @@
     "Error decrypting audio": "Błąd deszyfrowania audio",
     "Error decrypting image": "Błąd deszyfrowania obrazu",
     "Error decrypting video": "Błąd deszyfrowania wideo",
-    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Próbowano załadować konkretny punkt na osi czasu w tym pokoju, ale nie nie można go znaleźć.",
+    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Próbowano załadować konkretny punkt na osi czasu w tym pokoju, ale nie można go znaleźć.",
     "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.": "Wyeksportowany plik pozwoli każdej osobie będącej w stanie go odczytać na deszyfrację jakichkolwiek zaszyfrowanych wiadomości, które możesz zobaczyć, tak więc zalecane jest zachowanie ostrożności. Aby w tym pomóc, powinieneś/aś wpisać hasło poniżej; hasło to będzie użyte do zaszyfrowania wyeksportowanych danych. Późniejsze zaimportowanie tych danych będzie możliwe tylko po uprzednim podaniu owego hasła.",
     " (unsupported)": " (niewspierany)",
     "Idle": "Bezczynny(-a)",
@@ -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",
@@ -771,7 +771,7 @@
     "was invited %(count)s times|one": "został(a) zaproszony(-a)",
     "was banned %(count)s times|one": "został(a) zablokowany(-a)",
     "was kicked %(count)s times|one": "został wyrzucony",
-    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Niezależnie od tego, czy używasz trybu Richtext edytora tekstu w formacie RTF",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Czy używasz bądź nie trybu edytora tekstu sformatowanego",
     "Call in Progress": "Łączenie w toku",
     "Permission Required": "Wymagane Uprawnienia",
     "A call is currently being placed!": "W tej chwili trwa rozmowa!",
@@ -883,7 +883,7 @@
     "Retry": "Ponów",
     "Unable to create key backup": "Nie można utworzyć kopii zapasowej klucza",
     "Download": "Pobierz",
-    "Next": "Następny",
+    "Next": "Dalej",
     "No backup found!": "Nie znaleziono kopii zapasowej!",
     "Checking...": "Sprawdzanie…",
     "Create a new room with the same name, description and avatar": "Utwórz nowy pokój o tej samej nazwie, opisie i awatarze",
@@ -1047,8 +1047,8 @@
     "Once enabled, encryption cannot be disabled.": "Po włączeniu szyfrowanie nie może zostać wyłączone.",
     "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.": "Aby uniknąć duplikowania problemów, prosimy najpierw <existingIssuesLink>przejrzeć istniejące problemy</existingIssuesLink> (i dodać +1) lub <newIssueLink>utworzyć nowy problem</newIssueLink>, jeżeli nie możesz go znaleźć.",
     "Go back": "Wróć",
-    "Whether or not you're logged in (we don't record your username)": "Niezależnie od tego, czy jesteś zalogowany (nie zapisujemy Twojej nazwy użytkownika)",
-    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Niezależnie od tego, czy korzystasz z funkcji \"okruchy\" (awatary nad listą pokoi)",
+    "Whether or not you're logged in (we don't record your username)": "Czy jesteś zalogowany(-a) lub niezalogowany(-a) (nie zapisujemy Twojej nazwy użytkownika)",
+    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Czy używasz korzystasz z funkcji „okruchów” (awatary nad listą pokoi)",
     "Call failed due to misconfigured server": "Połączenie nie udało się przez błędną konfigurację serwera",
     "Try using turn.matrix.org": "Spróbuj użyć serwera turn.matrix.org",
     "The file '%(fileName)s' failed to upload.": "Nie udało się przesłać pliku '%(fileName)s'.",
@@ -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.",
@@ -1150,7 +1150,7 @@
     "Disconnect from the identity server <idserver />?": "Odłączyć od serwera tożsamości <idserver />?",
     "Disconnect": "Odłącz",
     "Identity Server (%(server)s)": "Serwer tożsamości (%(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.": "Używasz <server></server>, aby odnajdywać i móc być odnajdywanym przez istniejące kontakty, które znasz.  Możesz zmienić serwer tożsamości poniżej.",
+    "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "Używasz <server></server>, aby odnajdywać i móc być odnajdywanym przez istniejące kontakty, które znasz. Możesz zmienić serwer tożsamości poniżej.",
     "Identity Server": "Serwer Tożsamości",
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Nie używasz serwera tożsamości. Aby odkrywać i być odkrywanym przez istniejące kontakty które znasz, dodaj jeden poniżej.",
     "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.": "Odłączenie się od serwera tożsamości oznacza, że inni nie będą mogli Cię odnaleźć ani Ty nie będziesz w stanie zaprosić nikogo za pomocą e-maila czy telefonu.",
@@ -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,739 @@
     "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",
+    "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.",
+    "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",
+    "Attach files from chat or just drag and drop them anywhere in a room.": "Załącz pliki w rozmowie lub upuść je w dowolnym miejscu rozmowy.",
+    "Sign in with SSO": "Zaloguj się z SSO",
+    "No files visible in this room": "Brak plików widocznych w tym pokoju",
+    "Document": "Dokument",
+    "Service": "Usługa",
+    "Summary": "Opis",
+    "To continue you need to accept the terms of this service.": "Aby kontynuować, musisz zaakceptować zasady użytkowania.",
+    "Connecting to integration manager...": "Łączenie z zarządcą integracji…",
+    "Add widgets, bridges & bots": "Dodaj widżety, mostki i boty",
+    "Forget this room": "Zapomnij o tym pokoju",
+    "You were kicked from %(roomName)s by %(memberName)s": "Zostałeś(-aś) wyrzucony(-a) z %(roomName)s przez %(memberName)s",
+    "List options": "Ustawienia listy",
+    "Explore all public rooms": "Przeglądaj wszystkie publiczne pokoje",
+    "Explore public rooms": "Przeglądaj publiczne pokoje",
+    "Verification Requests": "Żądania weryfikacji",
+    "View Servers in Room": "Zobacz serwery w pokoju",
+    "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Zmiany tego, kto może przeglądać historię wyszukiwania dotyczą tylko przyszłych wiadomości w pokoju. Widoczność wcześniejszej historii nie zmieni się.",
+    "No other published addresses yet, add one below": "Brak innych opublikowanych adresów, dodaj jakiś poniżej",
+    "Other published addresses:": "Inne opublikowane adresy:",
+    "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.": "Opublikowane adresy mogą być używane, aby każdy mógł dołączyć do Twojego pokoju. Aby opublikować adres, należy wcześniej ustawić lokalny adres.",
+    "Room settings": "Ustawienia pokoju",
+    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Wiadomości w tym pokoju są szyfrowane end-to-end. Jeżeli ludzie dołączą do niego, możesz zweryfikować ich na ich profilu, naciskając na ich awatar.",
+    "Messages in this room are not end-to-end encrypted.": "Wiadomości w tym pokoju nie są szyfrowane end-to-end.",
+    "Show files": "Zobacz pliki",
+    "%(count)s people|one": "%(count)s osoba",
+    "%(count)s people|other": "%(count)s ludzi(e)",
+    "About": "Informacje",
+    "<a>Add a topic</a> to help people know what it is about.": "<a>Dodaj temat</a>, aby poinformować ludzi czego to dotyczy.",
+    "Show info about bridges in room settings": "Pokazuj informacje o mostkach w ustawieniach pokoju",
+    "about a day from now": "około dnia od teraz",
+    "about an hour from now": "około godziny od teraz",
+    "about a minute from now": "około minuty od teraz",
+    "Room Info": "Informacje o pokoju",
+    "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Zgłoszenie tej wiadomości wyśle administratorowi serwera unikatowe „ID wydarzenia”. Jeżeli wiadomości w tym pokoju są szyfrowane, administrator serwera może nie być w stanie przeczytać treści wiadomości, lub zobaczyć plików bądź zdjęć.",
+    "Send report": "Wyślij zgłoszenie",
+    "Report Content to Your Homeserver Administrator": "Zgłoś zawartość do administratora swojego serwera",
+    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Prywatne pokoje można odnaleźć i dołączyć do nich tylko przez zaproszenie. Do publicznych pokojów może dołączyć każdy w tej społeczności.",
+    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Prywatne pokoje można odnaleźć i dołączyć do nich tylko przez zaproszenie. Do publicznych pokojów każdy może dołączyć.",
+    "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Możesz ustawić tę opcję, jeżeli pokój będzie używany wyłącznie do współpracy wewnętrznych zespołów na Twoim serwerze. To nie może być później zmienione.",
+    "Block anyone not part of %(serverName)s from ever joining this room.": "Zablokuj wszystkich niebędących użytkownikami %(serverName)s w tym pokoju.",
+    "You can’t disable this later. Bridges & most bots won’t work yet.": "Nie możesz wyłączyć tego później. Mostki i większość botów nie będą działać.",
+    "Matrix rooms": "Pokoje Matrix",
+    "Start a conversation with someone using their name or username (like <userId/>).": "Rozpocznij konwersację z innymi korzystając z ich nazwy lub nazwy użytkownika (np. <userId/>).",
+    "Start a conversation with someone using their name, email address or username (like <userId/>).": "Rozpocznij konwersację z innymi korzystając z ich nazwy, adresu e-mail lub nazwy użytkownika (np. <userId/>).",
+    "Show %(count)s more|one": "Pokaż %(count)s więcej",
+    "Show %(count)s more|other": "Pokaż %(count)s więcej",
+    "Room options": "Ustawienia pokoju",
+    "Manually verify all remote sessions": "Ręcznie weryfikuj wszystkie zdalne sesje",
+    "Privacy": "Prywatność",
+    "This version of %(brand)s does not support searching encrypted messages": "Ta wersja %(brand)s nie obsługuje wyszukiwania zabezpieczonych wiadomości",
+    "Use the <a>Desktop app</a> to search encrypted messages": "Używaj <a>Aplikacji desktopowej</a>, aby wyszukiwać zaszyfrowane wiadomości",
+    "Message search": "Wyszukiwanie wiadomości",
+    "Enable message search in encrypted rooms": "Włącz wyszukiwanie wiadomości w szyfrowanych pokojach",
+    "New version of %(brand)s is available": "Dostępna jest nowa wersja %(brand)s",
+    "Update %(brand)s": "Aktualizuj %(brand)s",
+    "Set up Secure Backup": "Skonfiguruj bezpieczny backup",
+    "Ok": "OK",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Wysyłaj <UsageDataLink>anonimowe dane o wykorzystywaniu</UsageDataLink>, które pomogą nam usprawnić %(brand)s. To będzie korzystać z <PolicyLink>pliku cookie</PolicyLink>.",
+    "Help us improve %(brand)s": "Pomóż nam usprawnić %(brand)s",
+    "Unknown App": "Nieznana aplikacja",
+    "Enable desktop notifications": "Włącz powiadomienia na pulpicie",
+    "Don't miss a reply": "Nie przegap odpowiedzi",
+    "A session's public name is visible to people you communicate with": "Publiczna nazwa sesji jest widoczna dla osób z którymi się komunikujesz",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Zarządzaj nazwami i unieważnaj sesje poniżej, lub <a>weryfikuj je na swoim profilu</a>.",
+    "Where you’re logged in": "Gdzie jesteś zalogowany(-a)",
+    "Review where you’re logged in": "Przejrzyj, gdzie jesteś zalogowany(-a)",
+    "Show tray icon and minimize window to it on close": "Pokazuj ikonę w zasobniku i minimalizuj okno do zasobnika przy zamknięciu",
+    "Display your community flair in rooms configured to show it.": "Wyświetlaj swój wyróżnik społeczności w pokojach skonfigurowanych, aby go używać.",
+    "System font name": "Nazwa czcionki systemowej",
+    "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Wybierz nazwę czcionki zainstalowanej w systemie, a %(brand)s spróbuje jej użyć.",
+    "Use a system font": "Użyj czcionki systemowej",
+    "Enable experimental, compact IRC style layout": "Włącz eksperymentalny, kompaktowy układ w stylu IRC",
+    "Use a more compact ‘Modern’ layout": "Użyj bardziej kompaktowego „nowoczesnego” układu",
+    "Use custom size": "Użyj niestandardowego rozmiaru",
+    "Appearance Settings only affect this %(brand)s session.": "Ustawienia wyglądu wpływają tylko na tę sesję %(brand)s.",
+    "Customise your appearance": "Dostosuj wygląd",
+    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Użyj Zarządcy Integracji aby zarządzać botami, widżetami i pakietami naklejek.",
+    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Użyj Zarządcy Integracji <b>%(serverName)s</b> aby zarządzać botami, widżetami i pakietami naklejek.",
+    "There are two ways you can provide feedback and help us improve %(brand)s.": "Są dwa sposoby na przekazanie informacji zwrotnych i pomoc w usprawnieniu %(brand)s.",
+    "Feedback sent": "Wysłano informacje zwrotne",
+    "Send feedback": "Wyślij informacje zwrotne",
+    "Feedback": "Informacje zwrotne",
+    "You have no visible notifications in this room.": "Nie masz widocznych powiadomień w tym pokoju.",
+    "%(creator)s created this DM.": "%(creator)s utworzył(a) tę wiadomość bezpośrednią.",
+    "You do not have permission to create rooms in this community.": "Nie masz uprawnień do tworzenia pokojów w tej społeczności.",
+    "Cannot create rooms in this community": "Nie można utworzyć pokojów w tej społeczności",
+    "Liberate your communication": "Uwolnij swoją komunikację",
+    "Welcome to %(appName)s": "Witamy w %(appName)s",
+    "Now, let's help you get started": "Teraz pomożemy Ci zacząć",
+    "Welcome %(name)s": "Witaj, %(name)s",
+    "Israel": "Izrael",
+    "Isle of Man": "Man",
+    "Ireland": "Irlandia",
+    "Iraq": "Irak",
+    "Iran": "Iran",
+    "Indonesia": "Indonezja",
+    "India": "Indie",
+    "Iceland": "Islandia",
+    "Hungary": "Węgry",
+    "Hong Kong": "Hong Kong",
+    "Honduras": "Honduras",
+    "Heard & McDonald Islands": "Wyspy Heard i McDonald",
+    "Haiti": "Haiti",
+    "Guyana": "Gujana",
+    "Guinea-Bissau": "Gwinea Bissau",
+    "Guinea": "Gwinea",
+    "Guernsey": "Guernsey",
+    "Guatemala": "Gwatemala",
+    "Guam": "Guam",
+    "Guadeloupe": "Gwadelupa",
+    "Grenada": "Grenada",
+    "Greenland": "Grenlandia",
+    "Greece": "Grecja",
+    "Gibraltar": "Gibraltar",
+    "Ghana": "Ghana",
+    "Germany": "Niemcy",
+    "Georgia": "Gruzja",
+    "Gambia": "Gambia",
+    "Gabon": "Gabon",
+    "French Southern Territories": "Francuskie Terytoria Południowe i Antarktyczne",
+    "French Polynesia": "Polinezja Francuska",
+    "French Guiana": "Gujana Francuska",
+    "France": "Francja",
+    "Finland": "Finlandia",
+    "Fiji": "Fidżi",
+    "Faroe Islands": "Wyspy Owcze",
+    "Falkland Islands": "Falklandy",
+    "Ethiopia": "Etiopia",
+    "Estonia": "Estonia",
+    "Eritrea": "Erytrea",
+    "Equatorial Guinea": "Gwinea Równikowa",
+    "El Salvador": "Salwador",
+    "Egypt": "Egipt",
+    "Ecuador": "Ekwador",
+    "Dominican Republic": "Dominikana",
+    "Dominica": "Dominika",
+    "Djibouti": "Dżibuti",
+    "Denmark": "Dania",
+    "Côte d’Ivoire": "Wybrzeże Kości Słoniowej",
+    "Czech Republic": "Czechy",
+    "Cyprus": "Cypr",
+    "Curaçao": "Curaçao",
+    "Cuba": "Kuba",
+    "Croatia": "Chorwacja",
+    "Costa Rica": "Kostaryka",
+    "Cook Islands": "Wyspy Cooka",
+    "Congo - Kinshasa": "Kinszasa",
+    "Congo - Brazzaville": "Kongo",
+    "Comoros": "Komory",
+    "Colombia": "Kolumbia",
+    "Cocos (Keeling) Islands": "Wyspy Kokosowe",
+    "Christmas Island": "Wyspa Bożego Narodzenia",
+    "China": "Chiny",
+    "Chile": "Chile",
+    "Chad": "Czad",
+    "Central African Republic": "Republika Środkowoafrykańska",
+    "Cayman Islands": "Kajmany",
+    "Caribbean Netherlands": "Holandia Karaibska",
+    "Cape Verde": "Republika Zielonego Przylądka",
+    "Canada": "Kanada",
+    "Cameroon": "Kamerun",
+    "Cambodia": "Kambodża",
+    "Burundi": "Burundi",
+    "Burkina Faso": "Burkina Faso",
+    "Bulgaria": "Bułgaria",
+    "Brunei": "Brunei",
+    "British Virgin Islands": "Brytyjskie Wyspy Dziewicze",
+    "British Indian Ocean Territory": "Brytyjskie Terytorium Oceanu Indyjskiego",
+    "Brazil": "Brazylia",
+    "Bouvet Island": "Wyspa Bouveta",
+    "Botswana": "Botswana",
+    "Bosnia": "Bośnia",
+    "Bolivia": "Boliwia",
+    "Bhutan": "Bhutan",
+    "Bermuda": "Bermudy",
+    "Benin": "Benin",
+    "Belize": "Belize",
+    "Belgium": "Belgia",
+    "Belarus": "Białoruś",
+    "Barbados": "Barbados",
+    "Bangladesh": "Bangladesz",
+    "Bahrain": "Bahrajn",
+    "Bahamas": "Bahamy",
+    "Azerbaijan": "Azerbejdżan",
+    "Austria": "Austria",
+    "Australia": "Australia",
+    "Aruba": "Aruba",
+    "Armenia": "Armenia",
+    "Argentina": "Argentyna",
+    "Antigua & Barbuda": "Antigua i Barbuda",
+    "Antarctica": "Antarktyda",
+    "Anguilla": "Anguilla",
+    "Angola": "Angola",
+    "Andorra": "Andora",
+    "American Samoa": "Samoa Amerykańskie",
+    "Algeria": "Algeria",
+    "Albania": "Albania",
+    "Åland Islands": "Wyspy Alandzkie",
+    "Afghanistan": "Afganistan",
+    "United States": "Stany Zjednoczone",
+    "United Kingdom": "Wielka Brytania",
+    "Marshall Islands": "Wyspy Marshalla",
+    "Malta": "Malta",
+    "Mali": "Mali",
+    "Maldives": "Malediwy",
+    "Malaysia": "Malezja",
+    "Malawi": "Malawi",
+    "Madagascar": "Madagaskar",
+    "Macedonia": "Macedonia",
+    "Macau": "Makau",
+    "Luxembourg": "Luksemburg",
+    "Lithuania": "Litwa",
+    "Liechtenstein": "Liechtenstein",
+    "Libya": "Libia",
+    "Liberia": "Liberia",
+    "Lesotho": "Lesotho",
+    "Lebanon": "Liban",
+    "Latvia": "Łotwa",
+    "Laos": "Laos",
+    "Kyrgyzstan": "Kirgistan",
+    "Kuwait": "Kuwejt",
+    "Kosovo": "Kosowo",
+    "Kiribati": "Kiribati",
+    "Kenya": "Kenia",
+    "Kazakhstan": "Kazachstan",
+    "Jordan": "Jordania",
+    "Jersey": "Jersey",
+    "User rules": "Zasady użytkownika",
+    "Server rules": "Zasady serwera",
+    "not found": "nie znaleziono",
+    "Decline (%(counter)s)": "Odrzuć (%(counter)s)",
+    "Starting backup...": "Rozpoczynanie kopii zapasowej…",
+    "User Autocomplete": "Autouzupełnianie użytkowników",
+    "Community Autocomplete": "Autouzupełnianie społeczności",
+    "Room Autocomplete": "Autouzupełnianie pokojów",
+    "Notification Autocomplete": "Autouzupełnianie powiadomień",
+    "Emoji Autocomplete": "Autouzupełnianie emoji",
+    "Phone (optional)": "Telefon (opcjonalny)",
+    "Upload Error": "Błąd wysyłania",
+    "GitHub issue": "Błąd na GitHubie",
+    "Close dialog": "Zamknij okno dialogowe",
+    "Show all": "Zobacz wszystko",
+    "Deactivate user": "Dezaktywuj użytkownika",
+    "Deactivate user?": "Dezaktywować użytkownika?",
+    "Revoke invite": "Wygaś zaproszenie",
+    "Code block": "Blok kodu",
+    "Ban users": "Zablokuj użytkowników",
+    "Kick users": "Wyrzuć użytkowników",
+    "Syncing...": "Synchronizacja…",
+    "General failure": "Ogólny błąd",
+    "Removing…": "Usuwanie…",
+    "Premium": "Premium",
+    "Cancelling…": "Anulowanie…",
+    "Algorithm:": "Algorytm:",
+    "Bulk options": "Masowe działania",
+    "Modern": "Współczesny",
+    "Compact": "Kompaktowy",
+    "Approve": "Zatwierdź",
+    "Incompatible Database": "Niekompatybilna baza danych",
+    "Show": "Pokaż",
+    "Information": "Informacje",
+    "Categories": "Kategorie",
+    "Reactions": "Reakcje",
+    "Role": "Rola",
+    "Trusted": "Zaufane",
+    "Accepting…": "Akceptowanie…",
+    "Re-join": "Dołącz ponownie",
+    "Unencrypted": "Nieszyfrowane",
+    "Revoke": "Unieważnij",
+    "Encrypted": "Szyfrowane",
+    "Unsubscribe": "Odsubskrybuj",
+    "None": "Brak",
+    "exists": "istnieje",
+    "Change the topic of this room": "Zmień temat tego pokoju",
+    "Change which room you're viewing": "Zmień pokój który przeglądasz",
+    "Send stickers into your active room": "Wyślij naklejki w swoim aktywnym pokoju",
+    "Send stickers into this room": "Wyślij naklejki w tym pokoju",
+    "Zimbabwe": "Zimbabwe",
+    "Zambia": "Zambia",
+    "Yemen": "Jemen",
+    "Western Sahara": "Sahara Zachodnia",
+    "Wallis & Futuna": "Wallis i Futuna",
+    "Vietnam": "Wietnam",
+    "Venezuela": "Wenezuela",
+    "Vatican City": "Watykan",
+    "Vanuatu": "Vanuatu",
+    "Uzbekistan": "Uzbekistan",
+    "Uruguay": "Urugwaj",
+    "United Arab Emirates": "Zjednoczone Emiraty Arabskie",
+    "Ukraine": "Ukraina",
+    "Uganda": "Uganda",
+    "U.S. Virgin Islands": "Wyspy Dziewicze Stanów Zjednoczonych",
+    "Tuvalu": "Tuvalu",
+    "Turks & Caicos Islands": "Turks i Caicos",
+    "Turkmenistan": "Turkmenistan",
+    "Turkey": "Turcja",
+    "Tunisia": "Tunezja",
+    "Trinidad & Tobago": "Trynidad i Tobago",
+    "Tonga": "Tonga",
+    "Tokelau": "Tokelau",
+    "Togo": "Togo",
+    "Timor-Leste": "Timor Wschodni",
+    "Thailand": "Tajlandia",
+    "Tanzania": "Tanzania",
+    "Tajikistan": "Tadżykistan",
+    "Taiwan": "Tajwan",
+    "São Tomé & Príncipe": "Wyspy Świętego Tomasza i Książęca",
+    "Syria": "Syria",
+    "Switzerland": "Szwajcaria",
+    "Sweden": "Szwecja",
+    "Swaziland": "Eswatini",
+    "Svalbard & Jan Mayen": "Svalbard i Jan Mayen",
+    "Suriname": "Surinam",
+    "Sudan": "Sudan",
+    "St. Vincent & Grenadines": "Saint Vincent i Grenadyny",
+    "St. Pierre & Miquelon": "Saint-Pierre i Miquelon",
+    "St. Martin": "Sint Maarten",
+    "St. Lucia": "Saint Lucia",
+    "St. Kitts & Nevis": "Saint Kitts & Nevis",
+    "St. Helena": "Święta Helena",
+    "St. Barthélemy": "Wspólnota Saint-Barthélemy",
+    "Sri Lanka": "Sri Lanka",
+    "Spain": "Hiszpania",
+    "South Sudan": "Sudan Południowy",
+    "South Korea": "Korea Południowa",
+    "South Georgia & South Sandwich Islands": "Georgia Południowa i Sandwich Południowy",
+    "South Africa": "Republika Południowej Afryki",
+    "Somalia": "Somalia",
+    "Solomon Islands": "Wyspy Salomona",
+    "Slovenia": "Słowenia",
+    "Slovakia": "Słowacja",
+    "Sint Maarten": "Sint Maarten",
+    "Singapore": "Singapur",
+    "Sierra Leone": "Sierra Leone",
+    "Seychelles": "Seszele",
+    "Serbia": "Serbia",
+    "Senegal": "Senegal",
+    "Saudi Arabia": "Arabia Saudyjska",
+    "San Marino": "San Marino",
+    "Samoa": "Samoa",
+    "Réunion": "Reunion",
+    "Rwanda": "Rwanda",
+    "Russia": "Rosja",
+    "Romania": "Rumunia",
+    "Qatar": "Katar",
+    "Puerto Rico": "Portoryko",
+    "Portugal": "Portugalia",
+    "Poland": "Polska",
+    "Pitcairn Islands": "Pitcairn",
+    "Philippines": "Filipiny",
+    "Peru": "Peru",
+    "Paraguay": "Paragwaj",
+    "Papua New Guinea": "Papua Nowa Gwinea",
+    "Panama": "Panama",
+    "Palestine": "Palestyna",
+    "Palau": "Palau",
+    "Pakistan": "Pakistan",
+    "Oman": "Oman",
+    "Norway": "Norwegia",
+    "Northern Mariana Islands": "Mariany Północne",
+    "North Korea": "Korea Północna",
+    "Norfolk Island": "Norfolk",
+    "Niue": "Niue",
+    "Nigeria": "Nigeria",
+    "Niger": "Niger",
+    "Nicaragua": "Nikaragua",
+    "New Zealand": "Nowa Zelandia",
+    "New Caledonia": "Nowa Kaledonia",
+    "Netherlands": "Holandia",
+    "Nepal": "Nepal",
+    "Nauru": "Nauru",
+    "Namibia": "Namibia",
+    "Myanmar": "Mjanma",
+    "Mozambique": "Mozambik",
+    "Morocco": "Maroko",
+    "Montserrat": "Montserrat",
+    "Montenegro": "Czarnogóra",
+    "Mongolia": "Mongolia",
+    "Monaco": "Monako",
+    "Moldova": "Mołdawia",
+    "Micronesia": "Mikronezja",
+    "Mexico": "Meksyk",
+    "Mayotte": "Majotta",
+    "Mauritius": "Mauritius",
+    "Mauritania": "Mauretania",
+    "Martinique": "Martynika",
+    "Room %(name)s": "Pokój %(name)s",
+    "This is the start of <roomName/>.": "Oto początek <roomName/>.",
+    "Add a photo, so people can easily spot your room.": "Dodaj zdjęcie, aby inni mogli łatwo zauważyć Twój pokój.",
+    "%(displayName)s created this room.": "%(displayName)s utworzył(a) ten pokój.",
+    "You created this room.": "Utworzyłeś(-aś) ten pokój.",
+    "Topic: %(topic)s ": "Temat: %(topic)s ",
+    "Topic: %(topic)s (<a>edit</a>)": "Temat: %(topic)s (<a>edytuj</a>)",
+    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Tylko Wy jesteście w tej konwersacji, dopóki ktoś z Was nie zaprosi tu innej osoby.",
+    "This is the beginning of your direct message history with <displayName/>.": "Oto początek historii Twojej rozmowy bezpośredniej z <displayName/>.",
+    "%(count)s results|other": "%(count)s wyniki(-ów)",
+    "Security & privacy": "Bezpieczeństwo i prywatność",
+    "Start chatting": "Rozpocznij rozmowę",
+    "<userName/> wants to chat": "<userName/> chce porozmawiać",
+    "Rejecting invite …": "Odrzucanie zaproszenia…",
+    "Use the + to make a new room or explore existing ones below": "Użyj + aby utworzyć nowy pokój, lub przeglądaj istniejące poniżej",
+    "%(count)s results|one": "%(count)s wynik",
+    "Custom Tag": "Niestandardowy tag",
+    "Explore community rooms": "Przeglądaj pokoje społeczności",
+    "Hide Widgets": "Ukryj widgety",
+    "No recently visited rooms": "Brak ostatnio odwiedzonych pokoi",
+    "Show Widgets": "Pokaż widgety",
+    "Can't see what you’re looking for?": "Nie możesz znaleźć tego, czego szukasz?",
+    "Start a new chat": "Rozpocznij nową rozmowę",
+    "Change the name of this room": "Zmień nazwę tego pokoju",
+    "Interactively verify by Emoji": "Zweryfikuj interaktywnie przez Emoji",
+    "Not Trusted": "Nie zaufany(-a)",
+    "Ask this user to verify their session, or manually verify it below.": "Poproś go/ją o zweryfikowanie tej sesji bądź zweryfikuj ją osobiście poniżej.",
+    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s%(userId)s zalogował(a) się do nowej sesji bez zweryfikowania jej:",
+    "Verify your other session using one of the options below.": "Zweryfikuj swoje pozostałe sesje używając jednej z opcji poniżej.",
+    "You signed in to a new session without verifying it:": "Zalogowałeś się do nowej sesji bez jej zweryfikowania:",
+    "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s zmienił regułę banującą serwery pasujące do wzorca na %(oldGlob)s ustawiając nowy wzorzec %(newGlob)s z powodu %(reason)s",
+    "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s zmienił regułę banującą pokoje pasujące do wzorca na %(oldGlob)s ustawiając nowy wzorzec %(newGlob)s z powodu %(reason)s",
+    "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s zmienił regułę banującą użytkowników pasujących do wzorca na %(oldGlob)s ustawiając nowy wzorzec %(newGlob)s z powodu %(reason)s",
+    "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s utworzył regułę banującą serwery pasujące do wzorca %(glob)s z powodu %(reason)s",
+    "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s utworzył regułę banującą pokoje pasujące do wzorca %(glob)s z powodu %(reason)s",
+    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s utworzył regułę banującą użytkowników pasujących do wzorca %(glob)s z powodu %(reason)s",
+    "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s zaktualizował regułę banującą serwery pasujące do wzorca %(glob)s z powodu %(reason)s",
+    "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s zaktualizował regułę banującą pokoje pasujące do wzorca %(glob)s z powodu %(reason)s",
+    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s zaktualizował regułę banującą użytkowników pasujących do wzorca %(glob)s z powodu %(reason)s",
+    "%(senderName)s updated an invalid ban rule": "%(senderName)s zaktualizował nieprawidłową regułę banującą",
+    "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s usunął regułę banującą serwery pasujące do wzorca %(glob)s",
+    "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s usunął regułę banującą pokoje pasujące do wzorca %(glob)s",
+    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s usunął regułę banującą użytkowników pasujących do wzorca %(glob)s",
+    "%(senderName)s declined the call.": "%(senderName)s odrzucił(a) połączenie.",
+    "(an error occurred)": "(wystąpił błąd)",
+    "(their device couldn't start the camera / microphone)": "(ich urządzenie nie może uruchomić kamery / mikrofonu)",
+    "(connection failed)": "(połączenie nieudane)",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s usunął(-ęła) alternatywny adres %(addresses)s tego pokoju.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s usunął(-ęła) alternatywny adres %(addresses)s tego pokoju.",
+    "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Wszystkie serwery zostały wykluczone z uczestnictwa! Ten pokój nie może być już używany.",
+    "Effects": "Efekty",
+    "Japan": "Japonia",
+    "Jamaica": "Jamajka",
+    "Italy": "Włochy",
+    "You've reached the maximum number of simultaneous calls.": "Osiągnięto maksymalną liczbę jednoczesnych połączeń.",
+    "Too Many Calls": "Zbyt wiele połączeń",
+    "No other application is using the webcam": "Kamera nie jest obecnie używana przez inną aplikację",
+    "Permission is granted to use the webcam": "Przyznano uprawnienia dostępu do kamery",
+    "A microphone and webcam are plugged in and set up correctly": "Mikrofon i kamera są podpięte i skonfigurowane prawidłowo",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "Połączenie nieudane z powodu braku dostępu do kamery bądź mikrofonu. Sprawdź czy:",
+    "Unable to access webcam / microphone": "Nie można uzyskać dostępu do kamery / mikrofonu",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Nie udało się zestawić połączenia z powodu braku dostępu do mikrofonu. Sprawdź czy mikrofon jest podłączony i poprawnie skonfigurowany.",
+    "Unable to access microphone": "Nie można uzyskać dostępu do mikrofonu",
+    "Forgot password?": "Nie pamiętasz hasła?",
+    "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Użyj serwera tożsamości, aby zapraszać przez e-mail. Zarządzaj w <settings>Ustawieniach</settings>.",
+    "Got it": "Rozumiem",
+    "Space used:": "Użyta powierzchnia:",
+    "This wasn't me": "To nie byłem(-am) ja",
+    "Verify by emoji": "Weryfikuj z użyciem emoji",
+    "Your messages are not secure": "Twoje wiadomości nie są bezpieczne",
+    "Start Verification": "Rozpocznij weryfikację",
+    "Waiting for %(displayName)s to accept…": "Oczekiwanie na akceptację przez %(displayName)s…",
+    "Bridges": "Mostki",
+    "Verify User": "Weryfikuj użytkownika",
+    "Verification Request": "Żądanie weryfikacji",
+    "Widgets do not use message encryption.": "Widżety nie używają szyfrowania wiadomości.",
+    "Automatically invite users": "Automatycznie zapraszaj użytkowników",
+    "This widget may use cookies.": "Ten widżet może używać plików cookies.",
+    "Widget added by": "Widżet dodany przez",
+    "Widget ID": "ID widżetu",
+    "Room ID": "ID pokoju",
+    "Your user ID": "Twoje ID użytkownika",
+    "Your avatar URL": "Adres URL Twojego awataru",
+    "Your display name": "Twoja nazwa wyświetlana",
+    "View rules": "Zobacz zasady",
+    "Quick Reactions": "Szybkie reakcje",
+    "Error subscribing to list": "Błąd subskrybowania listy",
+    "Please fill why you're reporting.": "Wypełnij, dlaczego dokonujesz zgłoszenia.",
+    "Jump to first unread room.": "Przejdź do pierwszego nieprzeczytanego pokoju.",
+    "Jump to first invite.": "Przejdź do pierwszego zaproszenia.",
+    "You verified %(name)s": "Zweryfikowałeś(-aś) %(name)s",
+    "Message Actions": "Działania na wiadomościach",
+    "This client does not support end-to-end encryption.": "Ten klient nie obsługuje szyfrowania end-to-end.",
+    "Failed to deactivate user": "Nie udało się zdezaktywować użytkownika",
+    "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Dla większej liczby wiadomości, może to zająć trochę czasu. Nie odświeżaj klienta w tym czasie.",
+    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "Zamierzasz usunąć jedną wiadomość od %(user)s. Nie możesz tego cofnąć. Czy chcesz kontynuować?",
+    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "Zamierzasz usunąć %(count)s wiadomości od %(user)s. Nie możesz tego cofnąć. Czy chcesz kontynuować?",
+    "Remove recent messages by %(user)s": "Usuń ostatnie wiadomości od %(user)s",
+    "No recent messages by %(user)s found": "Nie znaleziono ostatnich wiadomości od %(user)s",
+    "Clear personal data": "Wyczyść dane osobiste",
+    "Sign in and regain access to your account.": "Zaloguj się i odzyskaj dostęp do konta.",
+    "This account has been deactivated.": "To konto zostało zdezaktywowane.",
+    "Use bots, bridges, widgets and sticker packs": "Używaj botów, mostków, widżetów i zestawów naklejek",
+    "Find others by phone or email": "Odnajdź innych z użyciem numeru telefonu lub adresu e-mail",
+    "Clear all data": "Wyczyść wszystkie dane",
+    "Please enter verification code sent via text.": "Wprowadź kod weryfikacyjny wysłany wiadomością tekstową.",
+    "Unable to share phone number": "Nie udało się udostępnić numeru telefonu",
+    "Unable to share email address": "Nie udało się udostępnić adresu e-mail",
+    "You can now close this window or <a>log in</a> to your new account.": "Możesz teraz zamknąć to okno, lub <a>zalogować się</a> na swoje nowe konto.",
+    "Continue with previous account": "Kontynuuj, używając poprzedniego konta",
+    "Use an email address to recover your account": "Użyj adresu e-mail, aby odzyskać swoje konto",
+    "Doesn't look like a valid email address": "To nie wygląda na prawidłowy adres e-mail",
+    "Incompatible local cache": "Niekompatybilna lokalna pamięć podręczna",
+    "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "",
+    "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Niektóre pliki są <b>zbyt duże</b> do wysłania. Ograniczenie wielkości plików to %(limit)s.",
+    "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Te pliki są <b>zbyt duże</b> do wysłania. Ograniczenie wielkości plików to %(limit)s.",
+    "Remember my selection for this widget": "Zapamiętaj mój wybór dla tego widżetu",
+    "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Ten plik jest <b>zbyt duży</b>, aby został wysłany. Ograniczenie wielkości plików to %(limit)s, a ten plik waży %(sizeOfThisFile)s.",
+    "Your browser likely removed this data when running low on disk space.": "Twoja przeglądarka prawdopodobnie usunęła te dane, kiedy brakowało jej miejsca.",
+    "Missing session data": "Brakujące dane sesji",
+    "Sign out and remove encryption keys?": "Wylogować się i usunąć klucze szyfrowania?",
+    "Invited by %(sender)s": "Zaproszony(-a) przez %(sender)s",
+    "This room doesn't exist. Are you sure you're at the right place?": "Ten pokój nie istnieje. Czy na pewno jesteś we właściwym miejscu?",
+    "Something went wrong with your invite to %(roomName)s": "Coś poszło nie tak z Twoim zaproszeniem do %(roomName)s",
+    "You were banned from %(roomName)s by %(memberName)s": "Zostałeś(-aś) zbanowany(-a) z %(roomName)s przez %(memberName)s",
+    "Could not load user profile": "Nie udało się załadować profilu",
+    "Your password has been reset.": "Twoje hasło zostało zresetowane.",
+    "Want more than a community? <a>Get your own server</a>": "Chcesz więcej niż społeczności? <a>Zdobądź własny serwer</a>",
+    "Are you sure you want to sign out?": "Czy na pewno chcesz się wylogować?",
+    "Send %(eventType)s events": "Wyślij zdarzenia %(eventType)s",
+    "Failed to decrypt %(failedCount)s sessions!": "Nie udało się odszyfrować %(failedCount)s sesji!",
+    "Unable to load backup status": "Nie udało się załadować stanu kopii zapasowej",
+    "Failed to load group members": "Nie udało się załadować członków grupy",
+    "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Wysłaliśmy Ci e-mail, aby zweryfikować Twój adres. Podążaj za instrukcjami z niego, a później naciśnij poniższy przycisk.",
+    "Unable to verify phone number.": "Nie udało się zweryfikować numeru telefonu.",
+    "Go back to set it again.": "Wróć, aby skonfigurować to ponownie.",
+    "Upgrade Room Version": "Uaktualnij wersję pokoju",
+    "Upgrade this room to version %(version)s": "Uaktualnij ten pokój do wersji %(version)s",
+    "The room upgrade could not be completed": "Uaktualnienie pokoju nie mogło zostać ukończone",
+    "Failed to upgrade room": "Nie udało się uaktualnić pokoju",
+    "Backup version:": "Wersja kopii zapasowej:",
+    "The operation could not be completed": "To działanie nie mogło być ukończone",
+    "Failed to save your profile": "Nie udało się zapisać profilu",
+    "Confirm deleting these sessions": "Potwierdź usuwanie tych sesji",
+    "Unable to load session list": "Nie udało się załadować listy sesji",
+    "not found locally": "nie odnaleziono lokalnie",
+    "cached locally": "w lokalnej pamięci podręcznej",
+    "not found in storage": "nie odnaleziono w pamięci",
+    "in secret storage": "w tajnej pamięci",
+    "in memory": "w pamięci",
+    "Set up": "Konfiguruj",
+    "Channel: %(channelName)s": "Kanał: %(channelName)s",
+    "Workspace: %(networkName)s": "Przestrzeń robocza: %(networkName)s",
+    "This bridge is managed by <user />.": "Ten mostek jest zarządzany przez <user />.",
+    "Your server isn't responding to some <a>requests</a>.": "Twój serwer nie odpowiada na niektóre <a>zapytania</a>.",
+    "From %(deviceName)s (%(deviceId)s)": "Z %(deviceName)s (%(deviceId)s)",
+    "Verify this session by confirming the following number appears on its screen.": "Weryfikuj tę sesję potwierdzając, że następująca liczba pojawia się na jego ekranie.",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Oczekiwanie na weryfikację przez Twoją drugą sesję, %(deviceName)s (%(deviceId)s)…",
+    "Waiting for your other session to verify…": "Oczekiwanie na weryfikację przez Twoją drugą sesję…",
+    "Waiting for %(displayName)s to verify…": "Oczekiwanie na weryfikację przez %(displayName)s…",
+    "To be secure, do this in person or use a trusted way to communicate.": "Aby było to bezpieczne, wykonaj to przy tej osobie, lub używając zaufanego sposobu komunikacji.",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "Potwierdź, że poniższe emoji są wyświetlane w obu sesjach, w tej samej kolejności:",
+    "Start": "Rozpocznij",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Porównaj unikatowy zestaw emoji, jeżeli nie masz aparatu na jednym z urządzeń",
+    "Compare unique emoji": "Porównaj unikatowe emoji",
+    "or": "lub",
+    "Scan this unique code": "Zeskanuj ten unikatowy kod",
+    "Verify this session by completing one of the following:": "Weryfikuj tę sesję wykonując jedno z następujących:",
+    "Incoming call": "Połączenie przychodzące",
+    "Unknown caller": "Nieznany rozmówca",
+    "Return to call": "Wróć do połączenia",
+    "Uploading logs": "Wysyłanie logów",
+    "Downloading logs": "Pobieranie logów",
+    "Show rooms with unread notifications first": "Pokazuj na początku pokoje z nieprzeczytanymi powiadomieniami",
+    "Use Command + Enter to send a message": "Użyj Command + Enter, aby wysłać wiadomość",
+    "Use Ctrl + Enter to send a message": "Użyj Ctrl + Enter, aby wysłać wiadomość",
+    "How fast should messages be downloaded.": "Jak szybko powinny być pobierane wiadomości.",
+    "IRC display name width": "Szerokość nazwy wyświetlanej IRC",
+    "Show chat effects": "Pokazuj efekty czatu",
+    "Render LaTeX maths in messages": "Renderuj działania LaTeX w wiadomościach",
+    "Multiple integration managers": "Wiele menedżerów integracji",
+    "Change notification settings": "Zmień ustawienia powiadomień",
+    "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
+    "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
+    "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
+    "%(senderName)s is calling": "%(senderName)s dzwoni",
+    "Waiting for answer": "Oczekiwanie na odpowiedź",
+    "%(senderName)s started a call": "%(senderName)s rozpoczął(-ęła) połączenie",
+    "You started a call": "Rozpocząłeś(-ęłaś) połączenie",
+    "Call ended": "Połączenie zakończone",
+    "%(senderName)s ended the call": "%(senderName)s zakończył(a) połączenie",
+    "The person who invited you already left the room.": "Osoba, która Cię zaprosiła, już opuściła pokój.",
+    "Verify the new login accessing your account: %(name)s": "Zweryfikuj nowe logowanie z dostępem do Twojego konta: %(name)s",
+    "You joined the call": "Dołączyłeś(-aś) do połączenia",
+    "%(senderName)s joined the call": "%(senderName)s dołączył(a) do połączenia",
+    "Call in progress": "Połączenie w trakcie",
+    "You ended the call": "Zakończyłeś(-aś) połączenie",
+    "New login. Was this you?": "Nowe logowanie. Czy to byłeś(-aś) Ty?",
+    "Contact your <a>server admin</a>.": "Skontaktuj się ze swoim <a>administratorem serwera</a>.",
+    "Your homeserver has exceeded one of its resource limits.": "Twój homeserver przekroczył jeden z limitów zasobów.",
+    "Your homeserver has exceeded its user limit.": "Twój homeserver przekroczył limit użytkowników.",
+    "Review": "Przejrzyj",
+    "Verify all your sessions to ensure your account & messages are safe": "Zweryfikuj wszystkie swoje sesje, aby upewnić się, że Twoje konto i wiadomości są bezpieczne",
+    "Error leaving room": "Błąd opuszczania pokoju",
+    "Unexpected server error trying to leave the room": "Nieoczekiwany błąd serwera podczas próby opuszczania pokoju",
+    "%(num)s days from now": "za %(num)s dni",
+    "%(num)s hours from now": "za %(num)s godzin",
+    "%(num)s minutes from now": "za %(num)s minut",
+    "a few seconds from now": "za kilka sekund",
+    "See messages posted to your active room": "Zobacz wiadomości publikowane w obecnym pokoju",
+    "See messages posted to this room": "Zobacz wiadomości publikowane w tym pokoju",
+    "Send messages as you in your active room": "Wysyłaj wiadomości jako Ty w obecnym pokoju",
+    "Send messages as you in this room": "Wysyłaj wiadomości jako Ty w tym pokoju",
+    "The <b>%(capability)s</b> capability": "Możliwość<b>%(capability)s</b>",
+    "Send <b>%(eventType)s</b> events as you in your active room": "Wysyłaj zdarzenia <b>%(eventType)s</b> jako Ty w obecnym pokoju",
+    "See <b>%(eventType)s</b> events posted to your active room": "Zobacz zdarzenia <b>%(eventType)s</b> opublikowane w Twoim aktywnym pokoju",
+    "See <b>%(eventType)s</b> events posted to this room": "Zobacz zdarzenia <b>%(eventType)s</b> opublikowane w tym pokoju",
+    "Send <b>%(eventType)s</b> events as you in this room": "Wysyłaj zdarzenia <b>%(eventType)s</b> jako Ty w tym pokoju",
+    "%(senderDisplayName)s set the server ACLs for this room.": "",
+    "Change the avatar of your active room": "Zmień awatar swojego aktywnego pokoju",
+    "See when the avatar changes in this room": "Zobacz, gdy awatar tego pokoju zmienia się",
+    "Change the avatar of this room": "Zmień awatar tego pokoju",
+    "See when the avatar changes in your active room": "Zobacz, gdy awatar Twojego obecnego pokoju zmienia się",
+    "See when the name changes in your active room": "Zobacz, gdy nazwa Twojego obecnego pokoju zmienia się",
+    "Change the name of your active room": "Zmień nazwę swojego obecnego pokoju",
+    "See when the name changes in this room": "Zobacz, gdy nazwa tego pokoju zmienia się",
+    "See when the topic changes in your active room": "Zobacz, gdy temat Twojego obecnego pokoju zmienia się",
+    "Change the topic of your active room": "Zmień temat swojego obecnego pokoju",
+    "See when the topic changes in this room": "Zobacz, gdy temat tego pokoju zmienia się",
+    "Manually Verify by Text": "Weryfikuj ręcznie tekstem",
+    "Everyone in this room is verified": "Wszyscy w tym pokoju są zweryfikowani",
+    "This room is end-to-end encrypted": "Ten pokój jest szyfrowany end-to-end",
+    "This message cannot be decrypted": "Ta wiadomość nie może zostać odszyfrowana",
+    "Scroll to most recent messages": "Przewiń do najnowszych wiadomości",
+    "Incoming video call": "Przychodzące połączenie wideo",
+    "Video Call": "Połączenie wideo",
+    "Fill Screen": "Wypełnij ekran",
+    "The integration manager is offline or it cannot reach your homeserver.": "Menedżer integracji jest offline, lub nie może połączyć się z Twoim homeserverem.",
+    "Cannot connect to integration manager": "Nie udało się połączyć z menedżerem integracji",
+    "Incoming voice call": "Przychodzące połączenie głosowe",
+    "Voice Call": "Połączenie głosowe",
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Aby zgłosić błąd związany z bezpieczeństwem Matriksa, przeczytaj <a>Politykę odpowiedzialnego ujawniania informacji</a> Matrix.org.",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Czy używasz %(brand)s na urządzeniu, gdzie dotyk jest główną metodą wprowadzania",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "Czy używasz %(brand)s zainstalowanego jako Progressive Web App",
+    "Use email or phone to optionally be discoverable by existing contacts.": "Użyj adresu e-mail lub numeru telefonu, aby móc dodatkowo być odkrywanym(-ą) przez istniejące kontakty.",
+    "Add an email to be able to reset your password.": "Dodaj adres e-mail, aby zresetować swoje hasło.",
+    "Host account on": "Przechowuj konto na",
+    "Already have an account? <a>Sign in here</a>": "Masz już konto? <a>Zaloguj się tutaj</a>",
+    "Sign in instead": "Zaloguj się zamiast tego",
+    "Learn more": "Dowiedz się więcej",
+    "New? <a>Create account</a>": "Nowy(-a)? <a>Utwórz konto</a>",
+    "New here? <a>Create an account</a>": "Nowy(-a)? <a>Utwórz konto</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 Element with an existing Matrix account on a different homeserver.": "Możesz użyć własnych opcji serwera aby zalogować się na inny serwer Matrixa, określając inny adres URL serwera. To pozwala Ci na używanie Elementu z użyciem istniejącego konta Matrixa na innym serwerze.",
+    "Server Options": "Opcje serwera",
+    "<b>Copy it</b> to your personal cloud storage": "<b>Skopiuj go</b> do osobistego dysku w chmurze",
+    "Your recovery key is in your <b>Downloads</b> folder.": "Twój klucz przywracania jest w Twoim folderze <b>Pobrane</b>.",
+    "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Zachowaj jego kopię w bezpiecznym miejscu, np. w menedżerze haseł, czy nawet w sejfie.",
+    "Your recovery key": "Twój klucz przywracania",
+    "Make a copy of your recovery key": "Dokonaj kopii swojego klucza przywracania",
+    "Enter your recovery passphrase a second time to confirm it.": "Wprowadź swoje hasło przywracania drugi raz, aby je potwierdzić.",
+    "Confirm your recovery passphrase": "Potwierdź swoje hasło przywracania",
+    "Please enter your recovery passphrase a second time to confirm.": "Wprowadź swoje hasło przywracania drugi raz, aby je potwierdzić.",
+    "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Ostrzeżenie</b>: Kopia zapasowa klucza powinna być konfigurowana tylko z zaufanego komputera.",
+    "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Ostrzeżenie</b>: kopia zapasowa klucza powinna być konfigurowana tylko z zaufanego komputera.",
+    "For maximum security, this should be different from your account password.": "Dla maksymalnego bezpieczeństwa, powinno się ono różnić od hasła do Twojego konta.",
+    "Enter recovery passphrase": "Wprowadź hasło przywracania",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Będziemy przechowywać zaszyfrowaną kopię Twoich kluczy na naszym serwerze. Zabezpiecz swoją kopię zapasową hasłem przywracania.",
+    "Secure your backup with a recovery passphrase": "Zabezpiecz swoją kopię zapasową z hasłem przywracania",
+    "Discovery options will appear once you have added an email above.": "Opcje odkrywania pojawią się, gdy dodasz adres e-mail powyżej.",
+    "Discovery options will appear once you have added a phone number above.": "Opcje odkrywania pojawią się, gdy dodasz numer telefonu powyżej.",
+    "Show shortcuts to recently viewed rooms above the room list": "Pokazuj skróty do ostatnio wyświetlonych pokoi nad listą pokoi",
+    "Signature upload failed": "Wysłanie podpisu nie powiodło się",
+    "Signature upload success": "Wysłanie podpisu udało się",
+    "Manually export keys": "Ręcznie eksportuj klucze",
+    "Unable to upload": "Nie można wysłać",
+    "Recently Direct Messaged": "Ostatnio skontaktowani bezpośrednio",
+    "Click the button below to confirm your identity.": "Naciśnij poniższy przycisk, aby potwierdzić swoją tożsamość.",
+    "Confirm to continue": "Potwierdź, aby kontynuować",
+    "To continue, use Single Sign On to prove your identity.": "Aby kontynuować, użyj Single Sign On do potwierdzenia swojej tożsamości.",
+    "Integrations not allowed": "Integracje nie są dozwolone",
+    "Incoming Verification Request": "Oczekująca prośba o weryfikację",
+    "Waiting for partner to confirm...": "Oczekiwanie na potwierdzenie przez partnera…",
+    "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Zweryfikuj tego użytkownika, aby oznaczyć go jako zaufanego. Ustawienia użytkownika jako zaufanego dodaje większej pewności, gdy korzystasz z wiadomości szyfrowanych end-to-end.",
+    "PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> to help us track down the problem.": "PROTIP: Jeżeli zgłaszasz błąd, prosimy wysłać <debugLogsLink>dzienniki debugowania</debugLogsLink>, aby pomóc nam odnaleźć problem.",
+    "Please view <existingIssuesLink>existing bugs on Github</existingIssuesLink> first. No match? <newIssueLink>Start a new one</newIssueLink>.": "Najpierw zobacz <existingIssuesLink>istniejące błędy na GitHubie</existingIssuesLink>. Nie znajdziesz niczego? <newIssueLink>Utwórz nowy</newIssueLink>.",
+    "Report a bug": "Zgłoś błąd",
+    "Comment": "Komentarz",
+    "Add comment": "Dodaj komentarz",
+    "Please go into as much detail as you like, so we can track down the problem.": "Napisz tak szczegółowo, jak tylko możesz, abyśmy mogli odnaleźć problem.",
+    "Tell us below how you feel about %(brand)s so far.": "Powiedz nam, jak na razie podoba Ci się %(brand)s.",
+    "Rate %(brand)s": "Oceń %(brand)s",
+    "There was an error finding this widget.": "Wystąpił błąd podczas próby odnalezienia tego widżetu.",
+    "Active Widgets": "Aktywne widżety",
+    "Encryption not enabled": "Nie włączono szyfrowania",
+    "Encryption enabled": "Włączono szyfrowanie"
 }
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 8eee0c0909..b32fbf5094 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -10,7 +10,7 @@
     "Banned users": "Usuários banidos",
     "Bans user with given id": "Bane o usuário com o ID indicado",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s alterou a descrição para \"%(topic)s\".",
-    "Changes your display nickname": "Alterar seu nome e sobrenome",
+    "Changes your display nickname": "Altera o seu nome e sobrenome",
     "Click here to fix": "Clique aqui para resolver isso",
     "Commands": "Comandos",
     "Confirm password": "Confirme a nova senha",
@@ -20,7 +20,7 @@
     "Current password": "Senha atual",
     "Deactivate Account": "Desativar minha conta",
     "Default": "Padrão",
-    "Deops user with given id": "Retirar nível de moderador do usuário com o identificador informado",
+    "Deops user with given id": "Retira o nível de moderador do usuário com o ID informado",
     "Displays action": "Visualizar atividades",
     "Emoji": "Emoji",
     "Error": "Erro",
@@ -70,7 +70,7 @@
     "Return to login screen": "Retornar à tela de login",
     "Room Colour": "Cores da sala",
     "Rooms": "Salas",
-    "Searches DuckDuckGo for results": "Buscar por resultados no buscador DuckDuckGo",
+    "Searches DuckDuckGo for results": "Buscar resultados no DuckDuckGo",
     "Send Reset Email": "Enviar e-mail para redefinição de senha",
     "Server may be unavailable, overloaded, or you hit a bug.": "O servidor pode estar indisponível ou sobrecarregado, ou então você encontrou uma falha no sistema.",
     "Session ID": "Identificador de sessão",
@@ -168,7 +168,7 @@
     "The remote side failed to pick up": "A pessoa não atendeu a chamada",
     "This room is not recognised.": "Esta sala não é reconhecida.",
     "This phone number is already in use": "Este número de telefone já está em uso",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Para usar este recurso, aguarde o carregamento dos resultados de autocompletar e então escolha entre as opções.",
+    "To use it, just wait for autocomplete results to load and tab through them.": "Para usar este recurso, aguarde o carregamento dos resultados de preenchimento automático, e então escolha dentre as opções.",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s removeu o banimento de %(targetName)s.",
     "Unable to capture screen": "Não foi possível capturar a imagem da tela",
     "Unable to enable Notifications": "Não foi possível ativar as notificações",
@@ -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",
@@ -414,7 +414,7 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s de %(monthName)s de %(fullYear)s",
     "Who would you like to add to this community?": "Quem você gostaria de adicionar a esta comunidade?",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Atenção: qualquer pessoa que você adicionar a esta comunidade estará publicamente visível para todas as pessoas que conheçam o ID da comunidade",
-    "Invite new community members": "Convidar novos participantes para a comunidade",
+    "Invite new community members": "Convidar novos integrantes para a comunidade",
     "Which rooms would you like to add to this community?": "Quais salas você quer adicionar a esta comunidade?",
     "Show these rooms to non-members on the community page and room list?": "Exibir estas salas para não participantes na página da comunidade e na lista de salas?",
     "Unable to create widget.": "Não foi possível criar o widget.",
@@ -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",
@@ -492,7 +492,7 @@
     "Remove this user from community?": "Remover esta pessoa da comunidade?",
     "Failed to withdraw invitation": "Não foi possível retirar o convite",
     "Failed to remove user from community": "Não foi possível remover esta pessoa da comunidade",
-    "Filter community members": "Filtrar  participantes da comunidade",
+    "Filter community members": "Pesquisar participantes da comunidade",
     "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Tem certeza que quer remover a sala '%(roomName)s' da comunidade %(groupId)s?",
     "Removing a room from the community will also remove it from the community page.": "Remover uma sala da comunidade também a removerá da página da comunidade.",
     "Failed to remove room from community": "Não foi possível remover a sala da comunidade",
@@ -501,7 +501,7 @@
     "Visibility in Room List": "Visibilidade na lista de salas",
     "Visible to everyone": "Visível para todos",
     "Only visible to community members": "Apenas visível para participantes da comunidade",
-    "Filter community rooms": "Filtrar salas da comunidade",
+    "Filter community rooms": "Pesquisar salas da comunidade",
     "Something went wrong when trying to get your communities.": "Não foi possível carregar suas comunidades.",
     "Display your community flair in rooms configured to show it.": "Mostrar o ícone da sua comunidade nas salas que o permitem.",
     "You're not currently a member of any communities.": "No momento, você não é participante de nenhuma comunidade.",
@@ -581,7 +581,7 @@
     "example": "exemplo",
     "Create": "Criar",
     "To get started, please pick a username!": "Para começar, escolha um nome de usuário!",
-    "<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ágina da sua comunidade</h1>\n<p>\n    Use a descrição longa para apresentar a comunidade para novas/os participantes, ou compartilhe <a href=\"foo\">links</a> importantes.\n</p>\n<p>\n    Você pode até mesmo usar tags 'img' em HTML\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ágina da sua comunidade</h1>\n<p>\n    Use a descrição longa para apresentar a comunidade para novas/os participantes,\n    ou compartilhe <a href=\"foo\">links</a> importantes.\n</p>\n<p>\n    Você pode até mesmo usar tags 'img' em HTML\n</p>\n",
     "Add rooms to the community summary": "Adicionar salas para o índice da comunidade",
     "Which rooms would you like to add to this summary?": "Quais salas você gostaria de adicionar a este índice?",
     "Add to summary": "Adicionar ao índice",
@@ -632,9 +632,9 @@
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Um e-mail foi enviado para %(emailAddress)s. Após clicar no link contido no e-mail, clique abaixo.",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Note que você está se conectando ao servidor %(hs)s, e não ao servidor matrix.org.",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Este servidor de base (homeserver) não oferece fluxos de login que funcionem neste cliente.",
-    "Define the power level of a user": "Definir o nível de permissões de um(a) usuário(a)",
-    "Ignores a user, hiding their messages from you": "Bloquear um usuário, esconderá as mensagens dele de você",
-    "Stops ignoring a user, showing their messages going forward": "Desbloquear um usuário, exibe suas mensagens daqui para frente",
+    "Define the power level of a user": "Define o nível de permissões de um usuário",
+    "Ignores a user, hiding their messages from you": "Bloqueia um usuário, escondendo as mensagens dele de você",
+    "Stops ignoring a user, showing their messages going forward": "Desbloqueia um usuário, exibindo as mensagens dele daqui para frente",
     "Notify the whole room": "Notifica a sala inteira",
     "Room Notification": "Notificação da sala",
     "Failed to set direct chat tag": "Falha ao definir esta conversa como direta",
@@ -708,13 +708,13 @@
     "Failed to set Direct Message status of room": "Falha em definir a descrição da conversa",
     "Monday": "Segunda-feira",
     "All messages (noisy)": "Todas as mensagens (com som)",
-    "Enable them now": "Ativá-los agora",
+    "Enable them now": "Ativar agora",
     "Toolbox": "Ferramentas",
     "Collecting logs": "Coletando logs",
     "You must specify an event type!": "Você precisa especificar um tipo do evento!",
     "(HTTP status %(httpStatus)s)": "(Status HTTP %(httpStatus)s)",
     "Invite to this room": "Convidar para esta sala",
-    "Send logs": "Enviar registros",
+    "Send logs": "Enviar relatórios",
     "All messages": "Todas as mensagens novas",
     "Call invitation": "Recebendo chamada",
     "Downloading update...": "Baixando atualização...",
@@ -821,8 +821,8 @@
     "Messages containing @room": "Mensagens contendo @room",
     "Encrypted messages in one-to-one chats": "Mensagens criptografadas em conversas individuais",
     "Encrypted messages in group chats": "Mensagens criptografadas em salas",
-    "Delete Backup": "Deletar Backup",
-    "Unable to load key backup status": "Não é possível carregar o status da chave de backup",
+    "Delete Backup": "Remover backup",
+    "Unable to load key backup status": "Não foi possível carregar o status do backup da chave",
     "Backup version: ": "Versão do Backup: ",
     "Algorithm: ": "Algoritmo: ",
     "This event could not be displayed": "Este evento não pôde ser exibido",
@@ -860,18 +860,18 @@
     "An error ocurred whilst trying to remove the widget from the room": "Ocorreu um erro ao tentar remover o widget da sala",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Não é possível carregar o evento que foi respondido, ele não existe ou você não tem permissão para visualizá-lo.",
     "That doesn't look like a valid email address": "Este não parece ser um endereço de e-mail válido",
-    "Preparing to send logs": "Preparando para enviar registros",
-    "Logs sent": "Registros enviados",
-    "Failed to send logs: ": "Falha ao enviar registros:· ",
-    "Submit debug logs": "Submeter registros de depuração",
-    "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.": "Os registros de depuração contêm dados de uso do aplicativo, incluindo seu nome de usuário, os IDs ou aliases das salas ou comunidades que você visitou e os nomes de usuários de outros usuários. Eles não contêm mensagens.",
-    "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Antes de enviar os registros, você deve <a>criar um bilhete de erro no GitHub</a> para descrever seu problema.",
+    "Preparing to send logs": "Preparando para enviar relatórios",
+    "Logs sent": "Relatórios enviados",
+    "Failed to send logs: ": "Falha ao enviar os relatórios:· ",
+    "Submit debug logs": "Enviar relatórios de erros",
+    "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.": "Os relatórios de erros contêm dados de uso do aplicativo, incluindo seu nome de usuário, os IDs ou nomes das salas ou comunidades que você visitou e os nomes de usuários de seus contatos. Eles não contêm mensagens.",
+    "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Antes de enviar os relatórios, você deve <a>criar um bilhete de erro no GitHub</a> para descrever seu problema.",
     "Unable to load commit detail: %(msg)s": "Não foi possível carregar os detalhes do envio: %(msg)s",
     "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of %(brand)s to do this": "Para evitar perder seu histórico de bate-papo, você precisa exportar as chaves da sua sala antes de se desconectar. Quando entrar novamente, você precisará usar a versão mais atual do %(brand)s",
     "Incompatible Database": "Banco de dados incompatível",
     "Continue With Encryption Disabled": "Continuar com criptografia desativada",
-    "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>": "Isso tornará sua conta permanentemente inutilizável. Você não poderá efetuar login e ninguém poderá registrar novamente o mesmo ID de usuário. Isso fará com que sua conta deixe todas as salas nas quais está participando e removerá os detalhes da sua conta do seu servidor de identidade. <b>Esta ação é irreversível.</ 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.": "Desativar sua conta <b>não faz com que, por padrão, esqueçamos as mensagens que você enviou.</ B> Se você quiser que esqueçamos suas mensagens, marque a caixa abaixo.",
+    "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>": "Isso tornará sua conta permanentemente inutilizável. Você não poderá efetuar login e ninguém poderá registrar novamente o mesmo ID de usuário. Isso fará com que sua conta deixe todas as salas nas quais está participando e removerá os detalhes da sua conta do seu servidor de identidade. <b>Esta ação é irreversível.</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.": "Desativar sua conta <b>não faz com que, por padrão, esqueçamos as mensagens que você enviou.</b> Se você quiser que esqueçamos suas mensagens, marque a opção abaixo.",
     "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 mensagens no Matrix é semelhante ao e-mail. O fato de esquecermos suas mensagens significa que as mensagens que você enviou não serão compartilhadas com usuários novos ou não registrados, mas os usuários registrados que já têm acesso a essas mensagens ainda terão acesso à cópia delas.",
     "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)": "Quando minha conta for desativada, exclua todas as mensagens que eu enviei (<b>Atenção:</b> isso fará com que futuros usuários tenham uma visão incompleta das conversas)",
     "To continue, please enter your password:": "Para continuar, por favor digite sua senha:",
@@ -888,7 +888,7 @@
     "Put a link back to the old room at the start of the new room so people can see old messages": "Colocar um link para a sala antiga no começo da sala nova de modo que as pessoas possam ver mensagens antigas",
     "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.": "Você já usou o %(brand)s em %(host)s com o carregamento Lazy de participantes ativado. Nesta versão, o carregamento Lazy está desativado. Como o cache local não é compatível entre essas duas configurações, o %(brand)s precisa ressincronizar sua conta.",
     "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.": "Se a outra versão do %(brand)s ainda estiver aberta em outra aba, por favor, feche-a pois usar o %(brand)s no mesmo host com o carregamento Lazy ativado e desativado simultaneamente causará problemas.",
-    "Update any local room aliases to point to the new room": "Atualize todos os aliases da sala local para apontar para a nova sala",
+    "Update any local room aliases to point to the new room": "Atualize todos os nomes locais da sala para apontar para a nova sala",
     "Clear Storage and Sign Out": "Limpar armazenamento e sair",
     "Refresh": "Recarregar",
     "We encountered an error trying to restore your previous session.": "Encontramos um erro ao tentar restaurar sua sessão anterior.",
@@ -901,8 +901,8 @@
     "Share Room Message": "Compartilhar Mensagem da Sala",
     "Link to selected message": "Link da mensagem selecionada",
     "COPY": "COPIAR",
-    "Unable to load backup status": "Não é possível carregar o status do backup",
-    "Unable to restore backup": "Não é possível restaurar o backup",
+    "Unable to load backup status": "Não foi possível carregar o status do backup",
+    "Unable to restore backup": "Não foi possível restaurar o backup",
     "No backup found!": "Nenhum backup encontrado!",
     "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Acesse seu histórico de mensagens seguras e configure mensagens seguras digitando sua frase secreta de recuperação.",
     "Next": "Próximo",
@@ -912,7 +912,7 @@
     "Access your secure message history and set up secure messaging by entering your recovery key.": "Acesse seu histórico seguro de mensagens e configure mensagens seguras inserindo sua chave de recuperação.",
     "Share Message": "Compartilhar Mensagem",
     "Popout widget": "Widget Popout",
-    "Send Logs": "Enviar registros",
+    "Send Logs": "Enviar relatórios",
     "Failed to decrypt %(failedCount)s sessions!": "Falha ao descriptografar as sessões de %(failedCount)s!",
     "Set a new status...": "Definir um novo status ...",
     "Collapse Reply Thread": "Recolher grupo de respostas",
@@ -928,12 +928,12 @@
     "Can't leave Server Notices room": "Não é possível sair da sala Avisos do Servidor",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Esta sala é usada para mensagens importantes do Homeserver, então você não pode sair dela.",
     "Terms and Conditions": "Termos e Condições",
-    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.\n\nPara continuar usando o homeserver %(homeserverDomain)s, você deve rever e concordar com nossos termos e condições.",
+    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Para continuar usando o servidor local %(homeserverDomain)s, você deve ler e concordar com nossos termos e condições.",
     "Review terms and conditions": "Revise os termos e condições",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Você não pode enviar nenhuma mensagem até revisar e concordar com <consentLink>nossos termos e condições</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.": "Sua mensagem não foi enviada porque este homeserver atingiu seu Limite de usuário ativo mensal. Por favor, <a>entre em contato com o seu administrador de serviços</a> para continuar usando o serviço.",
     "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.": "Sua mensagem não foi enviada porque este servidor local excedeu o limite de recursos. Por favor, <a>entre em contato com o seu administrador de serviços</a> para continuar usando o serviço.",
-    "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.": "Se você enviou um bug por meio do GitHub, os registros de depuração podem nos ajudar a rastrear o problema. Os registros de depuração contêm dados de uso do aplicativo, incluindo seu nome de usuário, os IDs ou apelidos das salas ou comunidades que você visitou e os nomes de usuários de outros usuários. Eles não contêm mensagens.",
+    "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.": "Se você informou um erro por meio do GitHub, os relatórios de erros podem nos ajudar a rastrear o problema. Os relatórios de erros contêm dados de uso do aplicativo, incluindo seu nome de usuário, os IDs ou apelidos das salas ou comunidades que você visitou e os nomes de usuários de seus contatos. Eles não contêm mensagens.",
     "Legal": "Legal",
     "No Audio Outputs detected": "Nenhuma caixa de som detectada",
     "Audio Output": "Caixa de som",
@@ -947,16 +947,16 @@
     "That doesn't match.": "Isto não corresponde.",
     "Go back to set it again.": "Voltar para configurar novamente.",
     "Download": "Baixar",
-    "<b>Print it</b> and store it somewhere safe": "<b>Imprima-o</ b> e armazene-o em algum lugar seguro",
-    "<b>Save it</b> on a USB key or backup drive": "<b>Salve isto</ b> em uma chave USB ou unidade de backup",
-    "<b>Copy it</b> to your personal cloud storage": "<b>Copie isto</ b> para seu armazenamento em nuvem pessoal",
+    "<b>Print it</b> and store it somewhere safe": "<b>Imprima-o</b> e armazene-o em algum lugar seguro",
+    "<b>Save it</b> on a USB key or backup drive": "<b>Salve isto</b> em uma chave USB ou unidade de backup",
+    "<b>Copy it</b> to your personal cloud storage": "<b>Copie isto</b> para o seu armazenamento em nuvem pessoal",
     "Set up Secure Message Recovery": "Configurar Recuperação Segura de Mensagens",
-    "Unable to create key backup": "Não é possível criar backup de chave",
+    "Unable to create key backup": "Não foi possível criar backup da chave",
     "Retry": "Tentar novamente",
     "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Sem configurar a Recuperação Segura de Mensagens, você perderá seu histórico de mensagens seguras quando fizer logout.",
     "If you don't want to set this up now, you can later in Settings.": "Se você não quiser configurá-lo agora, poderá fazê-lo posteriormente em Configurações.",
-    "New Recovery Method": "Novo método de recuperação",
-    "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 você não definiu o novo método de recuperação, um invasor pode estar tentando acessar sua conta. Altere a senha da sua conta e defina um novo método de recuperação imediatamente nas Configurações.",
+    "New Recovery Method": "Nova opção de recuperação",
+    "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 você não definiu a nova opção de recuperação, um invasor pode estar tentando acessar sua conta. Altere a senha da sua conta e defina uma nova opção de recuperação imediatamente nas Configurações.",
     "Set up Secure Messages": "Configurar mensagens seguras",
     "Go to Settings": "Ir para as configurações",
     "Unrecognised address": "Endereço não reconhecido",
@@ -967,10 +967,10 @@
     "Invite anyway and never warn me again": "Convide mesmo assim e nunca mais me avise",
     "Invite anyway": "Convide mesmo assim",
     "Whether or not you're logged in (we don't record your username)": "Se você está logado ou não (não gravamos seu nome de usuário)",
-    "Upgrades a room to a new version": "Atualiza uma sala para uma nova versão",
-    "Gets or sets the room topic": "Consultar ou definir a descrição da sala",
+    "Upgrades a room to a new version": "Atualiza a sala para uma nova versão",
+    "Gets or sets the room topic": "Consulta ou altera a descrição da sala",
     "This room has no topic.": "Esta sala não tem descrição.",
-    "Sets the room name": "Define o nome da sala",
+    "Sets the room name": "Altera o nome da sala",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Agrupar e filtrar salas por tags personalizadas (recarregue para aplicar as alterações)",
     "Render simple counters in room header": "Renderizar contadores simples no cabeçalho da sala",
     "Enable Emoji suggestions while typing": "Ativar sugestões de emojis ao digitar",
@@ -978,7 +978,7 @@
     "Show join/leave messages (invites/kicks/bans unaffected)": "Mostrar mensagens de entrar/sair (não considera convites/remoções/banimentos)",
     "Show avatar changes": "Mostrar alterações de foto de perfil",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "O arquivo '%(fileName)s' excede o limite de tamanho deste homeserver para uploads",
-    "Changes your display nickname in the current room only": "Altera o seu nome e sobrenome apenas na sala atual",
+    "Changes your display nickname in the current room only": "Altera o seu nome e sobrenome apenas nesta sala",
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s atualizou esta sala.",
     "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s tornou a sala pública para quem conhece o link.",
     "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s tornou a sala disponível apenas por convite.",
@@ -1005,7 +1005,7 @@
     "You've successfully verified this user.": "Você confirmou este usuário com sucesso.",
     "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "As mensagens com este usuário estão protegidas com a criptografia de ponta a ponta e não podem ser lidas por terceiros.",
     "Got It": "Ok, entendi",
-    "Unable to find a supported verification method.": "Nenhum método de confirmação é suportado.",
+    "Unable to find a supported verification method.": "Nenhuma opção de confirmação é suportada.",
     "Dog": "Cachorro",
     "Cat": "Gato",
     "Lion": "Leão",
@@ -1042,7 +1042,7 @@
     "Glasses": "Óculos",
     "Spanner": "Chave inglesa",
     "Santa": "Papai-noel",
-    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Adiciona  ¯ \\ _ (ツ) _ / ¯ no início de uma mensagem de texto simples",
+    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Adiciona ¯ \\ _ (ツ) _ / ¯ a uma mensagem de texto",
     "User %(userId)s is already in the room": "O usuário %(userId)s já está na sala",
     "The user must be unbanned before they can be invited.": "O banimento do usuário precisa ser removido antes de ser convidado.",
     "Show display name changes": "Mostrar alterações de nome e sobrenome",
@@ -1079,13 +1079,13 @@
     "No": "Não",
     "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Enviamos um e-mail para você confirmar seu endereço. Por favor, siga as instruções e clique no botão abaixo.",
     "Email Address": "Endereço de e-mail",
-    "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Você tem certeza? Você perderá suas mensagens criptografadas se não for feito o backup correto de suas chaves.",
+    "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Tem certeza? Você perderá suas mensagens criptografadas se não tiver feito o backup de suas chaves.",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "As mensagens estão protegidas com a criptografia de ponta a ponta. Somente você e o(s) destinatário(s) têm as chaves para ler essas mensagens.",
-    "Restore from Backup": "Restaurar do Backup",
+    "Restore from Backup": "Restaurar do backup",
     "Back up your keys before signing out to avoid losing them.": "Faça o backup das suas chaves antes de sair, para evitar perdê-las.",
     "Backing up %(sessionsRemaining)s keys...": "Fazendo o backup das chaves de %(sessionsRemaining)s...",
-    "All keys backed up": "O Backup de todas as chaves foi realizado",
-    "Start using Key Backup": "Comece a usar o Backup de chave",
+    "All keys backed up": "O backup de todas as chaves foi realizado",
+    "Start using Key Backup": "Comece a usar backup de chave",
     "Add an email address to configure email notifications": "Adicione um endereço de e-mail para configurar notificações por e-mail",
     "Unable to verify phone number.": "Não foi possível confirmar o número de telefone.",
     "Verification code": "Código de confirmação",
@@ -1181,12 +1181,12 @@
     "Messages": "Mensagens",
     "Actions": "Ações",
     "Other": "Outros",
-    "Sends a message as plain text, without interpreting it as markdown": "Envia uma mensagem como texto simples, sem formatar o texto",
-    "Sends a message as html, without interpreting it as markdown": "Envia uma mensagem como HTML, sem formatar o texto",
+    "Sends a message as plain text, without interpreting it as markdown": "Envia uma mensagem de texto sem formatação",
+    "Sends a message as html, without interpreting it as markdown": "Envia uma mensagem como HTML, sem formatação",
     "You do not have the required permissions to use this command.": "Você não tem as permissões necessárias para usar este comando.",
     "Error upgrading room": "Erro atualizando a sala",
     "Double check that your server supports the room version chosen and try again.": "Verifique se seu servidor suporta a versão de sala escolhida e tente novamente.",
-    "Changes the avatar of the current room": "Altera a foto da sala atual",
+    "Changes the avatar of the current room": "Altera a foto da sala",
     "Changes your avatar in this current room only": "Altera a sua foto de perfil apenas nesta sala",
     "Changes your avatar in all rooms": "Altera a sua foto de perfil em todas as salas",
     "Failed to set topic": "Não foi possível definir a descrição",
@@ -1206,14 +1206,14 @@
     "Session already verified!": "Sessão já confirmada!",
     "WARNING: Session already verified, but keys do NOT MATCH!": "ATENÇÃO: Sessão já confirmada, mas as chaves NÃO SÃO IGUAIS!",
     "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!": "ATENÇÃO: A CONFIRMAÇÃO DA CHAVE FALHOU! A chave de assinatura para %(userId)s e sessão %(deviceId)s é \"%(fprint)s\", o que não corresponde à chave fornecida \"%(fingerprint)s\". Isso pode significar que suas comunicações estejam sendo interceptadas por terceiros!",
-    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "A chave de assinatura que você forneceu corresponde à chave de assinatura que você recebeu da sessão %(deviceId)s  do usuário %(userId)s. Esta sessão foi marcada como confirmada.",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "A chave de assinatura que você forneceu corresponde à chave de assinatura que você recebeu da sessão %(deviceId)s do usuário %(userId)s. Esta sessão foi marcada como confirmada.",
     "Sends the given message coloured as a rainbow": "Envia a mensagem colorida como arco-íris",
     "Sends the given emote coloured as a rainbow": "Envia o emoji colorido como um arco-íris",
     "Displays list of commands with usages and descriptions": "Exibe a lista de comandos com usos e descrições",
     "Displays information about a user": "Exibe informação sobre um usuário",
-    "Send a bug report with logs": "Envia um relatório de erros com os logs",
+    "Send a bug report with logs": "Envia um relatório de erro",
     "Opens chat with the given user": "Abre um chat com determinada pessoa",
-    "Sends a message to the given user": "Envia uma mensagem com determinada pessoa",
+    "Sends a message to the given user": "Envia uma mensagem para determinada pessoa",
     "%(senderName)s made no change.": "%(senderName)s não fez nenhuma alteração.",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s alterou o nome da sala de %(oldRoomName)s para %(newRoomName)s.",
     "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s adicionou os endereços alternativos %(addresses)s desta sala.",
@@ -1328,7 +1328,7 @@
     "Try out new ways to ignore people (experimental)": "Tente novas maneiras de bloquear pessoas (experimental)",
     "Support adding custom themes": "Permite adicionar temas personalizados",
     "Enable advanced debugging for the room list": "Ativar a depuração avançada para a lista de salas",
-    "Show info about bridges in room settings": "Exibir informações sobre bridges nas configurações das salas",
+    "Show info about bridges in room settings": "Exibir informações sobre integrações nas configurações das salas",
     "Font size": "Tamanho da fonte",
     "Use custom size": "Usar tamanho personalizado",
     "Use a more compact ‘Modern’ layout": "Usar um layout mais compacto 'Moderno'",
@@ -1378,8 +1378,8 @@
     "Decline (%(counter)s)": "Recusar (%(counter)s)",
     "Accept <policyLink /> to continue:": "Aceitar <policyLink /> para continuar:",
     "Upload": "Enviar",
-    "This bridge was provisioned by <user />.": "Esta ponte foi disponibilizada por <user />.",
-    "This bridge is managed by <user />.": "Esta ponte é gerida por <user />.",
+    "This bridge was provisioned by <user />.": "Esta integração foi disponibilizada por <user />.",
+    "This bridge is managed by <user />.": "Esta integração é desenvolvida por <user />.",
     "Workspace: %(networkName)s": "Espaço de trabalho: %(networkName)s",
     "Channel: %(channelName)s": "Canal: %(channelName)s",
     "Show less": "Mostrar menos",
@@ -1431,24 +1431,24 @@
     "%(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.",
-    "This session is backing up your keys. ": "Esta sessão está fazendo a cópia (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 cópia (backup) de suas chaves</b>, mas você tem uma cópia existente que pode restaurar e adicionar para continuar.",
-    "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Conecte esta sessão à cópia de segurança (backup) das chaves antes de fazer logout para evitar perder quaisquer chaves que possam estar apenas nesta sessão.",
-    "Connect this session to Key Backup": "Conecte esta sessão à Cópia de Segurança (Backup) da Chave",
+    "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.",
+    "Connect this session to Key Backup": "Autorize esta sessão a fazer o backup de chaves",
     "not stored": "não armazenado",
-    "Backup has a <validity>valid</validity> signature from this user": "A cópia de segurança (backup) tem uma assinatura <validity>válida</validity> deste(a) usuário(a)",
-    "Backup has a <validity>invalid</validity> signature from this user": "A cópia de segurança (backup) tem uma assinatura <validity>inválida</validity> deste(a) usuário(a)",
-    "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "A cópia de segurança tem uma assinatura de um usuário <verify>desconhecido</verify> com ID %(deviceId)s",
-    "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "A cópia de segurança tem uma assinatura de uma sessão <verify>desconhecida</verify> com ID %(deviceId)s",
-    "Backup has a <validity>valid</validity> signature from this session": "A cópia de segurança (backup) tem uma assinatura <validity>válida</validity> desta sessão",
-    "Backup has an <validity>invalid</validity> signature from this session": "A cópia de segurança (backup) tem uma assinatura <validity>inválida</validity> desta sessão",
-    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "A cópia de segurança (backup) tem uma assinatura <validity>válida</validity> da sessão <verify>confirmada</verify> <device></device>",
-    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "A cópia de segurança tem uma assinatura <validity>válida</validity> de uma sessão <verify>não confirmada</verify> <device></device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "A cópia de segurança tem uma assinatura <validity>inválida</validity> de uma sessão <verify>confirmada</verify> <device></device>",
-    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "A cópia de segurança (backup) tem uma assinatura <validity>inválida</validity> de uma sessão <verify>não confirmada</verify> <device></device>",
-    "Backup is not signed by any of your sessions": "A cópia de segurança (backup) não foi assinada por nenhuma de suas sessões",
-    "This backup is trusted because it has been restored on this session": "Esta cópia de segurança (backup) é confiável, pois foi restaurada nesta sessão",
+    "Backup has a <validity>valid</validity> signature from this user": "O backup tem uma assinatura <validity>válida</validity> deste usuário",
+    "Backup has a <validity>invalid</validity> signature from this user": "O backup tem uma assinatura <validity>inválida</validity> deste usuário",
+    "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "O backup tem uma assinatura de um usuário <verify>desconhecido</verify> com ID %(deviceId)s",
+    "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "O backup tem uma assinatura de uma sessão <verify>desconhecida</verify> com ID %(deviceId)s",
+    "Backup has a <validity>valid</validity> signature from this session": "O backup tem uma assinatura <validity>válida</validity> desta sessão",
+    "Backup has an <validity>invalid</validity> signature from this session": "O backup tem uma assinatura <validity>inválida</validity> desta sessão",
+    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "O backup tem uma assinatura <validity>válida</validity> da sessão <verify>confirmada</verify> <device></device>",
+    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "O backup tem uma assinatura <validity>válida</validity> de uma sessão <verify>não confirmada</verify> <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "O backup tem uma assinatura <validity>inválida</validity> de uma sessão <verify>confirmada</verify> <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "O backup tem uma assinatura <validity>inválida</validity> de uma sessão <verify>não confirmada</verify> <device></device>",
+    "Backup is not signed by any of your sessions": "O backup não foi assinado por nenhuma de suas sessões",
+    "This backup is trusted because it has been restored on this session": "Este backup é confiável, pois foi restaurado nesta sessão",
     "Backup key stored: ": "Chave de segurança (backup) armazenada: ",
     "Your keys are <b>not being backed up from this session</b>.": "Suas chaves <b>não estão sendo copiadas desta sessão</b>.",
     "wait and try again later": "aguarde e tente novamente mais tarde",
@@ -1460,7 +1460,7 @@
     "A session's public name is visible to people you communicate with": "O nome público de uma sessão é visível para as pessoas com quem você se comunica",
     "Enable room encryption": "Ativar criptografia nesta sala",
     "Enable encryption?": "Ativar criptografia?",
-    "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>": "Uma vez ativada, a criptografia da sala não poderá ser desativada. Mensagens enviadas em uma sala criptografada não podem ser lidas pelo servidor, apenas pelos participantes da sala. Ativar a criptografia poderá impedir que vários bots e bridges funcionem corretamente. <a>Saiba mais sobre criptografia.</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>": "Uma vez ativada, a criptografia da sala não poderá ser desativada. Mensagens enviadas em uma sala criptografada não podem ser lidas pelo servidor, apenas pelos participantes da sala. Ativar a criptografia poderá impedir que vários bots e integrações funcionem corretamente. <a>Saiba mais sobre criptografia.</a>",
     "Encryption": "Criptografia",
     "Once enabled, encryption cannot be disabled.": "Uma vez ativada, a criptografia não poderá ser desativada.",
     "Encrypted": "Criptografada",
@@ -1514,7 +1514,7 @@
     "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Por favor, diga-nos o que aconteceu de errado ou, ainda melhor, crie um bilhete de erro no GitHub que descreva o problema.",
     "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Apagar todos os dados desta sessão é uma ação permanente. Mensagens criptografadas serão perdidas, a não ser que as chaves delas tenham sido copiadas para o backup.",
     "Set a room address to easily share your room with other people.": "Defina um endereço de sala para facilmente compartilhar sua sala com outras pessoas.",
-    "You can’t disable this later. Bridges & most bots won’t work yet.": "Você não poderá desativar isso mais tarde. Pontes e a maioria dos bots não funcionarão.",
+    "You can’t disable this later. Bridges & most bots won’t work yet.": "Você não poderá desativar isso mais tarde. Integrações e a maioria dos bots não funcionarão.",
     "Enable end-to-end encryption": "Ativar a criptografia de ponta a ponta",
     "Create a public room": "Criar uma sala pública",
     "Create a private room": "Criar uma sala privada",
@@ -1540,7 +1540,7 @@
     "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 a duplicação de registro de problemas, por favor <existingIssuesLink>veja os problemas existentes</existingIssuesLink> antes e adicione um +1, ou então <newIssueLink>crie um novo item</newIssueLink> se seu problema ainda não foi reportado.",
     "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Reportar esta mensagem enviará o seu 'event ID' único para o/a administrador/a do seu Homeserver. Se as mensagens nesta sala são criptografadas, o/a administrador/a não conseguirá ler o texto da mensagem nem ver nenhuma imagem ou arquivo.",
     "Sign out and remove encryption keys?": "Fazer logout e remover as chaves de criptografia?",
-    "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Alguns dados de sessão, incluindo chaves de mensagens criptografadas, estão faltando. Faça logout e entre novamente para resolver isso, restaurando as chaves do backup.",
+    "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Alguns dados de sessão, incluindo chaves de mensagens criptografadas, estão faltando. Desconecte-se e entre novamente para resolver isso, o que restaurará as chaves do backup.",
     "Verify other session": "Confirmar outra sessão",
     "A widget would like to verify your identity": "Um widget deseja confirmar sua identidade",
     "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.": "Um widget localizado em %(widgetUrl)s deseja confirmar sua identidade. Permitindo isso, o widget poderá verificar sua ID de usuário, mas não poderá realizar nenhuma ação em seu nome.",
@@ -1553,15 +1553,15 @@
     "Recovery key mismatch": "Chave de recuperação incorreta",
     "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "O backup não pôde ser descriptografado com esta chave de recuperação: por favor, verifique se você digitou a chave de recuperação correta.",
     "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "O backup não pôde ser descriptografado com esta frase de recuperação: por favor, verifique se você digitou a frase de recuperação correta.",
-    "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Atenção</b>: você só deve configurar a cópia de segurança (backup) das chaves em um computador de sua confiança.",
+    "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Atenção</b>: você só deve configurar o backup de chave em um computador de sua confiança.",
     "Enter recovery key": "Digite a chave de recuperação",
-    "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Atenção</b>: Você só deve configurar a cópia de segurança (backup) das chaves em um computador de sua confiança.",
+    "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Atenção</b>: Você só deve configurar o backup de chave em um computador de sua confiança.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Se você esqueceu sua chave de recuperação, pode <button>configurar novas opções de recuperação</button>",
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Está faltando a chave pública do captcha no Servidor (homeserver). Por favor, reporte isso aos(às) administradores(as) do servidor.",
     "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>.": "Entre com a localização do seu Servidor Matrix. Pode ser seu próprio domínio ou ser um subdomínio de <a>element.io</a>.",
     "Create your Matrix account on %(serverName)s": "Criar sua conta Matrix em %(serverName)s",
     "Create your Matrix account on <underlinedServerName />": "Crie sua conta Matrix em <underlinedServerName />",
-    "Welcome to %(appName)s": "Bem-vinda/o ao %(appName)s",
+    "Welcome to %(appName)s": "Boas-vindas ao %(appName)s",
     "Liberate your communication": "Liberte sua comunicação",
     "Send a Direct Message": "Enviar uma mensagem",
     "Explore Public Rooms": "Explorar salas públicas",
@@ -1571,7 +1571,7 @@
     "%(creator)s created and configured the room.": "%(creator)s criou e configurou esta sala.",
     "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Se você não conseguir encontrar a sala que está procurando, peça um convite para a sala ou <a>Crie uma nova sala</a>.",
     "Verify this login": "Confirmar este login",
-    "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Alterar a sua senha redefinirá todas as chaves de criptografia de ponta a ponta existentes em todas as suas sessões, tornando o histórico de mensagens criptografadas ilegível. Faça uma cópia (backup) das suas chaves, ou exporte as chaves de outra sessão antes de alterar a sua senha.",
+    "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Alterar a sua senha redefinirá todas as chaves de criptografia de ponta a ponta existentes em todas as suas sessões, tornando o histórico de mensagens criptografadas ilegível. Faça um backup das suas chaves, ou exporte as chaves de outra sessão antes de alterar a sua senha.",
     "Create account": "Criar conta",
     "Create your account": "Criar sua conta",
     "Use Recovery Key or Passphrase": "Use a chave de recuperação, ou a frase de recuperação",
@@ -1583,17 +1583,17 @@
     "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.": "Atenção: Seus dados pessoais (incluindo chaves de criptografia) ainda estão armazenados nesta sessão. Apague-os quando tiver finalizado esta sessão, ou se quer entrar com outra conta.",
     "Confirm encryption setup": "Confirmar a configuração de criptografia",
     "Click the button below to confirm setting up encryption.": "Clique no botão abaixo para confirmar a configuração da criptografia.",
-    "Safeguard against losing access to encrypted messages & data by backing up encryption keys on your server.": "Proteja-se contra a perda de acesso a mensagens e dados criptografados fazendo a cópia segura (backup) das chaves de criptografia no seu servidor.",
+    "Safeguard against losing access to encrypted messages & data by backing up encryption keys on your server.": "Proteja-se contra a perda de acesso a mensagens e dados criptografados fazendo backup das chaves de criptografia no seu servidor.",
     "Generate a Security Key": "Gerar uma Chave de Segurança",
     "We’ll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": "Nós geramos uma Chave de Segurança para você. Por favor, guarde-a em um lugar seguro, como um gerenciador de senhas ou um cofre.",
-    "Use a secret phrase only you know, and optionally save a Security Key to use for backup.": "Use uma frase secreta que apenas você conhece, e opcionalmente salve uma Chave de Segurança para usar como cópia de segurança (backup).",
-    "Restore your key backup to upgrade your encryption": "Restaurar a sua cópia segura (backup) de chaves para atualizar a sua criptografia",
+    "Use a secret phrase only you know, and optionally save a Security Key to use for backup.": "Use uma frase secreta que apenas você conhece, e opcionalmente salve uma Chave de Segurança para acessar o backup.",
+    "Restore your key backup to upgrade your encryption": "Restaurar o backup das suas chaves para atualizar a sua criptografia",
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Atualize esta sessão para permitir que ela confirme outras sessões, dando a elas acesso às mensagens criptografadas e marcando-as como confiáveis para os seus contatos.",
     "Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.": "Guarde sua Chave de Segurança em algum lugar seguro, como por exemplo um gestor de senhas ou um cofre, já que esta chave é a proteção para seus dados criptografados.",
     "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "Se você cancelar agora, poderá perder mensagens e dados criptografados se você perder acesso aos seus logins atuais.",
     "Upgrade your encryption": "Atualizar sua criptografia",
     "Save your Security Key": "Salve sua Chave de Segurança",
-    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Nós vamos armazenar uma cópia criptografada de suas chaves no nosso servidor. Por favor, proteja esta cópia (backup) com uma frase de recuperação.",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Nós armazenaremos uma cópia criptografada de suas chaves no nosso servidor. Por favor, proteja este backup com uma frase de recuperação.",
     "Set up with a recovery key": "Configurar com uma chave de recuperação",
     "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Sua chave de recuperação é uma rede de proteção - você pode usá-la para restaurar o acesso às suas mensagens criptografadas se você esquecer sua frase de recuperação.",
     "Your recovery key": "Sua chave de recuperação",
@@ -1601,12 +1601,12 @@
     "Your recovery key is in your <b>Downloads</b> folder.": "Sua chave de recuperação está na sua pasta de <b>Downloads</b>.",
     "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.": "Sem configurar a Recuperação Segura de Mensagens, você não será capaz de restaurar seu histórico de mensagens criptografadas e fizer logout ou usar outra sessão.",
     "Make a copy of your recovery key": "Fazer uma cópia de sua chave de recuperação",
-    "Starting backup...": "Iniciando cópia de segurança (backup)...",
-    "Create key backup": "Criar cópia de segurança (backup) da chave",
+    "Starting backup...": "Começando o backup...",
+    "Create key backup": "Criar backup de chave",
     "A new recovery passphrase and key for Secure Messages have been detected.": "Uma nova frase e chave de recuperação para Mensagens Seguras foram detectadas.",
-    "This session is encrypting history using the new recovery method.": "Esta sessão está criptografando o histórico de mensagens usando o novo método de restauração.",
+    "This session is encrypting history using the new recovery method.": "Esta sessão está criptografando o histórico de mensagens usando a nova opção de recuperação.",
     "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Esta sessão detectou que sua frase e chave de recuperação para Mensagens Seguras foram removidas.",
-    "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.": "Se você fez isso acidentalmente, você pode configurar Mensagens Seguras nesta sessão, o que vai re-criptografar o histórico de mensagens desta sessão com um novo método de recuperação.",
+    "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.": "Se você fez isso acidentalmente, você pode configurar Mensagens Seguras nesta sessão, o que vai re-criptografar o histórico de mensagens desta sessão com uma nova opção de recuperação.",
     "If disabled, messages from encrypted rooms won't appear in search results.": "Se desativado, as mensagens de salas criptografadas não aparecerão em resultados de buscas.",
     "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "%(brand)s está armazenando de forma segura as mensagens criptografadas localmente, para que possam aparecer nos resultados das buscas:",
     "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s de %(totalRooms)s",
@@ -1642,7 +1642,7 @@
     "Edited at %(date)s. Click to view edits.": "Editado em %(date)s. Clique para ver edições.",
     "edited": "editado",
     "Can't load this message": "Não foi possível carregar esta mensagem",
-    "Submit logs": "Enviar registros",
+    "Submit logs": "Enviar relatórios",
     "Frequently Used": "Mais usados",
     "Animals & Nature": "Animais e natureza",
     "Food & Drink": "Comidas e bebidas",
@@ -1722,7 +1722,7 @@
     "Published Addresses": "Endereços publicados",
     "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.": "Os endereços publicados podem ser usados por qualquer pessoa em qualquer servidor para entrar na sala. Para publicar um endereço, primeiramente ele precisa ser definido como um endereço local.",
     "Other published addresses:": "Outros endereços publicados:",
-    "New published address (e.g. #alias:server)": "Novo endereço publicado (por exemplo, #apelido:server)",
+    "New published address (e.g. #alias:server)": "Novo endereço publicado (por exemplo, #nome:server)",
     "Local Addresses": "Endereços locais",
     "%(name)s cancelled verifying": "%(name)s cancelou a confirmação",
     "Your display name": "Seu nome e sobrenome",
@@ -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 />",
@@ -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",
@@ -1889,12 +1889,12 @@
     "All settings": "Todas as configurações",
     "You're signed out": "Você está desconectada/o",
     "Clear personal data": "Limpar dados pessoais",
-    "Command Autocomplete": "Preenchimento automático de comandos",
+    "Command Autocomplete": "Preenchimento automático do comando",
     "Community Autocomplete": "Preenchimento automático da comunidade",
     "DuckDuckGo Results": "Resultados no DuckDuckGo",
-    "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.": "Se você não excluiu o método de recuperação, um invasor pode estar tentando acessar sua conta. Altere a senha da sua conta e defina imediatamente um novo método de recuperação nas Configurações.",
+    "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.": "Se você não excluiu a opção de recuperação, um invasor pode estar tentando acessar sua conta. Altere a senha da sua conta e defina imediatamente uma nova opção de recuperação nas Configurações.",
     "Room List": "Lista de salas",
-    "Autocomplete": "Autocompletar",
+    "Autocomplete": "Preencher automaticamente",
     "Alt": "Alt",
     "Alt Gr": "Alt Gr",
     "Shift": "Shift",
@@ -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.",
@@ -2056,11 +2056,11 @@
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Você atualizará esta sala de <oldVersion /> para <newVersion />.",
     "A username can only contain lower case letters, numbers and '=_-./'": "Um nome de usuário só pode ter letras minúsculas, números e '=_-./'",
     "Command Help": "Ajuda com Comandos",
-    "To help us prevent this in future, please <a>send us logs</a>.": "Para nos ajudar a evitar isso no futuro, <a>envie-nos os registros</a>.",
+    "To help us prevent this in future, please <a>send us logs</a>.": "Para nos ajudar a evitar isso no futuro, <a>envie-nos os relatórios</a>.",
     "Your browser likely removed this data when running low on disk space.": "O seu navegador provavelmente removeu esses dados quando o espaço de armazenamento ficou insuficiente.",
     "Integration Manager": "Gerenciador de Integrações",
     "Find others by phone or email": "Encontre outras pessoas por telefone ou e-mail",
-    "Use bots, bridges, widgets and sticker packs": "Use bots, pontes, widgets e pacotes de figurinhas",
+    "Use bots, bridges, widgets and sticker packs": "Use bots, integrações, widgets e pacotes de figurinhas",
     "Terms of Service": "Termos de serviço",
     "To continue you need to accept the terms of this service.": "Para continuar, você precisa aceitar os termos deste serviço.",
     "Service": "Serviço",
@@ -2308,8 +2308,8 @@
     "Room Info": "Informações da sala",
     "Widgets": "Widgets",
     "Unpin app": "Desafixar app",
-    "Edit widgets, bridges & bots": "Editar widgets, pontes & bots",
-    "Add widgets, bridges & bots": "Adicionar widgets, pontes & bots",
+    "Edit widgets, bridges & bots": "Editar widgets, integrações & bots",
+    "Add widgets, bridges & bots": "Adicionar widgets, integrações & bots",
     "%(count)s people|other": "%(count)s pessoas",
     "%(count)s people|one": "%(count)s pessoa",
     "Show files": "Mostrar arquivos",
@@ -2329,5 +2329,659 @@
     "What's the name of your community or team?": "Qual é o nome da sua comunidade ou equipe?",
     "Add image (optional)": "Adicionar foto (opcional)",
     "An image will help people identify your community.": "Uma foto ajudará as pessoas identificarem a sua comunidade.",
-    "Preview": "Visualizar"
+    "Preview": "Visualizar",
+    "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Adiciona ( ͡° ͜ʖ ͡°) a uma mensagem de texto",
+    "Set up Secure Backup": "Configurar o backup online",
+    "Safeguard against losing access to encrypted messages & data": "Proteja-se contra a perda de acesso a mensagens & dados criptografados",
+    "Show message previews for reactions in DMs": "Mostrar pré-visualizações para reações em mensagens privadas",
+    "Show message previews for reactions in all rooms": "Mostrar pré-visualizações para reações em todas as salas",
+    "Uploading logs": "Enviando relatórios",
+    "Downloading logs": "Baixando relatórios",
+    "Backup version:": "Versão do backup:",
+    "Backup key stored:": "Backup da chave armazenada:",
+    "Backup key cached:": "Backup da chave em cache:",
+    "Secure Backup": "Backup online",
+    "Your keys are being backed up (the first backup could take a few minutes).": "O backup de suas chaves está sendo feito (o primeiro backup pode demorar alguns minutos).",
+    "Secure your backup with a recovery passphrase": "Proteja o seu backup com uma frase de recuperação",
+    "You can also set up Secure Backup & manage your keys in Settings.": "Você também pode configurar o Backup online & configurar as suas senhas nas Configurações.",
+    "End conference": "Terminar conferência",
+    "This will end the conference for everyone. Continue?": "Isso encerrará a chamada para todos. Prosseguir?",
+    "Cross-signing is ready for use.": "A autoverificação está pronta para uso.",
+    "Cross-signing is not set up.": "A autoverificação não está configurada.",
+    "Reset": "Redefinir",
+    "not found in storage": "não encontrado no armazenamento",
+    "Master private key:": "Chave privada principal:",
+    "Failed to save your profile": "Houve uma falha ao salvar o seu perfil",
+    "The operation could not be completed": "A operação não foi concluída",
+    "Algorithm:": "Algoritmo:",
+    "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.": "Faça backup de suas chaves de criptografia com os dados da sua conta, para se prevenir a perder o acesso às suas sessões. Suas chaves serão protegidas com uma chave de recuperação exclusiva.",
+    "Secret storage:": "Armazenamento secreto:",
+    "ready": "pronto",
+    "not ready": "não está pronto",
+    "Subscribed lists": "Listas inscritas",
+    "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Esta sala está integrando mensagens com as seguintes plataformas. <a>Saiba mais.</a>",
+    "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Esta sala não está integrando mensagens com nenhuma plataforma. <a>Saiba mais.</a>",
+    "Bridges": "Integrações",
+    "Error changing power level requirement": "Houve um erro ao alterar o nível de permissão do contato",
+    "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "Ocorreu um erro ao alterar os níveis de permissão da sala. Certifique-se de que você tem o nível suficiente e tente novamente.",
+    "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "Ocorreu um erro ao alterar o nível de permissão de um contato. Certifique-se de que você tem o nível suficiente e tente novamente.",
+    "Remove messages sent by others": "Remover mensagens enviadas por outros",
+    "To link to this room, please add an address.": "Para criar um link para esta sala, antes adicione um endereço.",
+    "Explore community rooms": "Explorar salas da comunidade",
+    "Explore public rooms": "Explorar salas públicas",
+    "Can't see what you’re looking for?": "Não consegue encontrar o que está procurando?",
+    "Explore all public rooms": "Explorar todas as salas públicas",
+    "%(count)s results|other": "%(count)s resultados",
+    "%(count)s results|one": "%(count)s resultado",
+    "%(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 apareceu ao tentar entrar na sala. Se você recebeu essa mensagem por engano, <issueLink>envie um relatório de erro</issueLink>.",
+    "Not encrypted": "Não criptografada",
+    "About": "Sobre a sala",
+    "Pin to room": "Fixar na sala",
+    "You can only pin 2 widgets at a time": "Você só pode fixar 2 widgets ao mesmo tempo",
+    "Ignored attempt to disable encryption": "A tentativa de desativar a criptografia foi ignorada",
+    "Message Actions": "Ações da mensagem",
+    "Join the conference at the top of this room": "Entre na chamada em grupo no topo desta sala",
+    "Join the conference from the room information card on the right": "Participe da chamada em grupo, clicando no botão de informações da sala, à direita da tela",
+    "Video conference ended by %(senderName)s": "Chamada de vídeo em grupo encerrada por %(senderName)s",
+    "Video conference updated by %(senderName)s": "Chamada de vídeo em grupo atualizada por %(senderName)s",
+    "Video conference started by %(senderName)s": "Chamada de vídeo em grupo iniciada por %(senderName)s",
+    "Preparing to download logs": "Preparando os relatórios para download",
+    "Download logs": "Baixar relatórios",
+    "Use this when referencing your community to others. The community ID cannot be changed.": "Use esta informação para indicar a sua comunidade para outras pessoas. O ID da comunidade não pode ser alterado.",
+    "You can change this later if needed.": "Você poderá alterar esta informação posteriormente, se for necessário.",
+    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone.": "Salas privadas são encontradas e acessadas apenas por meio de convite. Por sua vez, salas públicas são encontradas e acessadas por qualquer pessoa.",
+    "Private rooms can be found and joined by invitation only. Public rooms can be found and joined by anyone in this community.": "Salas privadas são encontradas e acessadas apenas por meio de convite. Por sua vez, salas públicas são encontradas e acessadas por qualquer integrante desta comunidade.",
+    "Your server requires encryption to be enabled in private rooms.": "O seu servidor demanda que a criptografia esteja ativada em salas privadas.",
+    "You might enable this if the room will only be used for collaborating with internal teams on your homeserver. This cannot be changed later.": "Você pode ativar essa opção se a sala for usada apenas para colaboração dentre equipes internas em seu servidor local. Essa opção não poderá ser alterado mais tarde.",
+    "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.": "Você pode desativar essa opção se a sala for usada para colaboração dentre equipes externas que possuem seu próprio servidor local. Isso não poderá ser alterado mais tarde.",
+    "Create a room in %(communityName)s": "Criar uma sala em %(communityName)s",
+    "Block anyone not part of %(serverName)s from ever joining this room.": "Bloquear pessoas externas ao servidor %(serverName)s de conseguirem entrar nesta sala.",
+    "Confirm your account deactivation by using Single Sign On to prove your identity.": "Prove a sua identidade por meio do seu Acesso único, para confirmar a desativação da sua conta.",
+    "There was an error updating your community. The server is unable to process your request.": "Houve um erro ao atualizar a sua comunidade. O servidor não conseguiu processar a sua solicitação.",
+    "Update community": "Atualizar a comunidade",
+    "To continue, use Single Sign On to prove your identity.": "Para continuar, use o Acesso único para provar a sua identidade.",
+    "May include members not in %(communityName)s": "Pode incluir integrantes externos à %(communityName)s",
+    "Start a conversation with someone using their name or username (like <userId/>).": "Comece uma conversa, a partir do nome ou nome de usuário de alguém (por exemplo: <userId/>).",
+    "This won't invite them to %(communityName)s. To invite someone to %(communityName)s, click <a>here</a>": "Ninguém será convidado para %(communityName)s. Para convidar alguém para %(communityName)s, clique <a>aqui</a>",
+    "Go": "Próximo",
+    "Invite someone using their name, username (like <userId/>) or <a>share this room</a>.": "Convide alguém a partir do nome ou nome de usuário (por exemplo: <userId/>) ou <a>compartilhe esta sala</a>.",
+    "Confirm by comparing the following with the User Settings in your other session:": "Para confirmar, compare a seguinte informação com aquela apresentada em sua outra sessão:",
+    "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:": "Atualizar esta sala irá fechar a instância atual da sala e, em seu lugar, criar uma sala atualizada com o mesmo nome. Para oferecer a melhor experiência possível aos integrantes da sala, nós iremos:",
+    "You're all caught up.": "Tudo em dia.",
+    "Your area is experiencing difficulties connecting to the internet.": "A sua região está com dificuldade de acesso à internet.",
+    "A connection error occurred while trying to contact the server.": "Um erro ocorreu na conexão do Element com o servidor.",
+    "Unable to set up keys": "Não foi possível configurar as chaves",
+    "Unpin": "Desafixar",
+    "Cannot create rooms in this community": "Não foi possível criar salas nesta comunidade",
+    "You do not have permission to create rooms in this community.": "Você não tem permissão para criar salas nesta comunidade.",
+    "You’re all caught up": "Tudo em dia",
+    "Explore rooms in %(communityName)s": "Explore as salas em %(communityName)s",
+    "Create community": "Criar comunidade",
+    "Failed to find the general chat for this community": "Houve uma falha para encontrar a conversa principal desta comunidade",
+    "Community settings": "Configurações da comunidade",
+    "User settings": "Configurações do usuário",
+    "Community and user menu": "Comunidade e menu de usuário",
+    "Sign in instead": "Fazer login",
+    "Failed to get autodiscovery configuration from server": "Houve uma falha para obter do servidor a configuração de encontrar contatos",
+    "If you've joined lots of rooms, this might take a while": "Se você participa em muitas salas, isso pode demorar um pouco",
+    "Unable to query for supported registration methods.": "Não foi possível consultar as opções de registro suportadas.",
+    "Registration has been disabled on this homeserver.": "O registro de contas foi desativado neste servidor local.",
+    "Continue with previous account": "Continuar com a conta anterior",
+    "This requires the latest %(brand)s on your other devices:": "Esta funcionalidade requer o %(brand)s mais recente em seus outros aparelhos:",
+    "Emoji Autocomplete": "Preenchimento automático de emoji",
+    "Room Autocomplete": "Preenchimento automático de sala",
+    "User Autocomplete": "Preenchimento automático de usuário",
+    "Enter a recovery passphrase": "Digite uma frase de recuperação",
+    "Great! This recovery passphrase looks strong enough.": "Ótimo! Essa frase de recuperação é forte o suficiente.",
+    "Please enter your recovery passphrase a second time to confirm.": "Digite a sua frase de recuperação uma segunda vez para confirmar, por favor.",
+    "Repeat your recovery passphrase...": "Digite a sua frase de recuperação novamente...",
+    "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Mantenha uma cópia em algum lugar seguro, como em um gerenciador de senhas ou até mesmo em um cofre.",
+    "Unable to query secret storage status": "Não foi possível obter o status do armazenamento secreto",
+    "Set a Security Phrase": "Defina uma frase de segurança",
+    "Confirm Security Phrase": "Confirme a frase de segurança",
+    "Unable to set up secret storage": "Não foi possível definir o armazenamento secreto",
+    "Recovery Method Removed": "Opção de recuperação removida",
+    "Not currently indexing messages for any room.": "Atualmente, mensagens de nenhuma sala estão sendo armazenadas.",
+    "Currently indexing: %(currentRoom)s": "Armazenando no momento: %(currentRoom)s",
+    "Indexed messages:": "Mensagens armazenadas:",
+    "Indexed rooms:": "Salas armazenadas:",
+    "Message downloading sleep time(ms)": "Tempo de espera entre o download de mensagens (ms)",
+    "Clear room list filter field": "Limpar o campo de busca de salas",
+    "Previous/next unread room or DM": "Anterior/próxima mensagem ou sala não lida",
+    "Previous/next room or DM": "Anterior/próxima mensagem ou sala",
+    "Toggle the top left menu": "Alternar o menu superior esquerdo",
+    "Activate selected button": "Apertar no botão selecionado",
+    "Toggle right panel": "Alternar o painel na direita",
+    "Toggle this dialog": "Alternar esta janela",
+    "Move autocomplete selection up/down": "Alternar para cima/baixo a opção do preenchimento automático",
+    "Cancel autocomplete": "Cancelar o preenchimento automático",
+    "Offline encrypted messaging using dehydrated devices": "Envio de mensagens criptografadas offline, usando dispositivos específicos",
+    "Calling...": "Chamando...",
+    "Call connecting...": "Iniciando chamada...",
+    "Starting camera...": "Iniciando a câmera...",
+    "Starting microphone...": "Iniciando o microfone...",
+    "(their device couldn't start the camera / microphone)": "(o aparelho não conseguiu iniciar a câmera/microfone)",
+    "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s alterou a lista de controle de acesso do servidor para esta sala.",
+    "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s definiu a lista de controle de acesso do servidor para esta sala.",
+    "The call could not be established": "Não foi possível iniciar a chamada",
+    "The other party declined the call.": "O contato recusou a chamada.",
+    "%(senderName)s declined the call.": "%(senderName)s recusou a chamada.",
+    "(an error occurred)": "(ocorreu um erro)",
+    "(connection failed)": "(a conexão falhou)",
+    "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Todos os servidores foram banidos desta sala! Esta sala não pode mais ser utilizada.",
+    "Call Declined": "Chamada recusada",
+    "You can only pin up to %(count)s widgets|other": "Você pode fixar até %(count)s widgets",
+    "Move right": "Mover para a direita",
+    "Move left": "Mover para a esquerda",
+    "Revoke permissions": "Revogar permissões",
+    "Unpin a widget to view it in this panel": "Desafixe um widget para exibi-lo neste painel",
+    "Show Widgets": "Mostrar widgets",
+    "Hide Widgets": "Esconder widgets",
+    "The call was answered on another device.": "A chamada foi atendida em outro aparelho.",
+    "Answered Elsewhere": "Respondido em algum lugar",
+    "Modal Widget": "Popup do widget",
+    "Data on this screen is shared with %(widgetDomain)s": "Dados nessa tela são compartilhados com %(widgetDomain)s",
+    "Send feedback": "Enviar comentário",
+    "PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> to help us track down the problem.": "DICA: se você nos informar um erro, envie <debugLogsLink> relatórios de erro </debugLogsLink> para nos ajudar a rastrear o problema.",
+    "Please view <existingIssuesLink>existing bugs on Github</existingIssuesLink> first. No match? <newIssueLink>Start a new one</newIssueLink>.": "Por favor, consulte os <existingIssuesLink> erros conhecidos no Github </existingIssuesLink> antes de enviar o seu. Se ninguém tiver mencionado o seu erro, <newIssueLink> informe-nos sobre um erro novo </newIssueLink>.",
+    "Feedback sent": "Comentário enviado",
+    "Report a bug": "Reportar um erro",
+    "There are two ways you can provide feedback and help us improve %(brand)s.": "Há duas maneiras para fornecer seu comentário e nos ajudar a aprimorar o %(brand)s.",
+    "Comment": "Comentário",
+    "Add comment": "Comentar",
+    "Please go into as much detail as you like, so we can track down the problem.": "Detalhe o quanto for necessário, para que possamos rastrear o problema.",
+    "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",
+    "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",
+    "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",
+    "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",
+    "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.",
+    "Filter": "Pesquisar",
+    "Start a new chat": "Iniciar uma nova conversa",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Armazene mensagens criptografadas de forma segura localmente para que apareçam nos resultados das buscas. %(size)s é necessário para armazenar mensagens de %(rooms)s sala.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Armazene mensagens criptografadas de forma segura localmente para que apareçam nos resultados das buscas. %(size)s é necessário para armazenar mensagens de %(rooms)s salas.",
+    "Filter rooms and people": "Pesquisar salas e pessoas",
+    "Open the link in the email to continue registration.": "Abra o link no e-mail para continuar o registro.",
+    "A confirmation email has been sent to %(emailAddress)s": "Um e-mail de confirmação foi enviado para %(emailAddress)s",
+    "Go to Home View": "Ir para a tela inicial",
+    "<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 para a página da sua comunidade</h1>\n<p>\n     Escreva uma descrição longa para apresentar novos membros à comunidade, ou liste\n     alguns <a href=\"foo\">links</a> importantes\n</p>\n<p>\n     Você pode até adicionar fotos com URLs na Matrix <img src=\"mxc://url\" />\n</p>\n",
+    "Remain on your screen while running": "Permaneça na tela, quando executar",
+    "Remain on your screen when viewing another room, when running": "Permaneça na tela ao visualizar outra sala, quando executar",
+    "New here? <a>Create an account</a>": "Novo por aqui? <a>Crie uma conta</a>",
+    "Got an account? <a>Sign in</a>": "Já tem uma conta? <a>Login</a>",
+    "Use Command + Enter to send a message": "Usar Command + Enter para enviar uma mensagem",
+    "Enter phone number": "Digite o número de telefone",
+    "Enter email address": "Digite o endereço de e-mail",
+    "Decline All": "Recusar tudo",
+    "Approve": "Autorizar",
+    "This widget would like to:": "Este widget gostaria de:",
+    "Approve widget permissions": "Autorizar as permissões do widget",
+    "Return to call": "Retornar para a chamada",
+    "Fill Screen": "Preencher a tela",
+    "Voice Call": "Chamada de voz",
+    "Video Call": "Chamada de vídeo",
+    "Use Ctrl + Enter to send a message": "Usar Ctrl + Enter para enviar uma mensagem",
+    "Render LaTeX maths in messages": "Renderizar fórmulas matemáticas LaTeX em mensagens",
+    "See <b>%(msgtype)s</b> messages posted to your active room": "Veja mensagens de <b>%(msgtype)s</b> enviadas nesta sala ativa",
+    "See <b>%(msgtype)s</b> messages posted to this room": "Veja mensagens de <b>%(msgtype)s</b> enviadas nesta sala",
+    "Send <b>%(msgtype)s</b> messages as you in your active room": "Enviar mensagens de <b>%(msgtype)s</b> nesta sala ativa",
+    "Send <b>%(msgtype)s</b> messages as you in this room": "Enviar mensagens de <b>%(msgtype)s</b> nesta sala",
+    "See general files posted to your active room": "Veja os arquivos enviados nesta sala ativa",
+    "See general files posted to this room": "Veja os arquivos enviados nesta sala",
+    "Send general files as you in your active room": "Enviar arquivos nesta sala ativa",
+    "Send general files as you in this room": "Enviar arquivos nesta sala",
+    "See videos posted to your active room": "Veja os vídeos enviados nesta sala ativa",
+    "See videos posted to this room": "Veja os vídeos enviados nesta sala",
+    "Send videos as you in your active room": "Enviar vídeos nesta sala ativa",
+    "Send videos as you in this room": "Enviar vídeos nesta sala",
+    "See images posted to your active room": "Veja as fotos enviadas nesta sala ativa",
+    "See images posted to this room": "Veja as fotos enviadas nesta sala",
+    "Send images as you in your active room": "Enviar fotos nesta sala ativa",
+    "Send images as you in this room": "Enviar fotos nesta sala",
+    "See emotes posted to your active room": "Veja emojis enviados nesta sala ativa",
+    "See emotes posted to this room": "Veja emojis enviados nesta sala",
+    "Send emotes as you in your active room": "Enviar emojis nesta sala ativa",
+    "Send emotes as you in this room": "Enviar emojis nesta sala",
+    "See text messages posted to your active room": "Veja as mensagens de texto enviadas nesta sala ativa",
+    "See text messages posted to this room": "Veja as mensagens de texto enviadas nesta sala",
+    "Send text messages as you in your active room": "Enviar mensagens de texto nesta sala ativa",
+    "Send text messages as you in this room": "Enviar mensagens de texto nesta sala",
+    "See messages posted to your active room": "Veja as mensagens enviadas nesta sala ativa",
+    "See messages posted to this room": "Veja as mensagens enviadas nesta sala",
+    "Send messages as you in your active room": "Enviar mensagens nesta sala ativa",
+    "Send messages as you in this room": "Enviar mensagens nesta sala",
+    "The <b>%(capability)s</b> capability": "A permissão <b>%(capability)s</b>",
+    "See <b>%(eventType)s</b> events posted to your active room": "Veja eventos de <b>%(eventType)s</b> enviados nesta sala ativa",
+    "Send <b>%(eventType)s</b> events as you in your active room": "Enviar eventos de <b>%(eventType)s</b> nesta sala ativa",
+    "See <b>%(eventType)s</b> events posted to this room": "Veja eventos de <b>%(eventType)s</b> postados nesta sala",
+    "Send <b>%(eventType)s</b> events as you in this room": "Enviar eventos de <b>%(eventType)s</b> nesta sala",
+    "with state key %(stateKey)s": "com chave de estado %(stateKey)s",
+    "with an empty state key": "com uma chave de estado vazia",
+    "See when anyone posts a sticker to your active room": "Veja quando alguém enviar uma figurinha nesta sala ativa",
+    "Send stickers to your active room as you": "Enviar figurinhas para esta sala ativa",
+    "See when a sticker is posted in this room": "Veja quando uma figurinha for enviada nesta sala",
+    "Send stickers to this room as you": "Enviar figurinhas para esta sala",
+    "See when the avatar changes in your active room": "Veja quando a foto desta sala ativa for alterada",
+    "Change the avatar of your active room": "Alterar a foto desta sala ativa",
+    "See when the avatar changes in this room": "Veja quando a foto desta sala for alterada",
+    "Change the avatar of this room": "Alterar a foto desta sala",
+    "See when the name changes in your active room": "Veja quando o nome desta sala ativa for alterado",
+    "Change the name of your active room": "Alterar o nome desta sala ativa",
+    "See when the name changes in this room": "Veja quando o nome desta sala for alterado",
+    "Change the name of this room": "Alterar o nome desta sala",
+    "See when the topic changes in your active room": "Veja quando a descrição for alterada nesta sala ativa",
+    "Change the topic of your active room": "Alterar a descrição desta sala ativa",
+    "See when the topic changes in this room": "Veja quando a descrição for alterada nesta sala",
+    "Change the topic of this room": "Alterar a descrição desta sala",
+    "Change which room you're viewing": "Alterar a sala que você está vendo",
+    "Send stickers into your active room": "Enviar figurinhas nesta sala ativa",
+    "Send stickers into this room": "Enviar figurinhas nesta sala",
+    "No other application is using the webcam": "Nenhum outro aplicativo está usando a câmera",
+    "Permission is granted to use the webcam": "Permissão concedida para usar a câmera",
+    "A microphone and webcam are plugged in and set up correctly": "Um microfone e uma câmera estão conectados e configurados corretamente",
+    "Call failed because no webcam or microphone could not be accessed. Check that:": "A chamada falhou porque não foi possível acessar alguma câmera ou microfone. Verifique se:",
+    "Unable to access webcam / microphone": "Não é possível acessar a câmera/microfone",
+    "Call failed because no microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "A chamada falhou porque não foi possível acessar algum microfone. Verifique se o microfone está conectado e configurado corretamente.",
+    "Unable to access microphone": "Não é possível acessar o microfone",
+    "New? <a>Create account</a>": "Quer se registrar? <a>Crie uma conta</a>",
+    "Decide where your account is hosted": "Decida onde a sua conta será hospedada",
+    "Host account on": "Hospedar conta em",
+    "Already have an account? <a>Sign in here</a>": "Já tem uma conta? <a>Entre aqui</a>",
+    "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s ou %(usernamePassword)s",
+    "Continue with %(ssoButtons)s": "Continuar com %(ssoButtons)s",
+    "That username already exists, please try another.": "Este nome de usuário já existe. Por favor, digite outro.",
+    "There was a problem communicating with the homeserver, please try again later.": "Ocorreu um problema de comunicação com o servidor local. Tente novamente mais tarde.",
+    "Use email to optionally be discoverable by existing contacts.": "Seja encontrado por seus contatos a partir de um e-mail.",
+    "Use email or phone to optionally be discoverable by existing contacts.": "Seja encontrado por seus contatos a partir de um e-mail ou número de telefone.",
+    "Add an email to be able to reset your password.": "Adicione um e-mail para depois poder redefinir sua senha.",
+    "Forgot password?": "Esqueceu a senha?",
+    "That phone number doesn't look quite right, please check and try again": "Esse número de telefone não é válido, verifique e tente novamente",
+    "About homeservers": "Sobre os servidores locais",
+    "Learn more": "Saiba mais",
+    "Use your preferred Matrix homeserver if you have one, or host your own.": "Use o seu servidor local Matrix preferido, ou hospede o seu próprio servidor.",
+    "Other homeserver": "Outro servidor local",
+    "We call the places you where you can host your account ‘homeservers’.": "Chamamos de \"servidores locais\" os locais onde você pode hospedar a sua conta.",
+    "Sign into your homeserver": "Faça login em seu servidor local",
+    "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "Matrix.org é o maior servidor local público do mundo, então é um bom lugar para muitas pessoas.",
+    "Specify a homeserver": "Digite um servidor local",
+    "Just a heads up, if you don't add an email and forget your password, you could <b>permanently lose access to your account</b>.": "Apenas um aviso: se você não adicionar um e-mail e depois esquecer sua senha, poderá <b>perder permanentemente o acesso à sua conta</b>.",
+    "Continuing without email": "Continuar sem e-mail",
+    "Continue with %(provider)s": "Continuar com %(provider)s",
+    "Homeserver": "Servidor local",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Element with an existing Matrix account on a different homeserver.": "Você pode usar as opções personalizadas de servidor para entrar em outros servidores Matrix, especificando um URL de servidor local diferente. Isso permite que você use o Element com uma conta Matrix em um servidor local diferente.",
+    "Server Options": "Opções do servidor",
+    "Reason (optional)": "Motivo (opcional)",
+    "We call the places where you can host your account ‘homeservers’.": "Os locais onde você pode hospedar sua conta são chamados de \"servidores locais\".",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "A chamada falhou porque a câmera ou o microfone não puderam ser acessados. Verifique se:",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "A chamada falhou porque não foi possível acessar o microfone. Verifique se o microfone está conectado e configurado corretamente.",
+    "Invalid URL": "URL inválido",
+    "Unable to validate homeserver": "Não foi possível validar o servidor local",
+    "sends confetti": "envia confetes",
+    "Sends the given message with confetti": "Envia a mensagem com confetes",
+    "Show chat effects": "Mostrar efeitos em conversas",
+    "Effects": "Efeitos",
+    "Hold": "Pausar",
+    "Resume": "Retomar",
+    "%(peerName)s held the call": "%(peerName)s pausou a chamada",
+    "You held the call <a>Resume</a>": "Você pausou a chamada <a>Retomar</a>",
+    "You've reached the maximum number of simultaneous calls.": "Você atingiu o número máximo de chamadas simultâneas.",
+    "Too Many Calls": "Muitas chamadas",
+    "%(name)s paused": "%(name)s pausou",
+    "You held the call <a>Switch</a>": "Você pausou a chamada <a>Retomar</a>",
+    "%(name)s on hold": "%(name)s em espera",
+    "sends snowfall": "envia neve caindo",
+    "Sends the given message with snowfall": "Envia a mensagem com neve caindo",
+    "sends fireworks": "envia fogos de artifício",
+    "Sends the given message with fireworks": "Envia a mensagem com fogos de artifício",
+    "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "Adiciona ┬──┬ ノ( ゜-゜ノ) a uma mensagem de texto simples",
+    "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "Adiciona (╯°□°）╯︵ ┻━┻ a uma mensagem de texto",
+    "You have no visible notifications.": "Não há notificações.",
+    "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "Esta sessão detectou que a sua Frase de Segurança e a chave para mensagens seguras foram removidas.",
+    "A new Security Phrase and key for Secure Messages have been detected.": "Uma nova Frase de Segurança e uma nova chave para mensagens seguras foram detectadas.",
+    "Make a copy of your Security Key": "Faça uma cópia da sua Chave de Segurança",
+    "Confirm your Security Phrase": "Confirmar com a sua Frase de Segurança",
+    "Secure your backup with a Security Phrase": "Proteja o seu backup com uma Frase de Segurança",
+    "Your Security Key is in your <b>Downloads</b> folder.": "Sua Chave de Segurança está na pasta <b>Downloads</b>.",
+    "Your Security Key has been <b>copied to your clipboard</b>, paste it to:": "A sua Chave de Segurança foi <b>copiada para a sua área de transferência</b>, cole-a em:",
+    "Your Security Key": "Sua Chave de Segurança",
+    "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "A sua Chave de Segurança é uma prevenção - você pode usá-la para restaurar o acesso às suas mensagens criptografadas, se esquecer a sua Frase de Segurança.",
+    "Repeat your Security Phrase...": "Repita a sua Frase de Segurança...",
+    "Please enter your Security Phrase a second time to confirm.": "Digite a sua Frase de Segurança uma segunda vez para confirmá-la.",
+    "Set up with a Security Key": "Configurar uma Chave de Segurança",
+    "Great! This Security Phrase looks strong enough.": "Ótimo! Essa frase de segurança parece ser segura o suficiente.",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "Armazenaremos uma cópia criptografada de suas chaves em nosso servidor. Proteja o seu backup com uma Frase de Segurança.",
+    "Use Security Key": "Use a Chave de Segurança",
+    "Use Security Key or Phrase": "Use uma Chave de Segurança ou uma Frase de Segurança",
+    "If you've forgotten your Security Key you can <button>set up new recovery options</button>": "Se você esqueceu a sua Chave de Segurança, você pode <button>definir novas opções de recuperação</button>",
+    "Access your secure message history and set up secure messaging by entering your Security Key.": "Acesse o seu histórico de mensagens seguras e configure as mensagens seguras, ao inserir a sua Chave de Segurança.",
+    "Not a valid Security Key": "Chave de Segurança inválida",
+    "This looks like a valid Security Key!": "Essa Chave de Segurança é válida!",
+    "Enter Security Key": "Digite a Chave de Segurança",
+    "If you've forgotten your Security Phrase you can <button1>use your Security Key</button1> or <button2>set up new recovery options</button2>": "Se você esqueceu a sua Frase de Segurança, você pode <button1>usar a sua Chave de Segurança</button1> ou <button2>definir novas opções de recuperação</button2>",
+    "Access your secure message history and set up secure messaging by entering your Security Phrase.": "Acesse o seu histórico de mensagens seguras e configure mensagens seguras digitando a sua Frase de Segurança.",
+    "Enter Security Phrase": "Digite a Frase de Segurança",
+    "Backup could not be decrypted with this Security Phrase: please verify that you entered the correct Security Phrase.": "O backup não pôde ser descriptografado com esta Frase de Segurança: verifique se você digitou a Frase de Segurança correta.",
+    "Incorrect Security Phrase": "Frase de Segurança incorreta",
+    "Backup could not be decrypted with this Security Key: please verify that you entered the correct Security Key.": "Não foi possível descriptografar o backup com esta chave de segurança: verifique se você digitou a chave de segurança correta.",
+    "Security Key mismatch": "Incompatibilidade da Chave de Segurança",
+    "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "Não foi possível acessar o armazenamento secreto. Verifique se você digitou a Frase de Segurança correta.",
+    "Invalid Security Key": "Chave de Segurança inválida",
+    "Wrong Security Key": "Chave de Segurança errada",
+    "We recommend you change your password and Security Key in Settings immediately": "Recomendamos que você altere imediatamente a sua senha e Chave de Segurança nas Configurações",
+    "Transfer": "Transferir",
+    "Failed to transfer call": "Houve uma falha ao transferir a chamada",
+    "A call can only be transferred to a single user.": "Uma chamada só pode ser transferida para um único usuário.",
+    "There was an error finding this widget.": "Ocorreu um erro ao encontrar este widget.",
+    "Active Widgets": "Widgets ativados",
+    "Set my room layout for everyone": "Definir a minha aparência da sala para todos",
+    "Open dial pad": "Abrir o teclado de discagem",
+    "Start a Conversation": "Começar uma conversa",
+    "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 Security Key.": "Faça backup de suas chaves de criptografia com os dados da sua conta, para se prevenir a perder o acesso às suas sessões. Suas chaves serão protegidas por uma Chave de Segurança exclusiva.",
+    "Channel: <channelLink/>": "Canal: <channelLink/>",
+    "Workspace: <networkLink/>": "Espaço de trabalho: <networkLink/>",
+    "Dial pad": "Teclado de discagem",
+    "There was an error looking up the phone number": "Ocorreu um erro ao procurar o número de telefone",
+    "Unable to look up phone number": "Não foi possível procurar o número de telefone",
+    "Change which room, message, or user you're viewing": "Alterar a sala, mensagem ou usuário que você está visualizando",
+    "%(senderName)s has updated the widget layout": "%(senderName)s atualizou a aparência do widget",
+    "Search (must be enabled)": "Pesquisar (deve estar ativado)",
+    "Upgrade to pro": "Atualizar para a versão pro",
+    "Something went wrong in confirming your identity. Cancel and try again.": "Algo deu errado ao confirmar a sua identidade. Cancele e tente novamente.",
+    "Remember this": "Lembre-se disso",
+    "The widget will verify your user ID, but won't be able to perform actions for you:": "O widget verificará o seu ID de usuário, mas não poderá realizar ações para você:",
+    "Allow this widget to verify your identity": "Permitir que este widget verifique a sua identidade",
+    "Privacy Policy": "Política de privacidade",
+    "Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.": "Saiba mais em nossa <privacyPolicyLink />, <termsOfServiceLink /> e <cookiePolicyLink />.",
+    "Windows": "Windows",
+    "Screens": "Telas",
+    "Share your screen": "Compartilhar a sua tela",
+    "Recently visited rooms": "Salas visitadas recentemente",
+    "Use Command + F to search": "Use Command + F para pesquisar",
+    "Use Ctrl + F to search": "Use Ctrl + F para pesquisar",
+    "Show line numbers in code blocks": "Mostrar o número da linha em blocos de código",
+    "Expand code blocks by default": "Expandir blocos de código por padrão",
+    "Show stickers button": "Mostrar o botão de figurinhas",
+    "Use app": "Usar o aplicativo",
+    "Use app for a better experience": "Use o aplicativo para ter uma experiência melhor",
+    "Converts the DM to a room": "Converte a conversa para uma sala",
+    "Converts the room to a DM": "Converte a sala para uma conversa",
+    "Try again": "Tente novamente",
+    "We couldn't log you in": "Não foi possível fazer login"
 }
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 5dd9c66688..a72eef2c58 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -84,7 +84,7 @@
     "%(senderName)s answered the call.": "%(senderName)s ответил(а) на звонок.",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s забанил(а) %(targetName)s.",
     "Call Timeout": "Нет ответа",
-    "%(senderName)s changed their profile picture.": "%(senderName)s изменил свой аватар.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s изменил(а) свой аватар.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s изменил(а) уровни прав %(powerLevelDiffText)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s изменил(а) название комнаты на %(roomName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s изменил(а) тему комнаты на \"%(topic)s\".",
@@ -98,7 +98,7 @@
     "click to reveal": "нажмите для открытия",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s пригласил %(targetName)s.",
     "%(targetName)s joined the room.": "%(targetName)s вошёл в комнату.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s выгнал(а) %(targetName)s.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s исключил(а) %(targetName)s.",
     "%(targetName)s left the room.": "%(targetName)s покинул(а) комнату.",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s сделал(а) историю разговора видимой для всех собеседников с момента их приглашения.",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s сделал(а) историю разговора видимой для всех собеседников с момента их входа в комнату.",
@@ -273,7 +273,7 @@
     "Server unavailable, overloaded, or something else went wrong.": "Возможно, сервер недоступен, перегружен или что-то еще пошло не так.",
     "Session ID": "ID сессии",
     "%(senderName)s set a profile picture.": "%(senderName)s установил себе аватар.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s изменил отображаемое имя на %(displayName)s.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s изменил(а) отображаемое имя на %(displayName)s.",
     "Signed Out": "Выполнен выход",
     "This room is not accessible by remote Matrix servers": "Это комната недоступна из других серверов Matrix",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Попытка загрузить выбранный интервал истории чата этой комнаты не удалась, так как у вас нет разрешений на просмотр.",
@@ -636,7 +636,7 @@
     "This room is not public. You will not be able to rejoin without an invite.": "Эта комната не является публичной. Вы не сможете войти без приглашения.",
     "Community IDs cannot be empty.": "ID сообществ не могут быть пустыми.",
     "<a>In reply to</a> <pill>": "<a>В ответ на</a> <pill>",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s изменил отображаемое имя на %(displayName)s.",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s изменил(а) отображаемое имя на %(displayName)s.",
     "Failed to set direct chat tag": "Не удалось установить тег диалога",
     "Failed to remove tag %(tagName)s from room": "Не удалось удалить тег %(tagName)s из комнаты",
     "Failed to add tag %(tagName)s to room": "Не удалось добавить тег %(tagName)s в комнату",
@@ -1084,8 +1084,8 @@
     "Headphones": "Наушники",
     "Folder": "Папка",
     "Pin": "Кнопка",
-    "Your keys are being backed up (the first backup could take a few minutes).": "Выполняется резервная копия ключей  (первый раз это может занять несколько минут).",
-    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Размер файла '%(fileName)s' превышает допустимый размер для этого сервера",
+    "Your keys are being backed up (the first backup could take a few minutes).": "Выполняется резервная копия ключей (первый раз это может занять несколько минут).",
+    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Размер файла '%(fileName)s' превышает ограничения сервера для загрузки",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Добавляет смайл ¯\\_(ツ)_/¯ в начало сообщения",
     "Changes your display nickname in the current room only": "Изменяет ваш псевдоним только для текущей комнаты",
     "Gets or sets the room topic": "Читает или устанавливает тему комнаты",
@@ -1153,7 +1153,7 @@
     "No homeserver URL provided": "URL-адрес домашнего сервера не указан",
     "Unexpected error resolving homeserver configuration": "Неожиданная ошибка в настройках домашнего сервера",
     "The user's homeserver does not support the version of the room.": "Домашний сервер пользователя не поддерживает версию комнаты.",
-    "Show read receipts sent by other users": "Показывать отметки о прочтении, посылаемые другими пользователями",
+    "Show read receipts sent by other users": "Показывать информацию о прочтении, посылаемую другими пользователями",
     "Show hidden events in timeline": "Показать скрытые события в хронологии",
     "When rooms are upgraded": "При обновлении комнат",
     "<a>Upgrade</a> to your own domain": "<a>Обновление</a> до собственного домена",
@@ -1507,7 +1507,7 @@
     "Italics": "Курсив",
     "Strikethrough": "Перечёркнутый",
     "Code block": "Блок кода",
-    "%(count)s unread messages.|other": "%(count)s  непрочитанные сообщения.",
+    "%(count)s unread messages.|other": "%(count)s непрочитанных сообщений.",
     "Unread mentions.": "Непрочитанные упоминания.",
     "Show image": "Показать изображение",
     "e.g. my-room": "например, моя-комната",
@@ -1535,7 +1535,7 @@
     "This client does not support end-to-end encryption.": "Этот клиент не поддерживает сквозное шифрование.",
     "Messages in this room are not end-to-end encrypted.": "Сообщения в этой комнате не шифруются сквозным шифрованием.",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Пожалуйста, <newIssueLink> создайте новую проблему/вопрос </newIssueLink> на GitHub, чтобы мы могли расследовать эту ошибку.",
-    "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Используйте идентификационный сервер для приглашения по электронной почте. <default> Используйте значение по умолчанию (%(defaultIdentityServerName)s) </default> или  управляйте в <settings> Настройках</settings>.",
+    "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Используйте идентификационный сервер для приглашения по электронной почте. <default>Используйте значение по умолчанию (%(defaultIdentityServerName)s)</default> или управляйте в <settings>Настройках</settings>.",
     "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Используйте идентификационный сервер для приглашения по электронной почте. Управление в <settings>Настройки</settings>.",
     "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Запретить пользователям других Matrix-Серверов присоединяться к этой комнате (этот параметр нельзя изменить позже!)",
     "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Отчет о данном сообщении отправит свой уникальный 'event ID' администратору вашего домашнего сервера. Если сообщения в этой комнате зашифрованы, администратор вашего домашнего сервера не сможет прочитать текст сообщения или просмотреть какие-либо файлы или изображения.",
@@ -2191,8 +2191,8 @@
     "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 creating that address. It may not be allowed by the server or a temporary failure occurred.": "При создании этого адреса произошла ошибка. Это может быть запрещено сервером или произошел временный сбой.",
     "There was an error removing that address. It may no longer exist or a temporary error occurred.": "Произошла ошибка при удалении этого адреса. Возможно, он больше не существует или произошла временная ошибка.",
-    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Используя этот виджет, вы можете делиться данными <helpIcon />  с %(widgetDomain)s и вашим Менеджером Интеграции.",
-    "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 и вашим Менеджером Интеграции.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Используя этот виджет, вы можете делиться данными <helpIcon /> с %(widgetDomain)s.",
     "Can't find this server or its room list": "Не можем найти этот сервер или его список комнат",
     "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from.": "Удаление ключей кросс-подписи является мгновенным и необратимым действием. Любой, с кем вы прошли проверку, увидит предупреждения безопасности. Вы почти наверняка не захотите этого делать, если только не потеряете все устройства, с которых можно совершать кросс-подпись.",
     "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Очистка всех данных этой сессии является необратимым действием. Зашифрованные сообщения будут потеряны, если их ключи не были сохранены.",
@@ -2455,7 +2455,7 @@
     "User settings": "Пользовательские настройки",
     "Community and user menu": "Сообщество и меню пользователя",
     "Privacy": "Конфиденциальность",
-    "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Добавляет ( ͡° ͜ʖ ͡°) к текстовому сообщению",
+    "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Добавляет ( ͡° ͜ʖ ͡°) в начало сообщения",
     "Unknown App": "Неизвестное приложение",
     "%(count)s results|one": "%(count)s результат",
     "Room Info": "Информация о комнате",
@@ -2517,5 +2517,545 @@
     "End conference": "Завершить конференцию",
     "This will end the conference for everyone. Continue?": "Это завершит конференцию для всех. Продолжить?",
     "Failed to save your profile": "Не удалось сохранить ваш профиль",
-    "The operation could not be completed": "Операция не может быть выполнена"
+    "The operation could not be completed": "Операция не может быть выполнена",
+    "Calling...": "Звонок…",
+    "Call connecting...": "Устанавливается соединение…",
+    "Starting camera...": "Запуск камеры…",
+    "Starting microphone...": "Запуск микрофона…",
+    "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Все серверы запрещены к участию! Эта комната больше не может быть использована.",
+    "Remove messages sent by others": "Удалить сообщения, отправленные другими",
+    "Offline encrypted messaging using dehydrated devices": "Автономный обмен зашифрованными сообщениями с сохранёнными устройствами",
+    "Move right": "Сдвинуть вправо",
+    "Move left": "Сдвинуть влево",
+    "Revoke permissions": "Отозвать разрешения",
+    "Data on this screen is shared with %(widgetDomain)s": "Данные на этом экране используются %(widgetDomain)s",
+    "Modal Widget": "Модальный виджет",
+    "Ignored attempt to disable encryption": "Игнорируемая попытка отключить шифрование",
+    "Unpin a widget to view it in this panel": "Открепите виджет, чтобы просмотреть его на этой панели",
+    "You can only pin up to %(count)s widgets|other": "Вы можете закрепить не более %(count)s виджетов",
+    "Show Widgets": "Показать виджеты",
+    "Hide Widgets": "Скрыть виджеты",
+    "%(senderName)s declined the call.": "%(senderName)s отклонил(а) вызов.",
+    "(an error occurred)": "(произошла ошибка)",
+    "(their device couldn't start the camera / microphone)": "(их устройство не может запустить камеру / микрофон)",
+    "(connection failed)": "(ошибка соединения)",
+    "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s изменил(а) серверные разрешения для этой комнаты.",
+    "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s устанавливает серверные разрешения для этой комнаты.",
+    "The call was answered on another device.": "На звонок ответили на другом устройстве.",
+    "Answered Elsewhere": "Ответил в другом месте",
+    "The call could not be established": "Звонок не может быть установлен",
+    "The other party declined the call.": "Другой абонент отклонил звонок.",
+    "Call Declined": "Вызов отклонён",
+    "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": "Отзыв отправлен",
+    "%(senderName)s ended the call": "%(senderName)s завершил(а) звонок",
+    "You ended the call": "Вы закончили звонок",
+    "Send stickers into this room": "Отправить стикеры в эту комнату",
+    "Use Ctrl + Enter to send a message": "Используйте Ctrl + Enter, чтобы отправить сообщение",
+    "Use Command + Enter to send a message": "Используйте Command + Enter, чтобы отправить сообщение",
+    "Go to Home View": "Перейти на главную страницу",
+    "Filter rooms and people": "Фильтровать комнаты и людей",
+    "Open the link in the email to continue registration.": "Откройте ссылку в письме, чтобы продолжить регистрацию.",
+    "A confirmation email has been sent to %(emailAddress)s": "Письмо с подтверждением отправлено на %(emailAddress)s",
+    "Start a new chat": "Начать новый чат",
+    "Role": "Роль",
+    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Сообщения в этой комнате полностью зашифрованы. Когда люди присоединяются, вы можете проверить их в их профиле, просто нажмите на их аватар.",
+    "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.": "В этом разговоре только вы двое, если только кто-нибудь из вас не пригласит кого-нибудь присоединиться.",
+    "Takes the call in the current room off hold": "Прекратить удержание вызова в текущей комнате",
+    "Places the call in the current room on hold": "Перевести вызов в текущей комнате на удержание",
+    "Now, let's help you get started": "Теперь давайте поможем вам начать",
+    "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": "Пригласить по электронной почте",
+    "Welcome %(name)s": "Добро пожаловать, %(name)s",
+    "Add a photo so people know it's you.": "Добавьте фото, чтобы люди знали, что это вы.",
+    "Great, that'll help people know it's you": "Отлично, это поможет людям узнать, что это ты",
+    "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": "Не пропустите ответ",
+    "No other application is using the webcam": "Никакое другое приложение не использует веб-камеру",
+    "Permission is granted to use the webcam": "Разрешение на использование еб-камеры предоставлено",
+    "A microphone and webcam are plugged in and set up correctly": "Микрофон и веб-камера подключены и правильно настроены",
+    "Call failed because no webcam or microphone could not be accessed. Check that:": "Вызов не удался, потому что не удалось получить доступ к веб-камере или микрофону. Проверьте это:",
+    "Unable to access webcam / microphone": "Невозможно получить доступ к веб-камере / микрофону",
+    "Call failed because no microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Вызов не удался, потому что нет доступа к микрофону. Убедитесь, что микрофон подключен и правильно настроен.",
+    "Unable to access microphone": "Нет доступа к микрофону",
+    "Video Call": "Видеовызов",
+    "Voice Call": "Голосовой вызов",
+    "Fill Screen": "Заполнить экран",
+    "Return to call": "Вернуться к звонку",
+    "Got an account? <a>Sign in</a>": "Есть учётная запись? <a>Войти</a>",
+    "New here? <a>Create an account</a>": "Впервые здесь? <a>Создать учётную запись</a>",
+    "Render LaTeX maths in messages": "Отображать математику LaTeX в сообщениях",
+    "<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 для страницы вашего сообщества</h1>\n<p>\n     Используйте подробное описание, чтобы представить новых участников сообществу или распространить\n     некоторые важные <a href=\"foo\">ссылки</a>\n</p>\n<p>\n     Вы даже можете добавлять изображения с URL-адресами Matrix <img src=\"mxc://url\" />\n</p>\n",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Надежно кэшируйте зашифрованные сообщения локально, чтобы они отображались в результатах поиска, используется %(size)s для хранения сообщений из %(rooms)s комнаты.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Надежно кэшируйте зашифрованные сообщения локально, чтобы они отображались в результатах поиска, используется %(size)s для хранения сообщений из %(rooms)s комнат.",
+    "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Сообщения в этом чате полностью зашифрованы. Вы можете проверить профиль %(displayName)s, нажав на аватар.",
+    "Unable to validate homeserver": "Невозможно проверить домашний сервер",
+    "Sign into your homeserver": "Войдите на свой домашний сервер",
+    "with state key %(stateKey)s": "с ключом состояния %(stateKey)s",
+    "%(creator)s created this DM.": "%(creator)s начал этот чат.",
+    "Show chat effects": "Показать эффекты чата",
+    "Host account on": "Ваша учётная запись обслуживается",
+    "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s или %(usernamePassword)s",
+    "Continuing without email": "Продолжить без электронной почты",
+    "Continue with %(ssoButtons)s": "Продолжить с %(ssoButtons)s",
+    "New? <a>Create account</a>": "Впервые тут? <a>Создать учётную запись</a>",
+    "Specify a homeserver": "Укажите домашний сервер",
+    "Continue with %(provider)s": "Продолжить с %(provider)s",
+    "Enter phone number": "Введите номер телефона",
+    "Enter email address": "Введите адрес электронной почты",
+    "The <b>%(capability)s</b> capability": "<b>%(capability)s</b> возможности",
+    "sends confetti": "отправить конфетти",
+    "Invalid URL": "Неправильный URL-адрес",
+    "Reason (optional)": "Причина (необязательно)",
+    "Forgot password?": "Забыли пароль?",
+    "About homeservers": "О домашних серверах",
+    "Learn more": "Узнать больше",
+    "Other homeserver": "Другой домашний сервер",
+    "Server Options": "Параметры сервера",
+    "Decline All": "Отклонить все",
+    "Homeserver": "Домашний сервер",
+    "Approve": "Согласиться",
+    "Approve widget permissions": "Одобрить разрешения виджета",
+    "Send stickers into your active room": "Отправить стикеры в активную комнату",
+    "Remain on your screen while running": "Оставаться на экране во время работы",
+    "Remain on your screen when viewing another room, when running": "Оставаться на экране, при отображании другой комнаты, во время работы",
+    "Effects": "Эффекты",
+    "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": "Великобритания",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "Вызов не удался, потому что не удалось получить доступ к веб-камере или микрофону. Проверь это:",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Вызов не удался из-за отсутствия доступа к микрофону. Убедитесь, что микрофон подключен и правильно настроен.",
+    "See <b>%(msgtype)s</b> messages posted to your active room": "Посмотрите <b>%(msgtype)s</b> сообщения, размещённые в вашей активной комнате",
+    "Send general files as you in your active room": "Отправьте файлы от своего имени в активной комнате",
+    "Change the topic of your active room": "Измените тему вашей активной комнаты",
+    "See when the topic changes in this room": "Посмотрите, изменится ли тема этого чата",
+    "Change the topic of this room": "Измените тему этой комнаты",
+    "Change which room you're viewing": "Измените комнату, которую вы просматриваете",
+    "See <b>%(msgtype)s</b> messages posted to this room": "Посмотрите <b>%(msgtype)s</b> сообщения размещённые в этой комнате",
+    "Send <b>%(msgtype)s</b> messages as you in your active room": "Отправьте <b>%(msgtype)s</b> сообщения от своего имени в вашу активную комнату",
+    "Send <b>%(msgtype)s</b> messages as you in this room": "Отправьте <b>%(msgtype)s</b> сообщения от своего имени в эту комнату",
+    "See general files posted to your active room": "Посмотрите файлы, размещённые в вашей активной комнате",
+    "See general files posted to this room": "Посмотрите файлы, размещённые в этой комнате",
+    "Send general files as you in this room": "Отправьте файлы от своего имени в этой комнате",
+    "See videos posted to your active room": "Посмотрите видео размещённые в вашей активной комнате",
+    "See videos posted to this room": "Посмотрите видео размещённые в этой комнате",
+    "Send videos as you in your active room": "Отправьте видео от своего имени в вашей активной комнате",
+    "Send videos as you in this room": "Отправьте видео от своего имени в этой комнате",
+    "See images posted to this room": "Посмотрите изображения, размещённые в этой комнате",
+    "See emotes posted to your active room": "Посмотрите эмоции, размещённые в вашей активной комнате",
+    "See emotes posted to this room": "Посмотрите эмоции, размещённые в этой комнате",
+    "See text messages posted to your active room": "Посмотрите текстовые сообщения, размещённые в вашей активной комнате",
+    "See text messages posted to this room": "Посмотрите текстовые сообщения, размещённые в этой комнате",
+    "See messages posted to your active room": "Посмотрите сообщения, размещённые в вашей активной комнате",
+    "See messages posted to this room": "Посмотрите сообщения, размещённые в этой комнате",
+    "See <b>%(eventType)s</b> events posted to your active room": "Посмотрите <b>%(eventType)s</b> события, размещённые в вашей активной комнате",
+    "See <b>%(eventType)s</b> events posted to this room": "Посмотрите <b>%(eventType)s</b> события, размещённые в этой комнате",
+    "See when anyone posts a sticker to your active room": "Посмотрите, когда кто-нибудь размещает стикер в вашей активной комнате",
+    "See when a sticker is posted in this room": "Посмотрите, когда в этой комнате размещается стикер",
+    "See images posted to your active room": "Посмотрите изображения, размещённые в вашей активной комнате",
+    "Send images as you in your active room": "Отправьте изображения от своего имени в свою активную комнату",
+    "Send images as you in this room": "Отправьте изображения от своего имени в эту комнату",
+    "Send emotes as you in your active room": "Отправляйте эмоции от своего имени в активную комнату",
+    "Send emotes as you in this room": "Отправляйте эмоции от своего имени в эту комнату",
+    "Send text messages as you in your active room": "Отправляйте текстовые сообщения от своего имени в активную комнату",
+    "Send text messages as you in this room": "Отправляйте текстовые сообщения от своего имени в этой комнате",
+    "Send messages as you in your active room": "Отправляйте сообщения от своего имени в вашу активную комнату",
+    "Send messages as you in this room": "Отправляйте сообщения от своего имени в этой комнате",
+    "Send <b>%(eventType)s</b> events as you in your active room": "Отправляйте <b>%(eventType)s</b> события от своего имени в вашей активной комнате",
+    "Send <b>%(eventType)s</b> events as you in this room": "Отправляйте события <b>%(eventType)s</b> от своего имени в этой комнате",
+    "Send stickers to your active room as you": "Отправьте стикер от своего имени в активную комнату",
+    "Send stickers to this room as you": "Отправьте стикеры от своего имени в эту комнату",
+    "with an empty state key": "с пустым ключом состояния",
+    "See when the avatar changes in your active room": "Посмотрите, когда изменится аватар в вашей активной комнате",
+    "See when the avatar changes in this room": "Посмотрите, когда изменится аватар в этой комнате",
+    "See when the name changes in your active room": "Посмотрите, когда изменится название в вашей активной комнате",
+    "See when the name changes in this room": "Посмотрите, когда изменится название этой комнаты",
+    "Change the avatar of your active room": "Измените аватар вашей активной комнаты",
+    "Change the avatar of this room": "Смените аватар этой комнаты",
+    "Change the name of this room": "Измените название этой комнаты",
+    "Change the name of your active room": "Измените название вашей активной комнаты",
+    "See when the topic changes in your active room": "Посмотрите, изменится ли тема текущего активного чата",
+    "This widget would like to:": "Этому виджету хотелось бы:",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Element with an existing Matrix account on a different homeserver.": "Вы можете использовать настраиваемые параметры сервера для входа на другие серверы Matrix, указав другой URL-адрес домашнего сервера. Это позволяет вам использовать Element с существующей учётной записью Matrix на другом домашнем сервере.",
+    "Just a heads up, if you don't add an email and forget your password, you could <b>permanently lose access to your account</b>.": "Предупреждаем: если вы не добавите адрес электронной почты и забудете пароль, вы можете <b>навсегда потерять доступ к своей учётной записи</b>.",
+    "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "Matrix.org - крупнейший в мире домашний публичный сервер, который подходит многим.",
+    "Use your preferred Matrix homeserver if you have one, or host your own.": "Если вы предпочитаете домашний сервер Matrix, используйте его. Вы также можете настроить свой собственный домашний сервер, если хотите.",
+    "That phone number doesn't look quite right, please check and try again": "Этот номер телефона неправильный, проверьте его и повторите попытку",
+    "Add an email to be able to reset your password.": "Чтобы иметь возможность изменить свой пароль в случае необходимости, добавьте свой адрес электронной почты.",
+    "Use email or phone to optionally be discoverable by existing contacts.": "Если вы хотите, чтобы другие пользователи могли вас найти, укажите свой адрес электронной почты или номер телефона.",
+    "Use email to optionally be discoverable by existing contacts.": "Если вы хотите, чтобы другие пользователи могли вас найти, укажите свой адрес электронной почты.",
+    "There was a problem communicating with the homeserver, please try again later.": "Возникла проблема при обмене данными с домашним сервером. Повторите попытку позже.",
+    "That username already exists, please try another.": "Это имя пользователя уже существует, попробуйте другое.",
+    "Already have an account? <a>Sign in here</a>": "Уже есть учётная запись? <a>Войдите здесь</a>",
+    "Decide where your account is hosted": "Выберите, кто обслуживает вашу учётную запись",
+    "We call the places where you can host your account ‘homeservers’.": "Мы называем места, где вы можете разместить свою учётную запись, 'домашними серверами'.",
+    "Sends the given message with confetti": "Отправляет данное сообщение с конфетти",
+    "Hold": "Удерживать",
+    "Resume": "Возобновить",
+    "%(peerName)s held the call": "%(peerName)s удерживает звонок",
+    "You held the call <a>Resume</a>": "Вы удерживаете звонок <a>Возобновить</a>",
+    "%(name)s paused": "%(name)s приостановлен",
+    "You've reached the maximum number of simultaneous calls.": "Вы достигли максимального количества одновременных звонков.",
+    "Too Many Calls": "Слишком много звонков",
+    "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "Добавляет ┬──┬ ノ( ゜-゜ノ) в начало сообщения",
+    "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "Добавляет (╯°□°）╯︵ ┻━┻ в начало сообщения",
+    "sends fireworks": "отправляет фейерверк",
+    "Sends the given message with fireworks": "Отправляет сообщение с фейерверком",
+    "%(name)s on hold": "%(name)s на удержании",
+    "You held the call <a>Switch</a>": "Вы удерживаете звонок <a>Переключить</a>",
+    "sends snowfall": "отправляет снегопад",
+    "Sends the given message with snowfall": "Отправляет сообщение со снегопадом",
+    "You have no visible notifications.": "У вас нет видимых уведомлений.",
+    "Transfer": "Перевод",
+    "Failed to transfer call": "Не удалось перевести звонок",
+    "A call can only be transferred to a single user.": "Вызов может быть передан только одному пользователю.",
+    "There was an error finding this widget.": "При обнаружении этого виджета произошла ошибка.",
+    "Active Widgets": "Активные виджеты",
+    "Open dial pad": "Открыть панель набора номера",
+    "Dial pad": "Панель набора номера",
+    "Start a Conversation": "Начать разговор",
+    "There was an error looking up the phone number": "При поиске номера телефона произошла ошибка",
+    "Unable to look up phone number": "Невозможно найти номер телефона",
+    "Change which room, message, or user you're viewing": "Измените комнату, сообщение или пользователя, которого вы просматриваете",
+    "Channel: <channelLink/>": "Канал: <channelLink/>",
+    "Workspace: <networkLink/>": "Рабочая область: <networkLink/>",
+    "Search (must be enabled)": "Поиск (должен быть включен)",
+    "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "Этот сеанс обнаружил, что ваша секретная фраза и ключ безопасности для защищенных сообщений были удалены.",
+    "A new Security Phrase and key for Secure Messages have been detected.": "Обнаружены новая секретная фраза и ключ безопасности для защищенных сообщений.",
+    "Make a copy of your Security Key": "Сделайте копию своего ключа безопасности",
+    "Confirm your Security Phrase": "Подтвердите секретную фразу",
+    "Secure your backup with a Security Phrase": "Защитите свою резервную копию с помощью секретной фразы",
+    "Your Security Key is in your <b>Downloads</b> folder.": "Ваш ключ безопасности находится в папке <b>Загрузки</b>.",
+    "Your Security Key has been <b>copied to your clipboard</b>, paste it to:": "Ваш ключ безопасности был <b>скопирован в буфер обмена</b>, вставьте его в:",
+    "Your Security Key": "Ваш ключ безопасности",
+    "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "Ваш ключ безопасности является защитной сеткой - вы можете использовать его для восстановления доступа к своим зашифрованным сообщениям, если вы забыли секретную фразу.",
+    "Repeat your Security Phrase...": "Повторите секретную фразу…",
+    "Please enter your Security Phrase a second time to confirm.": "Пожалуйста, введите секретную фразу второй раз для подтверждения.",
+    "Set up with a Security Key": "Настройка с помощью ключа безопасности",
+    "Great! This Security Phrase looks strong enough.": "Отлично! Эта контрольная фраза выглядит достаточно сильной.",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "Мы будем хранить зашифрованную копию ваших ключей на нашем сервере. Защитите свою резервную копию с помощью секретной фразы.",
+    "Use Security Key": "Используйте ключ безопасности",
+    "Use Security Key or Phrase": "Используйте ключ безопасности или секретную фразу",
+    "Upgrade to pro": "Перейти на Pro",
+    "Allow this widget to verify your identity": "Разрешите этому виджету проверить ваш идентификатор",
+    "Something went wrong in confirming your identity. Cancel and try again.": "Что-то пошло не так при вашей идентификации. Отмените последнее действие и попробуйте еще раз.",
+    "If you've forgotten your Security Key you can <button>set up new recovery options</button>": "Если вы забыли свой ключ безопасности, вы можете <button>настроить новые параметры восстановления</button>",
+    "Access your secure message history and set up secure messaging by entering your Security Key.": "Получите доступ к своей истории защищенных сообщений и настройте безопасный обмен сообщениями, введя ключ безопасности.",
+    "Not a valid Security Key": "Неправильный ключ безопасности",
+    "This looks like a valid Security Key!": "Похоже, это правильный ключ безопасности!",
+    "Enter Security Key": "Введите ключ безопасности",
+    "If you've forgotten your Security Phrase you can <button1>use your Security Key</button1> or <button2>set up new recovery options</button2>": "Если вы забыли секретную фразу, вы можете <button1>использовать ключ безопасности</button1> или <button2>настроить новые параметры восстановления</button2>",
+    "Access your secure message history and set up secure messaging by entering your Security Phrase.": "Получите доступ к своей истории защищенных сообщений и настройте безопасный обмен сообщениями, введя секретную фразу.",
+    "Enter Security Phrase": "Введите секретную фразу",
+    "Backup could not be decrypted with this Security Phrase: please verify that you entered the correct Security Phrase.": "Не удалось расшифровать резервную копию с помощью этой секретной фразы: убедитесь, что вы ввели правильную секретную фразу.",
+    "Incorrect Security Phrase": "Неверная секретная фраза",
+    "Backup could not be decrypted with this Security Key: please verify that you entered the correct Security Key.": "Не удалось расшифровать резервную копию с помощью этого ключа безопасности: убедитесь, что вы ввели правильный ключ безопасности.",
+    "Security Key mismatch": "Ключ безопасности не подходит",
+    "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "Невозможно получить доступ к секретному хранилищу. Убедитесь, что вы ввели правильную секретную фразу.",
+    "Invalid Security Key": "Неверный ключ безопасности",
+    "Wrong Security Key": "Неправильный ключ безопасности",
+    "Remember this": "Запомнить это",
+    "The widget will verify your user ID, but won't be able to perform actions for you:": "Виджет проверит ваш идентификатор пользователя, но не сможет выполнять за вас действия:",
+    "We recommend you change your password and Security Key in Settings immediately": "Мы рекомендуем вам немедленно сменить пароль и ключ безопасности в настройках",
+    "Minimize dialog": "Свернуть диалог",
+    "Maximize dialog": "Развернуть диалог",
+    "%(hostSignupBrand)s Setup": "%(hostSignupBrand)s Настройка",
+    "You should know": "Вы должны знать",
+    "Privacy Policy": "Политика конфиденциальности",
+    "Cookie Policy": "Политика использования файлов cookie",
+    "Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.": "Дополнительную информацию можно найти на страницах <privacyPolicyLink />,<termsOfServiceLink /> и <cookiePolicyLink />.",
+    "Continuing temporarily allows the %(hostSignupBrand)s setup process to access your account to fetch verified email addresses. This data is not stored.": "Продолжая процесс настройки %(hostSignupBrand)s, вы предоставите доступ к вашей учётной записи для получения проверенных адресов электронной почты. Эти данные не сохраняются.",
+    "Failed to connect to your homeserver. Please close this dialog and try again.": "Не удалось подключиться к домашнему серверу. Закройте это диалоговое окно и попробуйте ещё раз.",
+    "Abort": "Отмена",
+    "Are you sure you wish to abort creation of the host? The process cannot be continued.": "Вы уверены, что хотите прервать создание хоста? Процесс не может быть продолжен.",
+    "Confirm abort of host creation": "Подтвердите отмену создания хоста",
+    "Windows": "Окна",
+    "Screens": "Экраны",
+    "Share your screen": "Поделитесь своим экраном",
+    "Set my room layout for everyone": "Установить мой макет комнаты для всех",
+    "Recently visited rooms": "Недавно посещённые комнаты",
+    "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 Security Key.": "Сделайте резервную копию ключей шифрования с данными вашей учетной записи на случай, если вы потеряете доступ к своим сеансам. Ваши ключи будут защищены уникальным ключом безопасности.",
+    "Use Ctrl + F to search": "Нажмите Ctrl + F для поиска",
+    "Use Command + F to search": "Нажмите Command (⌘) + F для поиска",
+    "Show line numbers in code blocks": "Показывать номера строк в блоках кода",
+    "Expand code blocks by default": "По умолчанию отображать блоки кода целиком",
+    "Show stickers button": "Показать кнопку стикеров",
+    "Use app": "Использовать приложение",
+    "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Element Web - экспериментальная версия на мобильных устройствах. Для лучшего опыта и новейших функций используйте наше бесплатное приложение.",
+    "Use app for a better experience": "Используйте приложение для лучшего опыта",
+    "%(senderName)s has updated the widget layout": "%(senderName)s обновил макет виджета",
+    "Converts the DM to a room": "Преобразовать ЛС в комнату",
+    "Converts the room to a DM": "Преобразовать комнату в ЛС",
+    "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "Ваш домашний сервер не позволил вам войти в систему. Это могло произойти из-за того, что вход занял слишком много времени. Пожалуйста, попробуйте снова через пару минут. Если ситуация по-прежнему не меняется, обратитесь к администратору домашнего сервера за дополнительной информацией.",
+    "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "Ваш домашний сервер был недоступен, и мы не смогли войти в систему. Пожалуйста, попробуйте снова через пару минут. Если ситуация по-прежнему не меняется, обратитесь к администратору домашнего сервера за дополнительной информацией.",
+    "Try again": "Попробовать ещё раз",
+    "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "Мы попросили браузер запомнить, какой домашний сервер вы используете для входа в систему, но, к сожалению, ваш браузер забыл об этом. Перейдите на страницу входа и попробуйте ещё раз.",
+    "We couldn't log you in": "Нам не удалось войти в систему"
 }
diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index 454d86cb64..0ee0c6cbc3 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -548,7 +548,7 @@
     "The phone number entered looks invalid": "Zdá sa, že zadané telefónne číslo je neplatné",
     "Error: Problem communicating with the given homeserver.": "Chyba: Nie je možné komunikovať so zadaným domovským serverom.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "K domovskému serveru nie je možné pripojiť sa použitím protokolu HTTP keďže v adresnom riadku prehliadača máte HTTPS adresu. Použite protokol HTTPS alebo <a>povolte nezabezpečené skripty</a>.",
-    "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Nie je možné pripojiť sa k domovskému serveru - skontrolujte prosím funkčnosť vašeho pripojenia na internet, uistite sa že <a>certifikát  domovského servera</a> je dôverihodný, a že žiaden doplnok nainštalovaný v prehliadači nemôže blokovať požiadavky.",
+    "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Nie je možné pripojiť sa k domovskému serveru - skontrolujte prosím funkčnosť vášho pripojenia na internet. Uistite sa že <a>certifikát domovského servera</a> je dôveryhodný a že žiaden doplnok nainštalovaný v prehliadači nemôže blokovať požiadavky.",
     "Failed to fetch avatar URL": "Nepodarilo sa získať URL adresu obrázka",
     "Set a display name:": "Nastaviť zobrazované meno:",
     "Upload an avatar:": "Nahrať obrázok:",
@@ -573,7 +573,7 @@
     "Passphrases must match": "Heslá sa musia zhodovať",
     "Passphrase must not be empty": "Heslo nesmie byť prázdne",
     "Export room keys": "Exportovať kľúče miestností",
-    "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.": "Tento proces vás prevedie exportom kľúčov určených na dešifrovanie správ, ktoré ste dostali v šifrovaných miestnostiach do lokálneho súboru. Tieto kľúče zo súboru môžete  neskôr importovať do iného Matrix klienta, aby ste v ňom mohli dešifrovať vaše šifrované správy.",
+    "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.": "Tento proces vás prevedie exportom kľúčov určených na dešifrovanie správ, ktoré ste dostali v šifrovaných miestnostiach do lokálneho súboru. Tieto kľúče zo súboru môžete neskôr importovať do iného Matrix klienta, aby ste v ňom mohli dešifrovať vaše šifrované správy.",
     "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.": "Tento súbor umožní komukoľvek, kto má ku nemu prístup, dešifrovať všetky vami viditeľné šifrované správy, mali by ste teda byť opatrní a tento súbor si bezpečne uchovať. Aby bolo toto pre vás jednoduchšie, nižšie zadajte heslo, ktorým budú údaje v súbore zašifrované. Importovať údaje zo súboru bude možné len po zadaní tohoto istého hesla.",
     "Enter passphrase": "Zadajte (dlhé) heslo",
     "Confirm passphrase": "Potvrďte heslo",
@@ -613,7 +613,7 @@
     "This room is not showing flair for any communities": "V tejto miestnosti nie je zobrazená príslušnosť k žiadnym komunitám",
     "Display your community flair in rooms configured to show it.": "Zobrazovať vašu príslušnosť ku komunite v miestnostiach, ktoré sú nastavené na zobrazovanie tejto príslušnosti.",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
-    "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.": "Túto zmenu nebudete môcť vrátiť späť pretože  znižujete vašu vlastnú úroveň moci. Ak ste jediný poverený používateľ v miestnosti, nebudete môcť znovu získať úroveň, akú máte teraz.",
+    "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.": "Túto zmenu nebudete môcť vrátiť späť, pretože znižujete vašu vlastnú úroveň moci. Ak ste jediný privilegovaný používateľ v miestnosti, nebudete môcť získať vašu súčasnú úroveň znovu.",
     "Send an encrypted reply…": "Odoslať šifrovanú odpoveď…",
     "Send an encrypted message…": "Odoslať šifrovanú správu…",
     "Replying": "Odpoveď",
@@ -727,7 +727,7 @@
     "You must specify an event type!": "Musíte nastaviť typ udalosti!",
     "(HTTP status %(httpStatus)s)": "(HTTP status %(httpStatus)s)",
     "All Rooms": "Vo všetkych miestnostiach",
-    "State Key": "State Key",
+    "State Key": "Stavový kľúč",
     "Wednesday": "Streda",
     "Quote": "Citovať",
     "Send logs": "Zahrnúť záznamy",
@@ -963,7 +963,7 @@
     "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.": "Ak ste si nenastavili nový spôsob obnovenia, je možné, že útočník sa pokúša dostať k vášmu účtu. Radšej si ihneď zmeňte vaše heslo a nastavte si nový spôsob obnovenia v Nastaveniach.",
     "Set up Secure Messages": "Nastaviť bezpečné obnovenie správ",
     "Go to Settings": "Otvoriť nastavenia",
-    "Whether or not you're logged in (we don't record your username)": "Či ste alebo nie ste prihlásení (nezaznamenávame vaše meno používateľa)",
+    "Whether or not you're logged in (we don't record your username)": "Či ste alebo nie ste prihlásení (nezaznamenávame vaše používateľské meno)",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Veľkosť súboru „%(fileName)s“ prekračuje limit veľkosti súboru nahrávania na tento domovský server",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Pridá znaky ¯\\_(ツ)_/¯ pred správy vo formáte obyčajného textu",
     "Upgrades a room to a new version": "Aktualizuje miestnosť na novšiu verziu",
@@ -1289,7 +1289,7 @@
     "Double check that your server supports the room version chosen and try again.": "Uistite sa, že domovský server podporuje zvolenú verziu miestnosti a skúste znovu.",
     "Changes the avatar of the current room": "Zmení obrázok miestnosti",
     "Use an identity server": "Použiť server totožností",
-    "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Aby ste mohli používateľov pozývať zadaním emailovej adresy, je potrebné nastaviť adresu servera totožností. Klepnutím na tlačidlo pokračovať  použijete predvolený server (%(defaultIdentityServerName)s) a zmeniť to môžete v nastaveniach.",
+    "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Aby ste mohli používateľov pozývať zadaním emailovej adresy, je potrebné nastaviť adresu servera totožností. Klepnutím na tlačidlo pokračovať použijete predvolený server (%(defaultIdentityServerName)s) a zmeniť to môžete v nastaveniach.",
     "Use an identity server to invite by email. Manage in Settings.": "Server totožností sa použije na pozývanie používateľov zadaním emailovej adresy. Spravujte v nastaveniach.",
     "%(senderName)s placed a voice call.": "%(senderName)s uskutočnil telefonát.",
     "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s uskutočnil telefonát. (Nepodporované týmto prehliadačom)",
@@ -1371,27 +1371,27 @@
     "Discovery": "Objaviť",
     "Deactivate account": "Deaktivovať účet",
     "Clear cache and reload": "Vymazať vyrovnávaciu pamäť a načítať znovu",
-    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Prispôsobte si zážitok s používania  aktivovaním experimentálnych vlastností. <a>Zistiť viac</a>.",
+    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Prispôsobte si zážitok z používania aktivovaním experimentálnych vlastností. <a>Zistiť viac</a>.",
     "Ignored/Blocked": "Ignorovaní / Blokovaní",
     "Error adding ignored user/server": "Chyba pri pridávaní ignorovaného používateľa / servera",
     "Something went wrong. Please try again or view your console for hints.": "Niečo sa nepodarilo. Prosím, skúste znovu neskôr alebo si prečítajte ďalšie usmernenia zobrazením konzoly.",
     "Error subscribing to list": "Chyba pri prihlasovaní sa do zoznamu",
     "Error removing ignored user/server": "Chyba pri odstraňovaní ignorovaného používateľa / servera",
-    "Use Single Sign On to continue": "Pokračovať pomocou Jednotného prihlásenia",
-    "Confirm adding this email address by using Single Sign On to prove your identity.": "Potvrďte pridanie tejto adresy pomocou Jednotného prihlásenia.",
-    "Single Sign On": "Jednotné prihlásenie",
+    "Use Single Sign On to continue": "Pokračovať pomocou Single Sign On",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Potvrďte pridanie tejto adresy pomocou Single Sign On.",
+    "Single Sign On": "Single Sign On",
     "Confirm adding email": "Potvrdiť pridanie emailu",
-    "Click the button below to confirm adding this email address.": "Kliknutím na tlačítko potvrdíte pridanie emailovej adresy.",
-    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Potvrďte pridanie telefónneho čísla pomocou Jednotného prihlásenia.",
+    "Click the button below to confirm adding this email address.": "Kliknutím na tlačidlo nižšie potvrdíte pridanie emailovej adresy.",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Potvrďte pridanie telefónneho čísla pomocou Single Sign On.",
     "Confirm adding phone number": "Potvrdiť pridanie telefónneho čísla",
-    "Click the button below to confirm adding this phone number.": "Kliknutím na tlačítko potvrdíte pridanie telefónneho čísla.",
+    "Click the button below to confirm adding this phone number.": "Kliknutím na tlačidlo nižšie potvrdíte pridanie telefónneho čísla.",
     "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Či používate %(brand)s na zariadení, ktorého hlavným vstupným mechanizmom je dotyk (mobil, tablet,...)",
     "Whether you're using %(brand)s as an installed Progressive Web App": "Či používate %(brand)s ako nainštalovanú Progresívnu Webovú Aplikáciu",
     "Your user agent": "Identifikátor vášho prehliadača",
     "If you cancel now, you won't complete verifying the other user.": "Pokiaľ teraz proces zrušíte, nedokončíte overenie druhého používateľa.",
     "If you cancel now, you won't complete verifying your other session.": "Pokiaľ teraz proces zrušíte, nedokončíte overenie vašej druhej relácie.",
     "If you cancel now, you won't complete your operation.": "Pokiaľ teraz proces zrušíte, nedokončíte ho.",
-    "Cancel entering passphrase?": "Zrušiť zadávanie (dlhého) hesla.",
+    "Cancel entering passphrase?": "Želáte si zrušiť zadávanie hesla?",
     "Setting up keys": "Príprava kľúčov",
     "Verify this session": "Overiť túto reláciu",
     "Enter recovery passphrase": "Zadajte (dlhé) heslo pre obnovu zálohy",
@@ -1439,7 +1439,7 @@
     "Interactively verify by Emoji": "Interaktívne overte pomocou emoji",
     "Done": "Hotovo",
     "a few seconds ago": "pred pár sekundami",
-    "about a minute ago": "približne pred minutou",
+    "about a minute ago": "približne pred minútou",
     "about an hour ago": "približne pred hodinou",
     "about a day ago": "približne deň dozadu",
     "a few seconds from now": "o pár sekúnd",
@@ -1474,7 +1474,7 @@
     "Failed to re-authenticate": "Opätovná autentifikácia zlyhala",
     "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.": "Znovuzískajte prístup k vášmu účtu a obnovte šifrovacie kľúče uložené v tejto relácií. Bez nich nebudete môcť čítať všetky vaše šifrované správy vo všetkých reláciach.",
     "Font scaling": "Škálovanie písma",
-    "Show info about bridges in room settings": "Zobraziť informácie o mostoch v Nastaveniach miestnosti",
+    "Show info about bridges in room settings": "Zobraziť informácie o mostoch v nastaveniach miestnosti",
     "Font size": "Veľkosť písma",
     "Show typing notifications": "Posielať oznámenia, keď píšete",
     "Never send encrypted messages to unverified sessions from this session": "Nikdy neposielať šifrované správy neovereným reláciam z tejto relácie",
@@ -1519,7 +1519,7 @@
     "To be secure, do this in person or use a trusted way to communicate.": "Aby ste si boli istý, urobte to osobne alebo použite dôveryhodný spôsob komunikácie.",
     "Lock": "Zámok",
     "If you can't scan the code above, verify by comparing unique emoji.": "Pokiaľ nemôžete kód vyššie skenovať, overte sa porovnaním jedinečnej kombinácie emoji.",
-    "Verify by comparing unique emoji.": "Overenie porovnaním jedinečnej kombinácie emoji",
+    "Verify by comparing unique emoji.": "Overenie porovnaním jedinečnej kombinácie emotikonov.",
     "Verify by emoji": "Overte pomocou emoji",
     "Compare emoji": "Porovnajte emoji",
     "Verify all your sessions to ensure your account & messages are safe": "Overte všetky vaše relácie, aby ste si boli istý, že sú vaše správy a účet bezpečné",
@@ -1528,7 +1528,7 @@
     "Upgrade": "Upgradovať",
     "Verify": "Overiť",
     "Verify yourself & others to keep your chats safe": "Overte seba a ostatných, aby vaše komunikácie boli bezpečné",
-    "Other users may not trust it": "Ostatný používatelia jej nemusia veriť",
+    "Other users may not trust it": "Ostatní používatelia jej nemusia veriť",
     "Verify the new login accessing your account: %(name)s": "Overte nové prihlásenie na váš účet: %(name)s",
     "From %(deviceName)s (%(deviceId)s)": "Od %(deviceName)s (%(deviceId)s)",
     "This bridge was provisioned by <user />.": "Tento most poskytuje <user />.",
@@ -1545,7 +1545,7 @@
     "unexpected type": "neočakávaný typ",
     "in memory": "v pamäti",
     "Self signing private key:": "Samo-podpísané súkromné kľúče:",
-    "cached locally": "cachenuté lokálne",
+    "cached locally": "uložené do lokálnej vyrovnávacej pamäťe",
     "not found locally": "nenájdené lokálne",
     "User signing private key:": "Používateľom podpísané súkromné kľúče:",
     "Session backup key:": "Kľúč na zálohu relácie:",
@@ -1595,7 +1595,7 @@
     "Restart": "Reštartovať",
     "Upgrade your %(brand)s": "Upgradujte svoj %(brand)s",
     "A new version of %(brand)s is available!": "Nová verzia %(brand)su je dostupná!",
-    "Which officially provided instance you are using, if any": "Ktorú oficiálne poskytovanú inštanciu používate, pokiaľ nejakú",
+    "Which officially provided instance you are using, if any": "Ktorú oficiálne poskytovanú inštanciu používate, ak nejakú",
     "Use your account to sign in to the latest version": "Použite svoj účet na prihlásenie sa do najnovšej verzie",
     "We’re excited to announce Riot is now Element": "Sme nadšený oznámiť, že Riot je odteraz Element",
     "Riot is now Element!": "Riot je odteraz Element!",
@@ -1669,7 +1669,7 @@
     "Incoming video call": "Prichádzajúci video hovor",
     "Incoming call": "Prichádzajúci hovor",
     "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.": "Vytvorte si filter, potiahnite avatara komunity do panelu filtrov na ľavý okraj obrazovky. Môžete kliknúť na avatara v paneli filtorv, aby ste videli len miestnosti a ľudí patriacich do danej komunity.",
-    "%(num)s minutes ago": "pred %(num)s minútami",
+    "%(num)s minutes ago": "pred %(num)s min",
     "%(num)s hours ago": "pred %(num)s hodinami",
     "%(num)s days ago": "pred %(num)s dňami",
     "%(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 nemôže bezpečne cachovať šiforvané správy lokálne pomocou prehlliadača. Použite <desktopLink>%(brand)s Desktop</desktopLink> na zobrazenie výsledkov vyhľadávania šiforavných správ.",
@@ -1775,10 +1775,10 @@
     "%(num)s hours from now": "o %(num)s hodín",
     "%(num)s days from now": "o %(num)s dní",
     "The person who invited you already left the room.": "Osoba ktorá Vás pozvala už opustila miestnosť.",
-    "The person who invited you already left the room, or their server is offline.": "Osoba ktorá Vás pozvala už opustila miestnosť, alebo je ich server offline.",
+    "The person who invited you already left the room, or their server is offline.": "Osoba, ktorá Vás pozvala už opustila miestnosť, alebo je jej server offline.",
     "* %(senderName)s %(emote)s": "* %(senderName)s %(emote)s",
     "Change notification settings": "Upraviť nastavenia upozornení",
-    "Enable advanced debugging for the room list": "Zapnúť pokročilé ladenie pre zoznam miestností",
+    "Enable advanced debugging for the room list": "Zapnúť pokročilé nástroje ladenia pre zoznam miestností",
     "Securely cache encrypted messages locally for them to appear in search results, using ": "Bezpečne uchovávať šifrované správy na tomto zariadení, aby sa v nich dalo vyhľadávať pomocou ",
     " to store messages from ": " na uchovanie správ z ",
     "rooms.": "miestnosti.",
@@ -1811,5 +1811,274 @@
     "Security": "Zabezpečenie",
     "Send a Direct Message": "Poslať priamu správu",
     "User menu": "Používateľské menu",
-    "Toggle Italics": "Prepnúť kurzíva"
+    "Toggle Italics": "Prepnúť kurzíva",
+    "Zimbabwe": "Zimbabwe",
+    "Zambia": "Zambia",
+    "Yemen": "Jemen",
+    "Western Sahara": "Západná Sahara",
+    "Wallis & Futuna": "Wallis a Futuna",
+    "Vietnam": "Vietnam",
+    "Venezuela": "Venezuela",
+    "Vatican City": "Vatikán",
+    "Vanuatu": "Vanuatu",
+    "Uzbekistan": "Uzbekistan",
+    "Uruguay": "Uruguaj",
+    "United Arab Emirates": "Spojené Arabské Emiráty",
+    "Ukraine": "Ukrajina",
+    "Uganda": "Uganda",
+    "U.S. Virgin Islands": "Americké Panenské ostrovy",
+    "Tuvalu": "Tuvalu",
+    "Turks & Caicos Islands": "Ostrovy Turks a Caicos",
+    "Turkmenistan": "Turkménsko",
+    "Turkey": "Turecko",
+    "Tunisia": "Tunisko",
+    "Trinidad & Tobago": "Trinidad a Tobago",
+    "Tonga": "Tonga",
+    "Tokelau": "Tokelau",
+    "Togo": "Togo",
+    "Timor-Leste": "Východný Timor",
+    "Thailand": "Thajsko",
+    "Tanzania": "Tanzánia",
+    "Tajikistan": "Tadžikistan",
+    "Taiwan": "Taiwan",
+    "São Tomé & Príncipe": "Svätý Tomáš a Princov ostrov",
+    "Syria": "Sýria",
+    "Switzerland": "Švajčiarsko",
+    "Sweden": "Švédsko",
+    "Swaziland": "Svazijsko",
+    "Svalbard & Jan Mayen": "Špicbergy a Jan Mayen",
+    "Suriname": "Surinam",
+    "Sudan": "Sudán",
+    "St. Vincent & Grenadines": "Svätý Vincent a Grenadíny",
+    "St. Pierre & Miquelon": "Svätý Pierre a Miquelon",
+    "St. Martin": "Svätý Martin",
+    "St. Lucia": "Svätá Lucia",
+    "St. Kitts & Nevis": "Svätý Krištof a Nevis",
+    "St. Helena": "Svätá Helena",
+    "St. Barthélemy": "Svätý Bartolomej",
+    "Sri Lanka": "Srí Lanka",
+    "Spain": "Španielsko",
+    "South Sudan": "Južný Sudán",
+    "South Korea": "Južná Kórea",
+    "South Georgia & South Sandwich Islands": "Južná Georgia a Južné sendvičové ostrovy",
+    "South Africa": "Južná Afrika",
+    "Somalia": "Somálsko",
+    "Solomon Islands": "Šalamúnove ostrovy",
+    "Slovenia": "Slovinsko",
+    "Slovakia": "Slovensko",
+    "Sint Maarten": "Sint Maarten",
+    "Singapore": "Singapur",
+    "Sierra Leone": "Sierra Leone",
+    "Seychelles": "Seychely",
+    "Serbia": "Srbsko",
+    "Senegal": "Senegal",
+    "Saudi Arabia": "Saudská Arábia",
+    "San Marino": "San Maríno",
+    "Samoa": "Samoa",
+    "Réunion": "Réunion",
+    "Rwanda": "Rwanda",
+    "Russia": "Rusko",
+    "Romania": "Rumunsko",
+    "Qatar": "Katar",
+    "Puerto Rico": "Portoriko",
+    "Portugal": "Portugalsko",
+    "Poland": "Poľsko",
+    "Pitcairn Islands": "Pitcairnove ostrovy",
+    "Philippines": "Filipíny",
+    "Peru": "Peru",
+    "Paraguay": "Paraguaj",
+    "Papua New Guinea": "Papua-Nová Guinea",
+    "Panama": "Panama",
+    "Palestine": "Palestína",
+    "Palau": "Palau",
+    "Pakistan": "Pakistan",
+    "Oman": "Omán",
+    "Norway": "Nórsko",
+    "Northern Mariana Islands": "Severné Mariány",
+    "North Korea": "Severná Kórea",
+    "Norfolk Island": "Ostrov Norfolk",
+    "Niue": "Niue",
+    "Nigeria": "Nigéria",
+    "Niger": "Niger",
+    "Nicaragua": "Nikaragua",
+    "New Zealand": "Nový Zéland",
+    "New Caledonia": "Nová Kaledónia",
+    "Netherlands": "Holandsko",
+    "Nepal": "Nepál",
+    "Nauru": "Nauru",
+    "Namibia": "Namíbia",
+    "Myanmar": "Mjanmarsko",
+    "Mozambique": "Mozambik",
+    "Morocco": "Maroko",
+    "Montserrat": "Montserrat",
+    "Montenegro": "Čierna Hora",
+    "Mongolia": "Mongolsko",
+    "Monaco": "Monako",
+    "Moldova": "Moldavsko",
+    "Micronesia": "Mikronézia",
+    "Mexico": "Mexiko",
+    "Mayotte": "Mayotte",
+    "Mauritius": "Maurícius",
+    "Mauritania": "Mauretánia",
+    "Martinique": "Martinik",
+    "Marshall Islands": "Maršalove ostrovy",
+    "Malta": "Malta",
+    "Mali": "Mali",
+    "Maldives": "Maledivy",
+    "Malaysia": "Malajzia",
+    "Malawi": "Malawi",
+    "Madagascar": "Madagaskar",
+    "Macedonia": "Macedónsko",
+    "Macau": "Macao",
+    "Luxembourg": "Luxembursko",
+    "Lithuania": "Litva",
+    "Liechtenstein": "Lichtenštajnsko",
+    "Libya": "Líbya",
+    "Liberia": "Libéria",
+    "Lesotho": "Lesotho",
+    "Lebanon": "Libanon",
+    "Latvia": "Lotyšsko",
+    "Laos": "Laos",
+    "Kyrgyzstan": "Kirgizsko",
+    "Kuwait": "Kuvajt",
+    "Kosovo": "Kosovo",
+    "Kiribati": "Kiribati",
+    "Kenya": "Keňa",
+    "Kazakhstan": "Kazachstan",
+    "Jordan": "Jordánsko",
+    "Jersey": "Jersey",
+    "Japan": "Japonsko",
+    "Jamaica": "Jamajka",
+    "Italy": "Taliansko",
+    "Israel": "Izrael",
+    "Isle of Man": "Ostrov Man",
+    "Ireland": "Írsko",
+    "Iraq": "Irak",
+    "Iran": "Irán",
+    "Indonesia": "Indonézia",
+    "India": "India",
+    "Iceland": "Island",
+    "Hungary": "Maďarsko",
+    "Hong Kong": "Hongkong",
+    "Honduras": "Honduras",
+    "Heard & McDonald Islands": "Teritórium Heardovho ostrova a Macdonaldových ostrovov",
+    "Haiti": "Haiti",
+    "Guyana": "Guyana",
+    "Guinea-Bissau": "Guinea-Bissau",
+    "Guinea": "Guinea",
+    "Guernsey": "Guernsey",
+    "Guatemala": "Guatemala",
+    "Guam": "Guam",
+    "Guadeloupe": "Guadeloupe",
+    "Grenada": "Grenada",
+    "Greenland": "Grónsko",
+    "Greece": "Grécko",
+    "Gibraltar": "Gibraltár",
+    "Ghana": "Ghana",
+    "Germany": "Nemecko",
+    "Georgia": "Gruzínsko",
+    "Gambia": "Gambia",
+    "Gabon": "Gabon",
+    "French Southern Territories": "Francúzske južné územia",
+    "French Polynesia": "Francúzska Polynézia",
+    "French Guiana": "Francúzska Guiana",
+    "France": "Francúzsko",
+    "Finland": "Fínsko",
+    "Fiji": "Fidži",
+    "Faroe Islands": "Faerské ostrovy",
+    "Falkland Islands": "Falklandské ostrovy",
+    "Ethiopia": "Etiópia",
+    "Estonia": "Estónsko",
+    "Eritrea": "Eritrea",
+    "Equatorial Guinea": "Rovníková Guinea",
+    "El Salvador": "El Salvador",
+    "Egypt": "Egypt",
+    "Ecuador": "Ekvádor",
+    "Dominican Republic": "Dominikánska republika",
+    "Dominica": "Dominika",
+    "Djibouti": "Džibuti",
+    "Denmark": "Dánsko",
+    "Côte d’Ivoire": "Pobrežie Slonoviny",
+    "Czech Republic": "Česká republika",
+    "Cyprus": "Cyprus",
+    "Curaçao": "Curaçao",
+    "Cuba": "Kuba",
+    "Croatia": "Chorvátsko",
+    "Costa Rica": "Kostarika",
+    "Cook Islands": "Cookove ostrovy",
+    "Congo - Kinshasa": "Kongo (Kinshasa)",
+    "Congo - Brazzaville": "Kongo (Brazzaville)",
+    "Comoros": "Komory",
+    "Colombia": "Kolumbia",
+    "Cocos (Keeling) Islands": "Kokosové ostrovy",
+    "Christmas Island": "Vianočný ostrov",
+    "China": "Čína",
+    "Chile": "Čile",
+    "Chad": "Čad",
+    "Central African Republic": "Stredoafrická republika",
+    "Cayman Islands": "Kajmanské ostrovy",
+    "Caribbean Netherlands": "Karibské Holandsko",
+    "Cape Verde": "Kapverdy",
+    "Canada": "Kanada",
+    "Cameroon": "Kamerun",
+    "Cambodia": "Kambodža",
+    "Burundi": "Burundi",
+    "Burkina Faso": "Burkina Faso",
+    "Bulgaria": "Bulharsko",
+    "Brunei": "Brunej",
+    "British Virgin Islands": "Britské Panenské ostrovy",
+    "British Indian Ocean Territory": "Britské indickooceánske územie",
+    "Brazil": "Brazília",
+    "Bouvet Island": "Bouvetov ostrov",
+    "Botswana": "Botswana",
+    "Bosnia": "Bosna",
+    "Bolivia": "Bolívia",
+    "Bhutan": "Bhután",
+    "Bermuda": "Bermudy",
+    "Benin": "Benin",
+    "Belize": "Belize",
+    "Belgium": "Belgicko",
+    "Belarus": "Bielorusko",
+    "Barbados": "Barbados",
+    "Bangladesh": "Bangladéš",
+    "Bahrain": "Bahrajn",
+    "Bahamas": "Bahamy",
+    "Azerbaijan": "Azerbajdžan",
+    "Austria": "Rakúsko",
+    "Australia": "Austrália",
+    "Aruba": "Aruba",
+    "Armenia": "Arménsko",
+    "Argentina": "Argentína",
+    "Antigua & Barbuda": "Antigua a Barbuda",
+    "Antarctica": "Antarktída",
+    "Anguilla": "Anguilla",
+    "Angola": "Angola",
+    "Andorra": "Andorra",
+    "American Samoa": "Americká Samoa",
+    "Algeria": "Alžírsko",
+    "Albania": "Albánsko",
+    "Åland Islands": "Alandské ostrovy",
+    "Afghanistan": "Afganistan",
+    "United States": "Spojené Štáty",
+    "United Kingdom": "Spojené Kráľovstvo",
+    "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "Domáci server odmietol váš pokus o prihlásenie. Môže to byť spôsobené tým, že požiadavky trvajú príliš dlho. Prosím skúste znova. Ak to bude pokračovať, kontaktujte svojho správcu domovského servera.",
+    "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "Váš domovský server bol nedosiahnuteľný a nemohol vás prihlásiť. Skúste to znova. Ak to bude pokračovať, kontaktujte svojho správcu domovského servera.",
+    "Try again": "Skúste to znova",
+    "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "Požiadali sme prehliadač, aby si pamätal, aký domovský server používate na prihlásenie, ale váš prehliadač ho, bohužiaľ, zabudol. Prejdite na prihlasovaciu stránku a skúste to znova.",
+    "We couldn't log you in": "Nemohli sme vás prihlásiť",
+    "This will end the conference for everyone. Continue?": "Týmto sa konferencia ukončí pre všetkých. Chcete pokračovať?",
+    "End conference": "Koniec konferencie",
+    "You've reached the maximum number of simultaneous calls.": "Dosiahli ste maximálny počet súčasných hovorov.",
+    "Too Many Calls": "Príliš veľa hovorov",
+    "No other application is using the webcam": "Webkameru nepoužíva žiadna iná aplikácia",
+    "Permission is granted to use the webcam": "Udeľuje sa povolenie na používanie webkamery",
+    "A microphone and webcam are plugged in and set up correctly": "Mikrofón a webkamera sú pripojené a správne nastavené",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "Hovor zlyhal, pretože nebolo možné získať prístup k webkamere alebo mikrofónu. Skontrolujte, či:",
+    "Unable to access webcam / microphone": "Nie je možné získať prístup k webkamere / mikrofónu",
+    "Unable to access microphone": "Nie je možné získať prístup k mikrofónu",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Hovor zlyhal, pretože nebolo možné získať prístup k mikrofónu. Skontrolujte, či je mikrofón pripojený a správne nastavený.",
+    "The call was answered on another device.": "Hovor bol prijatý na inom zariadení.",
+    "The call could not be established": "Hovor nemohol byť realizovaný",
+    "The other party declined the call.": "Druhá strana odmietla hovor.",
+    "Call Declined": "Hovor odmietnutý"
 }
diff --git a/src/i18n/strings/sl.json b/src/i18n/strings/sl.json
index beff9b5bcb..0e9bdb3d3e 100644
--- a/src/i18n/strings/sl.json
+++ b/src/i18n/strings/sl.json
@@ -20,5 +20,12 @@
     "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",
+    "End": "Konec",
+    "Use default": "Uporabi privzeto",
+    "Change": "Sprememba"
 }
diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 6b61316356..e8e47ac81b 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -807,7 +807,7 @@
     "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.": "Nëse më herët keni përdorur një version më të freskët të %(brand)s-it, sesioni juaj mund të jetë i papërputhshëm me këtë version. Mbylleni këtë dritare dhe kthehuni te versioni më i ri.",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Spastrimi i gjërave të depozituara në shfletuesin tuaj mund ta ndreqë problemin, por kjo do të sjellë nxjerrjen tuaj nga llogari dhe do ta bëjë të palexueshëm çfarëdo historiku të fshehtëzuar të bisedës.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Nëse keni tashmë një llogari Matrix, mund <a>të bëni hyrjen</a>.",
-    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Krijoni një bashkësi që bëni tok përdorues dhe dhoma! Krijoni një faqe hyrëse vetjake, që të ravijëzoni hapësirën tuaj në universin Matrix.",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Krijoni një bashkësi që të bëni tok përdorues dhe dhoma! Krijoni një faqe hyrëse vetjake, që të ravijëzoni hapësirën tuaj në universin Matrix.",
     "Sent messages will be stored until your connection has returned.": "Mesazhet e dërguar do të depozitohen deri sa lidhja juaj të jetë rikthyer.",
     "Server may be unavailable, overloaded, or search timed out :(": "Shërbyesi mund të jetë i pakapshëm, i mbingarkuar, ose kërkimit i mbaroi koha :(",
     "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.": "Nëse parashtruat një të metë përmes GitHub-it, regjistrat e diagnostikimit mund të na ndihmojnë të ndjekim problemin. Regjistrat e diagnostikimit përmbajnë të dhëna përdorimi, përfshi emrin tuaj të përdoruesit, ID-të ose aliaset e dhomave apo grupeve që keni vizituar dhe emrat e përdoruesve të përdoruesve të tjerë. Në to nuk përmbahen mesazhet.",
@@ -874,7 +874,7 @@
     "Incompatible Database": "Bazë të dhënash e Papërputhshme",
     "Continue With Encryption Disabled": "Vazhdo Me Fshehtëzimin të Çaktivizuar",
     "Unable to load! Check your network connectivity and try again.": "S’arrihet të ngarkohet! Kontrolloni lidhjen tuaj në rrjet dhe riprovoni.",
-    "Forces the current outbound group session in an encrypted room to be discarded": "Forces the current outbound group session in an encrypted room to be discarded",
+    "Forces the current outbound group session in an encrypted room to be discarded": "",
     "Delete Backup": "Fshije Kopjeruajtjen",
     "Unable to load key backup status": "S’arrihet të ngarkohet gjendje kopjeruajtjeje kyçesh",
     "Backup version: ": "Version kopjeruajtjeje: ",
@@ -1351,7 +1351,7 @@
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Sigurohuni se keni një lidhje të qëndrueshme internet, ose lidhuni me përgjegjësin e shërbyesit",
     "Your %(brand)s is misconfigured": "%(brand)s-i juaj është i keqformësuar",
     "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "Kërkojini përgjegjësit të %(brand)s-it tuaj të kontrollojë <a>formësimin tuaj</a> për zëra të pasaktë ose të përsëdytur.",
-    "Unexpected error resolving identity server configuration": "Gabim i papritur teksa ftillohej  formësimi i shërbyesit të identiteteve",
+    "Unexpected error resolving identity server configuration": "Gabim i papritur teksa ftillohej formësimi i shërbyesit të identiteteve",
     "Use lowercase letters, numbers, dashes and underscores only": "Përdorni vetëm shkronja të vogla, numra, vija ndarëse dhe nënvija",
     "Cannot reach identity server": "S’kapet dot shërbyesi i identiteteve",
     "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.": "Mund të regjistroheni, por disa veçori do të jenë të papërdorshme, derisa shërbyesi i identiteteve të jetë sërish në linjë. Nëse vazhdoni ta shihni këtë sinjalizim, kontrolloni formësimin tuaj ose lidhuni me një përgjegjës të shërbyesit.",
@@ -1400,7 +1400,7 @@
     "Command Help": "Ndihmë Urdhri",
     "Identity Server": "Shërbyes Identitetesh",
     "Find others by phone or email": "Gjeni të tjerë përmes telefoni ose email-i",
-    "Be found by phone or email": "Bëhuni i gjetshëm përmes telefoni  ose email-i",
+    "Be found by phone or email": "Bëhuni i gjetshëm përmes telefoni ose email-i",
     "Use bots, bridges, widgets and sticker packs": "Përdorni robotë, ura, widget-e dhe paketa ngjitësish",
     "Terms of Service": "Kushte Shërbimi",
     "Service": "Shërbim",
@@ -1636,7 +1636,7 @@
     "%(brand)s URL": "URL %(brand)s-i",
     "Room ID": "ID dhome",
     "Widget ID": "ID widget-i",
-    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Përdorimi i këtij widget-i mund të sjellë ndarje të dhënash  <helpIcon /> me %(widgetDomain)s & Përgjegjësin tuaj të Integrimeve.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Përdorimi i këtij widget-i mund të sjellë ndarje të dhënash <helpIcon /> me %(widgetDomain)s & Përgjegjësin tuaj të Integrimeve.",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Përdorimi i këtij widget-i mund të sjellë ndarje të dhënash <helpIcon /> me %(widgetDomain)s.",
     "Widget added by": "Widget i shtuar nga",
     "This widget may use cookies.": "Ky <em>widget</em> mund të përdorë <em>cookies</em>.",
@@ -2139,7 +2139,7 @@
     "Enter a recovery passphrase": "Jepni një frazëkalim rimarrjesh",
     "Enter your recovery passphrase a second time to confirm it.": "Për ta ripohuar, jepeni edhe një herë frazëkalimin tuaj të rimarrjeve.",
     "Confirm your recovery passphrase": "Ripohoni frazëkalimin tuaj të rimarrjeve",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Kyçi juaj i rimarrjeve është një rrjet sigurie - mund ta përdorni të të rifituar hyrje te mesazhet tuaj të fshehtëzuar, nëse harroni frazëkalimin tuaj të rimarrjeve.",
+    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Kyçi juaj i rimarrjeve është një rrjet sigurie - mund ta përdorni për të rifituar hyrje te mesazhet tuaj të fshehtëzuar, nëse harroni frazëkalimin tuaj të rimarrjeve.",
     "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Do të ruajmë një kopje të fshehtëzuar të kyçeve tuaj në shërbyesin tonë. Siguroni kopjeruajtjen tuaj me një frazëkalim rimarrjesh.",
     "Please enter your recovery passphrase a second time to confirm.": "Ju lutemi, jepeni frazëkalimin tuaj të rimarrjeve edhe një herë, për ta ripohuar.",
     "Repeat your recovery passphrase...": "Përsëritni frazëkalimin tuaj të rimarrjeve…",
@@ -2518,5 +2518,543 @@
     "This version of %(brand)s does not support viewing some encrypted files": "Ky version i %(brand)s nuk mbulon parjen për disa kartela të fshehtëzuara",
     "This version of %(brand)s does not support searching encrypted messages": "Ky version i %(brand)s nuk mbulon kërkimin në mesazhe të fshehtëzuar",
     "Cannot create rooms in this community": "S’mund të krijohen dhoma në këtë bashkësi",
-    "You do not have permission to create rooms in this community.": "S’keni leje të krijoni dhoma në këtë bashkësi."
+    "You do not have permission to create rooms in this community.": "S’keni leje të krijoni dhoma në këtë bashkësi.",
+    "Failed to save your profile": "S’u arrit të ruhej profili juaj",
+    "The operation could not be completed": "Veprimi s’u plotësua dot",
+    "Starting microphone...": "Po vihet mikrofoni në punë…",
+    "Starting camera...": "Po vihet kamera në punë…",
+    "Call connecting...": "Po bëhet lidhja për thirrje…",
+    "Calling...": "Po thirret…",
+    "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Janë dëbuar nga pjesëmarrja krejt shërbyesit! Kjo dhomë s’mund të përdoret më.",
+    "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s ndryshoi ACL-ra shërbyesi për këtë dhomë.",
+    "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s caktoi ACL-ra shërbyesi për këtë dhomë.",
+    "%(senderName)s declined the call.": "%(senderName)s hodhi poshtë thirrjen.",
+    "(an error occurred)": "(ndodhi një gabim)",
+    "(their device couldn't start the camera / microphone)": "(pajisja e tyre s’vuri dot në punë kamerën / mikrofonin)",
+    "(connection failed)": "(dështoi lidhja)",
+    "The call could not be established": "Thirrja s’u nis dot",
+    "The other party declined the call.": "Pala tjetër hodhi poshtë thirrjen.",
+    "Call Declined": "Thirrja u Hodh Poshtë",
+    "Move right": "Lëvize djathtas",
+    "Move left": "Lëvize majtas",
+    "Revoke permissions": "Shfuqizoji lejet",
+    "Unpin a widget to view it in this panel": "Që ta shihni te ku panel, shfiksojeni një widget",
+    "You can only pin up to %(count)s widgets|other": "Mundeni të fiksoni deri në %(count)s widget-e",
+    "Show Widgets": "Shfaqi Widget-et",
+    "Hide Widgets": "Fshihi Widget-et",
+    "The call was answered on another device.": "Thirrjes iu përgjigj në një tjetër pajisje.",
+    "Answered Elsewhere": "Përgjigjur Gjetkë",
+    "Data on this screen is shared with %(widgetDomain)s": "Të dhënat në këtë skenë ndahen me %(widgetDomain)s",
+    "Modal Widget": "Widget Modal",
+    "Send feedback": "Dërgoni përshtypjet",
+    "PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> to help us track down the problem.": "NDIHMËZ PROFESIONISTËSH: Nëse nisni një njoftim të mete, ju lutemi, parashtroni <debugLogsLink>regjistra diagnostikimi</debugLogsLink>, që të na ndihmoni të gjejmë problemin.",
+    "Please view <existingIssuesLink>existing bugs on Github</existingIssuesLink> first. No match? <newIssueLink>Start a new one</newIssueLink>.": "Ju lutemi, shihni <existingIssuesLink>të meta ekzistuese në Github</existingIssuesLink> së pari. S’ka përputhje? <newIssueLink>Nisni një të re</newIssueLink>.",
+    "Report a bug": "Njoftoni një të metë",
+    "There are two ways you can provide feedback and help us improve %(brand)s.": "Ka dy rrugë se si mund të jepni përshtypjet dhe të na ndihmoni të përmirësojmë %(brand)s.",
+    "Comment": "Koment",
+    "Add comment": "Shtoni koment",
+    "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",
+    "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",
+    "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 Sanduiç 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",
+    "Filter rooms and people": "Filtroni dhoma dhe njerëz",
+    "Open the link in the email to continue registration.": "Që të vazhdohet regjistrimi, hapni lidhjen te email-i.",
+    "A confirmation email has been sent to %(emailAddress)s": "Te %(emailAddress)s u dërgua një email ripohimi",
+    "Role": "Rol",
+    "Start a new chat": "Nisni një fjalosje të re",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Ruajini lokalisht në fshehtinë në mënyrë të sigurt mesazhet e fshehtëzuar, që të shfaqen në përfundime kërkimi, duke përdorur %(size)s që të depozitoni mesazhe nga %(rooms)s dhomë.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Ruajini lokalisht në fshehtinë në mënyrë të sigurt mesazhet e fshehtëzuar, që të shfaqen në përfundime kërkimi, duke përdorur %(size)s që të depozitoni mesazhe nga %(rooms)s dhoma.",
+    "See emotes posted to your active room": "Shihni emotikonë postuar në dhomën tuaj aktive",
+    "See emotes posted to this room": "Shihni emotikone postuar në këtë dhomë",
+    "Send emotes as you in your active room": "Dërgoni emotikone si ju në këtë dhomë",
+    "Send emotes as you in this room": "Dërgoni emotikone si ju në këtë dhomë",
+    "See text messages posted to your active room": "Shihni mesazhe tekst postuar në dhomën tuaj aktive",
+    "See text messages posted to this room": "Shihni mesazhe tekst postuar në këtë dhomë",
+    "Send text messages as you in your active room": "Dërgoni mesazhe tekst si ju në dhomën tuaj aktive",
+    "Send text messages as you in this room": "Dërgoni mesazhe tekst si ju në këtë dhomë",
+    "See messages posted to your active room": "Shihni mesazhe të postuar në dhomën tuaj aktive",
+    "See messages posted to this room": "Shihni mesazhe të postuar në këtë dhomë",
+    "Send messages as you in your active room": "Dërgoni mesazhe si ju në dhomën tuaj aktive",
+    "Send messages as you in this room": "Dërgoni mesazhi si ju në këtë dhomë",
+    "The <b>%(capability)s</b> capability": "Aftësia <b>%(capability)s</b>",
+    "See <b>%(eventType)s</b> events posted to your active room": "Shihni akte <b>%(eventType)s</b> postuar në dhomën tuaj aktive",
+    "Send <b>%(eventType)s</b> events as you in your active room": "Shihni akte <b>%(eventType)s</b> si ju në këtë dhomë",
+    "See <b>%(eventType)s</b> events posted to this room": "Shihni akte <b>%(eventType)s</b> postuar në këtë dhomë",
+    "Send <b>%(eventType)s</b> events as you in this room": "Dërgoni akte <b>%(eventType)s</b> në këtë dhomë si ju",
+    "with state key %(stateKey)s": "me kyç gjendjeje %(stateKey)s",
+    "with an empty state key": "me një kyç të zbrazët gjendjeje",
+    "See when anyone posts a sticker to your active room": "Shihni kur dikush poston një ngjitës në dhomën tuaj aktive",
+    "Send stickers to your active room as you": "Dërgoni ngjitës në dhomën tuaj aktive si ju",
+    "See when a sticker is posted in this room": "Shihni kur postohet një ngjitës në këtë dhomë",
+    "Send stickers to this room as you": "Dërgoni ngjitës në këtë dhomë si ju",
+    "See when the avatar changes in your active room": "Shihni kur ndryshon avatari në dhomën tuaj aktive",
+    "Change the avatar of your active room": "Ndryshoni avatarin në dhomën tuaj aktive",
+    "See when the avatar changes in this room": "Shihni kur ndryshon avatari në këtë dhomë",
+    "Change the avatar of this room": "Ndryshoni avatarin e kësaj dhome",
+    "See when the name changes in your active room": "Shihni kur ndryshon emri në dhomën tuaj aktive",
+    "Change the name of your active room": "Ndryshoni emrin e dhomës tuaj aktive",
+    "See when the name changes in this room": "Shihni kur ndryshohet emri në këtë dhomë",
+    "Change the name of this room": "Ndryshoni emrin e kësaj dhome",
+    "See when the topic changes in your active room": "Shihni kur ndryshon tema në dhomën tuaj aktive",
+    "Change the topic of your active room": "Ndryshoni temën në dhomën tuaj aktive",
+    "See when the topic changes in this room": "Shihni kur ndryshohet tema në këtë dhomë",
+    "Change the topic of this room": "Ndryshoni temën e kësaj dhome",
+    "Change which room you're viewing": "Ndryshoni cilën dhomë shihni",
+    "Send stickers into your active room": "Dërgoni ngjitës në dhomën tuaj aktive",
+    "Send stickers into this room": "Dërgoni ngjitës në këtë dhomë",
+    "Go to Home View": "Kaloni te Pamja Kreu",
+    "<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 për faqen e bashkësisë tuaj</h1>\n<p>\n    Përdoreni përshkrimin e gjatë që t’i prezantoni bashkësisë anëtarë të rinj, ose për t’u dhënë <a href=\"foo\">lidhje</a> të rëndësishme\n</p>\n<p>\n    Mundeni madje të shtoni figura me URL-ra Matrix <img src=\"mxc://url\" />\n</p>\n",
+    "Enter phone number": "Jepni numër telefoni",
+    "Enter email address": "Jepni adresë email-i",
+    "Decline All": "Hidhi Krejt Poshtë",
+    "Approve": "Miratojeni",
+    "This widget would like to:": "Ky widget do të donte të:",
+    "Approve widget permissions": "Miratoni leje widget-i",
+    "Use Ctrl + Enter to send a message": "Që të dërgoni një mesazh përdorni tastet Ctrl + Enter",
+    "Use Command + Enter to send a message": "Që të dërgoni një mesazh, përdorni tastet Command + Enter",
+    "See <b>%(msgtype)s</b> messages posted to your active room": "Shihni mesazhe <b>%(msgtype)s</b> postuar në dhomën tuaj aktive",
+    "See <b>%(msgtype)s</b> messages posted to this room": "Shihni mesazhe <b>%(msgtype)s</b> postuar në këtë dhomë",
+    "Send <b>%(msgtype)s</b> messages as you in your active room": "Dërgoni mesazhe <b>%(msgtype)s</b> si ju në dhomën tuaj aktive",
+    "Send <b>%(msgtype)s</b> messages as you in this room": "Dërgoni mesazhe <b>%(msgtype)s</b> si ju në këtë dhomë",
+    "See general files posted to your active room": "Shihni kartela të përgjithshme postuar në dhomën tuaj aktive",
+    "See general files posted to this room": "Shihni kartela të përgjithshme postuar në këtë dhomë",
+    "Send general files as you in your active room": "Dërgoni kartela të përgjithshme si ju në dhomën tuaj aktive",
+    "Send general files as you in this room": "Dërgoni kartela të përgjithshme si ju në këtë dhomë",
+    "See videos posted to your active room": "Shihni video të postuara në dhomën tuaj aktive",
+    "See videos posted to this room": "Shihni video të postuara në këtë dhomë",
+    "Send videos as you in your active room": "Dërgoni video si ju në dhomën tuaj aktive",
+    "Send videos as you in this room": "Dërgoni video si ju në këtë dhomë",
+    "See images posted to your active room": "Shihni figura postuar te dhoma juaj aktive",
+    "See images posted to this room": "Shihni figura postuar në këtë dhomë",
+    "Send images as you in your active room": "Dërgoni figura si ju në dhomën tuaj aktive",
+    "New here? <a>Create an account</a>": "I sapoardhur? <a>Krijoni një llogari</a>",
+    "Got an account? <a>Sign in</a>": "Keni një llogari? <a>Hyni</a>",
+    "Return to call": "Kthehu te thirrja",
+    "Fill Screen": "Mbushe Ekranin",
+    "Voice Call": "Thirrje Zanore",
+    "Video Call": "Thirrje Video",
+    "Render LaTeX maths in messages": "Formo formula LaTeX në mesazhe",
+    "Send images as you in this room": "Dërgoni figura si ju, në këtë dhomë",
+    "No other application is using the webcam": "Kamerën s’po e përdor aplikacion tjetër",
+    "Permission is granted to use the webcam": "Është dhënë leje për përdorimin e kamerës",
+    "A microphone and webcam are plugged in and set up correctly": "Një mikrofon dhe një kamerë janë futur dhe ujdisur si duhet",
+    "Call failed because no webcam or microphone could not be accessed. Check that:": "Thirrja dështoi, ngaqë s’u bë dot hyrje në kamerë ose mikrofon. Kontrolloni që:",
+    "Unable to access webcam / microphone": "S’arrihet të përdoret kamerë / mikrofon",
+    "Call failed because no microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Thirrja dështoi, ngaqë s’u hap dot ndonjë mikrofon. Shihni që të jetë futur një mikrofon dhe ujdiseni saktë.",
+    "Unable to access microphone": "S’arrihet të përdoret mikrofoni",
+    "Decide where your account is hosted": "Vendosni se ku të ruhet llogaria juaj",
+    "Host account on": "Strehoni llogari në",
+    "Already have an account? <a>Sign in here</a>": "Keni tashmë një llogari? <a>Bëni hyrjen këtu</a>",
+    "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s Ose %(usernamePassword)s",
+    "Continue with %(ssoButtons)s": "Vazhdo me %(ssoButtons)s",
+    "That username already exists, please try another.": "Ka tashmë një emër përdoruesi të tillë, ju lutemi, provoni një tjetër.",
+    "New? <a>Create account</a>": "I ri? <a>Krijoni llogari</a>",
+    "There was a problem communicating with the homeserver, please try again later.": "Pati një problem në komunikimin me shërbyesin Home, ju lutemi, riprovoni më vonë.",
+    "Use email to optionally be discoverable by existing contacts.": "Përdorni email që, nëse doni, të mund t’ju gjejnë kontaktet ekzistues.",
+    "Use email or phone to optionally be discoverable by existing contacts.": "Përdorni email ose telefon që, nëse doni, të mund t’ju gjejnë kontaktet ekzistues.",
+    "Add an email to be able to reset your password.": "Shtoni një email, që të jeni në gjendje të ricaktoni fjalëkalimin tuaj.",
+    "Forgot password?": "Harruat fjalëkalimin?",
+    "That phone number doesn't look quite right, please check and try again": "Ai numër telefoni s’duket i saktë, ju lutemi, rikontrollojeni dhe riprovojeni",
+    "About homeservers": "Mbi shërbyesit Home",
+    "Learn more": "Mësoni më tepër",
+    "Use your preferred Matrix homeserver if you have one, or host your own.": "Përdorni shërbyesin tuaj Home të parapëlqyer Matrix, nëse keni një të tillë, ose strehoni një tuajin.",
+    "Other homeserver": "Tjetër shërbyes home",
+    "We call the places you where you can host your account ‘homeservers’.": "Vendet ku mund të strehoni llogarinë tuaj i quajmë “shërbyes Home”.",
+    "Sign into your homeserver": "Bëni hyrjen te shërbyesi juaj Home",
+    "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "Matrix.org është shërbyesi Home më i madh në botë, ndaj është një vend i mirë për shumë vetë.",
+    "Specify a homeserver": "Tregoni një shërbyes Home",
+    "Just a heads up, if you don't add an email and forget your password, you could <b>permanently lose access to your account</b>.": "Që mos thoni nuk e dinim, nëse s’shtoni një email dhe harroni fjalëkalimin tuaj, mund <b>të humbi përgjithmonë hyrjen në llogarinë tuaj</b>.",
+    "Continuing without email": "Vazhdim pa email",
+    "Continue with %(provider)s": "Vazhdo me %(provider)s",
+    "Homeserver": "Shërbyes Home",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Element with an existing Matrix account on a different homeserver.": "Mund të përdorni mundësi vetjake shërbyesi që të bëni hyrjen në shërbyes të tjerë Matrix duke dhënë një tjetër URL shërbyesi Home. Kjo ju lejon të përdorni Element-in me një llogari Matrix ekzistuese në një tjetër shërbyes Home.",
+    "Server Options": "Mundësi Shërbyesi",
+    "Hold": "Mbaje",
+    "Resume": "Rimerre",
+    "We call the places where you can host your account ‘homeservers’.": "Vendet ku mund të strehoni llogarinë tuaj i quajmë ‘shërbyes Home’.",
+    "Invalid URL": "URL e pavlefshme",
+    "Unable to validate homeserver": "S’arrihet të vlerësohet shërbyesi Home",
+    "Reason (optional)": "Arsye (opsionale)",
+    "%(name)s paused": "%(name)s pushoi",
+    "%(peerName)s held the call": "%(peerName)s mbajti thirrjen",
+    "You held the call <a>Resume</a>": "E mbajtët thirrjen <a>Rimerreni</a>",
+    "sends confetti": "dërgon bonbone",
+    "Sends the given message with confetti": "E dërgon mesazhin e dhënë me bonbone",
+    "Show chat effects": "Shfaq efekte fjalosjeje",
+    "Effects": "Efekte",
+    "You've reached the maximum number of simultaneous calls.": "Keni mbërritur në numrin maksimum të thirrjeve të njëkohshme.",
+    "Too Many Calls": "Shumë Thirrje",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "Thirrja dështoi, ngaqë s’u hy dot kamera ose mikrofoni. Kontrolloni që:",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Thirrja dështoi, ngaqë s’u hy dot te mikrofoni. Kontrolloni që të jetë futur një mikrofon dhe të jetë ujdisur saktësisht.",
+    "sends fireworks": "dërgon fishekzjarrë",
+    "Sends the given message with fireworks": "E dërgon me fishekzjarrë mesazhin e dhënë",
+    "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "E paraprin një mesazh tekst i thjeshtë me ┬──┬ ノ( ゜-゜ノ)",
+    "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "E paraprin një mesazh tekst i thjeshtë me (╯°□°）╯︵ ┻━┻",
+    "%(name)s on hold": "%(name)s e mbajtur",
+    "sends snowfall": "dërgon rënie bore",
+    "Sends the given message with snowfall": "E dërgon mesazhin e dhënë të stolisur me rënie bore",
+    "You have no visible notifications.": "S’keni njoftime të dukshme.",
+    "Transfer": "Shpërngule",
+    "Failed to transfer call": "S’u arrit të shpërngulej thirrje",
+    "A call can only be transferred to a single user.": "Një thirrje mund të shpërngulet vetëm te një përdorues.",
+    "There was an error finding this widget.": "Pati një gabim në gjetjen e këtij widget-i.",
+    "Active Widgets": "Widget-e Aktivë",
+    "Open dial pad": "Hap butonat e numrave",
+    "Start a Conversation": "Filloni një Bisedë",
+    "Dial pad": "Butona numrash",
+    "There was an error looking up the phone number": "Pati një gabim gjatë kërkimit të numrit të telefonit",
+    "Unable to look up phone number": "S’arrihet të kërkohet numër telefoni",
+    "Your Security Key": "Kyçi juaj i Sigurisë",
+    "Your Security Key is in your <b>Downloads</b> folder.": "Kyçi juaj i Sigurisë gjendet te dosja juaj <b>Shkarkime</b>.",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "Do të ruajmë një kopje të fshehtëzuar të kyçeve tuaj në shërbyesin tonë. Siguroni kopjeruajtjen tuaj me një Frazë Sigurie.",
+    "Use Security Key": "Përdorni Kyç Sigurie",
+    "A new Security Phrase and key for Secure Messages have been detected.": "Janë pikasur një Frazë e re Sigurie dhe kyç i ri për Mesazhe të Sigurt.",
+    "If you've forgotten your Security Key you can <button>set up new recovery options</button>": "Nëse keni harruar Kyçin tuaj të Sigurisë, mund të <button>ujdisni mundësi të reja rimarrjeje</button>.",
+    "Your Security Key has been <b>copied to your clipboard</b>, paste it to:": "Kyçi juaj i Sigurisë është <b>kopjuar te e papastra juaj</b>, ngjiteni te:",
+    "Confirm your Security Phrase": "Ripohoni Frazën tuaj të Sigurisë",
+    "Secure your backup with a Security Phrase": "Sigurojeni kopjeruajtjen tuaj me një Frazë Sigurie.",
+    "Repeat your Security Phrase...": "Përsëritni Frazën tuaj të Sigurisë…",
+    "Please enter your Security Phrase a second time to confirm.": "Ju lutemi, që të ripohohet, rijepeni Frazën tuaj të Sigurisë.",
+    "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "Ky sesion ka pikasur se Fraza e Sigurisë dhe kyçi juaj për Mesazhe të Sigurt janë hequr.",
+    "Use Security Key or Phrase": "Përdorni Kyç ose Frazë Sigurie",
+    "Great! This Security Phrase looks strong enough.": "Bukur! Kjo Frazë Sigurie duket goxha e fuqishme.",
+    "Set up with a Security Key": "Ujdiseni me një Kyç Sigurie",
+    "Access your secure message history and set up secure messaging by entering your Security Key.": "Hyni te historiku i mesazheve tuaj të siguruar dhe rregulloni shkëmbim mesazhesh të sigurt duke dhënë Kyçin tuaj të Sigurisë.",
+    "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "Kyçi juaj i Sigurisë është një rrjetë sigurie - mund ta përdorni të të rifituar hyrje te mesazhet tuaj të fshehtëzuar, nëse harroni Frazën tuaj të Sigurisë.",
+    "Make a copy of your Security Key": "Bëni një kopje të Kyçit tuaj të Sigurisë",
+    "Not a valid Security Key": "Kyç Sigurie jo i vlefshëm",
+    "This looks like a valid Security Key!": "Ky duket si Kyç i vlefshëm Sigurie!",
+    "Enter Security Key": "Jepni Kyç Sigurie",
+    "If you've forgotten your Security Phrase you can <button1>use your Security Key</button1> or <button2>set up new recovery options</button2>": "Nëse keni harruar Frazën tuaj të Sigurisë, mund të <button1>përdorni Kyçin tuaj të Sigurisë</button1> ose të <button2>ujdisni mundësi të reja rikthimi</button2>",
+    "Access your secure message history and set up secure messaging by entering your Security Phrase.": "Hyni te historiku i mesazheve tuaj të siguruara dhe ujdisni shkëmbim të sigurt mesazhesh duke dhënë Frazën tuaj të Sigurisë.",
+    "Enter Security Phrase": "Jepni Frazën e Sigurisë",
+    "Backup could not be decrypted with this Security Phrase: please verify that you entered the correct Security Phrase.": "Kopjeruajtja s’u shfshehtëzua dot me këtë Frazë Sigurie: ju lutemi, verifikoni se keni dhënë Frazën e saktë të Sigurisë.",
+    "Incorrect Security Phrase": "Frazë e Pasaktë Sigurie",
+    "Backup could not be decrypted with this Security Key: please verify that you entered the correct Security Key.": "Kopjeruajtja s’mund të shfshehtëzohej me Kyçin e Sigurisë: ju lutemi, verifikoni se keni dhënë Kyçin e saktë të Sigurisë.",
+    "Security Key mismatch": "Mospërputhje Kyçesh Sigurie",
+    "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "S’arrihet të hyhet në depozitë të fshehtë. Ju lutemi, verifikoni se keni dhënë Frazën e saktë të Sigurisë.",
+    "Invalid Security Key": "Kyç Sigurie i Pavlefshëm",
+    "Wrong Security Key": "Kyç Sigurie i Gabuar",
+    "We recommend you change your password and Security Key in Settings immediately": "Rekomandojmë të ndryshoni menjëherë fjalëkalimin dhe Kyçin e Sigurisë, te Rregullimet",
+    "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 Security Key.": "Kopjeruani kyçet tuaj të fshehtëzimit me të dhënat e llogarisë tuaj, për ditën kur mund të humbni hyrje në sesionet tuaja. Kyçet tuaj do të jenë të siguruar me një Kyç unik Sigurie.",
+    "Channel: <channelLink/>": "Kanal: <channelLink/>",
+    "Workspace: <networkLink/>": "Hapësirë pune: <networkLink/>",
+    "Change which room, message, or user you're viewing": "Ndryshoni cilën dhomë, mesazh ose përdorues po shihni",
+    "Search (must be enabled)": "Kërkim (duhet të jetë i aktivizuar)",
+    "Something went wrong in confirming your identity. Cancel and try again.": "Diç shkoi ters me ripohimin e identitetit tuaj. Anulojeni dhe riprovoni.",
+    "Remember this": "Mbaje mend këtë",
+    "The widget will verify your user ID, but won't be able to perform actions for you:": "Ky widget do të verifikojë ID-në tuaj të përdoruesit, por s’do të jetë në gjendje të kryejë veprime për ju:",
+    "Allow this widget to verify your identity": "Lejojeni këtë widget të verifikojë identitetin tuaj",
+    "Set my room layout for everyone": "Ujdise skemën e dhomës time për këdo",
+    "You held the call <a>Switch</a>": "Mbajtët të shtypur <a>Butonin</a> e thirrjeve",
+    "Use Ctrl + F to search": "Që të kërkoni, përdorni tastet Ctrl + F",
+    "Use Command + F to search": "Që të kërkoni, përdorni tastet Command + F",
+    "Use app": "Përdorni aplikacionin",
+    "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Element Web në celular është eksperimental. Për një funksionim më të mirë dhe për veçoritë më të reja, përdorni aplikacionin falas, atë për platformën tuaj.",
+    "Use app for a better experience": "Për një punim më të mirë, përdorni aplikacionin",
+    "%(senderName)s has updated the widget layout": "%(senderName)s ka përditësuar skemën e widget-it",
+    "Converts the DM to a room": "E shndërron DM-në në një dhomë",
+    "Converts the room to a DM": "E shndërron dhomën në një DM",
+    "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "Shërbyesi juaj Home e hodhi poshtë përpjekjen tuaj për hyrje. Kjo mund të vijë për shkak gjërash që po zgjasin ca. Ju lutemi, riprovoniP. Nëse kjo vazhdon, ju lutemi, lidhuni me përgjegjësin e shërbyesit tuaj Home.",
+    "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "Shërbyesi juaj Home s’u kap dot dhe s’qe në gjendje të bëhej futja juaj në llogarinë tuaj. Ju lutemi, riprovoni. Nëse kjo vazhdon, ju lutemi, lidhuni me përgjegjësin e shërbyesit tuaj Home.",
+    "Try again": "Riprovoni",
+    "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "I kërkuam shfletuesit të mbajë mend cilin shërbyes Home përdorni, për t’ju lënë të bëni hyrje, por për fat të keq, shfletuesi juaj e ka harruar këtë. Kaloni te faqja e hyrjeve dhe riprovoni.",
+    "We couldn't log you in": "S’ju nxorëm dot nga llogaria juaj",
+    "Screens": "Ekrane",
+    "Share your screen": "Tregojuni ekranin tuaj të tjerëve",
+    "Show line numbers in code blocks": "Shfaq numra rreshtat në blloqe kodi",
+    "Expand code blocks by default": "Zgjeroji blloqet e kodit, si parazgjedhje",
+    "Show stickers button": "Shfaq buton ngjitësish",
+    "Recently visited rooms": "Dhoma të vizituara së fundi",
+    "Upgrade to pro": "Përmirësojeni me pro",
+    "Minimize dialog": "Minimizoje dialogun",
+    "Maximize dialog": "Zmadhoje plotësisht dialogun",
+    "%(hostSignupBrand)s Setup": "Ujdisje %(hostSignupBrand)s",
+    "You should know": "Duhet të dini",
+    "Privacy Policy": "Rregulla Privatësie",
+    "Cookie Policy": "Rregulla Cookie-sh",
+    "Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.": "Mësoni më tepër te <privacyPolicyLink />, <termsOfServiceLink /> dhe <cookiePolicyLink /> tonat.",
+    "Continuing temporarily allows the %(hostSignupBrand)s setup process to access your account to fetch verified email addresses. This data is not stored.": "Vazhdimi lejon përkohësisht procesin e ujdisjes së %(hostSignupBrand)s të hyjë në llogarinë tuaj dhe të sjellë adresa email të verifikuara. Këto të dhëna nuk depozitohen.",
+    "Failed to connect to your homeserver. Please close this dialog and try again.": "S’u arrit të lidhej me shërbyesin tuaj Home. Ju lutemi, mbylleni këtë dialog dhe riprovoni.",
+    "Abort": "Ndërprite",
+    "Are you sure you wish to abort creation of the host? The process cannot be continued.": "Jeni i sigurt se doni të ndërpritet krijimi i strehës? Procesi s’mund të vazhdohet.",
+    "Confirm abort of host creation": "Ripohoni ndërprerjen e krijimit të strehës"
 }
diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
index bce9fe6728..ca79955f72 100644
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -1,8 +1,8 @@
 {
-    "This email address is already in use": "Ова мејл адреса се већ користи",
+    "This email address is already in use": "Ова адреса е-поште се већ користи",
     "This phone number is already in use": "Овај број телефона се већ користи",
-    "Failed to verify email address: make sure you clicked the link in the email": "Нисам успео да проверим мејл адресу, постарајте се да сте кликнули на везу у мејлу",
-    "The remote side failed to pick up": "Друга страна није подигла слушалицу",
+    "Failed to verify email address: make sure you clicked the link in the email": "Неуспела провера адресе е-поште: морате да кликнете на везу у поруци",
+    "The remote side failed to pick up": "Друга страна се није јавила",
     "Unable to capture screen": "Не могу да ухватим садржај екрана",
     "Existing Call": "Постојећи позив",
     "You are already in a call.": "Већ сте у позиву.",
@@ -36,7 +36,7 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
     "Who would you like to add to this community?": "Кога желите додати у ову заједницу?",
-    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Упозорење: било која особа додата у заједницу биће јавно видљива било коме ко зна ИБ заједнице",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Упозорење: било која особа додата у заједницу биће јавно видљива било коме ко зна ИД заједнице",
     "Invite new community members": "Позови нове чланове заједнице",
     "Invite to Community": "Позови у заједницу",
     "Which rooms would you like to add to this community?": "Које собе желите додати у ову заједницу?",
@@ -51,7 +51,7 @@
     "%(brand)s was not given permission to send notifications - please try again": "%(brand)s-у није дато овлашћење за слање обавештења, пробајте поново касније",
     "Unable to enable Notifications": "Нисам успео да омогућим обавештења",
     "This email address was not found": "Ова мејл адреса није нађена",
-    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Изгледа да ваша мејл адреса није повезана са Матрикс ИБ-јем на овом кућном серверу.",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Изгледа да ваша е-адреса није повезана са Матрикс ИД на овом домаћем серверу.",
     "Default": "Подразумевано",
     "Restricted": "Ограничено",
     "Moderator": "Модератор",
@@ -64,13 +64,13 @@
     "Unable to create widget.": "Не могу да направим виџет.",
     "Failed to send request.": "Неуспех при слању захтева.",
     "This room is not recognised.": "Ова соба није препозната.",
-    "Power level must be positive integer.": "Ниво моћи мора бити позитивни број.",
+    "Power level must be positive integer.": "Ниво снаге мора бити позитивни број.",
     "You are not in this room.": "Нисте у овој соби.",
     "You do not have permission to do that in this room.": "Немате овлашћење да урадите то у овој соби.",
     "Missing room_id in request": "Недостаје room_id у захтеву",
     "Room %(roomId)s not visible": "Соба %(roomId)s није видљива",
     "Missing user_id in request": "Недостаје user_id у захтеву",
-    "Call Failed": "Позивање неуспешно",
+    "Call Failed": "Позив неуспешан",
     "Call Timeout": "Прекорачено време позивања",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
     "Usage": "Коришћење",
@@ -87,7 +87,7 @@
     "%(senderName)s requested a VoIP conference.": "%(senderName)s је затражио VoIP конференцију.",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s је позвао %(targetName)s.",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s је бановао %(targetName)s.",
-    "%(senderName)s set their display name to %(displayName)s.": "Корисник %(senderName)s је себи поставио приказно име %(displayName)s.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s постави приказно име на %(displayName)s.",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "Корисник %(senderName)s је себи уклонио приказно име %(oldDisplayName)s.",
     "%(senderName)s removed their profile picture.": "Корисник %(senderName)s је себи уклонио профилну слику.",
     "%(senderName)s changed their profile picture.": "Корисник %(senderName)s је себи променио профилну слику.",
@@ -118,7 +118,7 @@
     "%(senderName)s made future room history visible to anyone.": "Корисник %(senderName)s је учинио будући историјат собе видљивим свима.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "Корисник %(senderName)s је учинио будући историјат собе непознатим (%(visibility)s).",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s са %(fromPowerLevel)s на %(toPowerLevel)s",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "Корисник %(senderName)s је променио ниво моћи од %(powerLevelDiffText)s.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s промени ниво снаге за %(powerLevelDiffText)s.",
     "%(senderName)s changed the pinned messages for the room.": "Корисник %(senderName)s је променио закачене поруке у соби.",
     "%(widgetName)s widget modified by %(senderName)s": "Корисник %(senderName)s је променио виџет %(widgetName)s",
     "%(widgetName)s widget added by %(senderName)s": "Корисник %(senderName)s је додао виџет %(widgetName)s",
@@ -138,8 +138,8 @@
     "Enable automatic language detection for syntax highlighting": "Омогући самостално препознавање језика за истицање синтаксе",
     "Automatically replace plain text Emoji": "Самостално замени емоџије писане обичним текстом",
     "Mirror local video feed": "Копирај довод локалног видеа",
-    "Enable inline URL previews by default": "Подразумевано омогући претпрегледе адреса унутар линије",
-    "Enable URL previews for this room (only affects you)": "Омогући претпрегледе адреса у овој соби (утиче само на вас)",
+    "Enable inline URL previews by default": "Подразумевано укључи УРЛ прегледе",
+    "Enable URL previews for this room (only affects you)": "Укључи УРЛ прегледе у овој соби (утиче само на вас)",
     "Enable URL previews by default for participants in this room": "Подразумевано омогући прегледе адреса за чланове ове собе",
     "Room Colour": "Боја собе",
     "Active call (%(roomName)s)": "Активни позив (%(roomName)s)",
@@ -194,10 +194,10 @@
     "Ban this user?": "Забранити приступ овом кориснику?",
     "Failed to ban user": "Неуспех при забрањивању приступа кориснику",
     "Failed to mute user": "Неуспех при пригушивању корисника",
-    "Failed to change power level": "Неуспех при промени нивоа моћи",
-    "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.": "Нећете моћи да опозовете ове промене зато што снижавате себе, ако сте последњи овлашћени корисник у соби, немогуће је да поново добијете овлашћења.",
+    "Failed to change power level": "Не могу да изменим ниво снаге",
+    "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.": "Нећете моћи да опозовете ове промене јер себи смањујете овлашћења. Ако сте последњи овлашћени корисник у соби, немогуће је да поново добијете овлашћења.",
     "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.": "Нећете моћи да опозовете ову измену јер унапређујете корисника тако да има исти ниво моћи као и ви.",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Нећете моћи да опозовете ову измену јер унапређујете корисника тако да има исти ниво снаге као и ви.",
     "Unignore": "Не занемаруј више",
     "Ignore": "Занемари",
     "Jump to read receipt": "Скочи на потврду о прочитаности",
@@ -210,7 +210,7 @@
     "and %(count)s others...|one": "и још један други...",
     "Invited": "Позван",
     "Filter room members": "Филтрирај чланове собе",
-    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (моћ %(powerLevelNumber)s)",
+    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (снага %(powerLevelNumber)s)",
     "Attachment": "Прилог",
     "Hangup": "Спусти слушалицу",
     "Voice call": "Гласовни позив",
@@ -249,7 +249,7 @@
     "(~%(count)s results)|other": "(~%(count)s резултата)",
     "(~%(count)s results)|one": "(~%(count)s резултат)",
     "Join Room": "Приступи соби",
-    "Upload avatar": "Отпреми аватара",
+    "Upload avatar": "Отпреми аватар",
     "Settings": "Подешавања",
     "Forget room": "Заборави собу",
     "Search": "Претрага",
@@ -258,7 +258,7 @@
     "Favourites": "Омиљено",
     "Rooms": "Собе",
     "Low priority": "Ниска важност",
-    "Historical": "Историјско",
+    "Historical": "Историја",
     "This room": "Ова соба",
     "%(roomName)s does not exist.": "Соба %(roomName)s не постоји.",
     "%(roomName)s is not accessible at this time.": "Соба %(roomName)s није доступна у овом тренутку.",
@@ -269,15 +269,15 @@
     "Privileged Users": "Овлашћени корисници",
     "No users have specific privileges in this room": "Нема корисника са посебним овлашћењима у овој соби",
     "Banned users": "Корисници са забраном приступа",
-    "This room is not accessible by remote Matrix servers": "Овој соби не могу приступити удаљени Матрикс сервери",
+    "This room is not accessible by remote Matrix servers": "Ова соба није доступна са удаљених Матрикс сервера",
     "Leave room": "Напусти собу",
     "Favourite": "Омиљено",
     "Guests cannot join this room even if explicitly invited.": "Гости не могу приступити овој соби чак и ако су експлицитно позвани.",
     "Click here to fix": "Кликните овде да бисте поправили",
     "Who can access this room?": "Ко може приступити овој соби?",
     "Only people who have been invited": "Само особе које су позване",
-    "Anyone who knows the room's link, apart from guests": "Било ко ко зна везу ка соби, осим гостију",
-    "Anyone who knows the room's link, including guests": "Било ко ко зна везу ка соби, укључујући и госте",
+    "Anyone who knows the room's link, apart from guests": "Свако ко има везу ка соби, осим гостију",
+    "Anyone who knows the room's link, including guests": "Свако ко има везу ка соби, укључујући и госте",
     "Publish this room to the public in %(domain)s's room directory?": "Објавити ову собу у јавној фасцикли соба на домену %(domain)s?",
     "Who can read history?": "Ко може читати историјат?",
     "Anyone": "Било ко",
@@ -292,17 +292,17 @@
     "Close": "Затвори",
     "not specified": "није наведено",
     "This room has no local addresses": "Ова соба нема локалних адреса",
-    "Invalid community ID": "Неисправан ИБ заједнице",
-    "'%(groupId)s' is not a valid community ID": "„%(groupId)s“ није исправан ИБ заједнице",
+    "Invalid community ID": "Неисправан ИД заједнице",
+    "'%(groupId)s' is not a valid community ID": "„%(groupId)s“ није исправан ИД заједнице",
     "Flair": "Беџ",
     "Showing flair for these communities:": "Приказујем беџ за ове заједнице:",
     "This room is not showing flair for any communities": "Ова соба не приказује беџеве било које заједнице",
-    "New community ID (e.g. +foo:%(localDomain)s)": "Нови ИБ заједнице (нпр.: +zajednica:%(localDomain)s)",
-    "You have <a>enabled</a> URL previews by default.": "<a>Омогућили</a> сте подразумеване претпрегледе адреса.",
-    "You have <a>disabled</a> URL previews by default.": "<a>Онемогућили</a> сте подразумеване претпрегледе адреса.",
-    "URL previews are enabled by default for participants in this room.": "Претпрегледи адреса су подразумевано омогућени за све чланове ове собе.",
-    "URL previews are disabled by default for participants in this room.": "Претпрегледи адреса су подразумевано онемогућени за све чланове ове собе.",
-    "URL Previews": "Претпрегледи адреса",
+    "New community ID (e.g. +foo:%(localDomain)s)": "Нови ИД заједнице (нпр.: +zajednica:%(localDomain)s)",
+    "You have <a>enabled</a> URL previews by default.": "<a>Укључили</a> сте да се УРЛ прегледи подразумевају.",
+    "You have <a>disabled</a> URL previews by default.": "<a>Искључили</a> сте да се УРЛ прегледи подразумевају.",
+    "URL previews are enabled by default for participants in this room.": "УРЛ прегледи су подразумевано укључени за чланове ове собе.",
+    "URL previews are disabled by default for participants in this room.": "УРЛ прегледи су подразумевано искључени за чланове ове собе.",
+    "URL Previews": "УРЛ прегледи",
     "Error decrypting audio": "Грешка при дешифровању звука",
     "Error decrypting attachment": "Грешка при дешифровању прилога",
     "Decrypt %(text)s": "Дешифруј %(text)s",
@@ -310,9 +310,9 @@
     "Invalid file%(extra)s": "Неисправна датотека %(extra)s",
     "Error decrypting image": "Грешка при дешифровању слике",
     "Error decrypting video": "Грешка при дешифровању видеа",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "Корисник %(senderDisplayName)s је променио аватара собе %(roomName)s",
-    "%(senderDisplayName)s removed the room avatar.": "Корисник %(senderDisplayName)s је уклонио аватара собе.",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "Корисник %(senderDisplayName)s је променио аватара собе у <img/>",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s измени аватар собе %(roomName)s",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s уклони аватар собе.",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s промени аватар собе у <img/>",
     "Copied!": "Копирано!",
     "Failed to copy": "Нисам успео да ископирам",
     "Add an Integration": "Додај уградњу",
@@ -325,7 +325,7 @@
     "A text message has been sent to %(msisdn)s": "Текстуална порука је послата на %(msisdn)s",
     "Please enter the code it contains:": "Унесите код који се налази у њој:",
     "Start authentication": "Започните идентификацију",
-    "powered by Matrix": "покреће Матрикс",
+    "powered by Matrix": "покреће га Матрикс",
     "Sign in with": "Пријавите се преко",
     "Email address": "Мејл адреса",
     "Sign in": "Пријави се",
@@ -404,14 +404,14 @@
     "were kicked %(count)s times|one": "избачен",
     "was kicked %(count)s times|other": "избачен %(count)s пута",
     "was kicked %(count)s times|one": "избачен",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s је променило своје име %(count)s пута",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s је променило своје име",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s је променило своје име %(count)s пута",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s је променило своје име",
-    "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)s је променило свој аватар %(count)s пута",
-    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)s је променило свој аватар",
-    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)s је променило свој аватар %(count)s пута",
-    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s је променило свој аватар",
+    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s промени своје име %(count)s пута",
+    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s промени своје име",
+    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s промени своје име %(count)s пута",
+    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s промени своје име",
+    "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)s промени свој аватар %(count)s пута",
+    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)s промени свој аватар",
+    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)s промени свој аватар %(count)s пута",
+    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s промени свој аватар",
     "%(items)s and %(count)s others|other": "%(items)s и %(count)s других",
     "%(items)s and %(count)s others|one": "%(items)s и још један",
     "%(items)s and %(lastItem)s": "%(items)s и %(lastItem)s",
@@ -424,20 +424,20 @@
     "And %(count)s more...|other": "И %(count)s других...",
     "ex. @bob:example.com": "нпр.: @pera:domen.rs",
     "Add User": "Додај корисника",
-    "Matrix ID": "Матрикс ИБ",
-    "Matrix Room ID": "ИБ Матрикс собе",
+    "Matrix ID": "Матрикс ИД",
+    "Matrix Room ID": "ИД Матрикс собе",
     "email address": "мејл адреса",
     "Try using one of the following valid address types: %(validTypesList)s.": "Пробајте са једним од следећих исправних типова адреса: %(validTypesList)s.",
     "You have entered an invalid address.": "Унели сте неисправну адресу.",
     "Confirm Removal": "Потврди уклањање",
     "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.": "Да ли сте сигурни да желите уклонити (обрисати) овај догађај? Знајте да брисање назива собе или мењање теме може опозвати измену.",
-    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "ИБ-јеви заједнице могу садржати само знакове a-z, 0-9, или '=_-./'",
-    "Community IDs cannot be empty.": "ИБ-јеви заједнице не могу бити празни.",
+    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "ИД заједнице могу садржати само знакове a-z, 0-9, или =_-./",
+    "Community IDs cannot be empty.": "ИД заједнице не могу бити празни.",
     "Something went wrong whilst creating your community": "Нешто је пошло наопако приликом стварања ваше заједнице",
     "Create Community": "Направи заједницу",
     "Community Name": "Назив заједнице",
     "Example": "Пример",
-    "Community ID": "ИБ заједнице",
+    "Community ID": "ИД заједнице",
     "example": "пример",
     "Create": "Направи",
     "Create Room": "Направи собу",
@@ -447,9 +447,9 @@
     "An error has occurred.": "Догодила се грешка.",
     "OK": "У реду",
     "Unable to restore session": "Не могу да повратим сесију",
-    "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.": "Ако сте претходно користили новије издање %(brand)s-а, ваша сесија може бити некомпатибилна са овим издањем. Затворите овај прозор и вратите се на новије издање.",
+    "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.": "Ако сте претходно користили новије издање апликације %(brand)s, ваша сесија може бити некомпатибилна са овим издањем. Затворите овај прозор и вратите се на новије издање.",
     "Invalid Email Address": "Неисправна мејл адреса",
-    "This doesn't appear to be a valid email address": "Изгледа да ово није исправна мејл адреса",
+    "This doesn't appear to be a valid email address": "Ово не изгледа као исправна адреса е-поште",
     "Verification Pending": "Чека се на проверу",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Проверите ваш мејл и кликните на везу унутар њега. Када ово урадите, кликните на дугме „настави“.",
     "Unable to add email address": "Не могу да додам мејл адресу",
@@ -514,13 +514,13 @@
     "Old cryptography data detected": "Нађени су стари криптографски подаци",
     "The platform you're on": "Платформа коју користите",
     "The version of %(brand)s": "%(brand)s издање",
-    "Your language of choice": "Ваш жељени језик",
+    "Your language of choice": "Ваш изабрани језик",
     "Which officially provided instance you are using, if any": "Коју званичну инстанцу користите, ако користите",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Да ли користите режим богатог текста у уређивачу богатог текста",
-    "Your homeserver's URL": "Адреса вашег кућног сервера",
+    "Your homeserver's URL": "УРЛ вашег домаћег сервера",
     "Analytics": "Аналитика",
     "The information being sent to us to help make %(brand)s better includes:": "У податке које нам шаљете зарад побољшавања %(brand)s-а спадају:",
-    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Ако страница садржи поверљиве податке (као што је назив собе, корисника или ИБ-ја групе), ти подаци се уклањају пре слања на сервер.",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Ако страница садржи поверљиве податке (као што је назив собе, ИД корисника или групе), ти подаци се уклањају пре слања на сервер.",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "Корисник %(oldDisplayName)s је променио приказно име у %(displayName)s.",
     "Failed to set direct chat tag": "Нисам успео да поставим ознаку директног ћаскања",
     "Failed to remove tag %(tagName)s from room": "Нисам успео да скинем ознаку %(tagName)s са собе",
@@ -588,7 +588,7 @@
     "Account": "Налог",
     "Access Token:": "Приступни жетон:",
     "click to reveal": "кликни за приказ",
-    "Homeserver is": "Кућни сервер је",
+    "Homeserver is": "Домаћи сервер је",
     "Identity Server is": "Идентитетски сервер је",
     "%(brand)s version:": "%(brand)s издање:",
     "olm version:": "olm издање:",
@@ -603,20 +603,20 @@
     "Incorrect username and/or password.": "Нетачно корисничко име и/или лозинка.",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Знајте да се пријављујете на сервер %(hs)s, не на matrix.org.",
     "The phone number entered looks invalid": "Унети број телефона не изгледа исправно",
-    "This homeserver doesn't offer any login flows which are supported by this client.": "Овај кућни сервер не пружа било који начин пријаве унутар овог клијента.",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Овај домаћи сервер не пружа било који начин пријаве унутар овог клијента.",
     "Error: Problem communicating with the given homeserver.": "Грешка: проблем у комуницирању са датим кућним сервером.",
-    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Не могу да се повежем на кућни сервер преко HTTP-а када се користи HTTPS адреса у траци вашег прегледача. Или користите HTTPS или <a>омогућите небезбедне скрипте</a>.",
-    "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Не могу да се повежем на кућни сервер. Проверите вашу интернет везу, постарајте се да верујете <a>SSL сертификату кућног сервера</a> и да проширење прегледача не блокира захтеве.",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Не могу да се повежем на сервер преко ХТТП када је ХТТПС УРЛ у траци вашег прегледача. Или користите HTTPS или <a>омогућите небезбедне скрипте</a>.",
+    "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Не могу да се повежем на домаћи сервер. Проверите вашу интернет везу, постарајте се да је <a>ССЛ сертификат сервера</a> од поверења и да проширење прегледача не блокира захтеве.",
     "Failed to fetch avatar URL": "Нисам успео да добавим адресу аватара",
     "Set a display name:": "Постави приказно име:",
     "Upload an avatar:": "Отпреми аватар:",
     "This server does not support authentication with a phone number.": "Овај сервер не подржава идентификацију преко броја мобилног.",
     "Displays action": "Приказује радњу",
-    "Bans user with given id": "Забрањује приступ кориснику са датим иб-јем",
-    "Define the power level of a user": "Дефинише ниво моћи корисника",
-    "Deops user with given id": "Укида админа за корисника са датим иб-јем",
-    "Invites user with given id to current room": "Позива корисника са датим иб-јем у тренутну собу",
-    "Kicks user with given id": "Избацује корисника са датим иб-јем",
+    "Bans user with given id": "Забрањује приступ кориснику са датим ИД",
+    "Define the power level of a user": "Дефинише снагу корисника",
+    "Deops user with given id": "Укида админа за корисника са датим ИД",
+    "Invites user with given id to current room": "Позива корисника са датим ИД у тренутну собу",
+    "Kicks user with given id": "Избацује корисника са датим ИД",
     "Changes your display nickname": "Мења ваш приказни надимак",
     "Searches DuckDuckGo for results": "Претражује DuckDuckGo за резултате",
     "Ignores a user, hiding their messages from you": "Занемарује корисника и тиме скрива њихове поруке од вас",
@@ -627,7 +627,7 @@
     "Notify the whole room": "Обавести све у соби",
     "Room Notification": "Собно обавештење",
     "Users": "Корисници",
-    "Session ID": "ИБ сесије",
+    "Session ID": "ИД сесије",
     "Passphrases must match": "Фразе се морају подударати",
     "Passphrase must not be empty": "Фразе не смеју бити празне",
     "Export room keys": "Извези кључеве собе",
@@ -727,7 +727,7 @@
     "When I'm invited to a room": "Када сам позван у собу",
     "Can't update user notification settings": "Не могу да ажурирам корисничка подешавања обавештења",
     "Notify for all other messages/rooms": "Обавести за све друге поруке и собе",
-    "Unable to look up room ID from server": "Не могу да погледам ИБ собе на серверу",
+    "Unable to look up room ID from server": "Не могу да потражим ИД собе на серверу",
     "Couldn't find a matching Matrix room": "Не могу да нађем одговарајућу Матрикс собу",
     "Invite to this room": "Позови у ову собу",
     "You cannot delete this message. (%(code)s)": "Не можете обрисати ову поруку. (%(code)s)",
@@ -762,8 +762,8 @@
     "Thank you!": "Хвала вам!",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Са вашим тренутним прегледачем изглед и угођај ове апликације може бити скроз неправилан и неке могућности можда неће радити. Уколико желите да ипак пробате, можете наставити али ћете бити без подршке за било које проблеме на које налетите!",
     "Checking for an update...": "Проверавам ажурирања...",
-    "Every page you use in the app": "Свака страница коју будете користили у апликацији",
-    "e.g. <CurrentPageURL>": "Нпр.: <CurrentPageURL>",
+    "Every page you use in the app": "Свака страница коју користите у апликацији",
+    "e.g. <CurrentPageURL>": "нпр. <CurrentPageURL>",
     "Your device resolution": "Резолуција вашег уређаја",
     "Popout widget": "Виџет за искакање",
     "Missing roomId.": "Недостаје roomId.",
@@ -777,7 +777,7 @@
     "Logs sent": "Записници су послати",
     "Failed to send logs: ": "Нисам успео да пошаљем записнике: ",
     "Submit debug logs": "Пошаљи записнике за поправљање грешака",
-    "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.": "Записници за поправљање грешака садрже податке о коришћењу апликације међу којима се налази ваше корисничко име, ИБ-јеви или алијаси посећених соба или група и корисничка имена других корисника. Не садрже саме поруке.",
+    "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.": "Записници за поправљање грешака садрже податке о коришћењу апликације међу којима се налази ваше корисничко име, ИД или алијаси посећених соба или група и корисничка имена других корисника. Не садрже саме поруке.",
     "Unable to join community": "Не могу да приступим заједници",
     "Unable to leave community": "Не могу да напустим заједницу",
     "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> можда неће бити видљиве другим корисницима највише 30 минута.",
@@ -786,14 +786,14 @@
     "Who can join this community?": "Ко може приступити овој заједници?",
     "Everyone": "Свако",
     "Opens the Developer Tools dialog": "Отвори прозор програмерских алатки",
-    "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.": "Ако сте пријавили грешку преко Гитхаба, извештаји за поправљање грешака нам могу помоћи да лакше нађемо узрок. Извештаји садрже податке о коришћењу апликације и међу њих спада ваше корисничко име, ИБ-јеви или алијаси посећених соба или група и корисничка имена других корисника. Не садрже саме поруке.",
+    "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.": "Ако сте пријавили грешку преко Гитхаба, извештаји за поправљање грешака нам могу помоћи да лакше нађемо узрок. Извештаји садрже податке о коришћењу апликације и међу њих спада ваше корисничко име, ИД или алијаси посећених соба или група и корисничка имена других корисника. Не садрже саме поруке.",
     "Always show encryption icons": "Увек прикажи иконице шифровања",
     "Send Logs": "Пошаљи записнике",
     "Clear Storage and Sign Out": "Очисти складиште и одјави ме",
     "Refresh": "Освежи",
     "We encountered an error trying to restore your previous session.": "Наишли смо на грешку приликом повраћаја ваше претходне сесије.",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Чишћење складишта вашег прегледача може решити проблем али ће вас то одјавити и учинити шифровани историјат ћаскања нечитљивим.",
-    "e.g. %(exampleValue)s": "нпр.: %(exampleValue)s",
+    "e.g. %(exampleValue)s": "нпр. %(exampleValue)s",
     "Send analytics data": "Пошаљи аналитичке податке",
     "Enable widget screenshots on supported widgets": "Омогући снимке екрана виџета у подржаним виџетима",
     "Muted Users": "Утишани корисници",
@@ -801,13 +801,13 @@
     "To continue, please enter your password:": "Да бисте наставили, унесите вашу лозинку:",
     "Collapse Reply Thread": "Скупи нит са одговорима",
     "Can't leave Server Notices room": "Не могу да напустим собу са напоменама сервера",
-    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ова соба се користи за важне поруке са Кућног сервера, не можете изаћи из ове собе.",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ова соба се користи за важне поруке са сервера. Не можете напустити ову собу.",
     "Terms and Conditions": "Услови коришћења",
-    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Да бисте наставили са коришћењем Кућног сервера %(homeserverDomain)s морате погледати и пристати на наше услове коришћења.",
+    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Да наставите са коришћењем сервера %(homeserverDomain)s морате погледати и пристати на наше услове коришћења.",
     "Review terms and conditions": "Погледај услове коришћења",
     "Share Link to User": "Подели везу са корисником",
     "Share room": "Подели собу",
-    "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>": "Ово ће учинити ваш налог трајно неупотребљивим. Нећете моћи да се пријавите и нико се неће моћи поново регистровати са истим корисничким ИБ-јем. Ово ће учинити да ваш налог напусти све собе у којима учествује и уклониће појединости вашег налога са идентитетског сервера. <b>Ова радња се не може опозвати.</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>": "Ово ће учинити ваш налог трајно неупотребљивим. Нећете моћи да се пријавите и нико се неће моћи поново да се региструје са истим корисничким ИД. Ово ће учинити да ваш налог напусти све собе у којима учествује и уклониће појединости вашег налога са идентитетског сервера. <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.": "Видљивост порука у Матриксу је слична мејловима. Оне поруке које заборавимо нећемо делити са новим и нерегистрованим корисницима али постојећи корисници који су имали приступ овим порукама ће и даље моћи да виде своју копију.",
     "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> овим ће будући корисници видети непотпуне разговоре)",
@@ -827,11 +827,11 @@
     "Permission Required": "Неопходна је дозвола",
     "You do not have permission to start a conference call in this room": "Немате дозволу да започињете конференцијски позив у овој соби",
     "This event could not be displayed": "Овај догађај не може бити приказан",
-    "Demote yourself?": "Снизите чин себи?",
-    "Demote": "Снизите чин",
+    "Demote yourself?": "Рашчињавате себе?",
+    "Demote": "Рашчини",
     "Whether or not you're logged in (we don't record your username)": "Да ли сте пријављени (не бележимо ваше корисничко име)",
-    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Датотека „%(fileName)s“ премашује ограничење величине отпремања на овом кућном серверу",
-    "Unable to load! Check your network connectivity and try again.": "Нисам могао да учитам! Проверите вашу мрежну везу и пробајте поново.",
+    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Фајл „%(fileName)s“ премашује ограничење величине отпремања на овом серверу",
+    "Unable to load! Check your network connectivity and try again.": "Не могу да учитам! Проверите повезаност и пробајте поново.",
     "Failed to invite users to the room:": "Нисам успео да позовем кориснике у собу:",
     "Upgrades a room to a new version": "Надограђује собу на ново издање",
     "Gets or sets the room topic": "Добавља или поставља тему собе",
@@ -863,17 +863,17 @@
     "The username field must not be blank.": "Поље корисничког имена не може бити празно.",
     "Username": "Корисничко име",
     "Not sure of your password? <a>Set a new one</a>": "Не сећате се лозинке? <a>Поставите нову</a>",
-    "Are you sure you want to sign out?": "Да ли сте сигурни да се желите одјавити?",
-    "Call failed due to misconfigured server": "Позив није успео због погрешно подешеног сервера",
-    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Замолите администратора вашег сервера (<code>%(homeserverDomain)s</code>) да подеси TURN сервер како би позиви радили поуздано.",
-    "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.": "Или, можете покушати да користите јавни сервер на  <code>turn.matrix.org</code>, али ово неће бити толико поуздано, и поделиће вашу IP адресу са тим сервером. Ово такође можете мењати у Подешавањима.",
-    "Try using turn.matrix.org": "Покушајте да користите turn.matrix.org",
+    "Are you sure you want to sign out?": "Заиста желите да се одјавите?",
+    "Call failed due to misconfigured server": "Позив неуспешан због лоше подешеног сервера",
+    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Замолите администратора вашег сервера (<code>%(homeserverDomain)s</code>) да подеси „TURN“ сервер како би позиви радили поуздано.",
+    "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.": "Можете покушати и да користите јавни сервер на <code>turn.matrix.org</code>, али ово неће бити толико поуздано и откриће вашу ИП адресу серверу. Овим можете управљати у Поставкама.",
+    "Try using turn.matrix.org": "Пробајте turn.matrix.org",
     "Use Single Sign On to continue": "Користи јединствену пријаву за наставак",
     "Confirm adding this email address by using Single Sign On to prove your identity.": "Потврдите додавање ове е-адресе коришћењем јединствене пријаве за доказивање вашег идентитета.",
     "Single Sign On": "Јединствена пријава",
     "Confirm adding email": "Потврди додавање е-адресе",
     "Click the button below to confirm adding this email address.": "Кликните на дугме испод за потврђивање додавања ове е-адресе.",
-    "Add Email Address": "Додај е-адресу",
+    "Add Email Address": "Додај адресу е-поште",
     "Room name or address": "Назив собе или адреса",
     "Identity server has no terms of service": "Идентитетски сервер нема услове коришћења",
     "Changes your avatar in all rooms": "Промените ваш аватар у свим собама",
@@ -920,7 +920,7 @@
     "Scroll to most recent messages": "Пребаци на најновије поруке",
     "Emoji picker": "Бирач емоџија",
     "Send a message…": "Пошаљи поруку…",
-    "Direct Messages": "Непосредне поруке",
+    "Direct Messages": "Директне поруке",
     "Create room": "Направи собу",
     "People": "Људи",
     "Forget this room": "Заборави ову собу",
@@ -937,8 +937,8 @@
     "Room Topic": "Тема собе",
     "Messages in this room are end-to-end encrypted.": "Поруке у овој соби су шифроване с краја на крај.",
     "Messages in this room are not end-to-end encrypted.": "Поруке у овој соби нису шифроване с краја на крај.",
-    "%(count)s verified sessions|other": "Укупно потврђених сесија: %(count)s",
-    "%(count)s verified sessions|one": "Једна потврђена сесија",
+    "%(count)s verified sessions|other": "потврђених сесија: %(count)s",
+    "%(count)s verified sessions|one": "1 потврђена сесија",
     "Hide verified sessions": "Сакриј потврђене сесије",
     "Remove recent messages by %(user)s": "Уклони недавне поруке корисника %(user)s",
     "Remove recent messages": "Уклони недавне поруке",
@@ -958,7 +958,7 @@
     "Suggestions": "Предлози",
     "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Позовите некога уз помоћ њихово имена, корисничког имена (типа <userId/>), мејл адресе или <a>поделите ову собу</a>.",
     "Report bugs & give feedback": "Пријави грешке и пошаљи повратне податке",
-    "Report Content to Your Homeserver Administrator": "Пријави садржај администратору вашег кућног сервера",
+    "Report Content to Your Homeserver Administrator": "Пријави садржај администратору вашег домаћег сервера",
     "Room Settings - %(roomName)s": "Подешавања собе - %(roomName)s",
     "Terms of Service": "Услови коришћења",
     "To continue you need to accept the terms of this service.": "За наставак, морате прихватити услове коришћења ове услуге.",
@@ -971,7 +971,7 @@
     "Notification settings": "Подешавања обавештења",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Инсталирајте <chromeLink>Хром</chromeLink>, <firefoxLink>Фајерфокс</firefoxLink>, или <safariLink>Сафари</safariLink> за најбољи доживљај.",
     "%(creator)s created and configured the room.": "Корисник %(creator)s је направио и подесио собу.",
-    "Preview": "Претпреглед",
+    "Preview": "Преглед",
     "Switch to light mode": "Пребаци на светлу тему",
     "Switch to dark mode": "Пребаци на тамну тему",
     "Security & privacy": "Безбедност и приватност",
@@ -1001,7 +1001,7 @@
     "Show rooms with unread notifications first": "Прво прикажи собе са непрочитаним обавештењима",
     "Enable experimental, compact IRC style layout": "Омогући пробни, збијенији распоред у IRC стилу",
     "Got It": "Разумем",
-    "Light bulb": "Сијалица",
+    "Light bulb": "сијалица",
     "Algorithm: ": "Алгоритам: ",
     "Go back": "Назад",
     "Hey you. You're the best!": "Хеј! Само напред!",
@@ -1022,7 +1022,7 @@
     "No recently visited rooms": "Нема недавно посећених соба",
     "Appearance": "Изглед",
     "Show rooms with unread messages first": "Прво прикажи собе са непрочитаним порукама",
-    "Show previews of messages": "Прикажи претпрегледе порука",
+    "Show previews of messages": "Прикажи прегледе порука",
     "Sort by": "Поређај по",
     "Activity": "Активности",
     "A-Z": "А-Ш",
@@ -1035,13 +1035,478 @@
     "Looks good": "Изгледа добро",
     "Show advanced": "Прикажи напредно",
     "Recent Conversations": "Недавни разговори",
-    "Recently Direct Messaged": "Недавно послате непосредне поруке",
+    "Recently Direct Messaged": "Недавне директне поруке",
     "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Започните разговор са неким користећи њихово име, корисничко име (као нпр.: <userId/>) или мејл адресу.",
     "Go": "Напред",
     "Go to Element": "Иди у Елемент",
     "We’re excited to announce Riot is now Element!": "Са одушевљењем објављујемо да је Рајот (Riot) сада Елемент (Element)!",
     "Learn more at <a>element.io/previously-riot</a>": "Сазнајте више на страници <a>element.io/previously-riot</a>",
     "Looks good!": "Изгледа добро!",
-    "Send a Direct Message": "Пошаљи непосредну поруку",
-    "Switch theme": "Промени тему"
+    "Send a Direct Message": "Пошаљи директну поруку",
+    "Switch theme": "Промени тему",
+    "Error upgrading room": "Грешка при надоградњи собе",
+    "You do not have the required permissions to use this command.": "Немате потребне дозволе за коришћење ове команде.",
+    "Sends a message as html, without interpreting it as markdown": "Шаље поруку као ХТМЛ, без маркдаун интерпретације",
+    "Sends a message as plain text, without interpreting it as markdown": "Шаље поруку као обичан текст, без маркдаун интерпретације",
+    "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Придодаје ( ͡° ͜ʖ ͡°) обичној поруци",
+    "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "Придодаје ┬──┬ ノ( ゜-゜ノ) обичној поруци",
+    "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "Придодаје (╯°□°）╯︵ ┻━┻ обичној поруци",
+    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Придодаје ¯\\_(ツ)_/¯ обичној поруци",
+    "Other": "Остало",
+    "Effects": "Ефекти",
+    "Actions": "Радње",
+    "Messages": "Поруке",
+    "Setting up keys": "Постављам кључеве",
+    "Are you sure you want to cancel entering passphrase?": "Заиста желите да откажете унос фразе?",
+    "Cancel entering passphrase?": "Отказати унос фразе?",
+    "Custom (%(level)s)": "Посебан %(level)s",
+    "Sign In": "Пријави се",
+    "Create Account": "Направи налог",
+    "Use your account or create a new one to continue.": "Користите постојећи или направите нови да наставите.",
+    "Sign In or Create Account": "Пријавите се или направите налог",
+    "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": "Самоа",
+    "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": "Кувајт",
+    "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": "Уједињено Краљевство",
+    "%(name)s is requesting verification": "%(name)s тражи верификацију",
+    "Trust": "Веруј",
+    "Only continue if you trust the owner of the server.": "Наставите само ако верујете власнику сервера.",
+    "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.": "Ова радња захтева приступ серверу идентитета <server /> за валидацију адресе е-поште или телефонског броја али изгледа да сервер нема „услове услуге“.",
+    "Name or Matrix ID": "Име или Матрикс ИД",
+    "The server does not support the room version specified.": "Сервер не подржава наведену верзију собе.",
+    "The file '%(fileName)s' failed to upload.": "Фајл „%(fileName)s“ није отпремљен.",
+    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Тренутно није могуће одговорити и приложити фајл. Желите ли да пошаљете само фајл без одговора?",
+    "Replying With Files": "Одговори са фајловима",
+    "This will end the conference for everyone. Continue?": "Ово ће завршити конференцију за све. Да наставим?",
+    "End conference": "Завршите конференцију",
+    "You've reached the maximum number of simultaneous calls.": "Достигли сте максималан број истовремених позива.",
+    "Too Many Calls": "Превише позива",
+    "No other application is using the webcam": "Друга апликације не користи камеру",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "Позив није успео јер камера или микрофон нису доступни. Проверите да:",
+    "Permission is granted to use the webcam": "Постоји дозвола за коришћење камере",
+    "A microphone and webcam are plugged in and set up correctly": "Микрофон и камера су прикључени и исправно подешени",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Позив није успео јер микрофон није доступан. Проверите да ли је прикључен и исправно подешен.",
+    "Unable to access webcam / microphone": "Не могу да приступим камери/микрофону",
+    "Unable to access microphone": "Не могу да приступим микрофону",
+    "The call was answered on another device.": "На позив је одговорено на другом уређају.",
+    "Answered Elsewhere": "Одговорен другде",
+    "The call could not be established": "Позив није могао да се успостави",
+    "The other party declined the call.": "Друга страна је одбила позив.",
+    "Call Declined": "Позив одбијен",
+    "Your user agent": "Ваш кориснички агент",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Било да користите %(brand)s на уређају где је додир главни начин уноса",
+    "Add Phone Number": "Додај број телефона",
+    "Click the button below to confirm adding this phone number.": "Кликните на дугме испод за потврду додавања броја телефона.",
+    "Confirm adding phone number": "Потврда додавања броја телефона",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Потврдите додавање броја телефона помоћу јединствене пријаве да докажете свој идентитет.",
+    "About": "О програму",
+    "Homeserver": "Домаћи сервер",
+    "The homeserver the user you’re verifying is connected to": "Домаћи сервер корисника којег верификујете",
+    "Your homeserver": "Ваш домаћи сервер",
+    "Your homeserver does not support session management.": "Ваш домаћи сервер не подржава управљање сесијама.",
+    "Your homeserver does not support cross-signing.": "Ваш домаћи сервер не подржава међу-потписивање.",
+    "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Прототипови заједница вер.2 захтевају компатибилан сервер. Експериментална опција — користите са опрезом.",
+    "Please contact your homeserver administrator.": "Контактирајте администратора вашег сервера.",
+    "Sorry, your homeserver is too old to participate in this room.": "Нажалост, ваш домаћи сервер је престар да бисте учествовали у овој соби.",
+    "Your homeserver has exceeded one of its resource limits.": "Ваш домаћи сервер је прекорачио ограничење неког ресурса.",
+    "Your homeserver has exceeded its user limit.": "Ваш домаћи сервер је прекорачио ограничење корисника.",
+    "The user's homeserver does not support the version of the room.": "Корисников домаћи сервер не подржава верзију собе.",
+    "Unable to connect to Homeserver. Retrying...": "Не могу да се повежем са сервером. Покушавам поново…",
+    "This homeserver has exceeded one of its resource limits.": "Овај сервер је достигао ограничење неког свог ресурса.",
+    "Unexpected error resolving homeserver configuration": "Неочекивана грешка при откривању подешавања сервера",
+    "No homeserver URL provided": "Није наведен УРЛ сервера",
+    "Cannot reach homeserver": "Сервер недоступан",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s додаде алтернативну адресу %(addresses)s за ову собу.",
+    "%(senderName)s removed the main address for this room.": "%(senderName)s уклони главну адресу за ову собу.",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s постави главну адресу собе на %(address)s.",
+    "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Свим серверима је забрањено да учествују! Ова соба се више не може користити.",
+    "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s измени гостински приступ на %(rule)s",
+    "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s спречи госте да се придруже у соби.",
+    "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s дозволи гостима да се придруже у собу.",
+    "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s измени правило придруживања на %(rule)s",
+    "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s учини собу доступном само позивницом.",
+    "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s учини собу јавном за све који знају везу.",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s измени назив собе из %(oldRoomName)s у %(newRoomName)s.",
+    "%(senderName)s made no change.": "%(senderName)s не направи измене.",
+    "Takes the call in the current room off hold": "Узима позив са чекања у тренутној соби",
+    "Places the call in the current room on hold": "Ставља позив на чекање у тренутној соби",
+    "Sends a message to the given user": "Шаље поруку наведеном кориснику",
+    "Opens chat with the given user": "Отвара ћаскање са наведеним корисником",
+    "Displays information about a user": "Приказује податке о кориснику",
+    "Displays list of commands with usages and descriptions": "Приказује списак команди са употребом и описом",
+    "Sends the given message coloured as a rainbow": "Шаље наведену поруку у дугиним бојама",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "УПОЗОРЕЊЕ: Сесија је већ верификована али се кључеви НЕ ПОКЛАПАЈУ!",
+    "Session already verified!": "Сесија је већ верификована!",
+    "Unknown (user, session) pair:": "Непознат пар (корисник, сесија):",
+    "You cannot modify widgets in this room.": "Не можете мењати виџете у овој соби.",
+    "Please supply a https:// or http:// widget URL": "Наведите https:// или http:// УРЛ виџета",
+    "Please supply a widget URL or embed code": "Наведите УРЛ виџета или убаците код",
+    "Adds a custom widget by URL to the room": "У собу додаје посебан виџет помоћу УРЛ-а",
+    "Could not find user in room": "Не налазим корисника у соби",
+    "Command failed": "Команда неуспешна",
+    "Unbans user with given ID": "Скида забрану са корисника са датим ИД",
+    "Unrecognised room address:": "Непозната адреса собе:",
+    "Joins room with given address": "Придружује се соби са датом адресом",
+    "Use an identity server to invite by email. Manage in Settings.": "Користите сервер идентитета за позивнице е-поштом. Управљајте у поставкама.",
+    "Use an identity server": "Користи сервер идентитета",
+    "Failed to set topic": "Нисам успео да поставим тему",
+    "Removing…": "Уклањам…",
+    "Clear all data in this session?": "Да очистим све податке у овој сесији?",
+    "Reason (optional)": "Разлог (опционо)",
+    "An image will help people identify your community.": "Слика помаже да људи препознају вашу заједницу.",
+    "Add image (optional)": "Додај слику (опционо)",
+    "Disable": "Искључи",
+    "If disabled, messages from encrypted rooms won't appear in search results.": "Ако је искључено, поруке из шифрованих соба неће се приказивати у резултатима.",
+    "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.": "Ако нисте ви уклонили начин опоравка, нападач можда покушава да приступи вашем налогу. Промените своју лозинку и поставите нови начин опоравка у поставкама, одмах.",
+    "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.": "Ако сте то случајно учинили, безбедне поруке можете подесити у овој сесији, која ће поново шифровати историју порука сесије помоћу новог начина опоравка.",
+    "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "Сесија је открила да су ваша безбедносна фраза и кључ за безбедне поруке уклоњени.",
+    "Cancel autocomplete": "Откажи ауто-довршавање",
+    "Direct message": "Директна порука",
+    "Hide sessions": "Сакриј сесије",
+    "Trusted": "поуздан",
+    "Not trusted": "није поуздан",
+    "Room settings": "Поставке собе",
+    "Show files": "Прикажи фајлове",
+    "Not encrypted": "Није шифровано",
+    "Add widgets, bridges & bots": "Додај виџете, мостове и ботове",
+    "Edit widgets, bridges & bots": "Уреди виџете, мостове и ботове",
+    "Widgets": "Виџети",
+    "Set my room layout for everyone": "Постави мој распоред собе за сваког",
+    "Error changing power level requirement": "Грешка при промени захтеваног нивоа снаге",
+    "Error changing power level": "Грешка при промени нивоа снаге",
+    "Power level": "Ниво снаге",
+    "Explore rooms": "Истражи собе",
+    "%(senderName)s has updated the widget layout": "%(senderName)s освежи распоред виџета",
+    "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s повуче позивницу за приступ соби кориснику %(targetDisplayName)s.",
+    "%(senderName)s declined the call.": "%(senderName)s одби позив.",
+    "(an error occurred)": "(дошло је до грешке)",
+    "(their device couldn't start the camera / microphone)": "(туђи уређај не може да покрене камеру / микрофон)",
+    "(connection failed)": "(неуспела веза)",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s измени адресе за ову собу.",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s измени главну и алтернативне адресе за ову собу.",
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s измени алтернативне адресе за ову собу.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s уклони алтернативне адресе %(addresses)s за ову собу.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s уклони алтернативну адресу %(addresses)s за ову собу.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s додаде алтернативну адресу %(addresses)s за ову собу.",
+    "Converts the room to a DM": "Претвара собу у директно дописивање",
+    "Converts the DM to a room": "Претвара директно дописивање у собу",
+    "Changes your avatar in this current room only": "Мења ваш аватар само у тренутној соби",
+    "Changes the avatar of the current room": "Мења аватар тренутне собе",
+    "Changes your display nickname in the current room only": "Мења ваше приказно име само у тренутној соби",
+    "Try again": "Покушај поново",
+    "We couldn't log you in": "Не могу да вас пријавим",
+    "Double check that your server supports the room version chosen and try again.": "Добро проверите да ли сервер подржава изабрану верзију собе и пробајте поново.",
+    "a few seconds from now": "за неколико секунди",
+    "The message you are trying to send is too large.": "Порука коју покушавате да пошаљете је предугачка.",
+    "Pin": "чиода",
+    "Folder": "фасцикла",
+    "Headphones": "слушалице",
+    "Anchor": "сидро",
+    "Bell": "звоно",
+    "Trumpet": "труба",
+    "Guitar": "гитара",
+    "Ball": "лопта",
+    "Trophy": "трофеј",
+    "Rocket": "ракета",
+    "Aeroplane": "авион",
+    "Bicycle": "бицикл",
+    "Train": "воз",
+    "Flag": "застава",
+    "Telephone": "телефон",
+    "Hammer": "чекић",
+    "Key": "кључ",
+    "Lock": "катанац",
+    "Scissors": "маказе",
+    "Paperclip": "спајалица",
+    "Pencil": "оловка",
+    "Book": "књига",
+    "Gift": "поклон",
+    "Clock": "сат",
+    "Hourglass": "пешчаник",
+    "Umbrella": "кишобран",
+    "Thumbs up": "палац горе",
+    "Santa": "Мраз",
+    "Spanner": "кључ",
+    "Glasses": "наочаре",
+    "Hat": "шешир",
+    "Robot": "робот",
+    "Smiley": "смајли",
+    "Heart": "срце",
+    "Cake": "торта",
+    "Pizza": "пица",
+    "Corn": "кукуруз",
+    "Strawberry": "јагода",
+    "Apple": "јабука",
+    "Banana": "банана",
+    "Fire": "ватра",
+    "Cloud": "облак",
+    "Moon": "месец",
+    "Globe": "глобус",
+    "Mushroom": "печурка",
+    "Cactus": "кактус",
+    "Tree": "дрво",
+    "Flower": "цвет",
+    "Butterfly": "лептир",
+    "Octopus": "октопод",
+    "Fish": "риба",
+    "Turtle": "корњача",
+    "Penguin": "пингвин",
+    "Rooster": "петао",
+    "Panda": "панда",
+    "Rabbit": "зец",
+    "Elephant": "слон",
+    "Pig": "прасе",
+    "Unicorn": "једнорог",
+    "Horse": "коњ",
+    "Lion": "лав",
+    "Cat": "мачка",
+    "Dog": "пас",
+    "To be secure, do this in person or use a trusted way to communicate.": "Да будете сигурни, ово обавите лично или путем поузданог начина комуникације.",
+    "They don't match": "Не поклапају се",
+    "They match": "Поклапају се",
+    "Cancelling…": "Отказујем…",
+    "Show stickers button": "Прикажи дугме за налепнице"
 }
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 6283e8b945..916de9ecce 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -87,7 +87,7 @@
     "Failed to set display name": "Misslyckades att ange visningsnamn",
     "Failed to unban": "Misslyckades att avbanna",
     "Failed to verify email address: make sure you clicked the link in the email": "Misslyckades att bekräfta e-postadressen: set till att du klickade på länken i e-postmeddelandet",
-    "Favourite": "Favorit",
+    "Favourite": "Favoritmarkera",
     "Accept": "Godkänn",
     "Access Token:": "Åtkomsttoken:",
     "Active call (%(roomName)s)": "Aktiv samtal (%(roomName)s)",
@@ -1902,7 +1902,7 @@
     "Show %(count)s more|other": "Visa %(count)s till",
     "Show %(count)s more|one": "Visa %(count)s till",
     "Use default": "Använd förval",
-    "Mentions & Keywords": "Benämningar & nyckelord",
+    "Mentions & Keywords": "Omnämnanden & nyckelord",
     "Notification options": "Aviseringsinställningar",
     "Forget Room": "Glöm rum",
     "Favourited": "Favoritmarkerade",
@@ -2457,5 +2457,544 @@
     "This version of %(brand)s does not support viewing some encrypted files": "Den här versionen av %(brand)s stöder inte visning av vissa krypterade filer",
     "This version of %(brand)s does not support searching encrypted messages": "Den här versionen av %(brand)s stöder inte sökning bland krypterade meddelanden",
     "Cannot create rooms in this community": "Kan inte skapa rum i den här gemenskapen",
-    "You do not have permission to create rooms in this community.": "Du har inte behörighet att skapa rum i den här gemenskapen."
+    "You do not have permission to create rooms in this community.": "Du har inte behörighet att skapa rum i den här gemenskapen.",
+    "Calling...": "Ringer…",
+    "Call connecting...": "Samtal ansluts…",
+    "Starting camera...": "Startar kamera…",
+    "Starting microphone...": "Startar mikrofon…",
+    "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Alla servrar har bannats från att delta! Det här rummet kan inte längre användas.",
+    "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s ändrade server-ACL:erna för det här rummet.",
+    "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s ställde in server-ACL:er för det här rummet.",
+    "%(senderName)s declined the call.": "%(senderName)s avböjde samtalet.",
+    "(an error occurred)": "(ett fel inträffade)",
+    "(their device couldn't start the camera / microphone)": "(deras enhet kunde inte starta kameran/mikrofonen)",
+    "(connection failed)": "(anslutning misslyckad)",
+    "The call could not be established": "Samtalet kunde inte etableras",
+    "The other party declined the call.": "Den andra parten avböjde samtalet.",
+    "Call Declined": "Samtal avböjt",
+    "Move right": "Flytta till höger",
+    "Move left": "Flytta till vänster",
+    "Revoke permissions": "Återkalla behörigheter",
+    "Data on this screen is shared with %(widgetDomain)s": "Data på den här skärmen delas med %(widgetDomain)s",
+    "Modal Widget": "Dialogruta",
+    "Unpin a widget to view it in this panel": "Avfäst en widget för att visa den i den här panelen",
+    "You can only pin up to %(count)s widgets|other": "Du kan bara fästa upp till %(count)s widgets",
+    "Show Widgets": "Visa widgets",
+    "Hide Widgets": "Dölj widgets",
+    "The call was answered on another device.": "Samtalet mottogs på en annan enhet.",
+    "Answered Elsewhere": "Mottaget någon annanstans",
+    "Send feedback": "Skicka återkoppling",
+    "PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> to help us track down the problem.": "TIPS: Om du startar en bugg, vänligen inkludera <debugLogsLink>avbuggninsloggar</debugLogsLink> för att hjälpa oss att hitta problemet.",
+    "Please view <existingIssuesLink>existing bugs on Github</existingIssuesLink> first. No match? <newIssueLink>Start a new one</newIssueLink>.": "Vänligen se <existingIssuesLink> existerade buggar på GitHub</existingIssuesLink> först. Finns det ingen som matchar? <newIssueLink>Starta en ny</newIssueLink>.",
+    "Report a bug": "Rapportera en bugg",
+    "There are two ways you can provide feedback and help us improve %(brand)s.": "Det finns två sätt du kan ge återkoppling och hjälpa oss att förbättra %(brand)s.",
+    "Comment": "Kommentera",
+    "Add comment": "Lägg till kommentar",
+    "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",
+    "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 och Hercegovina",
+    "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",
+    "%(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": "Eswatini",
+    "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",
+    "Change which room you're viewing": "Ändra vilket rum du visar",
+    "Send stickers into your active room": "Skicka in dekaler i ditt aktiva rum",
+    "Send stickers into this room": "Skicka in dekaler i det här rummet",
+    "Remain on your screen while running": "Stanna kvar på skärmen när det körs",
+    "Remain on your screen when viewing another room, when running": "Stanna kvar på skärmen när ett annat rum visas, när det körs",
+    "See when the topic changes in this room": "Se när ämnet ändras i det här rummet",
+    "Change the topic of this room": "Ändra ämnet för det här rummet",
+    "See when the topic changes in your active room": "Se när ämnet ändras i ditt aktiva rum",
+    "Change the topic of your active room": "Ändra ämnet för ditt aktiva rum",
+    "Change the avatar of your active room": "Byta avatar för ditt aktiva rum",
+    "Change the avatar of this room": "Byta avatar för det här rummet",
+    "Change the name of your active room": "Byta namn på ditt aktiva rum",
+    "Change the name of this room": "Byta namn på det här rummet",
+    "See when the avatar changes in your active room": "Se när avataren byts för ditt aktiva rum",
+    "See when the avatar changes in this room": "Se när avataren byts för det här rummet",
+    "See when the name changes in your active room": "Se när namnet på ditt aktiva rum byts",
+    "See when the name changes in this room": "Se när namnet på det här rummet byts",
+    "See text messages posted to your active room": "Se textmeddelanden som skickas i ditt aktiva rum",
+    "See text messages posted to this room": "Se textmeddelanden som skickas i det här rummet",
+    "Send text messages as you in your active room": "Skicka textmeddelanden som dig i ditt aktiva rum",
+    "Send text messages as you in this room": "Skicka textmeddelanden som dig i det här rummet",
+    "See messages posted to your active room": "Se meddelanden som skickas i ditt aktiva rum",
+    "See messages posted to this room": "Se meddelanden som skickas i det här rummet",
+    "Send messages as you in your active room": "Skicka meddelanden som dig i ditt aktiva rum",
+    "Send messages as you in this room": "Skicka meddelanden som dig i det här rummet",
+    "with an empty state key": "med en tom statusnyckel",
+    "The <b>%(capability)s</b> capability": "<b>%(capability)s</b>-kapaciteten",
+    "See <b>%(eventType)s</b> events posted to your active room": "Se <b>%(eventType)s</b>-händelser som skickas i ditt aktiva rum",
+    "Send <b>%(eventType)s</b> events as you in your active room": "Skicka <b>%(eventType)s</b>-händelser som dig i ditt aktiva rum",
+    "See <b>%(eventType)s</b> events posted to this room": "Se <b>%(eventType)s</b>-händelser skickade i det här rummet",
+    "Send <b>%(eventType)s</b> events as you in this room": "Skicka <b>%(eventType)s</b>-händelser som dig i det här rummet",
+    "with state key %(stateKey)s": "med statusnyckel %(stateKey)s",
+    "See when a sticker is posted in this room": "Se när en dekal skickas i det här rummet",
+    "See when anyone posts a sticker to your active room": "Se när någon skickar en dekal till ditt aktiva rum",
+    "Send stickers to your active room as you": "Skicka dekaler till ditt aktiva rum som dig",
+    "Send stickers to this room as you": "Skicka dekaler till det här rummet som dig",
+    "Reason (optional)": "Orsak (valfritt)",
+    "Continue with %(provider)s": "Fortsätt med %(provider)s",
+    "Homeserver": "Hemserver",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Element with an existing Matrix account on a different homeserver.": "Du kan använda anpassade serveralternativ för att logga in på andra Matrixservrar genom att specificera en annan hemserver-URL. Detta låter dig använda Element med ett existerande Matrix-konto på en annan hemserver.",
+    "Server Options": "Serveralternativ",
+    "Start a new chat": "Starta en ny chatt",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "Cacha på ett säkert sätt krypterade meddelanden lokalt för att de ska visas i sökresultat, och använd %(size)s för att lagra meddelanden från %(rooms)s rum.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "Cacha på ett säkert sätt krypterade meddelanden lokalt för att de ska visas i sökresultat, och använd %(size)s för att lagra meddelanden från %(rooms)s rum.",
+    "Return to call": "Återgå till samtal",
+    "Fill Screen": "Fyll skärmen",
+    "Voice Call": "Röstsamtal",
+    "Video Call": "Videosamtal",
+    "Use Ctrl + Enter to send a message": "Använd Ctrl + Enter för att skicka ett meddelande",
+    "Use Command + Enter to send a message": "Använd Kommando + Enter för att skicka ett meddelande",
+    "Render LaTeX maths in messages": "Rendera LaTeX-matte i meddelanden",
+    "No other application is using the webcam": "Inget annat program använder webbkameran",
+    "Permission is granted to use the webcam": "Åtkomst till webbkameran har beviljats",
+    "A microphone and webcam are plugged in and set up correctly": "En webbkamera och en mikrofon är inkopplad och korrekt inställd",
+    "Call failed because no webcam or microphone could not be accessed. Check that:": "Samtal misslyckades eftersom ingen webbkamera eller mikrofon kunde kommas åt. Kolla att:",
+    "Unable to access webcam / microphone": "Kan inte komma åt webbkamera eller mikrofon",
+    "Call failed because no microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Samtal misslyckades eftersom ingen mikrofon kunde kommas åt. Kolla att en mikrofon är inkopplad och korrekt inställd.",
+    "Unable to access microphone": "Kan inte komma åt mikrofonen",
+    "See <b>%(msgtype)s</b> messages posted to your active room": "Se <b>%(msgtype)s</b>-meddelanden som skickas i ditt aktiva rum",
+    "See <b>%(msgtype)s</b> messages posted to this room": "Se <b>%(msgtype)s</b>-meddelanden som skickas i det här rummet",
+    "Send <b>%(msgtype)s</b> messages as you in your active room": "Skicka <b>%(msgtype)s</b>-meddelanden som dig i ditt aktiva rum",
+    "Send <b>%(msgtype)s</b> messages as you in this room": "Skicka <b>%(msgtype)s</b>-meddelanden som dig i det här rummet",
+    "See general files posted to your active room": "Se generella filer som skickas i ditt aktiva rum",
+    "See general files posted to this room": "Se generella filer som skickas i det här rummet",
+    "Send general files as you in your active room": "Skicka generella filer som dig i ditt aktiva rum",
+    "Send general files as you in this room": "Skicka generella filer som dig i det här rummet",
+    "See videos posted to your active room": "Se videor som skickas i ditt aktiva rum",
+    "See videos posted to this room": "Se videor som skickas i det här rummet",
+    "Send videos as you in your active room": "Skicka videor som dig i ditt aktiva rum",
+    "Send videos as you in this room": "Skicka videor som dig i det här rummet",
+    "See images posted to your active room": "Se bilder som skickas i ditt aktiva rum",
+    "See images posted to this room": "Se bilder som skickas i det här rummet",
+    "Send images as you in your active room": "Skicka bilder som dig i ditt aktiva rum",
+    "Send images as you in this room": "Skicka bilder som dig i det här rummet",
+    "See emotes posted to your active room": "Se emotes som skickas i ditt aktiva rum",
+    "See emotes posted to this room": "Se emotes som skickas i det här rummet",
+    "Send emotes as you in your active room": "Skicka emotes som dig i ditt aktiva rum",
+    "Send emotes as you in this room": "Skicka emotes som dig i det här rummet",
+    "Just a heads up, if you don't add an email and forget your password, you could <b>permanently lose access to your account</b>.": "En förvarning, om du inte lägger till en e-postadress och glömmer ditt lösenord, så kan du <b>permanent förlora åtkomst till ditt konto</b>.",
+    "Continuing without email": "Fortsätter utan e-post",
+    "sends confetti": "skickar konfetti",
+    "Sends the given message with confetti": "Skickar det givna meddelandet med konfetti",
+    "Show chat effects": "Visa chatteffekter",
+    "Effects": "Effekter",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "Samtal misslyckades eftersom webbkamera eller mikrofon inte kunde kommas åt. Kolla att:",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Samtal misslyckades eftersom att mikrofonen inte kunde kommas åt. Kolla att en mikrofon är inkopplat och korrekt inställd.",
+    "Go to Home View": "Gå till hemvyn",
+    "Decide where your account is hosted": "Bestäm var ditt konto finns",
+    "Host account on": "Skapa kontot på",
+    "Already have an account? <a>Sign in here</a>": "Har du redan ett konto? <a>Logga in här</a>",
+    "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s Eller %(usernamePassword)s",
+    "Continue with %(ssoButtons)s": "Fortsätt med %(ssoButtons)s",
+    "That username already exists, please try another.": "Det användarnamnet finns redan, vänligen pröva ett annat.",
+    "New? <a>Create account</a>": "Ny? <a>Skapa konto</a>",
+    "There was a problem communicating with the homeserver, please try again later.": "Ett problem inträffade vi kommunikation med hemservern, vänligen försök igen senare.",
+    "New here? <a>Create an account</a>": "Ny här? <a>Skapa ett konto</a>",
+    "Got an account? <a>Sign in</a>": "Har du ett konto? <a>Logga in</a>",
+    "Filter rooms and people": "Filtrera rum och personer",
+    "<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 för din gemenskaps sida</h1>\n<p>\n    Använd den långa beskrivningen för att introducera nya medlemmar till gemenskapen, eller\n    sprida några viktiga <a href=\"foo\">länkar</a>\n</p>\n<p>\n    Du kan till och med lägga till bilder med Matrix-URLer <img src=\"mxc://url\" />\n</p>\n",
+    "Use email to optionally be discoverable by existing contacts.": "Använd e-post för att valfritt kunna upptäckas av existerande kontakter.",
+    "Use email or phone to optionally be discoverable by existing contacts.": "Använd e-post eller telefon för att valfritt kunna upptäckas av existerande kontakter.",
+    "Add an email to be able to reset your password.": "Lägg till en e-postadress för att kunna återställa ditt lösenord.",
+    "Forgot password?": "Glömt lösenordet?",
+    "That phone number doesn't look quite right, please check and try again": "Det telefonnumret ser inte korrekt ut, vänligen kolla det och försök igen",
+    "Enter phone number": "Ange telefonnummer",
+    "Enter email address": "Ange e-postadress",
+    "Open the link in the email to continue registration.": "Öppna länken i e-brevet för att fortsätta registreringen.",
+    "A confirmation email has been sent to %(emailAddress)s": "Ett bekräftelse-e-brev har skickats till %(emailAddress)s",
+    "Hold": "Parkera",
+    "Resume": "Återuppta",
+    "Decline All": "Neka alla",
+    "Approve": "Godta",
+    "This widget would like to:": "Den här widgeten skulle vilja:",
+    "Approve widget permissions": "Godta widgetbehörigheter",
+    "About homeservers": "Om hemservrar",
+    "Learn more": "Läs mer",
+    "Use your preferred Matrix homeserver if you have one, or host your own.": "Använd din föredragna hemserver om du har en, eller driv din egen.",
+    "We call the places where you can host your account ‘homeservers’.": "Vi kallar platser där du kan ha ditt konto 'hemservrar'.",
+    "Other homeserver": "Annan hemserver",
+    "Sign into your homeserver": "Logga in på din hemserver",
+    "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "Matrix.org är den största offentliga hemservern i världen, så den är ett bra ställe för många.",
+    "Specify a homeserver": "Specificera en hemserver",
+    "Invalid URL": "Ogiltig URL",
+    "Unable to validate homeserver": "Kan inte validera hemservern",
+    "%(name)s on hold": "%(name)s parkerad",
+    "%(peerName)s held the call": "%(peerName)s parkerade samtalet",
+    "You held the call <a>Resume</a>": "Du parkerade samtalet <a>Återuppta</a>",
+    "You held the call <a>Switch</a>": "Du parkerade samtalet <a>Byt</a>",
+    "sends snowfall": "skickar snöfall",
+    "Sends the given message with snowfall": "Skickar det givna meddelandet med snöfall",
+    "sends fireworks": "skickar fyrverkerier",
+    "Sends the given message with fireworks": "Skicka det givna meddelandet med fyrverkerier",
+    "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "Lägger till ┬──┬ ノ( ゜-゜ノ) till början av ett textmeddelande",
+    "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "Lägger till (╯°□°）╯︵ ┻━┻ till början av ett textmeddelande",
+    "You've reached the maximum number of simultaneous calls.": "Du har nått det maximala antalet samtidiga samtal.",
+    "Too Many Calls": "För många samtal",
+    "You have no visible notifications.": "Du har inga synliga aviseringar.",
+    "Transfer": "Överlåt",
+    "Failed to transfer call": "Misslyckades att överlåta samtal",
+    "A call can only be transferred to a single user.": "Ett samtal kan bara överlåtas till en enskild användare.",
+    "There was an error finding this widget.": "Ett fel inträffade vid sökning efter widgeten.",
+    "Active Widgets": "Aktiva widgets",
+    "Open dial pad": "Öppna knappsats",
+    "Start a Conversation": "Starta en konversation",
+    "Dial pad": "Knappsats",
+    "There was an error looking up the phone number": "Ett fel inträffade vid uppslagning av telefonnumret",
+    "Unable to look up phone number": "Kunde inte slå upp telefonnumret",
+    "Invalid Security Key": "Ogiltig säkerhetsnyckel",
+    "Wrong Security Key": "Fel säkerhetsnyckel",
+    "Remember this": "Kom ihåg det här",
+    "The widget will verify your user ID, but won't be able to perform actions for you:": "Den här widgeten kommer att verifiera ditt användar-ID, men kommer inte kunna utföra handlingar som dig:",
+    "Allow this widget to verify your identity": "Tillåt att den här widgeten verifierar din identitet",
+    "We recommend you change your password and Security Key in Settings immediately": "Vi rekommenderar att du ändrar ditt lösenord och din säkerhetsnyckel i inställningarna omedelbart",
+    "Set my room layout for everyone": "Sätt mitt rumsarrangemang för alla",
+    "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 Security Key.": "Säkerhetskopiera dina krypteringsnycklar med din kontodata ifall du skulle förlora åtkomst till dina sessioner. Dina nycklar kommer att säkras med en unik säkerhetsnyckel.",
+    "Channel: <channelLink/>": "Kanal: <channelLink/>",
+    "Workspace: <networkLink/>": "Arbetsyta: <networkLink/>",
+    "Use Ctrl + F to search": "Använd Ctrl + F för att söka",
+    "Use Command + F to search": "Använd kommando (⌘) + F för att söka",
+    "Change which room, message, or user you're viewing": "Ändra vilket rum, vilket meddelande eller vilken användare du ser",
+    "%(senderName)s has updated the widget layout": "%(senderName)s har uppdaterat widgetarrangemanget",
+    "Converts the DM to a room": "Konverterar DMet till ett rum",
+    "Converts the room to a DM": "Konverterar rummet till ett DM",
+    "Use app for a better experience": "Använd appen för en bättre upplevelse",
+    "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Element Web är experimentell på mobiler. För en bättre upplevelse och de senaste funktionerna, använd våran app.",
+    "Use app": "Använd app",
+    "Great! This Security Phrase looks strong enough.": "Fantastiskt! Den här säkerhetsfrasen ser tillräckligt stark ut.",
+    "Set up with a Security Key": "Ställ in med en säkerhetsnyckel",
+    "Please enter your Security Phrase a second time to confirm.": "Vänligen ange din säkerhetsfras en gång till för att bekräfta.",
+    "Repeat your Security Phrase...": "Repetera din säkerhetsfras…",
+    "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "Din säkerhetsnyckel är ett skyddsnät - du kan använda den för att återfå åtkomst till dina krypterade meddelanden om du glömmer din säkerhetsfras.",
+    "Your Security Key": "Din säkerhetsnyckel",
+    "Your Security Key has been <b>copied to your clipboard</b>, paste it to:": "Din säkerhetsnyckel har <b>kopierats till ditt klippbord</b>, klistra in den för att:",
+    "Your Security Key is in your <b>Downloads</b> folder.": "Din säkerhetsnyckel finns i din hämtningsmapp.",
+    "Secure your backup with a Security Phrase": "Säkra din säkerhetskopia med en säkerhetsfras",
+    "Confirm your Security Phrase": "Bekräfta din säkerhetsfras",
+    "Make a copy of your Security Key": "Kopiera din säkerhetsnyckel",
+    "A new Security Phrase and key for Secure Messages have been detected.": "En ny säkerhetsfras och -nyckel för säkra meddelanden har detekterats.",
+    "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "Den här sessionen har detekterat att din säkerhetsfras och -nyckel för säkra meddelanden har tagits bort.",
+    "Search (must be enabled)": "Sök (måste vara aktiverat)",
+    "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "Kan inte komma åt hemlig lagring. Vänligen verifiera att du angav rätt säkerhetsfras.",
+    "Security Key mismatch": "Säkerhetsnyckeln matchade inte",
+    "Backup could not be decrypted with this Security Key: please verify that you entered the correct Security Key.": "Säkerhetskopian kunde inte avkrypteras med den här säkerhetsnyckeln: vänligen verifiera att du har angett rätt säkerhetsnyckel.",
+    "Incorrect Security Phrase": "Felaktig säkerhetsfras",
+    "Backup could not be decrypted with this Security Phrase: please verify that you entered the correct Security Phrase.": "Säkerhetskopian kunde inte avkrypteras med den här säkerhetsfrasen: vänligen verifiera att du har angett rätt säkerhetsfras.",
+    "Enter Security Phrase": "Ange säkerhetsfras",
+    "Access your secure message history and set up secure messaging by entering your Security Phrase.": "Kom åt din säkra meddelandehistorik och ställ in säker meddelandehantering genom att ange din säkerhetsfras.",
+    "If you've forgotten your Security Phrase you can <button1>use your Security Key</button1> or <button2>set up new recovery options</button2>": "Om du har glömt din säkerhetsfras så kan du <button1>använda din säkerhetsnyckel</button1> eller <button2>ställa in nya återställningsalternativ</button2>",
+    "Enter Security Key": "Ange säkerhetsnyckel",
+    "This looks like a valid Security Key!": "Det här ser ut som en giltig säkerhetsnyckel!",
+    "Not a valid Security Key": "Inte en giltig säkerhetsnyckel",
+    "Access your secure message history and set up secure messaging by entering your Security Key.": "Kom åt din säkre meddelandehistorik och ställ in säker meddelandehantering genom att ange din säkerhetsnyckel.",
+    "If you've forgotten your Security Key you can <button>set up new recovery options</button>": "Om du har glömt din säkerhetsnyckel så kan du <button>ställa in nya återställningsalternativ</button>",
+    "Something went wrong in confirming your identity. Cancel and try again.": "Något gick fel vid bekräftelse av din identitet. Avbryt och försök igen.",
+    "Use Security Key or Phrase": "Använd säkerhetsnyckel eller -fras",
+    "Use Security Key": "Använd säkerhetsnyckel",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "Vi kommer att lagra en krypterad kopia av dina nycklar på våran server. Säkra din säkerhetskopia med en säkerhetsfras.",
+    "Windows": "Fönster",
+    "Screens": "Skärmar",
+    "Share your screen": "Dela din skärm",
+    "Recently visited rooms": "Nyligen besökta rum",
+    "Show line numbers in code blocks": "Visa radnummer i kodblock",
+    "Expand code blocks by default": "Expandera kodblock för förval",
+    "Show stickers button": "Visa dekalknapp",
+    "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "Din hemserver avslog ditt inloggningsförsök. Detta kan ha hänt för att det tog för lång tid. Vänligen försök igen. Om det här fortsätter, vänligen kontakta administratören för din hemserver.",
+    "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "Din hemserver kunde inte nås så du kunde inte loggas in. Vänligen försök igen. Om det här fortsätter, vänligen kontakta administratören för din hemserver.",
+    "Try again": "Försök igen",
+    "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "Vi bad webbläsaren att komma ihåg vilken hemserver du använder för att logga in, men tyvärr har din webbläsare glömt det. Gå till inloggningssidan och försök igen.",
+    "We couldn't log you in": "Vi kunde inte logga in dig",
+    "Upgrade to pro": "Uppgradera till pro",
+    "Minimize dialog": "Minimera dialog",
+    "Maximize dialog": "Maximera dialog",
+    "%(hostSignupBrand)s Setup": "inställning av %(hostSignupBrand)s",
+    "You should know": "Du behöver veta",
+    "Privacy Policy": "sekretesspolicy",
+    "Cookie Policy": "kakpolicy",
+    "Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.": "Läs mer i våran <privacyPolicyLink />, <termsOfServiceLink /> och <cookiePolicyLink />.",
+    "Continuing temporarily allows the %(hostSignupBrand)s setup process to access your account to fetch verified email addresses. This data is not stored.": "Om du fortsätter så tillåts inställningsprocessen för %(hostSignupBrand)s att temporärt komma åt din konto för att hämta verifierade e-postadresser. Den här datan lagras inte.",
+    "Failed to connect to your homeserver. Please close this dialog and try again.": "Misslyckades att ansluta till din hemserver. Vänligen stäng den här dialogrutan och försök igen.",
+    "Abort": "Avbryt",
+    "Are you sure you wish to abort creation of the host? The process cannot be continued.": "Är du säker på att du vill avbryta skapande av värden? Processen kan inte fortsättas.",
+    "Confirm abort of host creation": "Bekräfta avbrytning av värdskapande"
 }
diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 5a152eeab6..c5316ee2df 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -39,11 +39,11 @@
     "Bans user with given id": "Yasaklanan(Banlanan) Kullanıcılar , ID'leri ile birlikte",
     "Call Timeout": "Arama Zaman Aşımı",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Ana Sunucu'ya bağlanılamıyor - lütfen bağlantınızı kontrol edin ,<a> Ana Sunucu SSL sertifikanızın </a> güvenilir olduğundan ve bir tarayıcı uzantısının istekleri engellemiyor olduğundan emin olun.",
-    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Tarayıcı çubuğunuzda bir HTTPS URL'si olduğunda Ana Sunusuna HTTP üzerinden bağlanılamıyor . Ya HTTPS kullanın veya  <a> güvensiz komut dosyalarını</a> etkinleştirin.",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Tarayıcı çubuğunuzda bir HTTPS URL'si olduğunda Ana Sunusuna HTTP üzerinden bağlanılamıyor . Ya HTTPS kullanın veya <a> güvensiz komut dosyalarını</a> etkinleştirin.",
     "Change Password": "Şifre Değiştir",
     "%(senderName)s changed their profile picture.": "%(senderName)s profil resmini değiştirdi.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s %(powerLevelDiffText)s'nin güç düzeyini değiştirdi.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s odanın ismini  %(roomName)s olarak değiştirdi.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s odanın ismini %(roomName)s olarak değiştirdi.",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s oda adını kaldırdı.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s konuyu \"%(topic)s\" olarak değiştirdi.",
     "Changes your display nickname": "Görünen takma adınızı değiştirir",
@@ -226,7 +226,7 @@
     "This email address is already in use": "Bu e-posta adresi zaten kullanımda",
     "This email address was not found": "Bu e-posta adresi bulunamadı",
     "The email address linked to your account must be entered.": "Hesabınıza bağlı e-posta adresi girilmelidir.",
-    "The remote side failed to pick up": "Uzak taraf toplanamadı(alınamadı)",
+    "The remote side failed to pick up": "Karşı taraf cevaplayamadı",
     "This room has no local addresses": "Bu oda hiçbir yerel adrese sahip değil",
     "This room is not recognised.": "Bu oda tanınmıyor.",
     "This doesn't appear to be a valid email address": "Bu geçerli bir e-posta adresi olarak gözükmüyor",
@@ -305,9 +305,9 @@
     "Oct": "Ekim",
     "Nov": "Kasım",
     "Dec": "Aralık",
-    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s ,  %(monthName)s  %(day)s %(time)s",
-    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "Hafta - %(weekDayName)s ,  %(day)s -%(monthName)s -%(fullYear)s ,  %(time)s",
-    "%(weekDayName)s %(time)s": "%(weekDayName)s  %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s , %(monthName)s %(day)s %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "Hafta - %(weekDayName)s , %(day)s -%(monthName)s -%(fullYear)s , %(time)s",
+    "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
     "Set a display name:": "Görünür isim ayarla :",
     "Upload an avatar:": "Bir Avatar yükle :",
     "This server does not support authentication with a phone number.": "Bu sunucu bir telefon numarası ile kimlik doğrulamayı desteklemez.",
@@ -373,7 +373,7 @@
     "Offline": "Çevrimdışı",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s odanın avatarını <img/> olarak çevirdi",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s odanın avatarını kaldırdı.",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s  %(roomName)s için avatarı değiştirdi",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s %(roomName)s için avatarı değiştirdi",
     "Username available": "Kullanıcı ismi uygun",
     "Username not available": "Kullanıcı ismi uygun değil",
     "Something went wrong!": "Bir şeyler yanlış gitti!",
@@ -592,7 +592,7 @@
     "Preparing to send logs": "Loglar gönderilmek için hazırlanıyor",
     "Logs sent": "Loglar gönderiliyor",
     "Thank you!": "Teşekkürler!",
-    "Failed to send logs: ": "Loglarıb gönderilmesi başarısız: ",
+    "Failed to send logs: ": "Logların gönderilmesi başarısız: ",
     "GitHub issue": "GitHub sorunu",
     "Notes": "Notlar",
     "Removing…": "Siliniyor…",
@@ -821,13 +821,13 @@
     "DuckDuckGo Results": "DuckDuckGo Sonuçları",
     "Emoji Autocomplete": "Emoji Oto Tamamlama",
     "Notify the whole room": "Tüm odayı bilgilendir",
-    "Room Notification": "Oda  Bildirimi",
+    "Room Notification": "Oda Bildirimi",
     "Set up with a recovery key": "Kurtarma anahtarı ile kur",
     "That matches!": "Eşleşti!",
     "That doesn't match.": "Eşleşmiyor.",
     "Download": "İndir",
     "<b>Print it</b> and store it somewhere safe": "<b>Yazdır</b> ve güvenli bir yerde sakla",
-    "<b>Save it</b> on a USB key or backup drive": "Bir USB anahtara <b>kaydet</b>  veya sürücüye yedekle",
+    "<b>Save it</b> on a USB key or backup drive": "Bir USB anahtara <b>kaydet</b> veya sürücüye yedekle",
     "<b>Copy it</b> to your personal cloud storage": "Kişisel bulut depolamaya <b>kopyala</b>",
     "Success!": "Başarılı!",
     "Retry": "Yeniden Dene",
@@ -902,7 +902,7 @@
     "Show developer tools": "Geliştirici araçlarını göster",
     "Low bandwidth mode": "Düşük bant genişliği modu",
     "Messages containing my username": "Kullanıcı adımı içeren mesajlar",
-    "When rooms are upgraded": "Odaların güncellenme zamanları",
+    "When rooms are upgraded": "Odalar güncellendiğinde",
     "My Ban List": "Yasaklı Listem",
     "Verified!": "Doğrulandı!",
     "You've successfully verified this user.": "Bu kullanıcıyı başarılı şekilde doğruladınız.",
@@ -1150,7 +1150,7 @@
     "Copied!": "Kopyalandı!",
     "Failed to copy": "Kopyalama başarısız",
     "edited": "düzenlendi",
-    "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Kimlik sunucusu üzerinde hala <b>kişisel veri paylaşımı</b> yapıyorsunuz \n<idserver />.",
+    "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Kimlik sunucusu üzerinde hala <b>kişisel veri paylaşımı</b> yapıyorsunuz <idserver />.",
     "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Kimlik sunucusundan bağlantıyı kesmeden önce telefon numaranızı ve e-posta adreslerinizi silmenizi tavsiye ederiz.",
     "Set a new account password...": "Yeni bir hesap parolası belirle...",
     "Deactivating your account is a permanent action - be careful!": "Hesabınızı pasifleştirmek bir kalıcı eylemdir - dikkat edin!",
@@ -1243,7 +1243,7 @@
     "Avoid years that are associated with you": "Sizle ilişkili yıllardan kaçının",
     "Avoid dates and years that are associated with you": "Sizle ilişkili tarihler ve yıllardan kaçının",
     "Capitalization doesn't help very much": "Baş harfi büyük yapmak size pek yardımcı olmaz",
-    "All-uppercase is almost as easy to guess as all-lowercase": "Bütün harflerin büyük olmasıyla tümünün küçük olması tahmin için hemen hemen aynı kolaylıktadır",
+    "All-uppercase is almost as easy to guess as all-lowercase": "Bütün harflerin büyük olmasıyla tümünün küçük olması tahmin edilmesi bakımından hemen hemen aynı kolaylıktadır",
     "Reversed words aren't much harder to guess": "Ters kelimeler tahmin için çok zor değil",
     "Repeats like \"aaa\" are easy to guess": "“aaa” gibi tekrarlar tahmin için oldukça kolay",
     "Dates are often easy to guess": "Tarihler sıklıkla tahmin için daha kolaydır",
@@ -1326,7 +1326,7 @@
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Topluluk ID leri sadece a-z, 0-9 ya da '=_-./' karakterlerini içerebilir",
     "Create a public room": "Halka açık bir oda oluşturun",
     "Make this room public": "Bu odayı halka açık yap",
-    "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of %(brand)s to do this": "Sohbet tarihçesini kaybetmemek için, çıkmadan önce odanızın anahtarlarını dışarıya aktarın. Bunu yapabilmek için %(brand)sun daha yeni sürümü gerekli.  Ulaşmak için geri gitmeye ihtiyacınız var",
+    "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of %(brand)s to do this": "Sohbet tarihçesini kaybetmemek için, çıkmadan önce odanızın anahtarlarını dışarıya aktarın. Bunu yapabilmek için %(brand)sun daha yeni sürümü gerekli. Ulaşmak için geri gitmeye ihtiyacınız var",
     "Continue With Encryption Disabled": "Şifreleme Kapalı Şekilde Devam Et",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "%(fileName)s dosyası anasunucunun yükleme boyutu limitini aşıyor",
     "Double check that your server supports the room version chosen and try again.": "Seçtiğiniz oda sürümünün sunucunuz tarafından desteklenip desteklenmediğini iki kez kontrol edin ve yeniden deneyin.",
@@ -1592,7 +1592,7 @@
     "To continue you need to accept the terms of this service.": "Devam etmek için bu servisi kullanma şartlarını kabul etmeniz gerekiyor.",
     "Upload files (%(current)s of %(total)s)": "Dosyaları yükle (%(current)s / %(total)s)",
     "Incorrect recovery passphrase": "Hatalı kurtarma parolası",
-    "Failed to decrypt %(failedCount)s sessions!": "Çözümlemesi başarısız olan  %(failedCount)s oturum!",
+    "Failed to decrypt %(failedCount)s sessions!": "%(failedCount)s adet oturum çözümlenemedi!",
     "Enter recovery passphrase": "Kurtarma parolasını girin",
     "Confirm your identity by entering your account password below.": "Hesabınızın şifresini aşağıya girerek kimliğinizi teyit edin.",
     "An email has been sent to %(emailAddress)s": "%(emailAddress)s adresine bir e-posta gönderildi",
@@ -1635,7 +1635,7 @@
     "Sends a message as plain text, without interpreting it as markdown": "Mesajı markdown kullanmadan basit metin olarak iletir",
     "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "E-posta ile davet etmek için kimlik sunucusu kullan. Varsayılan kimlik sunucusunu (%(defaultIdentityServerName)s) kullanmak için devam edin ya da ayarlardan değiştirin.",
     "Unignored user": "Reddedilmemiş kullanıcı",
-    "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!": "UYARI: ANAHTAR DOĞRULAMASI BAŞARISIZ! %(userld)s'nin/nın %(deviceld)s oturumu için imza anahtarı \"%(fprint)s\" verilen anahtar ile uyumsuz \"%(fingerprint)s\". Bu iletişiminizin engellendiği anlamına gelebilir!",
+    "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!": "UYARI: ANAHTAR DOĞRULAMASI BAŞARISIZ! %(userld)s'nin/nın %(deviceId)s oturumu için imza anahtarı \"%(fprint)s\" verilen anahtar ile uyuşmuyor \"%(fingerprint)s\". Bu iletişiminizin engellendiği anlamına gelebilir!",
     "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Verilen imza anahtarı %(userld)s'nin/nın %(deviceld)s oturumundan gelen anahtar ile uyumlu. Oturum doğrulanmış olarak işaretlendi.",
     "Forces the current outbound group session in an encrypted room to be discarded": "Şifreli bir odadaki geçerli giden grup oturumunun atılmasını zorlar",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s oda ismini %(oldRoomName)s bununla değiştirdi %(newRoomName)s.",
@@ -1726,7 +1726,7 @@
     "Ok": "Tamam",
     "Set password": "Parola belirle",
     "To return to your account in future you need to set a password": "İleride hesabınızı tekrar kullanabilmek için bir parola belirlemeniz gerek",
-    "New login. Was this you?": "",
+    "New login. Was this you?": "Yeni giriş. Bu siz miydiniz?",
     "Restart": "Yeniden başlat",
     "You joined the call": "Çağrıya katıldınız",
     "%(senderName)s joined the call": "%(senderName)s çağrıya katıldı",
@@ -1757,5 +1757,765 @@
     "You were kicked": "Atıldınız",
     "%(targetName)s was kicked": "%(targetName)s atıldı",
     "You rejected the invite": "Daveti reddettiniz",
-    "%(targetName)s rejected the invite": "%(targetName)s daveti reddetti"
+    "%(targetName)s rejected the invite": "%(targetName)s daveti reddetti",
+    "See when anyone posts a sticker to your active room": "Aktif odanızda birisi çıkartma paylaştığında görün",
+    "See when a sticker is posted in this room": "Bu odada çıkartma paylaşıldığında görün",
+    "See when the avatar changes in your active room": "Aktif odanızdaki avatar değişikliklerini görün",
+    "See when the avatar changes in this room": "Bu odadaki avatar değişikliklerini görün",
+    "The person who invited you already left the room, or their server is offline.": "Seni davet eden kişi zaten odadan ayrılmış yada sunucuları çevrim dışı.",
+    "The person who invited you already left the room.": "Seni davet eden kişi zaten odadan ayrılmış.",
+    "New version of %(brand)s is available": "%(brand)s 'in yeni versiyonu hazır",
+    "Update %(brand)s": "%(brand)s 'i güncelle",
+    "Verify the new login accessing your account: %(name)s": "Hesabınıza erişen yeni girişi onaylayın: %(name)s",
+    "Safeguard against losing access to encrypted messages & data": "Şifrelenmiş mesajlara ve verilere erişimi kaybetmemek için koruma sağlayın",
+    "Set up Secure Backup": "Güvenli Yedekleme kur",
+    "Enable desktop notifications": "Masaüstü bildirimlerini etkinleştir",
+    "Don't miss a reply": "Yanıtları kaçırma",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "%(brand)s 'i geliştirmemize yardımcı olan <UsageDataLink> gizli kullanım verilerini</UsageDataLink> gönder. Bu <PolicyLink> çerez</PolicyLink> kullanacaktır.",
+    "Help us improve %(brand)s": "%(brand)s 'i geliştirmemize yardım et",
+    "Unknown App": "Bilinmeyen uygulama",
+    "Error leaving room": "Odadan ayrılırken hata",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Bu oda, Ana Sunucudan gelen önemli mesajlar için kullanılır, bu yüzden ayrılamazsınız.",
+    "Can't leave Server Notices room": "Sunucu Bildirimleri odasından ayrılınamıyor",
+    "Unexpected server error trying to leave the room": "Odadan ayrılmaya çalışırken beklenmeyen sunucu hatası",
+    "See images posted to your active room": "Aktif odanıza gönderilen fotoğrafları görün",
+    "See emotes posted to your active room": "Aktif odanıza gönderilen ifadeleri görün",
+    "See emotes posted to this room": "Bu odaya gönderilen ifadeleri görün",
+    "See text messages posted to your active room": "Aktif odanıza gönderilen metin mesajlarını görün",
+    "See text messages posted to this room": "Bu odaya gönderilen metin mesajlarını gör",
+    "The <b>%(capability)s</b> capability": "<b>%(capability)s</b> kabiliyet",
+    "See messages posted to your active room": "Aktif odanıza gönderilen mesajları görün",
+    "See messages posted to this room": "Bu odaya gönderilen mesajları görün",
+    "Change the avatar of your active room": "Aktif odanın avatarını değiştir",
+    "Change the avatar of this room": "Bu odanın avatarını değiştir",
+    "Change the name of your active room": "Aktif odanızın ismini değiştirin",
+    "%(senderName)s declined the call.": "%(senderName)s aramayı reddetti.",
+    "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Tüm sunucuların katılımı yasaklanmıştır! Bu oda artık kullanılamaz.",
+    "Change the name of this room": "Bu odanın ismini değiştirin",
+    "Change the topic of your active room": "Aktif odanızın konusunu değiştirin",
+    "Change the topic of this room": "Bu odanın konusunu değiştirin",
+    "Change which room you're viewing": "Görüntülediğiniz odayı değiştirin",
+    "Send stickers into your active room": "Aktif odanıza çıkartma gönderin",
+    "Send stickers into this room": "Bu odaya çıkartma gönderin",
+    "(an error occurred)": "(bir hata meydana geldi)",
+    "(their device couldn't start the camera / microphone)": "(Cihazları kamerayı/mikrofonu başlatamadı )",
+    "(connection failed)": "(bağlantı hatası)",
+    "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s bu oda için sunucu ACL'lerini değiştirdi.",
+    "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s bu oda için sunucu ACL'lerini ayarladı.",
+    "Takes the call in the current room off hold": "Mevcut odadaki aramayı beklemeden çıkarır",
+    "Places the call in the current room on hold": "Mevcut odadaki aramayı beklemeye alır",
+    "Please supply a widget URL or embed code": "Lütfen bir widget URL'si veya yerleşik kod girin",
+    "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Düz metin mesajının başına (͡ ° ͜ʖ ͡ °) ekler",
+    "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "Düz metin mesajının başına ┬──┬ ノ (゜ - ゜ ノ) ekler",
+    "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "Düz metin mesajının başına (╯°□°）╯︵ ┻━┻ ekler",
+    "Zimbabwe": "Zimbabve",
+    "Zambia": "Zambiya",
+    "Yemen": "Yemen",
+    "Western Sahara": "Batı Sahra",
+    "Wallis & Futuna": "Wallis & Futuna",
+    "Vietnam": "Vietnam",
+    "Venezuela": "Venezuela",
+    "Vatican City": "Vatikan Şehri",
+    "Vanuatu": "Vanuatu",
+    "Uzbekistan": "Özbekistan",
+    "Uruguay": "Uruguay",
+    "United Arab Emirates": "Birleşik Arap Emirlikleri",
+    "Ukraine": "Ukrayna",
+    "Uganda": "Uganda",
+    "U.S. Virgin Islands": "Amerika Birleşik Devletleri Virgin Adaları",
+    "Tuvalu": "Tuvalu",
+    "Turks & Caicos Islands": "Turks ve Caicos Adaları",
+    "Turkmenistan": "Türkmenistan",
+    "Turkey": "Türkiye",
+    "Tunisia": "Tunus",
+    "Trinidad & Tobago": "Trinidad & Tobago",
+    "Tonga": "Tonga",
+    "Tokelau": "Tokelau",
+    "Togo": "Togo",
+    "Timor-Leste": "Doğu Timor",
+    "Thailand": "Tayland",
+    "Tanzania": "Tanzanya",
+    "Tajikistan": "Tajikistan",
+    "Taiwan": "Tayvan",
+    "São Tomé & Príncipe": "São Tomé ve Príncipe",
+    "Syria": "Suriye",
+    "Switzerland": "İsviçre",
+    "Sweden": "İsveç",
+    "Swaziland": "Svaziland",
+    "Svalbard & Jan Mayen": "Svalbard & Jan Mayen",
+    "Suriname": "Surinam",
+    "Sudan": "Sudan",
+    "St. Vincent & Grenadines": "St. Vincent ve Grenadinler",
+    "St. Pierre & Miquelon": "St. Pierre ve Miquelon",
+    "St. Martin": "St. Martin",
+    "St. Lucia": "St. Lucia",
+    "St. Kitts & Nevis": "St. Kitts ve Nevis",
+    "St. Helena": "St. Helena",
+    "St. Barthélemy": "St. Barthélemy",
+    "Sri Lanka": "Sri Lanka",
+    "Spain": "İspanya",
+    "South Sudan": "Güney Sudan",
+    "South Korea": "Güney Kore",
+    "South Georgia & South Sandwich Islands": "Güney Georgia ve Güney Sandwich Adaları",
+    "South Africa": "Güney Afrika",
+    "Somalia": "Somali",
+    "Solomon Islands": "Solomon Adaları",
+    "Slovenia": "Slovenya",
+    "Slovakia": "Slovakya",
+    "Sint Maarten": "St Martin",
+    "Singapore": "Singapur",
+    "Sierra Leone": "Sierra Leone",
+    "Seychelles": "Şeyseller",
+    "Serbia": "Sırbistan",
+    "Senegal": "Senegal",
+    "Saudi Arabia": "Suudi Arabistan",
+    "San Marino": "San Marino",
+    "Samoa": "Samoa",
+    "Réunion": "Réunion",
+    "Rwanda": "Ruanda",
+    "Russia": "Rusya",
+    "Romania": "Romanya",
+    "Qatar": "Katar",
+    "Puerto Rico": "Porto Riko",
+    "Portugal": "Portekiz",
+    "Poland": "Polonya",
+    "Pitcairn Islands": "Pitcairn Adaları",
+    "Philippines": "Filipinler",
+    "Peru": "Peru",
+    "Paraguay": "Paraguay",
+    "Papua New Guinea": "Papua Yeni Gine",
+    "Panama": "Panama",
+    "Palestine": "Filistin",
+    "Palau": "Palau",
+    "Pakistan": "Pakistan",
+    "Oman": "Umman",
+    "Norway": "Norveç",
+    "Northern Mariana Islands": "Kuzey Mariana Adaları",
+    "North Korea": "Kuzey Kore",
+    "Norfolk Island": "Norfolk Adası",
+    "Niue": "Niue",
+    "Nigeria": "Nijerya",
+    "Niger": "Nijer",
+    "Nicaragua": "Nikaragua",
+    "New Zealand": "Yeni Zelanda",
+    "New Caledonia": "Yeni Kaledonya",
+    "Netherlands": "Hollanda",
+    "Nepal": "Nepal",
+    "Macau": "Makao",
+    "Nauru": "Nauru",
+    "Namibia": "Namibya",
+    "Myanmar": "Myanmar",
+    "Mozambique": "Mozambik",
+    "Morocco": "Fas",
+    "Montserrat": "Montserrat",
+    "Montenegro": "Karadağ",
+    "Mongolia": "Moğolistan",
+    "Monaco": "Monako",
+    "Moldova": "Moldova",
+    "Micronesia": "Mikronezya",
+    "Mexico": "Meksika",
+    "Mayotte": "Mayotte",
+    "Mauritius": "Mauritius",
+    "Mauritania": "Moritanya",
+    "Martinique": "Martinik",
+    "Marshall Islands": "Marşal Adaları",
+    "Malta": "Malta",
+    "Mali": "Mali",
+    "Maldives": "Maldivler",
+    "Malaysia": "Malezya",
+    "Malawi": "Malawi",
+    "Madagascar": "Madagaskar",
+    "Macedonia": "Makedonya",
+    "Luxembourg": "Lüksemburg",
+    "Lithuania": "Litvanya",
+    "Liechtenstein": "Lihtenştayn",
+    "Libya": "Libya",
+    "Liberia": "Liberya",
+    "Lesotho": "Lesoto",
+    "Lebanon": "Lübnan",
+    "Latvia": "Letonya",
+    "Laos": "Laos",
+    "Kyrgyzstan": "Kırgızistan",
+    "Kuwait": "Kuveyt",
+    "Jordan": "Ürdün",
+    "Kosovo": "Kosova",
+    "Kiribati": "Kiribati",
+    "Kenya": "Kenya",
+    "Kazakhstan": "Kazakistan",
+    "Jersey": "Jersey",
+    "Japan": "Japonya",
+    "Jamaica": "Jamaika",
+    "Italy": "İtalya",
+    "Israel": "İsrail",
+    "Isle of Man": "Man Adası",
+    "Ireland": "İrlanda",
+    "Iraq": "Irak",
+    "Iran": "İran",
+    "Indonesia": "Endonezya",
+    "India": "Hindistan",
+    "Iceland": "İzlanda",
+    "Hungary": "Macaristan",
+    "Hong Kong": "Hong Kong",
+    "Honduras": "Honduras",
+    "Heard & McDonald Islands": "Heard ve McDonald Adaları",
+    "Haiti": "Haiti",
+    "Guyana": "Guyana",
+    "Guinea-Bissau": "Gine-Bissau",
+    "Guinea": "Gine",
+    "Guernsey": "Guernsey",
+    "Guatemala": "Guatemala",
+    "Guam": "Guam",
+    "Guadeloupe": "Guadeloupe",
+    "Grenada": "Grenada",
+    "Greenland": "Grönland",
+    "Greece": "Yunanistan",
+    "Gibraltar": "Cebelitarık",
+    "Ghana": "Gana",
+    "Germany": "Almanya",
+    "Georgia": "Gürcistan",
+    "Gambia": "Gambiya",
+    "Gabon": "Gabon",
+    "French Southern Territories": "Fransız Güney Toprakları",
+    "French Polynesia": "Fransız Polinezyası",
+    "French Guiana": "Fransız Guyanası",
+    "France": "Fransa",
+    "Finland": "Finlandiya",
+    "Fiji": "Fij",
+    "Faroe Islands": "Faroe adaları",
+    "Falkland Islands": "Falkland adaları",
+    "Ethiopia": "Etiyopya",
+    "Estonia": "Estonya",
+    "Eritrea": "Eritre",
+    "Equatorial Guinea": "Ekvator Ginesi",
+    "El Salvador": "El Salvador",
+    "Egypt": "Mısır",
+    "Ecuador": "Ekvador",
+    "Dominican Republic": "Dominik cumhuriyeti",
+    "Dominica": "Dominik",
+    "Denmark": "Danimarka",
+    "Djibouti": "Cibuti",
+    "Côte d’Ivoire": "Fildişi Sahili",
+    "Czech Republic": "Çek cumhuriyeti",
+    "Cyprus": "Kıbrıs",
+    "Curaçao": "Curacao",
+    "Cuba": "Küba",
+    "Croatia": "Hırvatistan",
+    "Costa Rica": "Kosta Rika",
+    "Cook Islands": "Cook Adaları",
+    "Congo - Kinshasa": "Kongo - Kinşasa",
+    "Congo - Brazzaville": "Kongo - Brazzaville",
+    "Comoros": "Komorlar",
+    "Colombia": "Kolombiya",
+    "Cocos (Keeling) Islands": "Cocos (Keeling) Adaları",
+    "Christmas Island": "Noel Adası",
+    "China": "Çin",
+    "Chile": "Şili",
+    "Chad": "Çad",
+    "Central African Republic": "Orta Afrika Cumhuriyeti",
+    "Cayman Islands": "Cayman Adaları",
+    "Caribbean Netherlands": "Karayip Hollandası",
+    "Cape Verde": "Cape Verde",
+    "Canada": "Kanada",
+    "Cameroon": "Kamerun",
+    "Cambodia": "Kamboçya",
+    "Burundi": "Burundi",
+    "Burkina Faso": "Burkina Faso",
+    "Bulgaria": "Bulgaristan",
+    "Brunei": "Brunei",
+    "British Virgin Islands": "Britanya Virjin Adaları",
+    "British Indian Ocean Territory": "İngiliz Hint Okyanusu Bölgesi",
+    "Brazil": "Brezilya",
+    "Bouvet Island": "Bouvet Adası",
+    "Botswana": "Botsvana",
+    "Bosnia": "Bosna",
+    "Bolivia": "Bolivya",
+    "Bhutan": "Butan",
+    "Bermuda": "Bermuda",
+    "Benin": "Benin",
+    "Belize": "Belize",
+    "Belgium": "Belçika",
+    "Belarus": "Belarus",
+    "Barbados": "Barbados",
+    "Bangladesh": "Bangladeş",
+    "See <b>%(msgtype)s</b> messages posted to this room": "Bu odada gönderilen <b>%(msgtype)s</b> mesajlara bak",
+    "Send <b>%(msgtype)s</b> messages as you in this room": "Bu odadayken <b>%(msgtype)s</b> mesajlar gönder",
+    "Bahrain": "Bahreyn",
+    "Bahamas": "Bahamalar",
+    "Azerbaijan": "Azerbaycan",
+    "Austria": "Avusturya",
+    "Review terms and conditions": "Hükümler ve koşulları incele",
+    "Terms and Conditions": "Hükümler ve koşullar",
+    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "%(homeserverDomain)s ana sunucusunu kullanmaya devam etmek için hüküm ve koşulları incelemeli ve kabul etmelisiniz.",
+    "You do not have permission to create rooms in this community.": "Bu toplulukta oda oluşturmaya izniniz yok.",
+    "Cannot create rooms in this community": "Bu toplulukta oda oluşturulamıyor",
+    "Create a Group Chat": "Grup sohbeti başlat",
+    "Explore Public Rooms": "Herkese açık odaları keşfet",
+    "Send a Direct Message": "Direkt mesaj gönderin",
+    "Liberate your communication": "İletişiminizi özgürleştirin",
+    "Welcome to %(appName)s": "%(appName)s' e hoş geldiniz",
+    "Now, let's help you get started": "Şimdi, başlamanıza yardım edelim",
+    "Click to view edits": "Düzenlemeleri görmek için tıkla",
+    "Edited at %(date)s": "%(date)s tarihinde düzenlendi",
+    "This room is a continuation of another conversation.": "Bu oda başka bir görüşmenin devamıdır.",
+    "Message deleted on %(date)s": "Mesaj %(date)s tarihinde silindi",
+    "Message deleted by %(name)s": "Mesaj %(name)s tarafından silindi",
+    "Message deleted": "Mesaj silindi",
+    "%(name)s declined": "%(name)s reddetti",
+    "You declined": "Reddettiniz",
+    "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Bu kullanıcıyı yok saydınız, bu yüzden mesajları gizlidir. <a>Yine de göster.</a>",
+    "Video conference started by %(senderName)s": "Video konferans %(senderName)s tarafından başlatıldı",
+    "Video conference updated by %(senderName)s": "Video konferans %(senderName)s tarafından güncellendi",
+    "Video conference ended by %(senderName)s": "Video konferans %(senderName)s tarafından sonlandırıldı",
+    "React": "Tepki ver",
+    "The encryption used by this room isn't supported.": "Bu odada kullanılan şifreleme desteklenmiyor.",
+    "Encryption not enabled": "Şifreleme etkin değil",
+    "Ignored attempt to disable encryption": "Şifrelemeyi devre dışı bırakma denemesi yok sayıldı",
+    "Encryption enabled": "Şifreleme etkin",
+    "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Bu odadaki mesajlar uçtan uca şifrelenmiştir. İnsanlar katıldığında, onları profillerinden doğrulayabilirsiniz, avatarlarına dokunmanız yeterlidir.",
+    "Messages here are end-to-end encrypted. Verify %(displayName)s in their profile - tap on their avatar.": "Buradaki mesajlar uçtan uca şifrelenmiştir. %(displayName)s kullanıcısını profilinden onaylayın -avatarına dokunun.",
+    "Compare emoji": "Emoji karşılaştır",
+    "Verification cancelled": "Doğrulama iptal edildi",
+    "You cancelled verification.": "Doğrulamayı iptal ettiniz.",
+    "%(displayName)s cancelled verification.": "%(displayName)s doğrulamayı iptal etti.",
+    "You cancelled verification on your other session.": "Diğer oturumunuzda doğrulamayı iptal ettiniz.",
+    "Verification timed out.": "Doğrulama zaman aşımına uğradı.",
+    "Delete sessions|one": "Oturumu sil",
+    "Delete sessions|other": "Oturumları sil",
+    "Click the button below to confirm deleting these sessions.|one": "Bu oturumları silmeyi onaylamak için aşağıdaki butona tıklayın.",
+    "See when the name changes in your active room": "Aktif odanızın isim değişikliklerini görün",
+    "See when the name changes in this room": "Bu odanın isim değişikliklerini görün",
+    "See when the topic changes in this room": "Bu odada konu değişikliğini görün",
+    "See when the topic changes in your active room": "Aktif odanızda konu değiştiğinde görün",
+    "Remain on your screen when viewing another room, when running": "a",
+    "Incoming call": "Gelen arama",
+    "Incoming video call": "Gelen görüntülü arama",
+    "Incoming voice call": "Gelen sesli arama",
+    "Unknown caller": "Bilinmeyen arayan",
+    "%(name)s on hold": "%(name)s beklemede",
+    "Return to call": "Aramaya dön",
+    "Fill Screen": "Ekrana sığdır",
+    "Voice Call": "Sesi arama",
+    "%(peerName)s held the call": "%(peerName)s aramayı duraklattı",
+    "Video Call": "Görüntülü arama",
+    "sends snowfall": "Kartopu gönderir",
+    "Sends the given message with snowfall": "Mesajı kartopu ile gönderir",
+    "sends fireworks": "Havai fişek gönderir",
+    "Sends the given message with fireworks": "Mesajı havai fişeklerle gönderir",
+    "sends confetti": "Konfeti gönderir",
+    "Send stickers to this room as you": "Widget bu odaya sizin adınıza çıkartma göndersin",
+    "Send stickers to your active room as you": "Widget aktif odanıza sizin adınıza çıkartma göndersin",
+    "Send messages as you in this room": "Widget sizin adınıza mesaj göndersin",
+    "Answered Elsewhere": "Arama başka bir yerde yanıtlandı",
+    "Effects": "Efektler",
+    "Sends the given message with confetti": "Mesajı konfeti ile gönderir",
+    "Downloading logs": "Günlükler indiriliyor",
+    "Uploading logs": "Günlükler yükleniyor",
+    "Show chat effects": "Sohbet efektlerini gösterin",
+    "Enable experimental, compact IRC style layout": "Deneysel, kompakt IRC tarzı düzeni etkinleştirin",
+    "IRC display name width": "IRC görünen ad genişliği",
+    "Manually verify all remote sessions": "Bütün uzaktan oturumları el ile onayla",
+    "How fast should messages be downloaded.": "Mesajlar ne kadar hızlı indirilmeli.",
+    "Show previews/thumbnails for images": "Fotoğraflar için ön izleme/küçük resim göster",
+    "System font name": "Sistem yazı tipi ismi",
+    "Use a system font": "Bir sistem yazı tipi kullanın",
+    "Use Ctrl + Enter to send a message": "Mesaj göndermek için Ctrl + Enter tuşlarını kullanın",
+    "Use Command + Enter to send a message": "Mesaj göndermek için Command + Enter tuşlarını kullanın",
+    "Use a more compact ‘Modern’ layout": "Daha kompakt \"Modern\" düzen",
+    "Use custom size": "Özel büyüklük kullan",
+    "Font size": "Yazı boyutu",
+    "Enable advanced debugging for the room list": "Oda listesi için gelişmiş hata ayıklamayı etkinleştirin",
+    "Show message previews for reactions in DMs": "DM'lerdeki tepkiler için mesaj ön izlemelerini göster",
+    "Show message previews for reactions in all rooms": "Tüm odalardaki tepkiler için mesaj ön izlemelerini göster",
+    "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Topluluklar v2 prototipleri. Uygun ana sunucu gerektirir. Deneysel - dikkatli kullanın.",
+    "End": "End",
+    "Space": "Boşluk",
+    "Enter": "Enter",
+    "Esc": "Esc",
+    "%(senderName)s: %(stickerName)s": "%(senderName)s%(stickerName)s",
+    "%(senderName)s: %(reaction)s": "%(senderName)s%(reaction)s",
+    "%(senderName)s: %(message)s": "%(senderName)s%(message)s",
+    "* %(senderName)s %(emote)s": "%(senderName)s%(emote)s",
+    "%(senderName)s ended the call": "%(senderName)s aramayı sonlandırdı",
+    "You ended the call": "Aramayı sonlandırdınız",
+    "Click the button below to confirm deleting these sessions.|other": "Bu oturumları silmeyi onaylamak için aşağıdaki butona tıklayın.",
+    "Confirm deleting these sessions": "Bu oturumları silmeyi onayla",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "Kimliğinizi kanıtlamak için Tek Seferliğine Oturum Açma özelliğini kullanarak bu oturumu silmeyi onaylayın.",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Kimliğinizi kanıtlamak için Tek Seferlik Oturum Açma kullanarak bu oturumları silmeyi onaylayın.",
+    "New published address (e.g. #alias:server)": "Yeni yayınlanmış adresler (e.g. #alias:server)",
+    "Published Addresses": "Yayınlanmış adresler",
+    "No other published addresses yet, add one below": "Henüz yayınlanmış başka adres yok, aşağıdan bir tane ekle",
+    "Other published addresses:": "Diğer yayınlanmış adresler:",
+    "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.": "Yayınlanmış adresler, odanıza katılmak için herhangi bir sunucudaki herkes tarafından kullanılabilir. Bir adresi yayınlamak için önce yerel adres olarak ayarlanması gerekir.",
+    "Error removing address": "Adres kaldırılırken hata",
+    "There was an error removing that address. It may no longer exist or a temporary error occurred.": "Adres kaldırılırken bir hata ile karşılaşıldı. Artık mevcut olmayabilir yada geçici bir oluştu.",
+    "You don't have permission to delete the address.": "Bu adresi silmeye yetkiniz yok.",
+    "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "Adres oluşturulurken hata ile karşılaşıldı. Sunucu tarafından izin verilmemiş yada geçici bir hata olabilir.",
+    "Error creating address": "Adres oluşturulurken hata",
+    "You can still join it because this is a public room.": "Herkese açık oda olduğu için yine de katılabilirsiniz.",
+    "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "Davetinizi doğrularken %(errcode)s kodlu hata ile karşılaşıldı. Bu bilgiyi oda yöneticisine iletebilirsiniz.",
+    "%(count)s results|one": "%(count)s adet sonuç",
+    "%(count)s results|other": "%(count)s adet sonuç",
+    "Explore all public rooms": "Tüm herkese açık odaları keşfet",
+    "Start a new chat": "Yeni bir sohbet başlat",
+    "Can't see what you’re looking for?": "Aradığınızı bulamıyor musunuz ?",
+    "Custom Tag": "Özel Etiket",
+    "Explore public rooms": "Herkese açık odaları keşfet",
+    "Explore community rooms": "Topluluk odalarını keşfet",
+    "People": "İnsanlar",
+    "Show Widgets": "Widgetları Göster",
+    "Hide Widgets": "Widgetları gizle",
+    "No recently visited rooms": "Yakında ziyaret edilen oda yok",
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "%(displayName)s %(userName)s tarafından %(dateTime)s tarihinde görüldü",
+    "Unpin Message": "Mesajın sabitlemesini kaldır",
+    "This is the start of <roomName/>.": "Bu <roomName/> odasının başlangıcıdır.",
+    "Add a photo, so people can easily spot your room.": "İnsanların odanı kolayca tanıması için bir fotoğraf ekle.",
+    "%(displayName)s created this room.": "%(displayName)s bu odayı oluşturdu.",
+    "You created this room.": "Bu odayı oluşturdunuz.",
+    "<a>Add a topic</a> to help people know what it is about.": "İnsanların ne hakkında olduğunu bilmelerine yardımcı olmak için <a>Konu ekle</a>.",
+    "Topic: %(topic)s ": "Konu: %(topic)s ",
+    "This is the beginning of your direct message history with <displayName/>.": "Bu <displayName/> ile olan direkt mesaj geçmişinizin başlangıcıdır.",
+    "Only the two of you are in this conversation, unless either of you invites anyone to join.": "Biriniz bir başkasını davet etmediğiniz sürece bu görüşmede sadece ikiniz varsınız.",
+    "Emoji picker": "Emoji seçici",
+    "Scroll to most recent messages": "En son mesajlara git",
+    "The authenticity of this encrypted message can't be guaranteed on this device.": "Bu şifrelenmiş mesajın güvenilirliği bu cihazda garanti edilemez.",
+    "Australia": "Avustralya",
+    "Aruba": "Aruba",
+    "Armenia": "Ermenistan",
+    "Argentina": "Arjantin",
+    "Antigua & Barbuda": "Antigua ve Barbuda",
+    "Antarctica": "Antarktika",
+    "Anguilla": "Anguilla",
+    "Angola": "Angola",
+    "Andorra": "Andorra",
+    "American Samoa": "Amerikan Samoası",
+    "Algeria": "Cezayir",
+    "Albania": "Arnavutluk",
+    "Åland Islands": "Aland adaları",
+    "Afghanistan": "Afganistan",
+    "United States": "Amerika Birleşik Devletleri",
+    "United Kingdom": "Birleşik Krallık",
+    "This will end the conference for everyone. Continue?": "Bu görüşmeyi herkes için bitirecektir. Onaylıyor musunuz ?",
+    "End conference": "Görüşmeyi bitir",
+    "You've reached the maximum number of simultaneous calls.": "Maksimum eşzamanlı arama sayısına ulaştınız.",
+    "Too Many Calls": "Çok fazla arama",
+    "No other application is using the webcam": "Kamerayı başka bir uygulama kullanmıyor",
+    "Permission is granted to use the webcam": "Kamerayı kullanmak için izin gerekiyor",
+    "A microphone and webcam are plugged in and set up correctly": "Mikrofon ve kamera takılımı ve doğru şekilde ayarlanmış mı",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "Kameraya yada mikrofona erişilemediği için arama yapılamadı. Şunu kontrol edin:",
+    "Unable to access webcam / microphone": "Kameraya / mikrofona erişilemedi",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Mikrofona erişilemediği için arama yapılamadı. Mikrofonun takılı ve doğru şekilde ayarlandığından emin olun.",
+    "Unable to access microphone": "Mikrofona erişilemiyor",
+    "The call was answered on another device.": "Arama başka bir cihazda cevaplandı.",
+    "The call could not be established": "Arama yapılamadı",
+    "The other party declined the call.": "Diğer taraf aramayı reddetti.",
+    "Call Declined": "Arama Reddedildi",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Kimliğinizi doğrulamak için Tek Seferlik Oturum Açma özelliğini kullanarak bu telefon numarasını eklemeyi onaylayın.",
+    "Single Sign On": "Tek seferlik oturum aç",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Kimliğinizi doğrulamak için Tek Seferlik Oturum Açma özelliğini kullanarak bu e-posta adresini eklemeyi onaylayın.",
+    "Use Single Sign On to continue": "Devam etmek için tek seferlik oturum açın",
+    "Change notification settings": "Bildirim ayarlarını değiştir",
+    "See <b>%(msgtype)s</b> messages posted to your active room": "Aktif odanıza gönderilen <b>%(msgtype)s</b> mesajları görün",
+    "Send <b>%(msgtype)s</b> messages as you in your active room": "Widget sizin adınıza <b>%(msgtype)s</b> mesajlar göndersin",
+    "See general files posted to your active room": "Aktif odanıza gönderilen genel dosyaları görün",
+    "See general files posted to this room": "Bu odaya gönderilen genel dosyaları gör",
+    "Your server isn't responding to some <a>requests</a>.": "Sunucunuz bası <a>istekler'e</a> onay vermiyor.",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Her iki cihazda da kamera yoksa benzersiz bir emoji setini karşılaştırın",
+    "The other party cancelled the verification.": "Diğer taraf onaylamayı reddetti.",
+    "User signing private key:": "Kullanıcı imzalı özel anahtar",
+    "Homeserver feature support:": "Ana sunucu özellik desteği:",
+    "Self signing private key:": "Kendinden imzalı özel anahtar:",
+    "not found locally": "yerel olarak bulunamadı",
+    "cached locally": "yerel olarak önbelleğe alındı",
+    "Send general files as you in your active room": "Widget aktif odanıza sizin adınıza genel dosyalar göndersin",
+    "Send general files as you in this room": "Widget sizin adınıza bu odaya genel dosyalar göndersin",
+    "Send videos as you in your active room": "Widget aktif odanıza sizin adınıza video göndersin",
+    "Send videos as you in this room": "Widget sizin adınıza bu odaya video göndersin",
+    "See <b>%(eventType)s</b> events posted to your active room": "Aktif odanıza gönderilen <b>%(eventType)s</b> etkinlikleri gör",
+    "Decline (%(counter)s)": "",
+    "From %(deviceName)s (%(deviceId)s)": "%(deviceName)s%(deviceId)s tarafından",
+    "Thumbs up": "Başparmak havaya",
+    "Santa": "Noel Baba",
+    "Spanner": "Anahtar",
+    "Smiley": "Gülen yüz",
+    "To be secure, do this in person or use a trusted way to communicate.": "Güvende olmak için, bunu şahsen yapın veya güvenilir bir iletişim yöntemi kullanın.",
+    "Waiting for your other session to verify…": "Diğer oturumunuzun doğrulanması bekleniyor…",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Doğrulamak için diğer oturumunuz bekleniyor, %(deviceName)s %(deviceId)s",
+    "Verify this user by confirming the following number appears on their screen.": "Aşağıdaki numaranın ekranlarında göründüğünü onaylayarak bu kullanıcıyı doğrulayın.",
+    "Verify this session by confirming the following number appears on its screen.": "Aşağıdaki numaraların ekranında göründüğünü onaylayarak bu kullanıcıyı doğrulayın.",
+    "Verify this user by confirming the following emoji appear on their screen.": "Aşağıdaki emojinin ekranlarında göründüğünü onaylayarak bu kullanıcıyı doğrulayın.",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "Aşağıdaki emojinin her iki oturumda da aynı sırayla görüntülendiğini onaylayın:",
+    "Compare unique emoji": "Benzersiz emoji karşılaştır",
+    "Verify this session by completing one of the following:": "Şunlardan birini yaparak bu oturumu tamamlayın:",
+    "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Bu kullanıcıyla olan güvenli mesajlar uçtan uca şifrelidir ve 3 taraflar tarafından okunamaz.",
+    "Dial pad": "Arama tuşları",
+    "See videos posted to your active room": "Aktif odana gönderilen videoları gör",
+    "See videos posted to this room": "Bu odaya gönderilen videoları gör",
+    "See images posted to this room": "Bu odaya gönderilen resimleri gör",
+    "You held the call <a>Resume</a>": "Aramayı beklettiniz <a>Devam Ettir</a>",
+    "You held the call <a>Switch</a>": "Aramayı beklettiniz <a>Değiştir</a>",
+    "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.": "Parolayı değiştirmek, şu anda tüm oturumlardaki tüm uçtan-uca şifreleme anahtarlarını sıfırlayacak ve oda anahtarlarınız önce dışarı aktarıp sonrasında içeri aktarmadığınız sürece şifrelenmiş sohbet geçmişini okunamaz yapacaktır. Gelecekte bu geliştirilecektir.",
+    "Send images as you in this room": "Widget bu odaya sizin adınıza resim göndersin",
+    "Send emotes as you in your active room": "Widget aktif odanıza sizin adınıza ifade göndersin",
+    "Send emotes as you in this room": "Widget bu odaya sizin adınıza ifade göndersin",
+    "Send text messages as you in your active room": "Widget aktif odanıza sizin adınıza metin mesajı göndersin",
+    "Send text messages as you in this room": "Widget bu odaya sizin adınıza metin mesajı göndersin",
+    "Send messages as you in your active room": "Widget aktif odanıza sizin adınıza mesaj göndersin",
+    "Send <b>%(eventType)s</b> events as you in your active room": "Widget aktif odanıza sizin adınıza <b>%(eventType)s</b> türü etkinlik göndersin",
+    "Send <b>%(eventType)s</b> events as you in this room": "Widget bu odaya sizin adınıza <b>%(eventType)s</b> türü etkinlik göndersin",
+    "Send images as you in your active room": "Widget aktif odanıza sizin adınıza resim göndersin",
+    "with an empty state key": "boş durum anahtarı ile",
+    "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Emin misiniz? Eğer anahtarlarınız doğru bir şekilde yedeklemediyse, şifrelenmiş iletilerinizi kaybedeceksiniz.",
+    "The operation could not be completed": "Eylem tamamlanamadı",
+    "Failed to save your profile": "Profiliniz kaydedilemedi",
+    "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "Onları %(brand)s dışında bir sunucuda yapılandırmış olabilirsin. Onları %(brand)s içinde ayarlayamazsın ama yine de geçerlidir.",
+    "Securely cache encrypted messages locally for them to appear in search results.": "Arama sonuçlarında gozükmeleri için iletileri güvenli bir şekilde yerel olarak önbelleğe al.",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Çapraz imzalı cihazlara güvenmeden, güvenilir olarak işaretlemek için, bir kullanıcı tarafından kullanılan her bir oturumu ayrı ayrı doğrulayın.",
+    "There are advanced notifications which are not shown here.": "Burada gösterilmeyen gelişmiş bildirimler var.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "İletilerin arama sonuçlarında gözükmeleri için %(rooms)s odasından %(size)s  yardımıyla depolayarak, şifrelenmiş iletileri güvenli bir şekilde yerel olarak önbelleğe al.",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "İletilerin arama sonuçlarında gözükmeleri için %(rooms)s odalardan %(size)s  yardımıyla depolayarak, şifrelenmiş iletileri güvenli bir şekilde yerel olarak önbelleğe al.",
+    "not found in storage": "Cihazda bulunamadı",
+    "This bridge was provisioned by <user />.": "Bu köprü <user /> tarafından sağlandı.",
+    "Render LaTeX maths in messages": "Mesajlarda LaTex maths işleyin",
+    "See <b>%(eventType)s</b> events posted to this room": "Bu odaya gönderilen <b>%(eventType)s</b> türü etkinlikleri gör",
+    "with state key %(stateKey)s": "%(stateKey)s durum anahtarı ile",
+    "Verify all users in a room to ensure it's secure.": "Güvenli olduğuna emin olmak için odadaki tüm kullanıcıları onaylayın.",
+    "No recent messages by %(user)s found": "%(user)s kullanıcısın hiç yeni ileti yok",
+    "Show %(count)s more|one": "%(count)s adet daha fazla göster",
+    "Show %(count)s more|other": "%(count)s adet daha fazla göster",
+    "Activity": "Aktivite",
+    "Show previews of messages": "Mesajların ön izlemelerini göster",
+    "Show rooms with unread messages first": "Önce okunmamış mesajları olan odaları göster",
+    "Use the + to make a new room or explore existing ones below": "Yeni bir oda kurmak yada olan var olan odaları keşfetmek için aşağıdaki + yı kullanın",
+    "Topic: %(topic)s (<a>edit</a>)": "Konu: %(topic)s (<a>düzenle</a>)",
+    "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.": "Anahtar paylaşma isteğiniz gönderildi - anahtar paylaşma istekleri için lütfen diğer oturumlarınızı kontrol ediniz.",
+    "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Onaylamanız için size e-posta gönderdik. Lütfen yönergeleri takip edin ve sonra aşağıdaki butona tıklayın.",
+    "Customise your appearance": "Görünüşü özelleştir",
+    "Custom theme URL": "Özel tema URLsi",
+    "Secure Backup": "Güvenli yedekleme",
+    "User settings": "Kullanıcı ayarları",
+    "Community settings": "Topluluk ayarları",
+    "Room settings": "Oda ayarları",
+    "Show files": "Dosyaları göster",
+    "%(count)s people|other": "%(count)s kişi",
+    "%(count)s people|one": "%(count)s kişi",
+    "Not encrypted": "Şifrelenmemiş",
+    "Room Info": "Oda bilgisi",
+    "Backup version:": "Yedekleme sürümü:",
+    "Autocomplete": "Otomatik Tamamlama",
+    "Navigation": "Navigasyon",
+    "User Autocomplete": "Kullanıcı Otomatik Tamamlama",
+    "Room Autocomplete": "Otomatik Oda Tamamlama",
+    "Notification Autocomplete": "Otomatik Bildirim Tamamlama",
+    "Away": "Uzakta",
+    "Share Permalink": "Permalink'i Paylaş",
+    "Resend removal": "Kaldırmayı yeniden gönder",
+    "Resend edit": "Düzenlemeyi yeniden gönder",
+    "Quick Reactions": "Hızlı Tepkiler",
+    "Widgets": "Widgetlar",
+    "Unpin": "Sabitlemeyi kaldır",
+    "Create community": "Topluluk oluştur",
+    "Enter name": "İsim gir",
+    "Download logs": "Günlükleri indir",
+    "%(brand)s Android": "%(brand)s Android",
+    "%(brand)s iOS": "%(brand)s iOS",
+    "%(brand)s Desktop": "%(brand)s Masaüstü",
+    "%(brand)s Web": "%(brand)s Ağı",
+    "User menu": "Kullanıcı menüsü",
+    "Notification options": "Bildirim ayarları",
+    "Use default": "Varsayılanı kullan",
+    "Looks good!": "İyi görünüyor!",
+    "Security Key": "Güvenlik anahtarı",
+    "List options": "Liste seçenekleri",
+    "Sort by": "Göre sırala",
+    "All settings": "Tüm ayarlar",
+    "Switch theme": "Temayı değiştir",
+    "QR Code": "Kare kod (QR)",
+    "Keys restored": "Anahtarlar geri yüklendi",
+    "Submit logs": "Günlükleri kaydet",
+    "Signing In...": "Giriş yapılıyor...",
+    "Page Down": "Sayfa aşağı",
+    "Page Up": "Sayfa yukarı",
+    "New line": "Yeni satır",
+    "Alt Gr": "Alt Gr",
+    "Room List": "Oda listesi",
+    "Matrix rooms": "Matrix odaları",
+    "%(networkName)s rooms": "%(networkName)s odalar",
+    "Server name": "Sunucu adı",
+    "Remove server": "Sunucuyu kaldır",
+    "Your server": "Senin sunucun",
+    "All rooms": "Tüm odalar",
+    "Looks good": "İyi görünüyor",
+    "Declining …": "Reddediliyor…",
+    "Accepting …": "Kabul ediliyor…",
+    "Topic (optional)": "Konu (isteğe bağlı)",
+    "Featured Users:": "Öne çıkan kullanıcılar:",
+    "Featured Rooms:": "Öne çıkan odalar:",
+    "Transfer": "Aktar",
+    "Hold": "Beklet",
+    "Resume": "Devam et",
+    "Approve": "Onayla",
+    "Show": "Göster",
+    "Homeserver": "Ana sunucu",
+    "Information": "Bilgi",
+    "Role": "Rol",
+    "About": "Hakkında",
+    "Modern": "Modern",
+    "Ctrl": "Ctrl",
+    "Shift": "Shift",
+    "Alt": "Alt",
+    "Calls": "Aramalar",
+    "Disable": "Devre dışı bırak",
+    "Syncing...": "Senkronize ediliyor...",
+    "Feedback": "Geri bildirim",
+    "Matrix": "Matrix",
+    "Categories": "Kategoriler",
+    "Accepting…": "Kabul ediliyor…",
+    "A-Z": "A-Z",
+    "Appearance": "Görünüm",
+    "Room avatar": "Oda avatarı",
+    "Room options": "Oda ayarları",
+    "Leave Room": "Odadan ayrıl",
+    "Forget Room": "Odayı unut",
+    "Open dial pad": "Arama tuşlarını aç",
+    "Start a Conversation": "Bir sohbet başlat",
+    "Mod": "Mod",
+    "Revoke": "İptal et",
+    "Complete": "Tamamla",
+    "Where you’re logged in": "Giriş yaptığınız yer",
+    "Privacy": "Gizlilik",
+    "New version available. <a>Update now.</a>": "Yeni sürüm mevcut: <a> Şimdi güncelle.</a>",
+    "Compact": "Kompakt",
+    "Message layout": "Mesaj düzeni",
+    "Use between %(min)s pt and %(max)s pt": "%(min)s ile %(max)s arasında girin",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "Özel yazı tipi boyutu %(min)s ile %(max)s arasında olmalı",
+    "Size must be a number": "Boyut bir sayı olmalıdır",
+    "Hey you. You're the best!": "Hey sen. Sen en iyisisin!",
+    "You should:": "Şunu yapmalısınız:",
+    "not ready": "hazır değil",
+    "ready": "hazır",
+    "Secret storage:": "Gizli depolama:",
+    "Backup key cached:": "Yedekleme anahtarı önbelleğe alındı:",
+    "Backup key stored:": "Yedekleme anahtarı depolandı:",
+    "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.": "Oturumlarınıza erişimi kaybetmeniz ihtimaline karşı, şifreleme anahtarlarınızı hesap verilerinizle yedekleyin. Anahtarlarınız benzersiz bir Kurtarma Anahtarı ile korunacaktır.",
+    "unexpected type": "Bilinmeyen tür",
+    "Back up your keys before signing out to avoid losing them.": "Anahtarlarını kaybetmemek için, çıkış yapmadan önce önleri yedekle.",
+    "Algorithm:": "Algoritma:",
+    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "Yedekleme,<verify>onaylanmamış</verify> oturumdan <validity>geçerli</validity> bir imzaya sahip",
+    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "Yedekleme, <verify>onaylanmış</verify> oturumdan <validity>geçerli</validity> bir imzaya sahip<device></device>",
+    "Backup has an <validity>invalid</validity> signature from this session": "Yedekleme, bu oturumdan <validity>geçersiz</validity> bir imzaya sahip",
+    "Backup has a <validity>valid</validity> signature from this session": "Yedekleme bu oturumdan <validity>geçerli</validity> bir imzaya sahip",
+    "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "Yedeklemede, <verify>bilinmeyen</verify> %(deviceId)s ID'sine sahip bir oturumdan imza var",
+    "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Yedeklemede, %(deviceId)s ID'sine sahip <verify>bilinmeyen</verify> bir kullanıcı tarafından imza var.",
+    "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Yalnızca bu oturumda olabilecek anahtarları kaybetmemek için, oturumu kapatmadan önce bu oturumu anahtar yedeklemeye bağlayın.",
+    "%(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 internet tarayıcısında çalışıyorken şifrelenmiş mesajları güvenli bir şekilde önbelleğe alamaz. Şifrelenmiş mesajların arama sonucunda görünmesi için <desktopLink>%(brand)s Masaüstü</desktopLink> kullanın.",
+    "%(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, şifrelenmiş iletileri yerel olarak güvenli bir şekilde önbelleğe almak için gereken bazı bileşenlerden yoksun. Bu özelliği denemek istiyorsanız, <nativeLink> arama bileşenlerinin eklendiği</nativeLink> özel bir masaüstü oluşturun.",
+    "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.": "Bu oturum <b> anahtarlarınızı yedeklemiyor</b>, ama zaten geri yükleyebileceğiniz ve ileride ekleyebileceğiniz bir yedeğiniz var.",
+    "Converts the room to a DM": "Odayı birebir mesajlaşmaya dönüştürür",
+    "Converts the DM to a room": "Birebir mesajlaşmayı odaya çevirir",
+    "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.": "O sırada ne yaptığınız, oda kimlikleri, kullanıcı kimlikleri vb.gibi sorunu analiz etmede yardımcı olacak ek öğe varsa lütfen buraya ekleyin.",
+    "Continue with %(provider)s": "%(provider)s ile devam et",
+    "Sign in with single sign-on": "Çoklu oturum açma ile giriş yap",
+    "Enter a server name": "Sunucu adı girin",
+    "Can't find this server or its room list": "Sunucuda veya oda listesinde bulunamıyor",
+    "Are you sure you want to remove <b>%(serverName)s</b>": "<b>%(serverName)s</b> Sunucusunu silmek istediğinizden eminmisiniz",
+    "Add a new server": "Yeni sunucu ekle",
+    "Enter the name of a new server you want to explore.": "Keşfetmek istediğiniz sunucunun adını girin.",
+    "Add a new server...": "Yeni sunucu ekle...",
+    "Preparing to download logs": "Loglar indirilmeye hazırlanıyor",
+    "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Hatırlatma:Tarayıcınız desteklenmiyor, deneyiminiz öngörülemiyor.",
+    "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.": "Hata ayıklama günlükleri, kullanıcı adınız, ziyaret ettiğiniz oda veya grupların kimlikleri veya takma adları ve diğer kullanıcıların kullanıcı adları dahil olmak üzere uygulama kullanım verilerini içerir. Mesaj içermezler.",
+    "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>": "Bir oda için şifreleme bir kez etkinleştirildiğinde geri alınamaz. Şifrelenmiş bir odada gönderilen iletiler yalnızca ve yalnızca odadaki kullanıcılar tarafından görülebilir. Şifrelemeyi etkinleştirmek bir çok bot'un ve köprülemenin doğru çalışmasını etkileyebilir. <a>Şifrelemeyle ilgili daha fazla bilgi edinmek için.</a>",
+    "Link this email with your account in Settings to receive invites directly in %(brand)s.": "Doğrudan %(brand)s uygulamasından davet isteği almak için bu e-posta adresini Ayarlardan kendi hesabınıza bağlayın.",
+    "Failed to remove '%(roomName)s' from %(groupId)s": "",
+    "This client does not support end-to-end encryption.": "Bu istemci uçtan uca şifrelemeyi desteklemiyor.",
+    "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?": "Bu kullanıcı etkisizleştirmek onu bir daha oturum açmasını engeller.Ek olarak da bulundukları bütün odalardan atılırlar. Bu eylem geri dönüştürülebilir. Bu kullanıcıyı etkisizleştirmek istediğinize emin misiniz?",
+    "Disinvite this user from community?": "Bu kullanıcının bu topluluğa davetini iptal et?",
+    "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Çok sayıda ileti için bu biraz sürebilir. Lütfen bu sürede kullandığınız istemciyi yenilemeyin.",
+    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "%(user)s kullanıcısından %(count)s sayıda ileti silmek üzeresiniz. Bu işlem geri döndürülemez. Sürdürmek istiyor musunuz?",
+    "Remove recent messages by %(user)s": "%(user)s kullanıcısından en son iletileri kaldır",
+    "Try scrolling up in the timeline to see if there are any earlier ones.": "Daha önceden kalma iletilerin var olup olmadığını kontrol etmek için zaman çizelgesinde yukarı doğru kaydırın.",
+    "Set my room layout for everyone": "Oda düzenimi herkes için ayarla",
+    "Yours, or the other users’ internet connection": "Sizin ya da diğer kullanıcıların internet bağlantısı",
+    "The homeserver the user you’re verifying is connected to": "Doğruladığınız kullanıcının bağlı olduğunu ana sunucu:",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "Fazladan güvenlik sağlamak için bu kullanıcıyı cihazlarınızdaki tek kezlik kod ile doğrulayın.",
+    "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "Şifrelenmiş odalarda iletileriniz şifreledir ve yalnızca sizde ve gönderdiğiniz kullanıcılarda iletileri açmak için anahtarlar vardır.",
+    "Messages in this room are not end-to-end encrypted.": "Bu odadaki iletiler uçtan uca şifreli değildir.",
+    "Messages in this room are end-to-end encrypted.": "Bu odadaki iletiler uçtan uca şifrelenmiştir.",
+    "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "İletileriniz şifreledir ve yalnızca sizde ve gönderdiğiniz kullanıcılarda iletileri açmak için anahtarlar vardır.",
+    "Waiting for %(displayName)s to accept…": "%(displayName)s kullanıcısın onaylaması için bekleniliyor…",
+    "Waiting for you to accept on your other session…": "Diğer oturumunuzda onaylamanız için bekleniliyor…",
+    "URL previews are disabled by default for participants in this room.": "URL ön izlemeleri, bu odadaki kullanıcılar için varsayılan olarak devre dışı bıraktırılmıştır.",
+    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Adanın alternatif adresini güncellerken bir hata oluştu. Bu eylem, sunucu tarafından izin verilmemiş olabilir ya da geçici bir sorun oluşmuş olabilir.",
+    "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Odanın ana adresini güncellerken bir sorun oluştu. Bu eylem, sunucu tarafından izin verilmemiş olabilir ya da geçici bir sorun oluşmuş olabilir.",
+    "Hint: Begin your message with <code>//</code> to start it with a slash.": "İpucu: İletilerinizi eğik çizgi ile başlatmak için <code>//</code> ile başlayın.",
+    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "<code>/help</code> yazarak var olan komutları listeleyebilirsiniz. Yoksa bunu bir ileti olarak mı göndermek istemiştiniz?",
+    "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Bu oda, <roomVersion /> oda sürümünü kullanmaktadır ve ana sunucunuz tarafından <i>tutarsız</i> olarak işaretlenmiştir.",
+    "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Bu odayı güncellerseniz bu oda kapanacak ve yerine aynı adlı, güncellenmiş bir oda geçecek.",
+    "Favourited": "Beğenilenler",
+    "Mentions & Keywords": "Değinilmeler & Anahtar Sözcükler",
+    "Share this email in Settings to receive invites directly in %(brand)s.": "Doğrdan %(brand)s uygulamasından davet isteği almak için Ayarlardan bu e-posta adresini paylaşın.",
+    "Use an identity server in Settings to receive invites directly in %(brand)s.": "Doğrudan %(brand)s uygulamasından davet isteği almak için Ayarlardan bir kimlik sunucusu belirleyin.",
+    "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Bu davet, %(roomName)s odasına %(email)s e-posta adresi üzerinden yollanmıştır ve sizinle ilgili değildir",
+    "Recently visited rooms": "En son ziyaret edilmiş odalar",
+    "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Eğer diğer oturumlarınızın bu iletiyi açacak anahtarı yoksa deşifreleyemezsiniz.",
+    "Discovery options will appear once you have added a phone number above.": "Bulunulabilirlik seçenekleri, yukarıya bir telefon numarası ekleyince ortaya çıkacaktır.",
+    "Discovery options will appear once you have added an email above.": "Bulunulabilirlik seçenekleri, yukarıya bir e-posta adresi ekleyince ortaya çıkacaktır.",
+    "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Geçmişi kimin okuyabileceğini değiştirmek yalnızca odadaki yeni iletileri etkiler. Var olan geçmiş değişmeden kalacaktır.",
+    "To link to this room, please add an address.": "Bu odaya bağlamak için lütfen bir adres ekleyin.",
+    "Remove messages sent by others": "Diğerleri tarafından gönderilen iletileri kaldır",
+    "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "Odanın güç düzeyi gereksinimlerini değiştirirken bir hata ile karşılaşıldı. Yeterince yetkiniz olduğunuzdan emin olup yeniden deyin.",
+    "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Bu oda, iletileri hiçbir platforma köprülemiyor. <a>Daha fazla bilgi için.</a>",
+    "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Bu oda, iletileri sözü edilen platformlara köprülüyor. <a>Daha fazla bilgi için.</a>",
+    "A session's public name is visible to people you communicate with": "Bir oturumun halka açık adı iletişim kurduğunuz kişilerce görülebilir",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Aşağıdan oturumlarınızın adlarını düzenleyin veya oturumlarızdan çıkın ya da <a>oturumlarınızı Kullanıcı Profilinden doğrulayın</a>.",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Sunucu yönetinciniz varsayılan olarak odalarda ve doğrudandan iletilerde uçtan uca şifrelemeyi kapadı.",
+    "Read Marker lifetime (ms)": "Okundu iminin gösterim süresi (ms)",
+    "Read Marker off-screen lifetime (ms)": "Okundu iminin ekran dışındaki gösterim süresi (ms)",
+    "Composer": "Yazan",
+    "Room ID or address of ban list": "Engelleme listesinin oda kimliği ya da adresi",
+    "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.": "Kişisel engelleme listeniz, ileti almak istemediğiniz kullanıcı veya sunucuları bulundurur. İlk engellemenizde oda listenizde \"My Ban List\" adlı bir oda oluşturulacaktır. Engelleme listesinin yürürlüğünü sürdürmesini istiyorsanız o odada kalın.",
+    "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.": "Kullanıcıları engelleme, hangi kullanıcıları engelleyeceğini belirleyen kurallar bulunduran bir engelleme listesi kullanılarak gerçekleşir. Bir engelleme listesine abone olmak, o listeden engellenen kullanıcıların veya sunucuların sizden gizlenmesi demektir.",
+    "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.": "Görmezden gelmek istediğiniz kullanıcıları ya da sunucuları buraya ekleyin. %(brand)s uygulamasının herhangi bir karakteri eşleştirmesini istiyorsanız yıldız imi kullanın. Örneğin <code>@fobar:*</code>, \"foobar\" adlı kullanıcıların hepsini bütün sunucularda görmezden gelir.",
+    "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.": "Eğer GitHub aracılığıyla bir hata bildirdiyseniz hata kayıtları sorunu bulmamızda bize yardımcı olabilir. Hata kayıtları kullanıcı adınızı, daha önceden bulunmuş olduğunuz odaların veya grupların kimliklerini veya takma adlarını ve diğer kullanıcıların adlarını içerir. Hata kayıtları ileti içermez.",
+    "Please verify the room ID or address and try again.": "Lütfen oda kimliğini ya da adresini doğrulayıp yeniden deneyin.",
+    "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "%(brand)s uygulamasına yardımcı olmak için <a>buraya</a> tıklayın ya da aşağıdaki tuşları kullanarak bot'umuzla sohbet edin.",
+    "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Başkaları tarafından e-posta adresi ya da telefon numarası ile bulunabilmek için %(serverName)s kimlik sunucusunun Kullanım Koşullarını kabul edin.",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Parolanız başarıyla değişmiştir. Diğer oturumlarınızda yeniden oturum açmadığınız sürece anlık bildirim almayacaksınız",
+    "Flair": "Özel Yetenek",
+    "Appearance Settings only affect this %(brand)s session.": "Dış Görünüş Ayarları yalnızca bu %(brand)s oturumunu etkileyecek.",
+    "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Sisteminizde bulunan bir font adı belirtiniz. %(brand)s sizin için onu kullanmaya çalışacak.",
+    "Invalid theme schema.": "Geçersiz tema taslağı.",
+    "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.": "Bir kimlik sunucusu kullanmak isteğe bağlıdır. Eğer bir tane kullanmak istemezseniz başkaları tarafından bulunamayabilir ve başkalarını e-posta adresi ya da telefon numarası ile davet edemeyebilirsiniz.",
+    "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.": "Kimlik sunucunuz ile bağlantıyı keserseniz başkaları tarafından bulunamayabilir ve başkalarını e-posta adresi ya da telefon numarası ile davet edemeyebilirsiniz.",
+    "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Şu anda herhangi bir kimlik sunucusu kullanmıyorsunuz. Başkalarını bulmak ve başkaları tarafından bulunabilmek için aşağıya bir kimlik sunucusu ekleyin.",
+    "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Eğer <server /> kimlik sunucusunu kullanarak başkalarını bulmak ve başkalarını tarafından bulunabilmek istemiyorsanız aşağıya bir başka kimlik sunucusu giriniz.",
+    "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "Şu anda <server></server> kimlik sunucusunu kullanarak başkalarını buluyorsunuz ve başkalarını tarafından bulunabiliyorsunuz. Aşağıdan kimlik sunucunuzu değiştirebilirsiniz.",
+    "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "kimlik sunucunuza erişimi engelleyen herhangi bir eklenti (Privacy Badger gibi) için tarayıcınızı kontrol ediniz",
+    "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.": "Bağlantınızı kesmeden önce <b>kişisel verilerinizi <idserver /> kimlik sunucusundan silmelisiniz</b>. Ne yazık ki <idserver /> kimlik sunucusu şu anda çevrim dışı ya da bir nedenden ötürü erişilemiyor.",
+    "Disconnect from the identity server <current /> and connect to <new /> instead?": "<current /> kimlik sunucusundan bağlantı kesilip <new /> kimlik sunucusuna bağlanılsın mı?",
+    "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 Security Key.": "Olası bir oturuma erişememe durumunu önlemek için şifreleme anahtarlarınızı hesap verilerinizle yedekleyin. Anahtarlarınız eşsiz bir güvenlik anahtarı ile güvenlenecektir.",
+    "well formed": "uygun biçimlendirilmiş",
+    "Master private key:": "Ana gizli anahtar",
+    "Cross-signing is not set up.": "Çapraz imzalama ayarlanmamış.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Hesabınız gizli belleğinde çapraz imzalama kimliği barındırıyor ancak bu oturumda daha kullanılmış değil.",
+    "Cross-signing is ready for use.": "Çapraz imzalama zaten kullanılıyor.",
+    "Channel: <channelLink/>": "Kanal: <channelLink/>",
+    "Workspace: <networkLink/>": "Çalışma alanı: <networkLink/>",
+    "Unable to look up phone number": "Telefon numarasına bakılamadı",
+    "There was an error looking up the phone number": "Telefon numarasına bakarken bir hata oluştu",
+    "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "",
+    "Use Ctrl + F to search": "Arama yapmak için Ctrl + F",
+    "Use Command + F to search": "Arama yapmak için Command + F",
+    "Show line numbers in code blocks": "Kod bloklarında satır sayısını göster",
+    "Expand code blocks by default": "Varsayılan olarak kod bloklarını genişlet",
+    "Show stickers button": "Çıkartma tuşunu göster",
+    "Use app": "Uygulamayı kullan",
+    "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Element Web arayüzü mobil üzerinde daha tamamlanmadı. En yeni özellikler ve daha iyi bir deneyim için özgür yazılım mobil uygulamamızı kullanın.",
+    "Use app for a better experience": "Daha iyi bir deneyim için uygulamayı kullanın",
+    "%(senderName)s has updated the widget layout": "%(senderName)s widget düzenini güncelledi",
+    "Remain on your screen while running": "Uygulama çalışırken lütfen başka uygulamaya geçmeyin",
+    "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "Ana sunucunuza erişilemedi ve oturum açmanıza izin verilmedi. Lütfen yeniden deneyin. Eğer hata devam ederse ana sunucunuzun yöneticisine bildirin.",
+    "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "Ana sunucunuz oturum açma isteğinizi reddetti. Bunun nedeni bağlantı yavaşlığı olabilir. Lütfen yeniden deneyin. Eğer hata devam ederse ana sunucunuzun yöneticisine bildirin.",
+    "Try again": "Yeniden deneyin"
 }
diff --git a/src/i18n/strings/tzm.json b/src/i18n/strings/tzm.json
new file mode 100644
index 0000000000..8363c2d7c6
--- /dev/null
+++ b/src/i18n/strings/tzm.json
@@ -0,0 +1,38 @@
+{
+    "%(senderDisplayName)s sent an image.": "yuzen %(senderDisplayName)s yat twelaft.",
+    "Other": "Yaḍn",
+    "Actions": "Tugawin",
+    "Messages": "Tuzinin",
+    "Cancel": "Sser",
+    "Create Account": "Ssenflul amiḍan",
+    "Sign In": "Kcem",
+    "Name or Matrix ID": "Isem neɣ ID Matrix",
+    "Dec": "Duj",
+    "Nov": "Nuw",
+    "Oct": "Kṭu",
+    "Sep": "Cut",
+    "Aug": "Ɣuc",
+    "Jul": "Yul",
+    "Jun": "Yun",
+    "May": "May",
+    "Apr": "Ibr",
+    "Mar": "Maṛ",
+    "Sat": "Asḍ",
+    "Fri": "Asm",
+    "Thu": "Akw",
+    "Wed": "Akṛ",
+    "Tue": "Asn",
+    "Mon": "Ayn",
+    "Sun": "Asa",
+    "You are already in a call.": "tsuld Tellid g uɣuri.",
+    "OK": "WAX",
+    "Call Declined": "Aɣuri issern",
+    "Dismiss": "Nexxel",
+    "Error": "Tazgelt",
+    "e.g. <CurrentPageURL>": "a.m. <CurrentPageURL>",
+    "Every page you use in the app": "Akk tasna tssemrsed g tsensi",
+    "e.g. %(exampleValue)s": "a.m. %(exampleValue)s",
+    "The version of %(brand)s": "Taleqqemt n %(brand)s",
+    "Add Phone Number": "Rnu uṭṭun n utilifun",
+    "Add Email Address": "Rnu tasna imayl"
+}
diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index 4499d6d124..adb830c123 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -66,14 +66,14 @@
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Не вдається підключитись до домашнього серверу - перевірте підключення, переконайтесь, що ваш <a>SSL-сертифікат домашнього сервера</a> є довіреним і що розширення браузера не блокує запити.",
     "Cannot add any more widgets": "Неможливо додати більше віджетів",
     "Change Password": "Змінити пароль",
-    "%(senderName)s changed their profile picture.": "%(senderName)s змінив/ла зображення профілю.",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s змінив(-ла) рівень повноважень %(powerLevelDiffText)s.",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s змінив/ла назву кімнати на %(roomName)s.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s змінює зображення профілю.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s змінює рівень повноважень %(powerLevelDiffText)s.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s змінює назву кімнати на %(roomName)s.",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s видалив ім'я кімнати.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s змінив тему на %(topic)s.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s змінює тему на %(topic)s.",
     "Email": "е-пошта",
     "Email address": "Адреса е-пошти",
-    "Failed to send email": "Помилка відправки  е-почти",
+    "Failed to send email": "Помилка надсилання електронного листа",
     "Edit": "Відредагувати",
     "Unpin Message": "Відкріпити повідомлення",
     "Register": "Зареєструватися",
@@ -124,7 +124,7 @@
     "Explore Room State": "Перегляд статуса кімнати",
     "Source URL": "Джерельне посилання",
     "Messages sent by bot": "Повідомлення, надіслані ботом",
-    "Filter results": "Відцідити результати",
+    "Filter results": "Відфільтрувати результати",
     "Members": "Учасники",
     "No update available.": "Оновлення відсутні.",
     "Resend": "Перенадіслати",
@@ -177,7 +177,7 @@
     "Can't update user notification settings": "Неможливо оновити налаштування користувацьких сповіщень",
     "Notify for all other messages/rooms": "Сповіщати щодо всіх повідомлень/кімнат",
     "Unable to look up room ID from server": "Неможливо знайти ID кімнати на сервері",
-    "Couldn't find a matching Matrix room": "Неможливо знайти відповідну кімнату",
+    "Couldn't find a matching Matrix room": "Не вдалось знайти відповідну кімнату",
     "Invite to this room": "Запросити до цієї кімнати",
     "Thursday": "Четвер",
     "Search…": "Пошук…",
@@ -222,7 +222,7 @@
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Чи використовуєте ви режим форматованого тексту у редакторі Rich Text Editor",
     "Your homeserver's URL": "URL адреса вашого домашнього сервера",
     "Failed to verify email address: make sure you clicked the link in the email": "Не вдалось перевірити адресу електронної пошти: переконайтесь, що ви перейшли за посиланням у листі",
-    "The platform you're on": "Використовувана платформа",
+    "The platform you're on": "Платформа, на якій ви працюєте",
     "e.g. %(exampleValue)s": "напр. %(exampleValue)s",
     "Every page you use in the app": "Кожна сторінка, яку ви використовуєте в програмі",
     "e.g. <CurrentPageURL>": "напр. <CurrentPageURL>",
@@ -326,16 +326,16 @@
     "Reason": "Причина",
     "%(senderName)s requested a VoIP conference.": "%(senderName)s бажає розпочати дзвінок-конференцію.",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s запросив/ла %(targetName)s.",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s змінив(-ла) своє видиме ім'я на %(displayName)s.",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s змінює своє видиме ім'я на %(displayName)s.",
     "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s зазначив(-ла) своє видиме ім'я: %(displayName)s.",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s видалив(-ла) своє видиме ім'я (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s вилучав/ла свою світлину профілю.",
-    "%(senderName)s set a profile picture.": "%(senderName)s встановив/ла світлину профілю.",
+    "%(senderName)s removed their profile picture.": "%(senderName)s вилучає зображення свого профілю.",
+    "%(senderName)s set a profile picture.": "%(senderName)s встановлює зображення профілю.",
     "VoIP conference started.": "Розпочато дзвінок-конференцію.",
-    "%(targetName)s joined the room.": "%(targetName)s приєднав/лася до кімнати.",
+    "%(targetName)s joined the room.": "%(targetName)s приєднується до кімнати.",
     "VoIP conference finished.": "Дзвінок-конференцію завершено.",
     "%(targetName)s rejected the invitation.": "%(targetName)s відкинув/ла запрошення.",
-    "%(targetName)s left the room.": "%(targetName)s залишив/ла кімнату.",
+    "%(targetName)s left the room.": "%(targetName)s залишає кімнату.",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s розблокував/ла %(targetName)s.",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s викинув/ла %(targetName)s.",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s відкликав/ла запрошення %(targetName)s.",
@@ -347,18 +347,18 @@
     "(could not connect media)": "(не можливо під'єднати медіа)",
     "(no answer)": "(немає відповіді)",
     "(unknown failure: %(reason)s)": "(невідома помилка: %(reason)s)",
-    "%(senderName)s ended the call.": "%(senderName)s завершив/ла дзвінок.",
+    "%(senderName)s ended the call.": "%(senderName)s завершує дзвінок.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s надіслав(-ла) запрошення %(targetDisplayName)s приєднатися до кімнати.",
     "Show developer tools": "Показувати розробницькі засоби",
     "Default": "Типово",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s зробив(-ла) майбутню історію кімнати видимою для всіх учасників з моменту, коли вони приєдналися.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s зробив(-ла) майбутню історію кімнати видимою для всіх учасників з моменту, коли вони приєдналися.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s робить майбутню історію кімнати видимою для всіх учасників від часу їхнього приєднання.",
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s зробив(-ла) майбутню історію видимою для всіх учасників кімнати.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s зробив(-ла) майбутню історію кімнати видимою для всіх.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s зробив(-ла) майбутню історію видимою для невідомого значення (%(visibility)s).",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s з %(fromPowerLevel)s до %(toPowerLevel)s",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s змінив(-ла) приколоті повідомлення у кімнаті.",
-    "%(widgetName)s widget modified by %(senderName)s": "%(senderName)s змінив(-ла) знадіб %(widgetName)s",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s змінює приколоті повідомлення у кімнаті.",
+    "%(widgetName)s widget modified by %(senderName)s": "%(senderName)s змінює знадіб %(widgetName)s",
     "%(widgetName)s widget added by %(senderName)s": "%(senderName)s додав(-ла) знадіб %(widgetName)s",
     "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s вилучив(-ла) знадіб %(widgetName)s",
     "Failure to create room": "Не вдалося створити кімнату",
@@ -392,7 +392,7 @@
     "Incorrect verification code": "Неправильний код перевірки",
     "Submit": "Надіслати",
     "Phone": "Телефон",
-    "Failed to upload profile picture!": "Не вдалося відвантажити світлину профілю!",
+    "Failed to upload profile picture!": "Не вдалося відвантажити зображення профілю!",
     "Upload new:": "Відвантажити нову:",
     "No display name": "Немає видимого імені",
     "New passwords don't match": "Нові паролі не збігаються",
@@ -449,7 +449,7 @@
     "Name or Matrix ID": "Імʼя або Matrix ID",
     "Identity server has no terms of service": "Сервер ідентифікації не має умов надання послуг",
     "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.": "Щоб підтвердити адресу е-пошти або телефон ця дія потребує доступу до типового серверу ідентифікації <server />, але сервер не має жодних умов надання послуг.",
-    "Only continue if you trust the owner of the server.": "Продовжуйте тільки якщо довіряєте власнику сервера.",
+    "Only continue if you trust the owner of the server.": "Продовжуйте лише якщо довіряєте власнику сервера.",
     "Trust": "Довіра",
     "Unable to load! Check your network connectivity and try again.": "Завантаження неможливе! Перевірте інтернет-зʼєднання та спробуйте ще.",
     "Failed to invite users to the room:": "Не вдалося запросити користувачів до кімнати:",
@@ -587,8 +587,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>": "Ваш обліковий запис стане назавжди невикористовним. Ви не матимете змоги увійти в нього і ніхто не зможе перереєструватись під цим користувацьким ID. Це призведе до виходу вашого облікового запису з усіх кімнат та до видалення деталей вашого облікового запису з вашого серверу ідентифікації. <b>Ця дія є безповоротною.</b>",
     "Verify session": "Звірити сесію",
     "Session name": "Назва сесії",
-    "Session ID": "ID сесії",
-    "Session key": "Ключ сесії",
+    "Session ID": "ID сеансу",
+    "Session key": "Ключ сеансу",
     "%(count)s of your messages have not been sent.|one": "Ваше повідомлення не було надіслано.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Перенадіслати усе</resendText> або <cancelText>скасувати усе</cancelText> зараз. Ви також можете перенадіслати або скасувати окремі повідомлення.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Перенадіслати повідомлення</resendText> або <cancelText>скасувати повідомлення</cancelText> зараз.",
@@ -631,7 +631,7 @@
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Текстове повідомлення було відправлено на номер +%(msisdn)s. Будь ласка, введіть звірювальний код, який воно містить.",
     "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Повідомлення у цій кімнаті захищені наскрізним шифруванням. Тільки ви та одержувачі мають ключі для прочитання цих повідомлень.",
     "Messages in this room are end-to-end encrypted.": "Повідомлення у цій кімнаті наскрізно зашифровані.",
-    "Messages in this room are not end-to-end encrypted.": "Повідомлення у цій кімнаті не є наскрізно зашифрованими.",
+    "Messages in this room are not end-to-end encrypted.": "Повідомлення у цій кімнаті не захищено наскрізним шифруванням.",
     "Encryption enabled": "Шифрування увімкнено",
     "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Повідомлення у цій кімнаті наскрізно зашифровані. Дізнайтеся більше та звіртеся з цим користувачем через його профіль.",
     "You sent a verification request": "Ви відправили звірювальний запит",
@@ -658,23 +658,23 @@
     "Opens chat with the given user": "Відкриває балачку з вказаним користувачем",
     "Sends a message to the given user": "Надсилає повідомлення вказаному користувачеві",
     "%(senderName)s made no change.": "%(senderName)s не запровадив(-ла) жодних змін.",
-    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s змінив(ла) назву кімнати з %(oldRoomName)s на %(newRoomName)s.",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s змінює назву кімнати з %(oldRoomName)s на %(newRoomName)s.",
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s поліпшив(-ла) цю кімнату.",
     "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s зробив(-ла) кімнату відкритою для всіх, хто знає посилання.",
     "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s зробив(-ла) кімнату доступною лише за запрошеннями.",
-    "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s змінив(-ла) правило приєднування на \"%(rule)s\"",
+    "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s змінює правило приєднування на \"%(rule)s\"",
     "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s дозволив(-ла) гостям приєднуватися до кімнати.",
     "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s заборонив(-ла) гостям приєднуватися до кімнати.",
-    "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s змінив(-ла) гостьовий доступ на \"%(rule)s\"",
+    "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s змінює гостьовий доступ на \"%(rule)s\"",
     "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s увімкнув(-ла) значок для %(groups)s у цій кімнаті.",
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s вимкнув(-ла) значок для %(groups)s в цій кімнаті.",
     "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s додав(-ла) альтернативні адреси %(addresses)s для цієї кімнати.",
     "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s додав(-ла) альтернативні адреси %(addresses)s для цієї кімнати.",
     "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s прибрав(-ла) альтернативні адреси %(addresses)s для цієї кімнати.",
     "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s прибрав(-ла) альтернативні адреси %(addresses)s для цієї кімнати.",
-    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s змінив(-ла) альтернативні адреси для цієї кімнати.",
-    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s змінив(-ла) головні та альтернативні адреси для цієї кімнати.",
-    "%(senderName)s changed the addresses for this room.": "%(senderName)s змінив(-ла) адреси для цієї кімнати.",
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s змінює альтернативні адреси для цієї кімнати.",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s змінює головні та альтернативні адреси для цієї кімнати.",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s змінює адреси для цієї кімнати.",
     "%(senderName)s placed a voice call.": "%(senderName)s розпочав(-ла) голосовий виклик.",
     "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s розпочав(-ла) голосовий виклик. (не підтримується цим переглядачем)",
     "%(senderName)s placed a video call.": "%(senderName)s розпочав(-ла) відеовиклик.",
@@ -694,9 +694,9 @@
     "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s створив(-ла) правило блокування серверів зі збігом з %(glob)s через %(reason)s",
     "Light": "Світла",
     "Dark": "Темна",
-    "You signed in to a new session without verifying it:": "Ви увійшли в нову сесію, не підтвердивши її:",
-    "Verify your other session using one of the options below.": "Перевірте іншу сесію, використвуючи один із варіантів нижче.",
-    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) почав(ла) нову сесію без її підтвердження:",
+    "You signed in to a new session without verifying it:": "Ви увійшли в новий сеанс, не підтвердивши його:",
+    "Verify your other session using one of the options below.": "Перевірте інший сеанс за допомогою одного із варіантів знизу.",
+    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) починає новий сеанс без його підтвердження:",
     "Ask this user to verify their session, or manually verify it below.": "Попросіть цього користувача підтвердити сесію, або підтвердіть її власноруч нижче.",
     "Not Trusted": "Недовірене",
     "Manually Verify by Text": "Ручна перевірка за допомогою тексту",
@@ -712,7 +712,7 @@
     "Unexpected error resolving homeserver configuration": "Неочікувана помилка в налаштуваннях домашнього серверу",
     "Unexpected error resolving identity server configuration": "Незрозуміла помилка при розборі параметру сервера ідентифікації",
     "The message you are trying to send is too large.": "Ваше повідомлення було занадто велике.",
-    "%(items)s and %(count)s others|other": "%(items)s та ще %(count)s учасника(ів)",
+    "%(items)s and %(count)s others|other": "%(items)s та ще %(count)s учасників",
     "%(items)s and %(count)s others|one": "%(items)s і ще хтось",
     "a few seconds ago": "Декілька секунд тому",
     "about a minute ago": "близько хвилини тому",
@@ -729,7 +729,7 @@
     "%(num)s days from now": "%(num)s днів по тому",
     "Unrecognised address": "Нерозпізнана адреса",
     "You do not have permission to invite people to this room.": "У вас немає прав запрошувати людей у цю кімнату.",
-    "User %(userId)s is already in the room": "Користувач %(userId)s вже знаходиться серед вас",
+    "User %(userId)s is already in the room": "Користувач %(userId)s вже перебуває в кімнаті",
     "User %(user_id)s does not exist": "Користувача %(user_id)s не існує",
     "The user must be unbanned before they can be invited.": "Користувач має бути розблокованим(ою), перед тим як може бути запрошений(ая).",
     "The user's homeserver does not support the version of the room.": "Домашній сервер користувача не підтримує версію кімнати.",
@@ -779,8 +779,8 @@
     "A new version of %(brand)s is available!": "Нова версія %(brand)s вже доступна!",
     "Guest": "Гість",
     "There was an error joining the room": "Помилка при вході в кімнату",
-    "You joined the call": "Ви приєднались до дзвінку",
-    "%(senderName)s joined the call": "%(senderName)s приєднався(лась) до дзвінку",
+    "You joined the call": "Ви приєднались до виклику",
+    "%(senderName)s joined the call": "%(senderName)s приєднується до виклику",
     "Call in progress": "Дзвінок у процесі",
     "You left the call": "Ви припинили розмову",
     "%(senderName)s left the call": "%(senderName)s покинув(ла) дзвінок",
@@ -794,7 +794,7 @@
     "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
     "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
     "Custom user status messages": "користувацький статус",
-    "Group & filter rooms by custom tags (refresh to apply changes)": "Групувати та проціджувати кімнати за нетиповими наличками (оновіть щоб застосувати зміни)",
+    "Group & filter rooms by custom tags (refresh to apply changes)": "Групувати та фільтрувати кімнати за нетиповими наличками (оновіть, щоб застосувати зміни)",
     "Multiple integration managers": "Декілька менджерів інтеграції",
     "Try out new ways to ignore people (experimental)": "Спробуйте нові способи ігнорувати людей (експериментальні)",
     "Support adding custom themes": "Підтримка користувацьких тем",
@@ -875,7 +875,7 @@
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Ви не зможете скасувати цю зміну через те, що ви підвищуєте рівень повноважень користувача до свого рівня.",
     "React": "Відреагувати",
     "Message deleted": "Повідомлення видалено",
-    "Message deleted by %(name)s": "Повідомлення видалено від %(name)s",
+    "Message deleted by %(name)s": "Повідомлення видалено %(name)s",
     "Message deleted on %(date)s": "Повідомлення видалено %(date)s",
     "Power level": "Рівень повноважень",
     "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Використовуйте сервер ідентифікації щоб запрошувати через е-пошту. Керується у <settings>налаштуваннях</settings>.",
@@ -960,7 +960,7 @@
     "Show less": "Згорнути",
     "Show more": "Розгорнути",
     "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Змінення пароля призведе до скидання всіх ключів наскрізного шифрування та унеможливить читання історії листування, якщо тільки ви не експортуєте ваші ключі кімнати та не імпортуєте їх згодом. Це буде вдосконалено у майбутньому.",
-    "Santa": "Санта Клаус",
+    "Santa": "Св. Миколай",
     "Gift": "Подарунок",
     "Lock": "Замок",
     "Cross-signing and secret storage are not yet set up.": "Перехресне підписування та таємне сховище ще не налагоджені.",
@@ -998,7 +998,7 @@
     "Disconnect": "Відключити",
     "You should:": "Вам варто:",
     "Disconnect anyway": "Відключити в будь-якому випадку",
-    "Identity Server (%(server)s)": "Сервер ідентифікації  (%(server)s)",
+    "Identity Server (%(server)s)": "Сервер ідентифікації (%(server)s)",
     "Identity Server": "Сервер ідентифікації",
     "Do not use an identity server": "Не використовувати сервер ідентифікації",
     "Enter a new identity server": "Введіть новий сервер ідентифікації",
@@ -1017,7 +1017,7 @@
     "Unable to revoke sharing for email address": "Не вдалось відкликати оприлюднювання адреси е-пошти",
     "Revoke": "Відкликати",
     "Unable to revoke sharing for phone number": "Не вдалось відкликати оприлюднювання телефонного номеру",
-    "Filter room members": "Відцідити учасників кімнати",
+    "Filter room members": "Відфільтрувати учасників кімнати",
     "Voice call": "Голосовий виклик",
     "Video call": "Відеовиклик",
     "Not now": "Не зараз",
@@ -1097,11 +1097,11 @@
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s увімкнув(-ла) значок для %(newGroups)s та вимкнув(-ла) значок для %(oldGroups)s у цій кімнаті.",
     "New version available. <a>Update now.</a>": "Доступна нова версія. <a>Оновити зараз</a>",
     "Upgrade public room": "Поліпшити відкриту кімнату",
-    "Restore your key backup to upgrade your encryption": "Відновіть резервну копію вашого ключа щоб поліпшити шифрування",
+    "Restore your key backup to upgrade your encryption": "Відновіть резервну копію вашого ключа, щоб поліпшити шифрування",
     "You'll need to authenticate with the server to confirm the upgrade.": "Ви матимете пройти розпізнання на сервері щоб підтвердити поліпшування.",
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Поліпште цей сеанс щоб уможливити звіряння інших сеансів, надаючи їм доступ до зашифрованих повідомлень та позначуючи їх довіреними для інших користувачів.",
     "Upgrade your encryption": "Поліпшити ваше шифрування",
-    "Show a placeholder for removed messages": "Показувати позначку-заповнювач для видалених повідомлень",
+    "Show a placeholder for removed messages": "Показувати замісну позначку замість видалених повідомлень",
     "Show join/leave messages (invites/kicks/bans unaffected)": "Показувати повідомлення про приєднання/залишення (не впливає на запрошення/викидання/заборону)",
     "Show avatar changes": "Показувати зміни личини",
     "Show display name changes": "Показувати зміни видимого імені",
@@ -1121,7 +1121,7 @@
     "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Ви впевнені? Ви загубите ваші зашифровані повідомлення якщо копія ключів не була зроблена коректно.",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Зашифровані повідомлення захищені наскрізним шифруванням. Лише ви та отримувачі повідомлень мають ключі для їх читання.",
     "Display Name": "Видиме ім'я",
-    "wait and try again later": "почекайте та спробуйте пізніше",
+    "wait and try again later": "зачекайте та спопробуйте ще раз пізніше",
     "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>",
     "Encrypted": "Зашифроване",
     "This room is end-to-end encrypted": "Ця кімната є наскрізно зашифрованою",
@@ -1155,7 +1155,7 @@
     "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.": "Скарження на це повідомлення надішле його унікальний 'ідентифікатор події (event ID)' адміністраторові вашого домашнього сервера. Якщо повідомлення у цій кімнаті зашифровані, то адміністратор не зможе бачити ані тексту повідомлень, ані жодних файлів чи зображень.",
     "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Бракує деяких даних сеансу, включно з ключами зашифрованих повідомлень. Вийдіть та зайдіть знову щоб виправити цю проблему, відновлюючи ключі з дубля.",
     "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.": "Було виявлено дані зі старої версії %(brand)s. Це призведе до збоїння наскрізного шифрування у старій версії. Наскрізно зашифровані повідомлення, що обмінювані нещодавно, під час використання старої версії, можуть бути недешифровними у цій версії. Це може призвести до збоїв повідомлень, обмінюваних також і з цією версією. У разі виникнення проблем вийдіть з програми та зайдіть знову. Задля збереження історії повідомлень експортуйте та переімпортуйте ваші ключі.",
-    "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Змінення паролю скине усі ключі наскрізного шифрування в усіх ваших сеансах, роблячи зашифровану історію листувань непрочитною. Налагодьте дублювання ключів або експортуйте ключі кімнат з іншого сеансу перед скиданням паролю.",
+    "Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password.": "Змінення паролю скине всі ключі наскрізного шифрування в усіх ваших сеансах, роблячи зашифровану історію листувань нечитабельною. Налагодьте дублювання ключів або експортуйте ключі кімнат з іншого сеансу перед скиданням пароля.",
     "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Підтвердьте вашу особу шляхом звіряння цього входу з одного з інших ваших сеансів, надаючи йому доступ до зашифрованих повідомлень.",
     "Enable big emoji in chat": "Увімкнути великі емодзі у балачках",
     "Show typing notifications": "Сповіщати про друкування",
@@ -1182,11 +1182,11 @@
     "Emoji": "Емодзі",
     "Emoji Autocomplete": "Самодоповнення емодзі",
     "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s створив(-ла) правило блокування зі збігом з %(glob)s через %(reason)s",
-    "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s змінив(-ла) правило блокування користувачів зі збігу з %(oldGlob)s на збіг з %(newGlob)s через %(reason)s",
-    "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s змінив(-ла) правило блокування кімнат зі збігу з %(oldGlob)s на збіг з %(newGlob)s через %(reason)s",
-    "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s змінив(-ла) правило блокування серверів зі збігу з %(oldGlob)s на збіг з %(newGlob)s через %(reason)s",
-    "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s змінив(-ла) правило блокування зі збігу з %(oldGlob)s на збіг з %(newGlob)s через %(reason)s",
-    "Enable Community Filter Panel": "Увімкнути панель спільнот",
+    "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s змінює правило блокування користувачів зі збігу з %(oldGlob)s на збіг з %(newGlob)s через %(reason)s",
+    "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s змінює правило блокування кімнат зі збігу з %(oldGlob)s на збіг з %(newGlob)s через %(reason)s",
+    "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s змінює правило блокування серверів зі збігу з %(oldGlob)s на збіг з %(newGlob)s через %(reason)s",
+    "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s змінєю правило блокування зі збігу з %(oldGlob)s на збіг з %(newGlob)s через %(reason)s",
+    "Enable Community Filter Panel": "Увімкнути фільтр панелі спільнот",
     "Messages containing my username": "Повідомлення, що містять моє користувацьке ім'я",
     "Messages containing @room": "Повідомлення, що містять @room",
     "When rooms are upgraded": "Коли кімнати поліпшено",
@@ -1204,8 +1204,8 @@
     "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Ви ігноруєте цього користувача, тож його повідомлення приховано. <a>Все одно показати.</a>",
     "Show all": "Показати все",
     "Add an Integration": "Додати інтеграцію",
-    "Filter community members": "Відцідити учасників спільноти",
-    "Filter community rooms": "Відцідити кімнати спільноти",
+    "Filter community members": "Відфільтрувати учасників спільноти",
+    "Filter community rooms": "Відфільтрувати кімнати спільноти",
     "Display your community flair in rooms configured to show it.": "Відбивати ваш спільнотний значок у кімнатах, що налаштовані показувати його.",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Користування цим знадобом може призвести до поширення ваших даних <helpIcon /> з %(widgetDomain)s та вашим менеджером інтеграцій.",
     "Show advanced": "Показати розширені",
@@ -1219,15 +1219,383 @@
     "Did you know: you can use communities to filter your %(brand)s experience!": "Чи знаєте ви, що спільноти можна використовувати для припасування %(brand)s під ваші потреби?",
     "Communities": "Спільноти",
     "Create a new community": "Створити нову спільноту",
-    "Clear filter": "Очистити цідило",
+    "Clear filter": "Очистити фільтр",
     "Syncing...": "Синхронізування…",
     "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": "Створити обліковий запис",
     "Failed to fetch avatar URL": "Не вдалось вибрати URL личини",
-    "Clear room list filter field": "Очистити поле цідила списку кімнат",
+    "Clear room list filter field": "Очистити поле фільтра списку кімнат",
     "Cancel autocomplete": "Скасувати самодоповнення",
     "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.": "Журнали зневадження містять дані використання застосунку, включно з вашим користувацьким ім’ям, ідентифікаторами або псевдонімами відвіданих вами кімнат або груп, а також іменами інших користувачів. Вони не містять повідомлень.",
     "Confirm your account deactivation by using Single Sign On to prove your identity.": "Підтвердьте знедіяння вашого облікового запису через Single Sign On щоб підтвердити вашу особу.",
-    "This account has been deactivated.": "Цей обліковий запис було знедіяно."
+    "This account has been deactivated.": "Цей обліковий запис було знедіяно.",
+    "End conference": "Завершити конференцію",
+    "This will end the conference for everyone. Continue?": "Це завершить конференцію для всіх. Продовжити?",
+    "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Додає ( ͡° ͜ʖ ͡°) на початку текстового повідомлення",
+    "about a day ago": "близько доби тому",
+    "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
+    "Unexpected server error trying to leave the room": "Виникла неочікувана помилка серверу під час спроби залишити кімнату",
+    "Unknown App": "Невідомий додаток",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Відправляти <UsageDataLink>анонімну статистику користування</UsageDataLink>, що дозволяє нам покращувати %(brand)s. Це використовує <PolicyLink>кукі</PolicyLink>.",
+    "Set up Secure Backup": "Налаштувати захищене резервне копіювання",
+    "Safeguard against losing access to encrypted messages & data": "Захист від втрати доступу до зашифрованих повідомлень та даних",
+    "The person who invited you already left the room.": "Особа, що вас запросила, вже залишила кімнату.",
+    "The person who invited you already left the room, or their server is offline.": "Особа, що вас запросила вже залишила кімнату, або її сервер відімкнено.",
+    "Change notification settings": "Змінити налаштування сповіщень",
+    "Render simple counters in room header": "Показувати звичайні лічильники у заголовку кімнати",
+    "Send typing notifications": "Надсилати сповіщення про набирання тексту",
+    "Use a system font": "Використовувати системний шрифт",
+    "System font name": "Ім’я системного шрифту",
+    "Allow Peer-to-Peer for 1:1 calls": "Дозволити Peer-to-Peer для дзвінків 1:1",
+    "Enable widget screenshots on supported widgets": "Увімкнути скріншоти віджетів для віджетів, що підтримуються",
+    "Prompt before sending invites to potentially invalid matrix IDs": "Запитувати перед надсиланням запрошень на потенційно недійсні matrix ID",
+    "Order rooms by name": "Сортувати кімнати за назвою",
+    "Low bandwidth mode": "Режим для низької пропускної здатності",
+    "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-адреса буде розкрита для здійснення дзвінка)",
+    "Send read receipts for messages (requires compatible homeserver to disable)": "Надсилати мітки прочитання повідомлень (необхідний сумісний домашній сервер для відімкнення)",
+    "How fast should messages be downloaded.": "Як швидко повідомлення повинні завантажуватися.",
+    "Enable experimental, compact IRC style layout": "Увімкнути експериментальне, компактне компонування IRC",
+    "Uploading logs": "Відвантаження журналів",
+    "Downloading logs": "Завантаження журналів",
+    "My Ban List": "Мій список блокувань",
+    "This is your list of users/servers you have blocked - don't leave the room!": "Це ваш список користувачів/серверів, які ви заблокували – не залишайте кімнату!",
+    "Incoming call": "Вхідний виклик",
+    "The other party cancelled the verification.": "Друга сторона скасувала звірення.",
+    "Verified!": "Звірено!",
+    "You've successfully verified this user.": "Ви успішно звірили цього користувача.",
+    "Got It": "Зрозуміло",
+    "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": "Велика Британія",
+    "The call was answered on another device.": "На дзвінок відповіли на іншому пристрої.",
+    "Answered Elsewhere": "Відповіли деінде",
+    "The call could not be established": "Не вдалося встановити зв'язок",
+    "The other party declined the call.": "Інша сторона відхилила дзвінок.",
+    "Call Declined": "Дзвінок відхилено",
+    "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": "Конго",
+    "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s змінює серверні права доступу для цієї кімнати.",
+    "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s встановлює серверні права доступу для цієї кімнати.",
+    "Takes the call in the current room off hold": "Зніміть дзвінок у поточній кімнаті з утримання",
+    "Places the call in the current room on hold": "Переведіть дзвінок у поточній кімнаті на утримання",
+    "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": "Фарерські Острови",
+    "Unable to access microphone": "Неможливо доступитись до мікрофона",
+    "Filter rooms and people": "Відфільтрувати кімнати та людей",
+    "Find a room… (e.g. %(exampleRoom)s)": "Знайти кімнату… (напр. %(exampleRoom)s)",
+    "Find a room…": "Знайти кімнату…",
+    "Can't find this server or its room list": "Не вдалось знайти цей сервер у переліку кімнат",
+    "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Якщо ви не можете знайти потрібну кімнату, попросіть запрошення або <a>Створіть нову кімнату</a> власноруч.",
+    "Cannot reach homeserver": "Не вдається зв'язатися з домашнім сервером",
+    "Ensure you have a stable internet connection, or get in touch with the server admin": "Переконайтеся, що у ваше з'єднання з Інтернетом стабільне або зв’яжіться з системним адміністратором",
+    "User %(user_id)s may or may not exist": "Користувач %(user_id)s можливо існує, а можливо й ні",
+    "No need for symbols, digits, or uppercase letters": "Цифри або великі букви не вимагаються",
+    "Capitalization doesn't help very much": "Великі букви не дуже допомагають",
+    "You're all caught up.": "Все готово.",
+    "Hey you. You're the best!": "Гей, ти, так, ти. Ти найкращий!",
+    "You’re all caught up": "Все готово",
+    "%(senderName)s declined the call.": "%(senderName)s відхиляє виклик.",
+    "(an error occurred)": "(сталася помилка)",
+    "(their device couldn't start the camera / microphone)": "(їхній пристрій не зміг запустити камеру / мікрофон)",
+    "(connection failed)": "(не вдалося з'єднатися)",
+    "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 Всім серверам заборонено доступ до кімнати! Нею більше не можна користуватися.",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "Збій виклику, оскільки не вдалося отримати доступ до мікрофона. Переконайтеся, що мікрофон під'єднано та налаштовано правильно.",
+    "Effects": "Ефекти",
+    "You've reached the maximum number of simultaneous calls.": "Ви досягли максимальної кількості одночасних викликів.",
+    "Too Many Calls": "Забагато викликів",
+    "No other application is using the webcam": "Жодна інша програма не використовує вебкамеру",
+    "Permission is granted to use the webcam": "Використання вебкамери дозволено",
+    "A microphone and webcam are plugged in and set up correctly": "Мікрофон і вебкамера під'єднані та налаштовані правильно",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "Збій виклику, оскільки не вдалося отримати доступ до вебкамери або мікрофона. Перевірте, що:",
+    "Unable to access webcam / microphone": "Не вдається отримати доступ до вебкамери / мікрофона",
+    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)sприєдналися й вийшли %(count)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.": "Ви можете вимкнути це, якщо кімната буде використовуватися для співпраці із зовнішніми командами, які мають власний домашній сервер. Це неможливо змінити пізніше.",
+    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)sзмінює свій аватар",
+    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)sзмінюють свої аватари %(count)s разів",
+    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)sзмінюють свої аватари",
+    "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)sзмінюють свої аватари %(count)s разів",
+    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)sзмінює своє ім'я",
+    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)sзмінює своє ім'я %(count)s разів",
+    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)sзмінили свої імена",
+    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)sзмінили свої імена %(count)s разів",
+    "Error whilst fetching joined communities": "Помилка під час отримання спільнот до яких ви приєдналися",
+    "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.": "Закриті кімнати можна знайти та приєднатися до них лише за запрошенням. Загальнодоступні кімнати може знайти і приєднатись кожен.",
+    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)sвиходить і повертається",
+    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)sвиходить і повертається %(count)s разів",
+    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)sвиходять і повертаються",
+    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)sвиходять і повертаються %(count)s разів",
+    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)sприєднується й виходить",
+    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)sприєднується й виходить %(count)s разів",
+    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)sприєдналися й вийшли",
+    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)sприєднується",
+    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)sприєднується %(count)s разів",
+    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)sприєдналися",
+    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)sприєдналися %(count)s разів",
+    "Members only (since they joined)": "Лише учасники (від часу приєднання)",
+    "This room is not accessible by remote Matrix servers": "Ця кімната недоступна для віддалених серверів Matrix",
+    "Manually verify all remote sessions": "Перевірити всі сеанси власноруч",
+    "Explore rooms": "Каталог кімнат",
+    "Session key:": "Ключ сеансу:",
+    "If you didn’t sign in to this session, your account may be compromised.": "Якщо ви не входили в цей сеанс, можливо ваш обліковий запис зламано.",
+    "Hide sessions": "Сховати сеанси",
+    "Hide verified sessions": "Сховати підтверджені сеанси",
+    "Session ID:": "ID сеансу:",
+    "Click the button below to confirm setting up encryption.": "Клацніть на кнопку внизу, щоб підтвердити налаштування шифрування.",
+    "Confirm encryption setup": "Підтвердити налаштування шифрування",
+    "Enable end-to-end encryption": "Увімкнути наскрізне шифрування",
+    "Your server requires encryption to be enabled in private rooms.": "Ваш сервер вимагає увімкнення шифрування приватних кімнат.",
+    "Widgets do not use message encryption.": "Віджети не використовують шифрування повідомлень.",
+    "The encryption used by this room isn't supported.": "Шифрування, використане цією кімнатою не підтримується.",
+    "Encryption not enabled": "Шифрування не ввімкнено",
+    "Ignored attempt to disable encryption": "Знехтувані спроби вимкнути шифрування",
+    "This client does not support end-to-end encryption.": "Цей клієнт не підтримує наскрізного шифрування.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Повторно запитати ключі шифрування</requestLink> з інших сеансів.",
+    "Enable encryption?": "Увімкнути шифрування?",
+    "Enable room encryption": "Увімкнути шифрування кімнати",
+    "Encryption": "Шифрування",
+    "Try again": "Спробувати ще раз"
 }
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index eeb119dfd4..167fea70e1 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>",
@@ -1529,10 +1529,10 @@
     "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "备份有来自 ID 为 %(deviceId)s 的<verify>未知</verify>会话的签名",
     "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>": "备份有来自<verify>已验证的</verify>会话 <device></device> 的<validity>有效</validity>签名",
-    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "备份有来自<verify>未验证</verify>会话 <device></device> 的<validity>无效</validity>签名",
-    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "备份有来自<verify>已验证</verify>会话 <device></device> 的<validity>无效</validity>签名",
-    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "备份有来自<verify>未验证的</verify>会话 <device></device> 的 <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></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,12 +1553,12 @@
     "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.": "在断开连接之前，您应该从身份服务器 <idserver /> <b>删除您的个人信息</b>。不幸的是，身份服务器 <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": "等待并稍后重试",
     "Disconnect anyway": "仍然断开连接",
-    "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "您仍然在身份服务器 <idserver /> 上<b>共享您的个人信息</b>。",
+    "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "您仍然在<b>分享您的个人信息</b>在身份服务器上<idserver />。",
     "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "我们推荐您在断开连接前从身份服务器上删除您的邮箱地址和电话号码。",
     "Identity Server (%(server)s)": "身份服务器（%(server)s）",
     "not stored": "未存储",
@@ -1960,7 +1960,7 @@
     "Close dialog": "关闭对话框",
     "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "请告诉我们哪里出错了，或最好创建一个 GitHub issue 来描述该问题。",
     "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "提醒：您的浏览器不被支持，所以您的体验可能不可预料。",
-    "GitHub issue": "GitHub issue",
+    "GitHub issue": "GitHub 上的 issue",
     "Notes": "提示",
     "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.": "如果有额外的上下文可以帮助我们分析问题，比如您当时在做什么、房间 ID、用户 ID 等等，请将其列于此处。",
     "Removing…": "正在删除…",
@@ -2287,7 +2287,7 @@
     "Alt": "Alt",
     "Alt Gr": "Alt Gr",
     "Shift": "Shift",
-    "Super": "Super",
+    "Super": "超级",
     "Ctrl": "Ctrl",
     "New line": "换行",
     "Jump to start/end of the composer": "跳转到编辑器的开始/结束",
@@ -2398,5 +2398,16 @@
     "Privacy": "隐私",
     "Explore community rooms": "探索社区聊天室",
     "%(count)s results|one": "%(count)s 个结果",
-    "Room Info": "聊天室信息"
+    "Room Info": "聊天室信息",
+    "No other application is using the webcam": "没有其他应用程序正在使用摄像头",
+    "Permission is granted to use the webcam": "授予使用网络摄像头的权限",
+    "A microphone and webcam are plugged in and set up correctly": "麦克风和摄像头已插入并正确设置",
+    "Call failed because no webcam or microphone could not be accessed. Check that:": "通话失败，因为无法访问摄像头或麦克风。 检查：",
+    "Unable to access webcam / microphone": "无法访问摄像头/麦克风",
+    "Call failed because no microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "呼叫失败，因为无法访问任何麦克风。 检查是否已插入麦克风并正确设置。",
+    "Unable to access microphone": "无法使用麦克风",
+    "The call was answered on another device.": "在另一台设备上应答了该通话。",
+    "The call could not be established": "无法建立通话",
+    "The other party declined the call.": "对方拒绝了通话。",
+    "Call Declined": "通话被拒绝"
 }
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index da93d6c270..b11ff2274f 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1231,7 +1231,7 @@
     "Power level": "權力等級",
     "Want more than a community? <a>Get your own server</a>": "想要的不只是社群？<a>架設您自己的伺服器</a>",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "請安裝 <chromeLink>Chrome</chromeLink>、<firefoxLink>Firefox</firefoxLink> 或 <safariLink>Safari</safariLink> 以取得最佳體驗。",
-    "<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>。我們會在舊版聊天室中貼出到新聊天室的連結，聊天室成員必須點選此連結以加入新聊天室。",
+    "<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>。我們會在舊版聊天室中貼出到新聊天室的連結，聊天室成員必須點選此連結以加入新聊天室。",
     "Adds a custom widget by URL to the room": "透過 URL 新增自訂小工具到聊天室",
     "Please supply a https:// or http:// widget URL": "請提供 https:// 或 http:// 小工具 URL",
     "You cannot modify widgets in this room.": "您無法在此聊天室中修改小工具。",
@@ -2527,5 +2527,546 @@
     "Offline encrypted messaging using dehydrated devices": "使用乾淨裝置的離線加密訊息",
     "Failed to save your profile": "儲存您的設定檔失敗",
     "The operation could not be completed": "無法完成操作",
-    "Remove messages sent by others": "移除其他人傳送的訊息"
+    "Remove messages sent by others": "移除其他人傳送的訊息",
+    "Calling...": "正在通話……",
+    "Call connecting...": "正在連線通話……",
+    "Starting camera...": "正在開啟攝影機……",
+    "Starting microphone...": "正在開啟麥克風……",
+    "🎉 All servers are banned from participating! This room can no longer be used.": "🎉 所有伺服器都被禁止加入！ 這間聊天室無法使用。",
+    "%(senderDisplayName)s changed the server ACLs for this room.": "%(senderDisplayName)s 為此房間更改了伺服器的存取控制列表。",
+    "%(senderDisplayName)s set the server ACLs for this room.": "%(senderDisplayName)s 為此房間設置了伺服器的存取控制列表。",
+    "%(senderName)s declined the call.": "%(senderName)s 拒絕了通話。",
+    "(an error occurred)": "（遇到錯誤）",
+    "(their device couldn't start the camera / microphone)": "（他們的裝置無法開啟攝影機／麥克風）",
+    "(connection failed)": "（連線失敗）",
+    "The call could not be established": "無法建立通話",
+    "The other party declined the call.": "對方拒絕了電話。",
+    "Call Declined": "通話已拒絕",
+    "Move right": "向右移動",
+    "Move left": "向左移動",
+    "Revoke permissions": "撤銷權限",
+    "Unpin a widget to view it in this panel": "取消釘選小工具以在此面板檢視",
+    "You can only pin up to %(count)s widgets|other": "您最多只能釘選 %(count)s 個小工具",
+    "Show Widgets": "顯示小工具",
+    "Hide Widgets": "隱藏小工具",
+    "The call was answered on another device.": "通話已在其他裝置上回應。",
+    "Answered Elsewhere": "在其他地方回答",
+    "Data on this screen is shared with %(widgetDomain)s": "在此畫面上的資料會與 %(widgetDomain)s 分享",
+    "Modal Widget": "程式小工具",
+    "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": "已傳送回饋",
+    "%(senderName)s ended the call": "%(senderName)s 結束了通話",
+    "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": "不要錯過回覆",
+    "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": "英國",
+    "%(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": "在目前的聊天室撥打通話並等候接聽",
+    "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 個聊天室的訊息，在本機安全地快取已加密的訊息以讓它們可以在搜尋結果中出現。",
+    "Go to Home View": "轉到主視窗",
+    "Filter rooms and people": "過濾聊天室與人們",
+    "Open the link in the email to continue registration.": "開啟電子郵件中的連結以繼續註冊。",
+    "A confirmation email has been sent to %(emailAddress)s": "確認電子郵件已寄送至 %(emailAddress)s",
+    "Start a new chat": "開始新聊天",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|one": "使用 %(size)s 來儲存來自 %(rooms)s 個聊天室的訊息，在本機安全地快取已加密的訊息以使其出現在搜尋結果中。",
+    "Securely cache encrypted messages locally for them to appear in search results, using %(size)s to store messages from %(rooms)s rooms.|other": "使用 %(size)s 來儲存來自 %(rooms)s 個聊天室的訊息，在本機安全地快取已加密的訊息以使其出現在搜尋結果中。",
+    "<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</h1>\n<p>\n    使用詳細說明向社群介紹新成員，或散佈\n    一些重要的<a href=\"foo\">連結</a>\n</p>\n<p>\n    您甚至可以使用 Matrix URL <img src=\"mxc://url\" /> 新增圖片\n</p>\n",
+    "Decline All": "全部拒絕",
+    "Approve": "批准",
+    "This widget would like to:": "這個小工具想要：",
+    "Approve widget permissions": "批准小工具權限",
+    "Use Ctrl + Enter to send a message": "使用 Ctrl + Enter 來傳送訊息",
+    "Use Command + Enter to send a message": "使用 Command + Enter 來傳送訊息",
+    "See <b>%(msgtype)s</b> messages posted to your active room": "檢視發佈到您的活躍聊天室的 <b>%(msgtype)s</b> 訊息",
+    "See <b>%(msgtype)s</b> messages posted to this room": "檢視發佈到此聊天室的 <b>%(msgtype)s</b> 訊息",
+    "Send <b>%(msgtype)s</b> messages as you in your active room": "在您的活躍聊天室中以您的身份傳送 <b>%(msgtype)s</b> 訊息",
+    "Send <b>%(msgtype)s</b> messages as you in this room": "在此聊天室中以您的身份傳送 <b>%(msgtype)s</b> 訊息",
+    "See general files posted to your active room": "檢視在您的活躍聊天室中發佈的一般檔案",
+    "See general files posted to this room": "檢視在此聊天室中發佈的一般檔案",
+    "Send general files as you in your active room": "在您的活躍聊天室中以您的身份傳送一般檔案",
+    "Send general files as you in this room": "在此聊天室中以您的身份傳送一般檔案",
+    "See videos posted to your active room": "檢視發佈到您的活躍聊天室的影片",
+    "See videos posted to this room": "檢視發佈到此聊天室的影片",
+    "Send videos as you in your active room": "在您的活躍聊天室中以您的身份傳送影片",
+    "Send videos as you in this room": "在此聊天室中以您的身份傳送影片",
+    "See images posted to your active room": "檢視發佈到您的活躍聊天室的圖片",
+    "See images posted to this room": "檢視發佈到此聊天室的圖片",
+    "Send images as you in your active room": "在您活躍的聊天室以您的身份傳送圖片",
+    "Send images as you in this room": "在此聊天室以您的身份傳送圖片",
+    "See emotes posted to your active room": "檢視發佈到您的活躍聊天室的表情符號",
+    "See emotes posted to this room": "檢視發佈到此聊天室的表情符號",
+    "Send emotes as you in your active room": "在您的活躍聊天室中以您的身份傳送表情符號",
+    "Send emotes as you in this room": "在此聊天室中以您的身份傳送表情符號",
+    "See text messages posted to your active room": "檢視發佈到您的活躍聊天室的文字訊息",
+    "See text messages posted to this room": "檢視發佈到此聊天室的文字訊息",
+    "Send text messages as you in your active room": "在您的活躍聊天室以您的身份傳送文字訊息",
+    "Send text messages as you in this room": "在此聊天室以您的身份傳送文字訊息",
+    "See messages posted to your active room": "檢視發佈到您的活躍聊天室的訊息",
+    "See messages posted to this room": "檢視發佈到此聊天室的訊息",
+    "Send messages as you in your active room": "在您的活躍聊天室以您的身份傳送訊息",
+    "Send messages as you in this room": "在此聊天室以您的身份傳送訊息",
+    "The <b>%(capability)s</b> capability": "<b>%(capability)s</b> 能力",
+    "See <b>%(eventType)s</b> events posted to your active room": "檢視發佈到您的活躍聊天室的 <b>%(eventType)s</b> 活動",
+    "Send <b>%(eventType)s</b> events as you in your active room": "以您的身份在您的活躍聊天是傳送 <b>%(eventType)s</b> 活動",
+    "See <b>%(eventType)s</b> events posted to this room": "檢視發佈到此聊天室的 <b>%(eventType)s</b> 活動",
+    "Send <b>%(eventType)s</b> events as you in this room": "以您的身份在此聊天室傳送 <b>%(eventType)s</b> 活動",
+    "with state key %(stateKey)s": "帶有狀態金鑰 %(stateKey)s",
+    "with an empty state key": "帶有空的狀態金鑰",
+    "See when anyone posts a sticker to your active room": "檢視何時有人將貼圖貼到您活躍的聊天室",
+    "Send stickers to your active room as you": "以您的身份傳送貼圖到您活躍的聊天室",
+    "See when a sticker is posted in this room": "檢視貼圖在此聊天室中何時貼出",
+    "Send stickers to this room as you": "以您的身份傳送貼圖到此聊天室",
+    "See when the avatar changes in your active room": "檢視您活躍聊天是的大頭照何時變更",
+    "Change the avatar of your active room": "變更您活躍聊天是的大頭照",
+    "See when the avatar changes in this room": "檢視此聊天是的大頭照何時變更",
+    "Change the avatar of this room": "變更此聊天室的大頭照",
+    "See when the name changes in your active room": "檢視您活躍聊天室的名稱何時變更",
+    "Change the name of your active room": "變更您活躍聊天室的名稱",
+    "See when the name changes in this room": "檢視此聊天是的名稱何時變更",
+    "Change the name of this room": "變更此聊天室的名稱",
+    "See when the topic changes in your active room": "檢視您活躍的聊天是的主題何時變更",
+    "Change the topic of your active room": "變更您活躍聊天是的主題",
+    "See when the topic changes in this room": "檢視此聊天是的主題何時變更",
+    "Change the topic of this room": "變更此聊天室的主題",
+    "Change which room you're viewing": "變更您正在檢視的聊天室",
+    "Send stickers into your active room": "傳送貼圖到您活躍的聊天室",
+    "Send stickers into this room": "傳送貼圖到此聊天室",
+    "Remain on your screen while running": "在執行時保留在您的畫面上",
+    "Remain on your screen when viewing another room, when running": "在執行與檢視其他聊天室時仍保留在您的畫面上",
+    "Enter phone number": "輸入電話號碼",
+    "Enter email address": "輸入電子郵件地址",
+    "Return to call": "回到通話",
+    "Fill Screen": "全螢幕",
+    "Voice Call": "音訊通話",
+    "Video Call": "視訊通話",
+    "New here? <a>Create an account</a>": "新手？<a>建立帳號</a>",
+    "Got an account? <a>Sign in</a>": "有帳號了嗎？<a>登入</a>",
+    "Render LaTeX maths in messages": "在訊息中彩現 LaTeX 數學",
+    "No other application is using the webcam": "無其他應用程式正在使用網路攝影機",
+    "Permission is granted to use the webcam": "授予使用網路攝影機的權限",
+    "A microphone and webcam are plugged in and set up correctly": "麥克風與網路攝影機已插入並正確設定",
+    "Call failed because no webcam or microphone could not be accessed. Check that:": "因為無法存取網路攝影機或麥克風，所以通話失敗。請檢查：",
+    "Unable to access webcam / microphone": "無法存取網路攝影機／麥克風",
+    "Call failed because no microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "因為無法存取麥克風，所以通話失敗。請檢查是否已插入麥克風並正確設定。",
+    "Unable to access microphone": "無法存取麥克風",
+    "Decide where your account is hosted": "決定託管帳號的位置",
+    "Host account on": "帳號託管於",
+    "Already have an account? <a>Sign in here</a>": "已有帳號？<a>在此登入</a>",
+    "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s 或 %(usernamePassword)s",
+    "Continue with %(ssoButtons)s": "使用 %(ssoButtons)s 繼續",
+    "That username already exists, please try another.": "使用者名稱已存在，請試試其他的。",
+    "New? <a>Create account</a>": "新人？<a>建立帳號</a>",
+    "There was a problem communicating with the homeserver, please try again later.": "與家伺服器通訊時出現問題，請再試一次。",
+    "Use email to optionally be discoverable by existing contacts.": "使用電子郵件以選擇性地被既有的聯絡人探索。",
+    "Use email or phone to optionally be discoverable by existing contacts.": "使用電子郵件或電話以選擇性地被既有的聯絡人探索。",
+    "Add an email to be able to reset your password.": "新增電子郵件以重設您的密碼。",
+    "Forgot password?": "忘記密碼？",
+    "That phone number doesn't look quite right, please check and try again": "電話號碼看起來不太對，請檢查並再試一次",
+    "About homeservers": "關於家伺服器",
+    "Learn more": "取得更多資訊",
+    "Use your preferred Matrix homeserver if you have one, or host your own.": "如果您有的話，可以使用您偏好的 Matrix 家伺服器，或是自己架一個。",
+    "Other homeserver": "其他家伺服器",
+    "We call the places you where you can host your account ‘homeservers’.": "我們將您可以託管您的帳號的地方稱為「家伺服器」。",
+    "Sign into your homeserver": "登入您的家伺服器",
+    "Matrix.org is the biggest public homeserver in the world, so it’s a good place for many.": "Matrix.org 是世界上最大的公開伺服器，因此對許多人來說是個好地方。",
+    "Specify a homeserver": "指定家伺服器",
+    "Just a heads up, if you don't add an email and forget your password, you could <b>permanently lose access to your account</b>.": "請注意，如果您不新增電子郵件且忘記密碼，您將<b>永遠失去對您帳號的存取權</b>。",
+    "Continuing without email": "不用電子郵件繼續",
+    "Continue with %(provider)s": "使用 %(provider)s 繼續",
+    "Homeserver": "家伺服器",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Element with an existing Matrix account on a different homeserver.": "您可以透過指定不同的家伺服器 URL 使用自訂伺服器選項來登入其他 Matrix 伺服器。這讓您可以使用在不同家伺服器上的既有 Matrix 帳號。",
+    "Server Options": "伺服器選項",
+    "Reason (optional)": "理由（選擇性）",
+    "We call the places where you can host your account ‘homeservers’.": "我們將可以託管您的帳號的地方稱為「家伺服器」。",
+    "Invalid URL": "無效的 URL",
+    "Unable to validate homeserver": "無法驗證家伺服器",
+    "sends confetti": "傳送五彩碎紙",
+    "Sends the given message with confetti": "使用五彩碎紙傳送訊息",
+    "Show chat effects": "顯示聊天特效",
+    "Effects": "影響",
+    "Call failed because webcam or microphone could not be accessed. Check that:": "通話失敗，因為無法存取網路攝影機或麥克風。請檢查：",
+    "Call failed because microphone could not be accessed. Check that a microphone is plugged in and set up correctly.": "通話失敗，因為無法存取麥克風。請檢查是否已插入麥克風並正確設定。",
+    "Hold": "保留",
+    "Resume": "繼續",
+    "%(peerName)s held the call": "%(peerName)s 保留通話",
+    "You held the call <a>Resume</a>": "您已保留通話 <a>繼續</a>",
+    "%(name)s paused": "%(name)s 已暫停",
+    "You've reached the maximum number of simultaneous calls.": "您已達到同時通話的最大數量。",
+    "Too Many Calls": "太多通話",
+    "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message": "在純文字訊息前加入 ┬──┬ ノ( ゜-゜ノ)",
+    "Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message": "在純文字訊息前加入 (╯°□°）╯︵ ┻━┻",
+    "sends fireworks": "傳送煙火",
+    "Sends the given message with fireworks": "與煙火一同傳送指定訊息",
+    "%(name)s on hold": "保留 %(name)s",
+    "You held the call <a>Switch</a>": "您已保留通話 <a>切換</a>",
+    "sends snowfall": "傳送雪球",
+    "Sends the given message with snowfall": "與雪球一同傳送指定訊息",
+    "You have no visible notifications.": "您沒有可見的通知。",
+    "Transfer": "傳輸",
+    "Failed to transfer call": "傳輸通話失敗",
+    "A call can only be transferred to a single user.": "一個通話只能傳輸給ㄧ個使用者。",
+    "There was an error finding this widget.": "尋找此小工具時發生錯誤。",
+    "Active Widgets": "作用中的小工具",
+    "Open dial pad": "開啟撥號鍵盤",
+    "Start a Conversation": "開始對話",
+    "Dial pad": "撥號鍵盤",
+    "There was an error looking up the phone number": "尋找電話號碼時發生錯誤",
+    "Unable to look up phone number": "無法查詢電話號碼",
+    "Channel: <channelLink/>": "頻道：<channelLink/>",
+    "Workspace: <networkLink/>": "工作空間：<networkLink/>",
+    "Change which room, message, or user you're viewing": "變更您正在檢視的聊天室、訊息或使用者",
+    "This session has detected that your Security Phrase and key for Secure Messages have been removed.": "此工作階段已偵測到您的安全密語以及安全訊息金鑰被移除。",
+    "A new Security Phrase and key for Secure Messages have been detected.": "偵測到新的安全密語以及安全訊息金鑰。",
+    "Make a copy of your Security Key": "複製您的安全金鑰",
+    "Confirm your Security Phrase": "確認您的安全密語",
+    "Secure your backup with a Security Phrase": "使用安全密語保護您的備份",
+    "Your Security Key is in your <b>Downloads</b> folder.": "您的安全金鑰在您的<b>下載</b>資料夾中。",
+    "Your Security Key has been <b>copied to your clipboard</b>, paste it to:": "您的安全金鑰已<b>複製到您的剪貼簿</b>，將其貼上至：",
+    "Your Security Key": "您的安全金鑰",
+    "Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your Security Phrase.": "您的安全金鑰是安全網，如果您忘了您的安全密語的話，您可以用它來恢復對您已加密訊息的存取權。",
+    "Repeat your Security Phrase...": "重複您的安全密語……",
+    "Please enter your Security Phrase a second time to confirm.": "請再次輸入您的安全密語以進行確認。",
+    "Set up with a Security Key": "使用安全金鑰設定",
+    "Great! This Security Phrase looks strong enough.": "很好！此安全密語看起夠強。",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a Security Phrase.": "我們會將您金鑰的加密副本存在我們的伺服氣上。使用安全密語保護您的備份。",
+    "Use Security Key": "使用安全金鑰",
+    "Use Security Key or Phrase": "使用安全金鑰或密語",
+    "If you've forgotten your Security Key you can <button>set up new recovery options</button>": "如果您忘了您的安全金鑰，您可以<button>設定新的復原選項</button>",
+    "Access your secure message history and set up secure messaging by entering your Security Key.": "透過輸入您的安全金鑰來存取您的安全訊息歷史並設定安全訊息。",
+    "Not a valid Security Key": "不是有效的安全金鑰",
+    "This looks like a valid Security Key!": "這看起來是有效的安全金鑰！",
+    "Enter Security Key": "輸入安全金鑰",
+    "If you've forgotten your Security Phrase you can <button1>use your Security Key</button1> or <button2>set up new recovery options</button2>": "如果您忘了您的安全密語，您可以<button1>使用您的安全金鑰</button1>或<button2>設定新的復原選項</button2>",
+    "Access your secure message history and set up secure messaging by entering your Security Phrase.": "透過輸入您的安全密語存取您的安全訊息歷史紀錄並設定安全訊息。",
+    "Enter Security Phrase": "輸入安全密語",
+    "Backup could not be decrypted with this Security Phrase: please verify that you entered the correct Security Phrase.": "無法使用此安全密語解密備份：請確認您是否輸入了正確的安全密語。",
+    "Incorrect Security Phrase": "不正確的安全密語",
+    "Backup could not be decrypted with this Security Key: please verify that you entered the correct Security Key.": "無法使用此安全金鑰解密備份：請確認您是否輸入了正確的安全金鑰。",
+    "Security Key mismatch": "安全金鑰不相符",
+    "Unable to access secret storage. Please verify that you entered the correct Security Phrase.": "無法存取祕密儲存空間。請確認您輸入了正確的安全密語。",
+    "Invalid Security Key": "無效的安全金鑰",
+    "Wrong Security Key": "錯誤的安全金鑰",
+    "We recommend you change your password and Security Key in Settings immediately": "我們建議您立刻在設定中變更您的密碼與安全金鑰",
+    "Set my room layout for everyone": "為所有人設定我的聊天室佈局",
+    "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 Security Key.": "請使用您的帳號資料備份您的加密金鑰，避免您無法存取您的工作階段。您的金鑰將會以獨一無二的安全金鑰保護。",
+    "%(senderName)s has updated the widget layout": "%(senderName)s 已更新小工具佈局",
+    "Search (must be enabled)": "搜尋（必須啟用）",
+    "Remember this": "記住這個",
+    "The widget will verify your user ID, but won't be able to perform actions for you:": "小工具將會驗證您的使用者 ID，但將無法為您執行動作：",
+    "Allow this widget to verify your identity": "允許此小工具驗證您的身份",
+    "Use Ctrl + F to search": "使用 Ctrl + F 以進行搜尋",
+    "Use Command + F to search": "使用 Command + F 以進行搜尋",
+    "Converts the DM to a room": "將直接訊息轉換為聊天室",
+    "Converts the room to a DM": "將聊天室轉換為直接訊息",
+    "Use app for a better experience": "使用應用程式以取得更好的體驗",
+    "Element Web is experimental on mobile. For a better experience and the latest features, use our free native app.": "Element 網頁版在行動裝置上仍處於實驗階段。為了得到最好的體驗以及最新功能，請使用我們免費的原生應用程式。",
+    "Use app": "使用應用程式",
+    "Something went wrong in confirming your identity. Cancel and try again.": "確認您身份時出了一點問題。取消並再試一次。",
+    "Your homeserver rejected your log in attempt. This could be due to things just taking too long. Please try again. If this continues, please contact your homeserver administrator.": "您的家伺服器拒絕了您的登入嘗試。這可能只是因為花太長的時間登入了。請重試。如果此情況持續，請聯絡您的家伺服器管理員。",
+    "Your homeserver was unreachable and was not able to log you in. Please try again. If this continues, please contact your homeserver administrator.": "您的家伺服器無法存取，所以無法讓您登入。請重試。如果此情況持續，請聯絡您的家伺服器管理員。",
+    "Try again": "重試",
+    "We asked the browser to remember which homeserver you use to let you sign in, but unfortunately your browser has forgotten it. Go to the sign in page and try again.": "我們要求瀏覽器記住它讓您登入時使用的家伺服器，但不幸的是，您的瀏覽器忘了它。到登入頁面然後重試。",
+    "We couldn't log you in": "我們無法讓您登入",
+    "Show stickers button": "顯示貼圖案按鈕",
+    "Windows": "Windows",
+    "Screens": "畫面",
+    "Share your screen": "分享您的畫面",
+    "Recently visited rooms": "最近造訪過的聊天室",
+    "Show line numbers in code blocks": "在程式碼區塊中顯示行號",
+    "Expand code blocks by default": "預設展開程式碼區塊",
+    "Upgrade to pro": "升級到專業版",
+    "Minimize dialog": "最小化對話框",
+    "Maximize dialog": "最大化對話框",
+    "%(hostSignupBrand)s Setup": "%(hostSignupBrand)s 設定",
+    "You should know": "您應該知道",
+    "Privacy Policy": "隱私權政策",
+    "Cookie Policy": "Cookie 政策",
+    "Learn more in our <privacyPolicyLink />, <termsOfServiceLink /> and <cookiePolicyLink />.": "在我們的 <privacyPolicyLink />、<termsOfServiceLink /> 與 <cookiePolicyLink /> 取得更多資訊。",
+    "Continuing temporarily allows the %(hostSignupBrand)s setup process to access your account to fetch verified email addresses. This data is not stored.": "暫時繼續進行讓 %(hostSignupBrand)s 設定流程可以存取您的帳號來擷取已驗證的電子郵件地址。此資料未儲存。",
+    "Failed to connect to your homeserver. Please close this dialog and try again.": "無法連線到您的家伺服器。請關閉對話框並再試一次。",
+    "Abort": "中止",
+    "Are you sure you wish to abort creation of the host? The process cannot be continued.": "您確定您想要中止主機建立嗎？流程將無法繼續。",
+    "Confirm abort of host creation": "確認中止主機建立"
 }
diff --git a/src/integrations/IntegrationManagers.ts b/src/integrations/IntegrationManagers.ts
index 1791e92514..a29c74c5eb 100644
--- a/src/integrations/IntegrationManagers.ts
+++ b/src/integrations/IntegrationManagers.ts
@@ -120,7 +120,7 @@ export class IntegrationManagers {
             if (!data) return;
 
             const uiUrl = w.content['url'];
-            const apiUrl = data['api_url'];
+            const apiUrl = data['api_url'] as string;
             if (!apiUrl || !uiUrl) return;
 
             const manager = new IntegrationManagerInstance(
diff --git a/src/languageHandler.tsx b/src/languageHandler.tsx
index 0921b65137..b61f57d4b3 100644
--- a/src/languageHandler.tsx
+++ b/src/languageHandler.tsx
@@ -103,6 +103,8 @@ export interface IVariables {
 
 type Tags = Record<string, (sub: string) => React.ReactNode>;
 
+export type TranslatedString = string | React.ReactNode;
+
 /*
  * Translates text and optionally also replaces XML-ish elements in the text with e.g. React components
  * @param {string} text The untranslated text, e.g "click <a>here</a> now to %(foo)s".
@@ -121,7 +123,7 @@ type Tags = Record<string, (sub: string) => React.ReactNode>;
  */
 export function _t(text: string, variables?: IVariables): string;
 export function _t(text: string, variables: IVariables, tags: Tags): React.ReactNode;
-export function _t(text: string, variables?: IVariables, tags?: Tags): string | React.ReactNode {
+export function _t(text: string, variables?: IVariables, tags?: Tags): TranslatedString {
     // Don't do substitutions in counterpart. We handle it ourselves so we can replace with React components
     // However, still pass the variables to counterpart so that it can choose the correct plural if count is given
     // It is enough to pass the count variable, but in the future counterpart might make use of other information too
diff --git a/src/linkify-matrix.js b/src/linkify-matrix.js
index 77c62ce84d..1a40fde26f 100644
--- a/src/linkify-matrix.js
+++ b/src/linkify-matrix.js
@@ -183,12 +183,14 @@ const escapeRegExp = function(string) {
     return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 };
 
-// Recognise URLs from both our local vector and official vector as vector.
-// anyone else really should be using matrix.to.
-matrixLinkify.VECTOR_URL_PATTERN = "^(?:https?://)?(?:"
-    + escapeRegExp(window.location.host + window.location.pathname) + "|"
-    + "(?:www\\.)?(?:riot|vector)\\.im/(?:app|beta|staging|develop)/"
-    + ")(#.*)";
+// Recognise URLs from both our local and official Element deployments.
+// Anyone else really should be using matrix.to.
+matrixLinkify.ELEMENT_URL_PATTERN =
+    "^(?:https?://)?(?:" +
+        escapeRegExp(window.location.host + window.location.pathname) + "|" +
+        "(?:www\\.)?(?:riot|vector)\\.im/(?:app|beta|staging|develop)/|" +
+        "(?:app|beta|staging|develop)\\.element\\.io/" +
+    ")(#.*)";
 
 matrixLinkify.MATRIXTO_URL_PATTERN = "^(?:https?://)?(?:www\\.)?matrix\\.to/#/(([#@!+]).*)";
 matrixLinkify.MATRIXTO_MD_LINK_PATTERN =
@@ -253,7 +255,7 @@ matrixLinkify.options = {
     target: function(href, type) {
         if (type === 'url') {
             const transformed = tryTransformPermalinkToLocalHref(href);
-            if (transformed !== href || href.match(matrixLinkify.VECTOR_URL_PATTERN)) {
+            if (transformed !== href || href.match(matrixLinkify.ELEMENT_URL_PATTERN)) {
                 return null;
             } else {
                 return '_blank';
diff --git a/src/phonenumber.ts b/src/phonenumber.ts
index 6dd44a3c12..ea008cf2f0 100644
--- a/src/phonenumber.ts
+++ b/src/phonenumber.ts
@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import { _td } from './languageHandler';
+
 const PHONE_NUMBER_REGEXP = /^[0-9 -.]+$/;
 
 /*
@@ -43,1247 +45,1247 @@ export const getEmojiFlag = (countryCode: string) => {
 export const COUNTRIES = [
     {
         "iso2": "GB",
-        "name": "United Kingdom",
+        "name": _td("United Kingdom"),
         "prefix": "44",
     },
     {
         "iso2": "US",
-        "name": "United States",
+        "name": _td("United States"),
         "prefix": "1",
     },
     {
         "iso2": "AF",
-        "name": "Afghanistan",
+        "name": _td("Afghanistan"),
         "prefix": "93",
     },
     {
         "iso2": "AX",
-        "name": "\u00c5land Islands",
+        "name": _td("\u00c5land Islands"),
         "prefix": "358",
     },
     {
         "iso2": "AL",
-        "name": "Albania",
+        "name": _td("Albania"),
         "prefix": "355",
     },
     {
         "iso2": "DZ",
-        "name": "Algeria",
+        "name": _td("Algeria"),
         "prefix": "213",
     },
     {
         "iso2": "AS",
-        "name": "American Samoa",
+        "name": _td("American Samoa"),
         "prefix": "1",
     },
     {
         "iso2": "AD",
-        "name": "Andorra",
+        "name": _td("Andorra"),
         "prefix": "376",
     },
     {
         "iso2": "AO",
-        "name": "Angola",
+        "name": _td("Angola"),
         "prefix": "244",
     },
     {
         "iso2": "AI",
-        "name": "Anguilla",
+        "name": _td("Anguilla"),
         "prefix": "1",
     },
     {
         "iso2": "AQ",
-        "name": "Antarctica",
+        "name": _td("Antarctica"),
         "prefix": "672",
     },
     {
         "iso2": "AG",
-        "name": "Antigua & Barbuda",
+        "name": _td("Antigua & Barbuda"),
         "prefix": "1",
     },
     {
         "iso2": "AR",
-        "name": "Argentina",
+        "name": _td("Argentina"),
         "prefix": "54",
     },
     {
         "iso2": "AM",
-        "name": "Armenia",
+        "name": _td("Armenia"),
         "prefix": "374",
     },
     {
         "iso2": "AW",
-        "name": "Aruba",
+        "name": _td("Aruba"),
         "prefix": "297",
     },
     {
         "iso2": "AU",
-        "name": "Australia",
+        "name": _td("Australia"),
         "prefix": "61",
     },
     {
         "iso2": "AT",
-        "name": "Austria",
+        "name": _td("Austria"),
         "prefix": "43",
     },
     {
         "iso2": "AZ",
-        "name": "Azerbaijan",
+        "name": _td("Azerbaijan"),
         "prefix": "994",
     },
     {
         "iso2": "BS",
-        "name": "Bahamas",
+        "name": _td("Bahamas"),
         "prefix": "1",
     },
     {
         "iso2": "BH",
-        "name": "Bahrain",
+        "name": _td("Bahrain"),
         "prefix": "973",
     },
     {
         "iso2": "BD",
-        "name": "Bangladesh",
+        "name": _td("Bangladesh"),
         "prefix": "880",
     },
     {
         "iso2": "BB",
-        "name": "Barbados",
+        "name": _td("Barbados"),
         "prefix": "1",
     },
     {
         "iso2": "BY",
-        "name": "Belarus",
+        "name": _td("Belarus"),
         "prefix": "375",
     },
     {
         "iso2": "BE",
-        "name": "Belgium",
+        "name": _td("Belgium"),
         "prefix": "32",
     },
     {
         "iso2": "BZ",
-        "name": "Belize",
+        "name": _td("Belize"),
         "prefix": "501",
     },
     {
         "iso2": "BJ",
-        "name": "Benin",
+        "name": _td("Benin"),
         "prefix": "229",
     },
     {
         "iso2": "BM",
-        "name": "Bermuda",
+        "name": _td("Bermuda"),
         "prefix": "1",
     },
     {
         "iso2": "BT",
-        "name": "Bhutan",
+        "name": _td("Bhutan"),
         "prefix": "975",
     },
     {
         "iso2": "BO",
-        "name": "Bolivia",
+        "name": _td("Bolivia"),
         "prefix": "591",
     },
     {
         "iso2": "BA",
-        "name": "Bosnia",
+        "name": _td("Bosnia"),
         "prefix": "387",
     },
     {
         "iso2": "BW",
-        "name": "Botswana",
+        "name": _td("Botswana"),
         "prefix": "267",
     },
     {
         "iso2": "BV",
-        "name": "Bouvet Island",
+        "name": _td("Bouvet Island"),
         "prefix": "47",
     },
     {
         "iso2": "BR",
-        "name": "Brazil",
+        "name": _td("Brazil"),
         "prefix": "55",
     },
     {
         "iso2": "IO",
-        "name": "British Indian Ocean Territory",
+        "name": _td("British Indian Ocean Territory"),
         "prefix": "246",
     },
     {
         "iso2": "VG",
-        "name": "British Virgin Islands",
+        "name": _td("British Virgin Islands"),
         "prefix": "1",
     },
     {
         "iso2": "BN",
-        "name": "Brunei",
+        "name": _td("Brunei"),
         "prefix": "673",
     },
     {
         "iso2": "BG",
-        "name": "Bulgaria",
+        "name": _td("Bulgaria"),
         "prefix": "359",
     },
     {
         "iso2": "BF",
-        "name": "Burkina Faso",
+        "name": _td("Burkina Faso"),
         "prefix": "226",
     },
     {
         "iso2": "BI",
-        "name": "Burundi",
+        "name": _td("Burundi"),
         "prefix": "257",
     },
     {
         "iso2": "KH",
-        "name": "Cambodia",
+        "name": _td("Cambodia"),
         "prefix": "855",
     },
     {
         "iso2": "CM",
-        "name": "Cameroon",
+        "name": _td("Cameroon"),
         "prefix": "237",
     },
     {
         "iso2": "CA",
-        "name": "Canada",
+        "name": _td("Canada"),
         "prefix": "1",
     },
     {
         "iso2": "CV",
-        "name": "Cape Verde",
+        "name": _td("Cape Verde"),
         "prefix": "238",
     },
     {
         "iso2": "BQ",
-        "name": "Caribbean Netherlands",
+        "name": _td("Caribbean Netherlands"),
         "prefix": "599",
     },
     {
         "iso2": "KY",
-        "name": "Cayman Islands",
+        "name": _td("Cayman Islands"),
         "prefix": "1",
     },
     {
         "iso2": "CF",
-        "name": "Central African Republic",
+        "name": _td("Central African Republic"),
         "prefix": "236",
     },
     {
         "iso2": "TD",
-        "name": "Chad",
+        "name": _td("Chad"),
         "prefix": "235",
     },
     {
         "iso2": "CL",
-        "name": "Chile",
+        "name": _td("Chile"),
         "prefix": "56",
     },
     {
         "iso2": "CN",
-        "name": "China",
+        "name": _td("China"),
         "prefix": "86",
     },
     {
         "iso2": "CX",
-        "name": "Christmas Island",
+        "name": _td("Christmas Island"),
         "prefix": "61",
     },
     {
         "iso2": "CC",
-        "name": "Cocos (Keeling) Islands",
+        "name": _td("Cocos (Keeling) Islands"),
         "prefix": "61",
     },
     {
         "iso2": "CO",
-        "name": "Colombia",
+        "name": _td("Colombia"),
         "prefix": "57",
     },
     {
         "iso2": "KM",
-        "name": "Comoros",
+        "name": _td("Comoros"),
         "prefix": "269",
     },
     {
         "iso2": "CG",
-        "name": "Congo - Brazzaville",
+        "name": _td("Congo - Brazzaville"),
         "prefix": "242",
     },
     {
         "iso2": "CD",
-        "name": "Congo - Kinshasa",
+        "name": _td("Congo - Kinshasa"),
         "prefix": "243",
     },
     {
         "iso2": "CK",
-        "name": "Cook Islands",
+        "name": _td("Cook Islands"),
         "prefix": "682",
     },
     {
         "iso2": "CR",
-        "name": "Costa Rica",
+        "name": _td("Costa Rica"),
         "prefix": "506",
     },
     {
         "iso2": "HR",
-        "name": "Croatia",
+        "name": _td("Croatia"),
         "prefix": "385",
     },
     {
         "iso2": "CU",
-        "name": "Cuba",
+        "name": _td("Cuba"),
         "prefix": "53",
     },
     {
         "iso2": "CW",
-        "name": "Cura\u00e7ao",
+        "name": _td("Cura\u00e7ao"),
         "prefix": "599",
     },
     {
         "iso2": "CY",
-        "name": "Cyprus",
+        "name": _td("Cyprus"),
         "prefix": "357",
     },
     {
         "iso2": "CZ",
-        "name": "Czech Republic",
+        "name": _td("Czech Republic"),
         "prefix": "420",
     },
     {
         "iso2": "CI",
-        "name": "C\u00f4te d\u2019Ivoire",
+        "name": _td("C\u00f4te d\u2019Ivoire"),
         "prefix": "225",
     },
     {
         "iso2": "DK",
-        "name": "Denmark",
+        "name": _td("Denmark"),
         "prefix": "45",
     },
     {
         "iso2": "DJ",
-        "name": "Djibouti",
+        "name": _td("Djibouti"),
         "prefix": "253",
     },
     {
         "iso2": "DM",
-        "name": "Dominica",
+        "name": _td("Dominica"),
         "prefix": "1",
     },
     {
         "iso2": "DO",
-        "name": "Dominican Republic",
+        "name": _td("Dominican Republic"),
         "prefix": "1",
     },
     {
         "iso2": "EC",
-        "name": "Ecuador",
+        "name": _td("Ecuador"),
         "prefix": "593",
     },
     {
         "iso2": "EG",
-        "name": "Egypt",
+        "name": _td("Egypt"),
         "prefix": "20",
     },
     {
         "iso2": "SV",
-        "name": "El Salvador",
+        "name": _td("El Salvador"),
         "prefix": "503",
     },
     {
         "iso2": "GQ",
-        "name": "Equatorial Guinea",
+        "name": _td("Equatorial Guinea"),
         "prefix": "240",
     },
     {
         "iso2": "ER",
-        "name": "Eritrea",
+        "name": _td("Eritrea"),
         "prefix": "291",
     },
     {
         "iso2": "EE",
-        "name": "Estonia",
+        "name": _td("Estonia"),
         "prefix": "372",
     },
     {
         "iso2": "ET",
-        "name": "Ethiopia",
+        "name": _td("Ethiopia"),
         "prefix": "251",
     },
     {
         "iso2": "FK",
-        "name": "Falkland Islands",
+        "name": _td("Falkland Islands"),
         "prefix": "500",
     },
     {
         "iso2": "FO",
-        "name": "Faroe Islands",
+        "name": _td("Faroe Islands"),
         "prefix": "298",
     },
     {
         "iso2": "FJ",
-        "name": "Fiji",
+        "name": _td("Fiji"),
         "prefix": "679",
     },
     {
         "iso2": "FI",
-        "name": "Finland",
+        "name": _td("Finland"),
         "prefix": "358",
     },
     {
         "iso2": "FR",
-        "name": "France",
+        "name": _td("France"),
         "prefix": "33",
     },
     {
         "iso2": "GF",
-        "name": "French Guiana",
+        "name": _td("French Guiana"),
         "prefix": "594",
     },
     {
         "iso2": "PF",
-        "name": "French Polynesia",
+        "name": _td("French Polynesia"),
         "prefix": "689",
     },
     {
         "iso2": "TF",
-        "name": "French Southern Territories",
+        "name": _td("French Southern Territories"),
         "prefix": "262",
     },
     {
         "iso2": "GA",
-        "name": "Gabon",
+        "name": _td("Gabon"),
         "prefix": "241",
     },
     {
         "iso2": "GM",
-        "name": "Gambia",
+        "name": _td("Gambia"),
         "prefix": "220",
     },
     {
         "iso2": "GE",
-        "name": "Georgia",
+        "name": _td("Georgia"),
         "prefix": "995",
     },
     {
         "iso2": "DE",
-        "name": "Germany",
+        "name": _td("Germany"),
         "prefix": "49",
     },
     {
         "iso2": "GH",
-        "name": "Ghana",
+        "name": _td("Ghana"),
         "prefix": "233",
     },
     {
         "iso2": "GI",
-        "name": "Gibraltar",
+        "name": _td("Gibraltar"),
         "prefix": "350",
     },
     {
         "iso2": "GR",
-        "name": "Greece",
+        "name": _td("Greece"),
         "prefix": "30",
     },
     {
         "iso2": "GL",
-        "name": "Greenland",
+        "name": _td("Greenland"),
         "prefix": "299",
     },
     {
         "iso2": "GD",
-        "name": "Grenada",
+        "name": _td("Grenada"),
         "prefix": "1",
     },
     {
         "iso2": "GP",
-        "name": "Guadeloupe",
+        "name": _td("Guadeloupe"),
         "prefix": "590",
     },
     {
         "iso2": "GU",
-        "name": "Guam",
+        "name": _td("Guam"),
         "prefix": "1",
     },
     {
         "iso2": "GT",
-        "name": "Guatemala",
+        "name": _td("Guatemala"),
         "prefix": "502",
     },
     {
         "iso2": "GG",
-        "name": "Guernsey",
+        "name": _td("Guernsey"),
         "prefix": "44",
     },
     {
         "iso2": "GN",
-        "name": "Guinea",
+        "name": _td("Guinea"),
         "prefix": "224",
     },
     {
         "iso2": "GW",
-        "name": "Guinea-Bissau",
+        "name": _td("Guinea-Bissau"),
         "prefix": "245",
     },
     {
         "iso2": "GY",
-        "name": "Guyana",
+        "name": _td("Guyana"),
         "prefix": "592",
     },
     {
         "iso2": "HT",
-        "name": "Haiti",
+        "name": _td("Haiti"),
         "prefix": "509",
     },
     {
         "iso2": "HM",
-        "name": "Heard & McDonald Islands",
+        "name": _td("Heard & McDonald Islands"),
         "prefix": "672",
     },
     {
         "iso2": "HN",
-        "name": "Honduras",
+        "name": _td("Honduras"),
         "prefix": "504",
     },
     {
         "iso2": "HK",
-        "name": "Hong Kong",
+        "name": _td("Hong Kong"),
         "prefix": "852",
     },
     {
         "iso2": "HU",
-        "name": "Hungary",
+        "name": _td("Hungary"),
         "prefix": "36",
     },
     {
         "iso2": "IS",
-        "name": "Iceland",
+        "name": _td("Iceland"),
         "prefix": "354",
     },
     {
         "iso2": "IN",
-        "name": "India",
+        "name": _td("India"),
         "prefix": "91",
     },
     {
         "iso2": "ID",
-        "name": "Indonesia",
+        "name": _td("Indonesia"),
         "prefix": "62",
     },
     {
         "iso2": "IR",
-        "name": "Iran",
+        "name": _td("Iran"),
         "prefix": "98",
     },
     {
         "iso2": "IQ",
-        "name": "Iraq",
+        "name": _td("Iraq"),
         "prefix": "964",
     },
     {
         "iso2": "IE",
-        "name": "Ireland",
+        "name": _td("Ireland"),
         "prefix": "353",
     },
     {
         "iso2": "IM",
-        "name": "Isle of Man",
+        "name": _td("Isle of Man"),
         "prefix": "44",
     },
     {
         "iso2": "IL",
-        "name": "Israel",
+        "name": _td("Israel"),
         "prefix": "972",
     },
     {
         "iso2": "IT",
-        "name": "Italy",
+        "name": _td("Italy"),
         "prefix": "39",
     },
     {
         "iso2": "JM",
-        "name": "Jamaica",
+        "name": _td("Jamaica"),
         "prefix": "1",
     },
     {
         "iso2": "JP",
-        "name": "Japan",
+        "name": _td("Japan"),
         "prefix": "81",
     },
     {
         "iso2": "JE",
-        "name": "Jersey",
+        "name": _td("Jersey"),
         "prefix": "44",
     },
     {
         "iso2": "JO",
-        "name": "Jordan",
+        "name": _td("Jordan"),
         "prefix": "962",
     },
     {
         "iso2": "KZ",
-        "name": "Kazakhstan",
+        "name": _td("Kazakhstan"),
         "prefix": "7",
     },
     {
         "iso2": "KE",
-        "name": "Kenya",
+        "name": _td("Kenya"),
         "prefix": "254",
     },
     {
         "iso2": "KI",
-        "name": "Kiribati",
+        "name": _td("Kiribati"),
         "prefix": "686",
     },
     {
         "iso2": "XK",
-        "name": "Kosovo",
+        "name": _td("Kosovo"),
         "prefix": "383",
     },
     {
         "iso2": "KW",
-        "name": "Kuwait",
+        "name": _td("Kuwait"),
         "prefix": "965",
     },
     {
         "iso2": "KG",
-        "name": "Kyrgyzstan",
+        "name": _td("Kyrgyzstan"),
         "prefix": "996",
     },
     {
         "iso2": "LA",
-        "name": "Laos",
+        "name": _td("Laos"),
         "prefix": "856",
     },
     {
         "iso2": "LV",
-        "name": "Latvia",
+        "name": _td("Latvia"),
         "prefix": "371",
     },
     {
         "iso2": "LB",
-        "name": "Lebanon",
+        "name": _td("Lebanon"),
         "prefix": "961",
     },
     {
         "iso2": "LS",
-        "name": "Lesotho",
+        "name": _td("Lesotho"),
         "prefix": "266",
     },
     {
         "iso2": "LR",
-        "name": "Liberia",
+        "name": _td("Liberia"),
         "prefix": "231",
     },
     {
         "iso2": "LY",
-        "name": "Libya",
+        "name": _td("Libya"),
         "prefix": "218",
     },
     {
         "iso2": "LI",
-        "name": "Liechtenstein",
+        "name": _td("Liechtenstein"),
         "prefix": "423",
     },
     {
         "iso2": "LT",
-        "name": "Lithuania",
+        "name": _td("Lithuania"),
         "prefix": "370",
     },
     {
         "iso2": "LU",
-        "name": "Luxembourg",
+        "name": _td("Luxembourg"),
         "prefix": "352",
     },
     {
         "iso2": "MO",
-        "name": "Macau",
+        "name": _td("Macau"),
         "prefix": "853",
     },
     {
         "iso2": "MK",
-        "name": "Macedonia",
+        "name": _td("Macedonia"),
         "prefix": "389",
     },
     {
         "iso2": "MG",
-        "name": "Madagascar",
+        "name": _td("Madagascar"),
         "prefix": "261",
     },
     {
         "iso2": "MW",
-        "name": "Malawi",
+        "name": _td("Malawi"),
         "prefix": "265",
     },
     {
         "iso2": "MY",
-        "name": "Malaysia",
+        "name": _td("Malaysia"),
         "prefix": "60",
     },
     {
         "iso2": "MV",
-        "name": "Maldives",
+        "name": _td("Maldives"),
         "prefix": "960",
     },
     {
         "iso2": "ML",
-        "name": "Mali",
+        "name": _td("Mali"),
         "prefix": "223",
     },
     {
         "iso2": "MT",
-        "name": "Malta",
+        "name": _td("Malta"),
         "prefix": "356",
     },
     {
         "iso2": "MH",
-        "name": "Marshall Islands",
+        "name": _td("Marshall Islands"),
         "prefix": "692",
     },
     {
         "iso2": "MQ",
-        "name": "Martinique",
+        "name": _td("Martinique"),
         "prefix": "596",
     },
     {
         "iso2": "MR",
-        "name": "Mauritania",
+        "name": _td("Mauritania"),
         "prefix": "222",
     },
     {
         "iso2": "MU",
-        "name": "Mauritius",
+        "name": _td("Mauritius"),
         "prefix": "230",
     },
     {
         "iso2": "YT",
-        "name": "Mayotte",
+        "name": _td("Mayotte"),
         "prefix": "262",
     },
     {
         "iso2": "MX",
-        "name": "Mexico",
+        "name": _td("Mexico"),
         "prefix": "52",
     },
     {
         "iso2": "FM",
-        "name": "Micronesia",
+        "name": _td("Micronesia"),
         "prefix": "691",
     },
     {
         "iso2": "MD",
-        "name": "Moldova",
+        "name": _td("Moldova"),
         "prefix": "373",
     },
     {
         "iso2": "MC",
-        "name": "Monaco",
+        "name": _td("Monaco"),
         "prefix": "377",
     },
     {
         "iso2": "MN",
-        "name": "Mongolia",
+        "name": _td("Mongolia"),
         "prefix": "976",
     },
     {
         "iso2": "ME",
-        "name": "Montenegro",
+        "name": _td("Montenegro"),
         "prefix": "382",
     },
     {
         "iso2": "MS",
-        "name": "Montserrat",
+        "name": _td("Montserrat"),
         "prefix": "1",
     },
     {
         "iso2": "MA",
-        "name": "Morocco",
+        "name": _td("Morocco"),
         "prefix": "212",
     },
     {
         "iso2": "MZ",
-        "name": "Mozambique",
+        "name": _td("Mozambique"),
         "prefix": "258",
     },
     {
         "iso2": "MM",
-        "name": "Myanmar",
+        "name": _td("Myanmar"),
         "prefix": "95",
     },
     {
         "iso2": "NA",
-        "name": "Namibia",
+        "name": _td("Namibia"),
         "prefix": "264",
     },
     {
         "iso2": "NR",
-        "name": "Nauru",
+        "name": _td("Nauru"),
         "prefix": "674",
     },
     {
         "iso2": "NP",
-        "name": "Nepal",
+        "name": _td("Nepal"),
         "prefix": "977",
     },
     {
         "iso2": "NL",
-        "name": "Netherlands",
+        "name": _td("Netherlands"),
         "prefix": "31",
     },
     {
         "iso2": "NC",
-        "name": "New Caledonia",
+        "name": _td("New Caledonia"),
         "prefix": "687",
     },
     {
         "iso2": "NZ",
-        "name": "New Zealand",
+        "name": _td("New Zealand"),
         "prefix": "64",
     },
     {
         "iso2": "NI",
-        "name": "Nicaragua",
+        "name": _td("Nicaragua"),
         "prefix": "505",
     },
     {
         "iso2": "NE",
-        "name": "Niger",
+        "name": _td("Niger"),
         "prefix": "227",
     },
     {
         "iso2": "NG",
-        "name": "Nigeria",
+        "name": _td("Nigeria"),
         "prefix": "234",
     },
     {
         "iso2": "NU",
-        "name": "Niue",
+        "name": _td("Niue"),
         "prefix": "683",
     },
     {
         "iso2": "NF",
-        "name": "Norfolk Island",
+        "name": _td("Norfolk Island"),
         "prefix": "672",
     },
     {
         "iso2": "KP",
-        "name": "North Korea",
+        "name": _td("North Korea"),
         "prefix": "850",
     },
     {
         "iso2": "MP",
-        "name": "Northern Mariana Islands",
+        "name": _td("Northern Mariana Islands"),
         "prefix": "1",
     },
     {
         "iso2": "NO",
-        "name": "Norway",
+        "name": _td("Norway"),
         "prefix": "47",
     },
     {
         "iso2": "OM",
-        "name": "Oman",
+        "name": _td("Oman"),
         "prefix": "968",
     },
     {
         "iso2": "PK",
-        "name": "Pakistan",
+        "name": _td("Pakistan"),
         "prefix": "92",
     },
     {
         "iso2": "PW",
-        "name": "Palau",
+        "name": _td("Palau"),
         "prefix": "680",
     },
     {
         "iso2": "PS",
-        "name": "Palestine",
+        "name": _td("Palestine"),
         "prefix": "970",
     },
     {
         "iso2": "PA",
-        "name": "Panama",
+        "name": _td("Panama"),
         "prefix": "507",
     },
     {
         "iso2": "PG",
-        "name": "Papua New Guinea",
+        "name": _td("Papua New Guinea"),
         "prefix": "675",
     },
     {
         "iso2": "PY",
-        "name": "Paraguay",
+        "name": _td("Paraguay"),
         "prefix": "595",
     },
     {
         "iso2": "PE",
-        "name": "Peru",
+        "name": _td("Peru"),
         "prefix": "51",
     },
     {
         "iso2": "PH",
-        "name": "Philippines",
+        "name": _td("Philippines"),
         "prefix": "63",
     },
     {
         "iso2": "PN",
-        "name": "Pitcairn Islands",
+        "name": _td("Pitcairn Islands"),
         "prefix": "870",
     },
     {
         "iso2": "PL",
-        "name": "Poland",
+        "name": _td("Poland"),
         "prefix": "48",
     },
     {
         "iso2": "PT",
-        "name": "Portugal",
+        "name": _td("Portugal"),
         "prefix": "351",
     },
     {
         "iso2": "PR",
-        "name": "Puerto Rico",
+        "name": _td("Puerto Rico"),
         "prefix": "1",
     },
     {
         "iso2": "QA",
-        "name": "Qatar",
+        "name": _td("Qatar"),
         "prefix": "974",
     },
     {
         "iso2": "RO",
-        "name": "Romania",
+        "name": _td("Romania"),
         "prefix": "40",
     },
     {
         "iso2": "RU",
-        "name": "Russia",
+        "name": _td("Russia"),
         "prefix": "7",
     },
     {
         "iso2": "RW",
-        "name": "Rwanda",
+        "name": _td("Rwanda"),
         "prefix": "250",
     },
     {
         "iso2": "RE",
-        "name": "R\u00e9union",
+        "name": _td("R\u00e9union"),
         "prefix": "262",
     },
     {
         "iso2": "WS",
-        "name": "Samoa",
+        "name": _td("Samoa"),
         "prefix": "685",
     },
     {
         "iso2": "SM",
-        "name": "San Marino",
+        "name": _td("San Marino"),
         "prefix": "378",
     },
     {
         "iso2": "SA",
-        "name": "Saudi Arabia",
+        "name": _td("Saudi Arabia"),
         "prefix": "966",
     },
     {
         "iso2": "SN",
-        "name": "Senegal",
+        "name": _td("Senegal"),
         "prefix": "221",
     },
     {
         "iso2": "RS",
-        "name": "Serbia",
+        "name": _td("Serbia"),
         "prefix": "381 p",
     },
     {
         "iso2": "SC",
-        "name": "Seychelles",
+        "name": _td("Seychelles"),
         "prefix": "248",
     },
     {
         "iso2": "SL",
-        "name": "Sierra Leone",
+        "name": _td("Sierra Leone"),
         "prefix": "232",
     },
     {
         "iso2": "SG",
-        "name": "Singapore",
+        "name": _td("Singapore"),
         "prefix": "65",
     },
     {
         "iso2": "SX",
-        "name": "Sint Maarten",
+        "name": _td("Sint Maarten"),
         "prefix": "1",
     },
     {
         "iso2": "SK",
-        "name": "Slovakia",
+        "name": _td("Slovakia"),
         "prefix": "421",
     },
     {
         "iso2": "SI",
-        "name": "Slovenia",
+        "name": _td("Slovenia"),
         "prefix": "386",
     },
     {
         "iso2": "SB",
-        "name": "Solomon Islands",
+        "name": _td("Solomon Islands"),
         "prefix": "677",
     },
     {
         "iso2": "SO",
-        "name": "Somalia",
+        "name": _td("Somalia"),
         "prefix": "252",
     },
     {
         "iso2": "ZA",
-        "name": "South Africa",
+        "name": _td("South Africa"),
         "prefix": "27",
     },
     {
         "iso2": "GS",
-        "name": "South Georgia & South Sandwich Islands",
+        "name": _td("South Georgia & South Sandwich Islands"),
         "prefix": "500",
     },
     {
         "iso2": "KR",
-        "name": "South Korea",
+        "name": _td("South Korea"),
         "prefix": "82",
     },
     {
         "iso2": "SS",
-        "name": "South Sudan",
+        "name": _td("South Sudan"),
         "prefix": "211",
     },
     {
         "iso2": "ES",
-        "name": "Spain",
+        "name": _td("Spain"),
         "prefix": "34",
     },
     {
         "iso2": "LK",
-        "name": "Sri Lanka",
+        "name": _td("Sri Lanka"),
         "prefix": "94",
     },
     {
         "iso2": "BL",
-        "name": "St. Barth\u00e9lemy",
+        "name": _td("St. Barth\u00e9lemy"),
         "prefix": "590",
     },
     {
         "iso2": "SH",
-        "name": "St. Helena",
+        "name": _td("St. Helena"),
         "prefix": "290 n",
     },
     {
         "iso2": "KN",
-        "name": "St. Kitts & Nevis",
+        "name": _td("St. Kitts & Nevis"),
         "prefix": "1",
     },
     {
         "iso2": "LC",
-        "name": "St. Lucia",
+        "name": _td("St. Lucia"),
         "prefix": "1",
     },
     {
         "iso2": "MF",
-        "name": "St. Martin",
+        "name": _td("St. Martin"),
         "prefix": "590",
     },
     {
         "iso2": "PM",
-        "name": "St. Pierre & Miquelon",
+        "name": _td("St. Pierre & Miquelon"),
         "prefix": "508",
     },
     {
         "iso2": "VC",
-        "name": "St. Vincent & Grenadines",
+        "name": _td("St. Vincent & Grenadines"),
         "prefix": "1",
     },
     {
         "iso2": "SD",
-        "name": "Sudan",
+        "name": _td("Sudan"),
         "prefix": "249",
     },
     {
         "iso2": "SR",
-        "name": "Suriname",
+        "name": _td("Suriname"),
         "prefix": "597",
     },
     {
         "iso2": "SJ",
-        "name": "Svalbard & Jan Mayen",
+        "name": _td("Svalbard & Jan Mayen"),
         "prefix": "47",
     },
     {
         "iso2": "SZ",
-        "name": "Swaziland",
+        "name": _td("Swaziland"),
         "prefix": "268",
     },
     {
         "iso2": "SE",
-        "name": "Sweden",
+        "name": _td("Sweden"),
         "prefix": "46",
     },
     {
         "iso2": "CH",
-        "name": "Switzerland",
+        "name": _td("Switzerland"),
         "prefix": "41",
     },
     {
         "iso2": "SY",
-        "name": "Syria",
+        "name": _td("Syria"),
         "prefix": "963",
     },
     {
         "iso2": "ST",
-        "name": "S\u00e3o Tom\u00e9 & Pr\u00edncipe",
+        "name": _td("S\u00e3o Tom\u00e9 & Pr\u00edncipe"),
         "prefix": "239",
     },
     {
         "iso2": "TW",
-        "name": "Taiwan",
+        "name": _td("Taiwan"),
         "prefix": "886",
     },
     {
         "iso2": "TJ",
-        "name": "Tajikistan",
+        "name": _td("Tajikistan"),
         "prefix": "992",
     },
     {
         "iso2": "TZ",
-        "name": "Tanzania",
+        "name": _td("Tanzania"),
         "prefix": "255",
     },
     {
         "iso2": "TH",
-        "name": "Thailand",
+        "name": _td("Thailand"),
         "prefix": "66",
     },
     {
         "iso2": "TL",
-        "name": "Timor-Leste",
+        "name": _td("Timor-Leste"),
         "prefix": "670",
     },
     {
         "iso2": "TG",
-        "name": "Togo",
+        "name": _td("Togo"),
         "prefix": "228",
     },
     {
         "iso2": "TK",
-        "name": "Tokelau",
+        "name": _td("Tokelau"),
         "prefix": "690",
     },
     {
         "iso2": "TO",
-        "name": "Tonga",
+        "name": _td("Tonga"),
         "prefix": "676",
     },
     {
         "iso2": "TT",
-        "name": "Trinidad & Tobago",
+        "name": _td("Trinidad & Tobago"),
         "prefix": "1",
     },
     {
         "iso2": "TN",
-        "name": "Tunisia",
+        "name": _td("Tunisia"),
         "prefix": "216",
     },
     {
         "iso2": "TR",
-        "name": "Turkey",
+        "name": _td("Turkey"),
         "prefix": "90",
     },
     {
         "iso2": "TM",
-        "name": "Turkmenistan",
+        "name": _td("Turkmenistan"),
         "prefix": "993",
     },
     {
         "iso2": "TC",
-        "name": "Turks & Caicos Islands",
+        "name": _td("Turks & Caicos Islands"),
         "prefix": "1",
     },
     {
         "iso2": "TV",
-        "name": "Tuvalu",
+        "name": _td("Tuvalu"),
         "prefix": "688",
     },
     {
         "iso2": "VI",
-        "name": "U.S. Virgin Islands",
+        "name": _td("U.S. Virgin Islands"),
         "prefix": "1",
     },
     {
         "iso2": "UG",
-        "name": "Uganda",
+        "name": _td("Uganda"),
         "prefix": "256",
     },
     {
         "iso2": "UA",
-        "name": "Ukraine",
+        "name": _td("Ukraine"),
         "prefix": "380",
     },
     {
         "iso2": "AE",
-        "name": "United Arab Emirates",
+        "name": _td("United Arab Emirates"),
         "prefix": "971",
     },
     {
         "iso2": "UY",
-        "name": "Uruguay",
+        "name": _td("Uruguay"),
         "prefix": "598",
     },
     {
         "iso2": "UZ",
-        "name": "Uzbekistan",
+        "name": _td("Uzbekistan"),
         "prefix": "998",
     },
     {
         "iso2": "VU",
-        "name": "Vanuatu",
+        "name": _td("Vanuatu"),
         "prefix": "678",
     },
     {
         "iso2": "VA",
-        "name": "Vatican City",
+        "name": _td("Vatican City"),
         "prefix": "39",
     },
     {
         "iso2": "VE",
-        "name": "Venezuela",
+        "name": _td("Venezuela"),
         "prefix": "58",
     },
     {
         "iso2": "VN",
-        "name": "Vietnam",
+        "name": _td("Vietnam"),
         "prefix": "84",
     },
     {
         "iso2": "WF",
-        "name": "Wallis & Futuna",
+        "name": _td("Wallis & Futuna"),
         "prefix": "681",
     },
     {
         "iso2": "EH",
-        "name": "Western Sahara",
+        "name": _td("Western Sahara"),
         "prefix": "212",
     },
     {
         "iso2": "YE",
-        "name": "Yemen",
+        "name": _td("Yemen"),
         "prefix": "967",
     },
     {
         "iso2": "ZM",
-        "name": "Zambia",
+        "name": _td("Zambia"),
         "prefix": "260",
     },
     {
         "iso2": "ZW",
-        "name": "Zimbabwe",
+        "name": _td("Zimbabwe"),
         "prefix": "263",
     },
 ];
diff --git a/src/rageshake/rageshake.js b/src/rageshake/rageshake.js
index 59ed5fa8b7..8eb77bb3ae 100644
--- a/src/rageshake/rageshake.js
+++ b/src/rageshake/rageshake.js
@@ -371,7 +371,6 @@ class IndexedDBLogStore {
                 removeLogIds = allLogIds.slice(i + 1);
                 break;
             }
-
         }
         if (removeLogIds.length > 0) {
             console.log("Removing logs: ", removeLogIds);
@@ -469,7 +468,7 @@ export function flush() {
 
 /**
  * Clean up old logs.
- * @return Promise Resolves if cleaned logs.
+ * @return {Promise} Resolves if cleaned logs.
  */
 export async function cleanup() {
     if (!global.mx_rage_store) {
diff --git a/src/rageshake/submit-rageshake.ts b/src/rageshake/submit-rageshake.ts
index d361f6b0dd..29856b1a86 100644
--- a/src/rageshake/submit-rageshake.ts
+++ b/src/rageshake/submit-rageshake.ts
@@ -235,7 +235,7 @@ export async function downloadBugReport(opts: IOpts = {}) {
     let i = 0;
     for (const [key, value] of body.entries()) {
         if (key === 'compressed-log') {
-            await new Promise((resolve => {
+            await new Promise<void>((resolve => {
                 const reader = new FileReader();
                 reader.addEventListener('loadend', ev => {
                     tape.append(`log-${i++}.log`, new TextDecoder().decode(ev.target.result as ArrayBuffer));
@@ -269,7 +269,7 @@ function uint8ToString(buf: Buffer) {
 }
 
 function _submitReport(endpoint: string, body: FormData, progressCallback: (string) => void) {
-    return new Promise((resolve, reject) => {
+    return new Promise<void>((resolve, reject) => {
         const req = new XMLHttpRequest();
         req.open("POST", endpoint);
         req.timeout = 5 * 60 * 1000;
diff --git a/src/resizer/distributors/collapse.js b/src/resizer/distributors/collapse.ts
similarity index 58%
rename from src/resizer/distributors/collapse.js
rename to src/resizer/distributors/collapse.ts
index 784532a0eb..f8db0be52c 100644
--- a/src/resizer/distributors/collapse.js
+++ b/src/resizer/distributors/collapse.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 New Vector Ltd
+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.
@@ -16,28 +16,44 @@ limitations under the License.
 
 import FixedDistributor from "./fixed";
 import ResizeItem from "../item";
+import Resizer, {IConfig} from "../resizer";
+import Sizer from "../sizer";
 
-class CollapseItem extends ResizeItem {
-    notifyCollapsed(collapsed) {
+export interface ICollapseConfig extends IConfig {
+    toggleSize: number;
+    onCollapsed?(collapsed: boolean, id: string, element: HTMLElement): void;
+    isItemCollapsed(element: HTMLElement): boolean;
+}
+
+class CollapseItem extends ResizeItem<ICollapseConfig> {
+    notifyCollapsed(collapsed: boolean) {
         const callback = this.resizer.config.onCollapsed;
         if (callback) {
             callback(collapsed, this.id, this.domNode);
         }
     }
+
+    get isCollapsed() {
+        const isItemCollapsed = this.resizer.config.isItemCollapsed;
+        return isItemCollapsed(this.domNode);
+    }
 }
 
-export default class CollapseDistributor extends FixedDistributor {
-    static createItem(resizeHandle, resizer, sizer) {
+export default class CollapseDistributor extends FixedDistributor<ICollapseConfig, CollapseItem> {
+    static createItem(resizeHandle: HTMLDivElement, resizer: Resizer<ICollapseConfig>, sizer: Sizer) {
         return new CollapseItem(resizeHandle, resizer, sizer);
     }
 
-    constructor(item, config) {
+    private readonly toggleSize: number;
+    private isCollapsed: boolean;
+
+    constructor(item: CollapseItem) {
         super(item);
-        this.toggleSize = config && config.toggleSize;
-        this.isCollapsed = false;
+        this.toggleSize = item.resizer?.config?.toggleSize;
+        this.isCollapsed = item.isCollapsed;
     }
 
-    resize(newSize) {
+    public resize(newSize: number) {
         const isCollapsedSize = newSize < this.toggleSize;
         if (isCollapsedSize && !this.isCollapsed) {
             this.isCollapsed = true;
diff --git a/src/resizer/distributors/fixed.js b/src/resizer/distributors/fixed.ts
similarity index 60%
rename from src/resizer/distributors/fixed.js
rename to src/resizer/distributors/fixed.ts
index e93c6fbcee..64f1c5015b 100644
--- a/src/resizer/distributors/fixed.js
+++ b/src/resizer/distributors/fixed.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 New Vector Ltd
+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.
@@ -16,6 +16,7 @@ limitations under the License.
 
 import ResizeItem from "../item";
 import Sizer from "../sizer";
+import Resizer, {IConfig} from "../resizer";
 
 /**
 distributors translate a moving cursor into
@@ -27,29 +28,42 @@ they have two methods:
         within the container bounding box. For internal use.
         This method usually ends up calling `resize` once the start offset is subtracted.
 */
-export default class FixedDistributor {
-    static createItem(resizeHandle, resizer, sizer) {
+export default class FixedDistributor<C extends IConfig, I extends ResizeItem<any> = ResizeItem<C>> {
+    static createItem(resizeHandle: HTMLDivElement, resizer: Resizer, sizer: Sizer): ResizeItem {
         return new ResizeItem(resizeHandle, resizer, sizer);
     }
 
-    static createSizer(containerElement, vertical, reverse) {
+    static createSizer(containerElement: HTMLElement, vertical: boolean, reverse: boolean): Sizer {
         return new Sizer(containerElement, vertical, reverse);
     }
 
-    constructor(item) {
-        this.item = item;
+    private readonly beforeOffset: number;
+
+    constructor(public readonly item: I) {
         this.beforeOffset = item.offset();
     }
 
-    resize(size) {
+    public get size() {
+        return this.item.getSize();
+    }
+
+    public set size(size: string) {
+        this.item.setRawSize(size);
+    }
+
+    public resize(size: number) {
         this.item.setSize(size);
     }
 
-    resizeFromContainerOffset(offset) {
+    public resizeFromContainerOffset(offset: number) {
         this.resize(offset - this.beforeOffset);
     }
 
-    start() {}
+    public start() {
+        this.item.start();
+    }
 
-    finish() {}
+    public finish() {
+        this.item.finish();
+    }
 }
diff --git a/src/resizer/distributors/percentage.ts b/src/resizer/distributors/percentage.ts
new file mode 100644
index 0000000000..e9b1425414
--- /dev/null
+++ b/src/resizer/distributors/percentage.ts
@@ -0,0 +1,49 @@
+/*
+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 Sizer from "../sizer";
+import FixedDistributor from "./fixed";
+import {IConfig} from "../resizer";
+
+class PercentageSizer extends Sizer {
+    public start(item: HTMLElement) {
+        if (this.vertical) {
+            item.style.minHeight = null;
+        } else {
+            item.style.minWidth = null;
+        }
+    }
+
+    public finish(item: HTMLElement) {
+        const parent = item.offsetParent as HTMLElement;
+        if (!parent) return;
+        if (this.vertical) {
+            const p = ((item.offsetHeight / parent.offsetHeight) * 100).toFixed(2) + "%";
+            item.style.minHeight = p;
+            item.style.height = p;
+        } else {
+            const p = ((item.offsetWidth / parent.offsetWidth) * 100).toFixed(2) + "%";
+            item.style.minWidth = p;
+            item.style.width = p;
+        }
+    }
+}
+
+export default class PercentageDistributor extends FixedDistributor<IConfig> {
+    static createSizer(containerElement: HTMLElement, vertical: boolean, reverse: boolean) {
+        return new PercentageSizer(containerElement, vertical, reverse);
+    }
+}
diff --git a/src/resizer/index.ts b/src/resizer/index.ts
new file mode 100644
index 0000000000..9199fc2657
--- /dev/null
+++ b/src/resizer/index.ts
@@ -0,0 +1,20 @@
+/*
+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.
+*/
+
+export {default as FixedDistributor} from "./distributors/fixed";
+export {default as PercentageDistributor} from "./distributors/percentage";
+export {default as CollapseDistributor} from "./distributors/collapse";
+export {default as Resizer} from "./resizer";
diff --git a/src/resizer/item.js b/src/resizer/item.js
deleted file mode 100644
index 2e06ad217c..0000000000
--- a/src/resizer/item.js
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-Copyright 2019 New Vector 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.
-*/
-
-export default class ResizeItem {
-    constructor(handle, resizer, sizer) {
-        const id = handle.getAttribute("data-id");
-        const reverse = resizer.isReverseResizeHandle(handle);
-        const domNode = reverse ? handle.nextElementSibling : handle.previousElementSibling;
-
-        this.domNode = domNode;
-        this.id = id;
-        this.reverse = reverse;
-        this.resizer = resizer;
-        this.sizer = sizer;
-    }
-
-    _copyWith(handle, resizer, sizer) {
-        const Ctor = this.constructor;
-        return new Ctor(handle, resizer, sizer);
-    }
-
-    _advance(forwards) {
-        // opposite direction from fromResizeHandle to get back to handle
-        let handle = this.reverse ?
-            this.domNode.previousElementSibling :
-            this.domNode.nextElementSibling;
-        const moveNext = forwards !== this.reverse; // xor
-        // iterate at least once to avoid infinite loop
-        do {
-            if (moveNext) {
-                handle = handle.nextElementSibling;
-            } else {
-                handle = handle.previousElementSibling;
-            }
-        } while (handle && !this.resizer.isResizeHandle(handle));
-
-        if (handle) {
-            const nextHandle = this._copyWith(handle, this.resizer, this.sizer);
-            nextHandle.reverse = this.reverse;
-            return nextHandle;
-        }
-    }
-
-    next() {
-        return this._advance(true);
-    }
-
-    previous() {
-        return this._advance(false);
-    }
-
-    size() {
-        return this.sizer.getItemSize(this.domNode);
-    }
-
-    offset() {
-        return this.sizer.getItemOffset(this.domNode);
-    }
-
-    setSize(size) {
-        this.sizer.setItemSize(this.domNode, size);
-        const callback = this.resizer.config.onResized;
-        if (callback) {
-            callback(size, this.id, this.domNode);
-        }
-    }
-
-    clearSize() {
-        this.sizer.clearItemSize(this.domNode);
-        const callback = this.resizer.config.onResized;
-        if (callback) {
-            callback(null, this.id, this.domNode);
-        }
-    }
-
-
-    first() {
-        const firstHandle = Array.from(this.domNode.parentElement.children).find(el => {
-            return this.resizer.isResizeHandle(el);
-        });
-        if (firstHandle) {
-            return this._copyWith(firstHandle, this.resizer, this.sizer);
-        }
-    }
-
-    last() {
-        const lastHandle = Array.from(this.domNode.parentElement.children).reverse().find(el => {
-            return this.resizer.isResizeHandle(el);
-        });
-        if (lastHandle) {
-            return this._copyWith(lastHandle, this.resizer, this.sizer);
-        }
-    }
-}
diff --git a/src/resizer/item.ts b/src/resizer/item.ts
new file mode 100644
index 0000000000..3be290f15e
--- /dev/null
+++ b/src/resizer/item.ts
@@ -0,0 +1,125 @@
+/*
+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.
+*/
+
+import Resizer, {IConfig} from "./resizer";
+import Sizer from "./sizer";
+
+export default class ResizeItem<C extends IConfig = IConfig> {
+    public readonly domNode: HTMLElement;
+    protected readonly id: string;
+    protected reverse: boolean;
+
+    constructor(
+        handle: HTMLElement,
+        public readonly resizer: Resizer<C>,
+        public readonly sizer: Sizer,
+    ) {
+        this.reverse = resizer.isReverseResizeHandle(handle);
+        this.domNode = <HTMLElement>(this.reverse ? handle.nextElementSibling : handle.previousElementSibling);
+        this.id = handle.getAttribute("data-id");
+    }
+
+    private copyWith(handle: HTMLElement, resizer: Resizer, sizer: Sizer) {
+        const Ctor = this.constructor as typeof ResizeItem;
+        return new Ctor(handle, resizer, sizer);
+    }
+
+    private advance(forwards: boolean) {
+        // opposite direction from fromResizeHandle to get back to handle
+        let handle = this.reverse ? this.domNode.previousElementSibling : this.domNode.nextElementSibling;
+        const moveNext = forwards !== this.reverse; // xor
+        // iterate at least once to avoid infinite loop
+        do {
+            if (moveNext) {
+                handle = handle.nextElementSibling;
+            } else {
+                handle = handle.previousElementSibling;
+            }
+        } while (handle && !this.resizer.isResizeHandle(<HTMLElement>handle));
+
+        if (handle) {
+            const nextHandle = this.copyWith(<HTMLElement>handle, this.resizer, this.sizer);
+            nextHandle.reverse = this.reverse;
+            return nextHandle;
+        }
+    }
+
+    public next() {
+        return this.advance(true);
+    }
+
+    public previous() {
+        return this.advance(false);
+    }
+
+    public size() {
+        return this.sizer.getItemSize(this.domNode);
+    }
+
+    public offset() {
+        return this.sizer.getItemOffset(this.domNode);
+    }
+
+    public start() {
+        this.sizer.start(this.domNode);
+    }
+
+    public finish() {
+        this.sizer.finish(this.domNode);
+    }
+
+    public getSize() {
+        return this.sizer.getDesiredItemSize(this.domNode);
+    }
+
+    public setRawSize(size: string) {
+        this.sizer.setItemSize(this.domNode, size);
+    }
+
+    public setSize(size: number) {
+        this.setRawSize(`${Math.round(size)}px`);
+        const callback = this.resizer.config.onResized;
+        if (callback) {
+            callback(size, this.id, this.domNode);
+        }
+    }
+
+    public clearSize() {
+        this.sizer.clearItemSize(this.domNode);
+        const callback = this.resizer.config.onResized;
+        if (callback) {
+            callback(null, this.id, this.domNode);
+        }
+    }
+
+    public first() {
+        const firstHandle = Array.from(this.domNode.parentElement.children).find(el => {
+            return this.resizer.isResizeHandle(<HTMLElement>el);
+        });
+        if (firstHandle) {
+            return this.copyWith(<HTMLElement>firstHandle, this.resizer, this.sizer);
+        }
+    }
+
+    public last() {
+        const lastHandle = Array.from(this.domNode.parentElement.children).reverse().find(el => {
+            return this.resizer.isResizeHandle(<HTMLElement>el);
+        });
+        if (lastHandle) {
+            return this.copyWith(<HTMLElement>lastHandle, this.resizer, this.sizer);
+        }
+    }
+}
diff --git a/src/resizer/resizer.js b/src/resizer/resizer.ts
similarity index 55%
rename from src/resizer/resizer.js
rename to src/resizer/resizer.ts
index 1e75bf3bdf..c7c7edcd11 100644
--- a/src/resizer/resizer.js
+++ b/src/resizer/resizer.ts
@@ -1,6 +1,5 @@
 /*
-Copyright 2018 New Vector Ltd
-Copyright 2019 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.
@@ -15,86 +14,105 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-/*
-classNames:
+import {throttle} from "lodash";
+
+import FixedDistributor from "./distributors/fixed";
+import ResizeItem from "./item";
+import Sizer from "./sizer";
+
+interface IClassNames {
     // class on resize-handle
-    handle: string
+    handle?: string;
     // class on resize-handle
-    reverse: string
+    reverse?: string;
     // class on resize-handle
-    vertical: string
+    vertical?: string;
     // class on container
-    resizing: string
-*/
+    resizing?: string;
+}
 
+export interface IConfig {
+    onResizeStart?(): void;
+    onResizeStop?(): void;
+    onResized?(size: number, id: string, element: HTMLElement): void;
+}
+
+export default class Resizer<C extends IConfig = IConfig> {
+    private classNames: IClassNames;
 
-export default class Resizer {
     // TODO move vertical/horizontal to config option/container class
     // as it doesn't make sense to mix them within one container/Resizer
-    constructor(container, distributorCtor, config) {
+    constructor(
+        public container: HTMLElement,
+        private readonly distributorCtor: {
+            new(item: ResizeItem): FixedDistributor<C, any>;
+            createItem(resizeHandle: HTMLDivElement, resizer: Resizer, sizer: Sizer): ResizeItem;
+            createSizer(containerElement: HTMLElement, vertical: boolean, reverse: boolean): Sizer;
+        },
+        public readonly config?: C,
+    ) {
         if (!container) {
             throw new Error("Resizer requires a non-null `container` arg");
         }
-        this.container = container;
-        this.distributorCtor = distributorCtor;
-        this.config = config;
+
         this.classNames = {
             handle: "resizer-handle",
             reverse: "resizer-reverse",
             vertical: "resizer-vertical",
             resizing: "resizer-resizing",
         };
-        this._onMouseDown = this._onMouseDown.bind(this);
     }
 
-    setClassNames(classNames) {
+    public setClassNames(classNames: IClassNames) {
         this.classNames = classNames;
     }
 
-    attach() {
-        this.container.addEventListener("mousedown", this._onMouseDown, false);
+    public attach() {
+        this.container.addEventListener("mousedown", this.onMouseDown, false);
+        window.addEventListener("resize", this.onResize);
     }
 
-    detach() {
-        this.container.removeEventListener("mousedown", this._onMouseDown, false);
+    public detach() {
+        this.container.removeEventListener("mousedown", this.onMouseDown, false);
+        window.removeEventListener("resize", this.onResize);
     }
 
     /**
     Gives the distributor for a specific resize handle, as if you would have started
     to drag that handle. Can be used to manipulate the size of an item programmatically.
     @param {number} handleIndex the index of the resize handle in the container
-    @return {Distributor} a new distributor for the given handle
+    @return {FixedDistributor} a new distributor for the given handle
     */
-    forHandleAt(handleIndex) {
-        const handles = this._getResizeHandles();
+    public forHandleAt(handleIndex: number): FixedDistributor<C> {
+        const handles = this.getResizeHandles();
         const handle = handles[handleIndex];
         if (handle) {
-            const {distributor} = this._createSizerAndDistributor(handle);
+            const {distributor} = this.createSizerAndDistributor(<HTMLDivElement>handle);
             return distributor;
         }
     }
 
-    forHandleWithId(id) {
-        const handles = this._getResizeHandles();
+    public forHandleWithId(id: string): FixedDistributor<C> {
+        const handles = this.getResizeHandles();
         const handle = handles.find((h) => h.getAttribute("data-id") === id);
         if (handle) {
-            const {distributor} = this._createSizerAndDistributor(handle);
+            const {distributor} = this.createSizerAndDistributor(<HTMLDivElement>handle);
             return distributor;
         }
     }
 
-    isReverseResizeHandle(el) {
+    public isReverseResizeHandle(el: HTMLElement): boolean {
         return el && el.classList.contains(this.classNames.reverse);
     }
 
-    isResizeHandle(el) {
+    public isResizeHandle(el: HTMLElement): boolean {
         return el && el.classList.contains(this.classNames.handle);
     }
 
-    _onMouseDown(event) {
+    private onMouseDown = (event: MouseEvent) => {
         // use closest in case the resize handle contains
         // child dom nodes that can be the target
-        const resizeHandle = event.target && event.target.closest(`.${this.classNames.handle}`);
+        const resizeHandle = event.target && (<HTMLDivElement>event.target).closest(`.${this.classNames.handle}`);
         if (!resizeHandle || resizeHandle.parentElement !== this.container) {
             return;
         }
@@ -109,7 +127,7 @@ export default class Resizer {
             this.config.onResizeStart();
         }
 
-        const {sizer, distributor} = this._createSizerAndDistributor(resizeHandle);
+        const {sizer, distributor} = this.createSizerAndDistributor(<HTMLDivElement>resizeHandle);
         distributor.start();
 
         const onMouseMove = (event) => {
@@ -122,10 +140,10 @@ export default class Resizer {
             if (this.classNames.resizing) {
                 this.container.classList.remove(this.classNames.resizing);
             }
+            distributor.finish();
             if (this.config.onResizeStop) {
                 this.config.onResizeStop();
             }
-            distributor.finish();
             body.removeEventListener("mouseup", finishResize, false);
             document.removeEventListener("mouseleave", finishResize, false);
             body.removeEventListener("mousemove", onMouseMove, false);
@@ -133,21 +151,39 @@ export default class Resizer {
         body.addEventListener("mouseup", finishResize, false);
         document.addEventListener("mouseleave", finishResize, false);
         body.addEventListener("mousemove", onMouseMove, false);
-    }
+    };
 
-    _createSizerAndDistributor(resizeHandle) {
+    private onResize = throttle(() => {
+        const distributors = this.getDistributors();
+
+        // relax all items if they had any overconstrained flexboxes
+        distributors.forEach(d => d.start());
+        distributors.forEach(d => d.finish());
+    }, 100, {trailing: true, leading: true});
+
+    public getDistributors = () => {
+        return this.getResizeHandles().map(handle => {
+            const {distributor} = this.createSizerAndDistributor(<HTMLDivElement>handle);
+            return distributor;
+        });
+    };
+
+    private createSizerAndDistributor(
+        resizeHandle: HTMLDivElement,
+    ): {sizer: Sizer, distributor: FixedDistributor<any>} {
         const vertical = resizeHandle.classList.contains(this.classNames.vertical);
         const reverse = this.isReverseResizeHandle(resizeHandle);
         const Distributor = this.distributorCtor;
         const sizer = Distributor.createSizer(this.container, vertical, reverse);
         const item = Distributor.createItem(resizeHandle, this, sizer);
-        const distributor = new Distributor(item, this.config);
+        const distributor = new Distributor(item);
         return {sizer, distributor};
     }
 
-    _getResizeHandles() {
+    private getResizeHandles() {
+        if (!this.container.children) return [];
         return Array.from(this.container.children).filter(el => {
-            return this.isResizeHandle(el);
-        });
+            return this.isResizeHandle(<HTMLElement>el);
+        }) as HTMLElement[];
     }
 }
diff --git a/src/resizer/sizer.js b/src/resizer/sizer.ts
similarity index 68%
rename from src/resizer/sizer.js
rename to src/resizer/sizer.ts
index 4ce9232457..4de8bb9221 100644
--- a/src/resizer/sizer.js
+++ b/src/resizer/sizer.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 New Vector Ltd
+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.
@@ -19,18 +19,18 @@ implements DOM/CSS operations for resizing.
 The sizer determines what CSS mechanism is used for sizing items, like flexbox, ...
 */
 export default class Sizer {
-    constructor(container, vertical, reverse) {
-        this.container = container;
-        this.reverse = reverse;
-        this.vertical = vertical;
-    }
+    constructor(
+        protected readonly container: HTMLElement,
+        protected readonly vertical: boolean,
+        protected readonly reverse: boolean,
+    ) {}
 
     /**
         @param {Element} item the dom element being resized
         @return {number} how far the edge of the item is from the edge of the container
     */
-    getItemOffset(item) {
-        const offset = (this.vertical ? item.offsetTop : item.offsetLeft) - this._getOffset();
+    public getItemOffset(item: HTMLElement): number {
+        const offset = (this.vertical ? item.offsetTop : item.offsetLeft) - this.getOffset();
         if (this.reverse) {
             return this.getTotalSize() - (offset + this.getItemSize(item));
         } else {
@@ -42,41 +42,49 @@ export default class Sizer {
         @param {Element} item the dom element being resized
         @return {number} the width/height of an item in the container
     */
-    getItemSize(item) {
+    public getItemSize(item: HTMLElement): number {
         return this.vertical ? item.offsetHeight : item.offsetWidth;
     }
 
     /** @return {number} the width/height of the container */
-    getTotalSize() {
+    public getTotalSize(): number {
         return this.vertical ? this.container.offsetHeight : this.container.offsetWidth;
     }
 
     /** @return {number} container offset to offsetParent */
-    _getOffset() {
+    private getOffset(): number {
         return this.vertical ? this.container.offsetTop : this.container.offsetLeft;
     }
 
     /** @return {number} container offset to document */
-    _getPageOffset() {
+    private getPageOffset(): number {
         let element = this.container;
         let offset = 0;
         while (element) {
             const pos = this.vertical ? element.offsetTop : element.offsetLeft;
             offset = offset + pos;
-            element = element.offsetParent;
+            element = <HTMLElement>element.offsetParent;
         }
         return offset;
     }
 
-    setItemSize(item, size) {
+    public getDesiredItemSize(item: HTMLElement) {
         if (this.vertical) {
-            item.style.height = `${Math.round(size)}px`;
+            return item.style.height;
         } else {
-            item.style.width = `${Math.round(size)}px`;
+            return item.style.width;
         }
     }
 
-    clearItemSize(item) {
+    public setItemSize(item: HTMLElement, size: string) {
+        if (this.vertical) {
+            item.style.height = size;
+        } else {
+            item.style.width = size;
+        }
+    }
+
+    public clearItemSize(item: HTMLElement) {
         if (this.vertical) {
             item.style.height = null;
         } else {
@@ -84,17 +92,21 @@ export default class Sizer {
         }
     }
 
+    public start(item: HTMLElement) {}
+
+    public finish(item: HTMLElement) {}
+
     /**
         @param {MouseEvent} event the mouse event
         @return {number} the distance between the cursor and the edge of the container,
             along the applicable axis (vertical or horizontal)
     */
-    offsetFromEvent(event) {
+    public offsetFromEvent(event: MouseEvent) {
         const pos = this.vertical ? event.pageY : event.pageX;
         if (this.reverse) {
-            return (this._getPageOffset() + this.getTotalSize()) - pos;
+            return (this.getPageOffset() + this.getTotalSize()) - pos;
         } else {
-            return pos - this._getPageOffset();
+            return pos - this.getPageOffset();
         }
     }
 }
diff --git a/src/settings/Layout.ts b/src/settings/Layout.ts
new file mode 100644
index 0000000000..3a42b2b510
--- /dev/null
+++ b/src/settings/Layout.ts
@@ -0,0 +1,26 @@
+/*
+Copyright 2021 Šimon Brandner <simon.bra.ag@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import PropTypes from 'prop-types';
+
+/* TODO: This should be later reworked into something more generic */
+export enum Layout {
+    IRC = "irc",
+    Group = "group"
+}
+
+/* We need this because multiple components are still using JavaScript */
+export const LayoutPropType = PropTypes.oneOf(Object.values(Layout));
diff --git a/src/settings/Settings.ts b/src/settings/Settings.ts
index 8b96a2e819..4f589ba49a 100644
--- a/src/settings/Settings.ts
+++ b/src/settings/Settings.ts
@@ -32,9 +32,13 @@ import UseSystemFontController from './controllers/UseSystemFontController';
 import { SettingLevel } from "./SettingLevel";
 import SettingController from "./controllers/SettingController";
 import { RightPanelPhases } from "../stores/RightPanelStorePhases";
+import { isMac } from '../Keyboard';
 import UIFeatureController from "./controllers/UIFeatureController";
 import { UIFeature } from "./UIFeature";
 import { OrderedMultiController } from "./controllers/OrderedMultiController";
+import { Layout } from "./Layout";
+import ReducedMotionController from './controllers/ReducedMotionController';
+import IncompatibleController from "./controllers/IncompatibleController";
 
 // These are just a bunch of helper arrays to avoid copy/pasting a bunch of times
 const LEVELS_ROOM_SETTINGS = [
@@ -116,6 +120,20 @@ export interface ISetting {
 }
 
 export const SETTINGS: {[setting: string]: ISetting} = {
+    "feature_spaces": {
+        isFeature: true,
+        displayName: _td("Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. " +
+            "Requires compatible homeserver for some features."),
+        supportedLevels: LEVELS_FEATURE,
+        default: false,
+        controller: new ReloadOnChangeController(),
+    },
+    "feature_latex_maths": {
+        isFeature: true,
+        displayName: _td("Render LaTeX maths in messages"),
+        supportedLevels: LEVELS_FEATURE,
+        default: false,
+    },
     "feature_communities_v2_prototypes": {
         isFeature: true,
         displayName: _td(
@@ -124,6 +142,7 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         ),
         supportedLevels: LEVELS_FEATURE,
         default: false,
+        controller: new IncompatibleController("feature_spaces"),
     },
     "feature_new_spinner": {
         isFeature: true,
@@ -149,6 +168,7 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         displayName: _td("Group & filter rooms by custom tags (refresh to apply changes)"),
         supportedLevels: LEVELS_FEATURE,
         default: false,
+        controller: new IncompatibleController("feature_spaces"),
     },
     "feature_state_counters": {
         isFeature: true,
@@ -179,6 +199,8 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         displayName: _td("Show message previews for reactions in DMs"),
         supportedLevels: LEVELS_FEATURE,
         default: false,
+        // this option is a subset of `feature_roomlist_preview_reactions_all` so disable it when that one is enabled
+        controller: new IncompatibleController("feature_roomlist_preview_reactions_all"),
     },
     "feature_roomlist_preview_reactions_all": {
         isFeature: true,
@@ -233,6 +255,11 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         default: true,
         invertedSettingName: 'MessageComposerInput.dontSuggestEmoji',
     },
+    "MessageComposerInput.showStickersButton": {
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        displayName: _td('Show stickers button'),
+        default: true,
+    },
     // TODO: Wire up appropriately to UI (FTUE notifications)
     "Notifications.alwaysShowBadgeCounts": {
         supportedLevels: LEVELS_ROOM_OR_ACCOUNT,
@@ -293,6 +320,21 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         displayName: _td('Enable automatic language detection for syntax highlighting'),
         default: false,
     },
+    "expandCodeByDefault": {
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        displayName: _td('Expand code blocks by default'),
+        default: false,
+    },
+    "showCodeLineNumbers": {
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        displayName: _td('Show line numbers in code blocks'),
+        default: true,
+    },
+    "scrollToBottomOnMessageSent": {
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        displayName: _td('Jump to the bottom of the timeline when you send a message'),
+        default: true,
+    },
     "Pill.shouldShowPillAvatar": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td('Show avatars in user and room mentions'),
@@ -324,6 +366,16 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         displayName: _td("Show typing notifications"),
         default: true,
     },
+    "ctrlFForSearch": {
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        displayName: isMac ? _td("Use Command + F to search") : _td("Use Ctrl + F to search"),
+        default: false,
+    },
+    "MessageComposerInput.ctrlEnterToSend": {
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        displayName: isMac ? _td("Use Command + Enter to send a message") : _td("Use Ctrl + Enter to send a message"),
+        default: false,
+    },
     "MessageComposerInput.autoReplaceEmoji": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td('Automatically replace plain text Emoji'),
@@ -409,7 +461,8 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         default: true,
     },
     "allowedWidgets": {
-        supportedLevels: [SettingLevel.ROOM_ACCOUNT],
+        supportedLevels: [SettingLevel.ROOM_ACCOUNT, SettingLevel.ROOM_DEVICE],
+        supportedLevelsAreOrdered: true,
         default: {}, // none allowed
     },
     "analyticsOptIn": {
@@ -552,13 +605,6 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         // This is a tri-state value, where `null` means "prompt the user".
         default: null,
     },
-    "sendReadReceipts": {
-        supportedLevels: LEVELS_ROOM_SETTINGS,
-        displayName: _td(
-            "Send read receipts for messages (requires compatible homeserver to disable)",
-        ),
-        default: true,
-    },
     "showImages": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td("Show previews/thumbnails for images"),
@@ -591,6 +637,8 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         default: 3000,
     },
     "showCallButtonsInComposer": {
+        // Dev note: This is no longer "in composer" but is instead "in room header".
+        // TODO: Rename with settings v3
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG,
         default: true,
         controller: new UIFeatureController(UIFeature.Voip),
@@ -617,15 +665,32 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         displayName: _td("IRC display name width"),
         default: 80,
     },
-    "useIRCLayout": {
+    "layout": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        displayName: _td("Enable experimental, compact IRC style layout"),
-        default: false,
+        default: Layout.Group,
     },
-    "Widgets.pinned": {
+    "showChatEffects": {
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        displayName: _td("Show chat effects (animations when receiving e.g. confetti)"),
+        default: true,
+        controller: new ReducedMotionController(),
+    },
+    "Widgets.pinned": { // deprecated
         supportedLevels: LEVELS_ROOM_OR_ACCOUNT,
         default: {},
     },
+    "Widgets.layout": {
+        supportedLevels: LEVELS_ROOM_OR_ACCOUNT,
+        default: {},
+    },
+    "Widgets.leftPanel": {
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        default: null,
+    },
+    [UIFeature.RoomHistorySettings]: {
+        supportedLevels: LEVELS_UI_FEATURE,
+        default: true,
+    },
     [UIFeature.AdvancedEncryption]: {
         supportedLevels: LEVELS_UI_FEATURE,
         default: true,
@@ -685,6 +750,7 @@ export const SETTINGS: {[setting: string]: ISetting} = {
     [UIFeature.Communities]: {
         supportedLevels: LEVELS_UI_FEATURE,
         default: true,
+        controller: new IncompatibleController("feature_spaces"),
     },
     [UIFeature.AdvancedSettings]: {
         supportedLevels: LEVELS_UI_FEATURE,
diff --git a/src/settings/SettingsStore.ts b/src/settings/SettingsStore.ts
index 7c05e4b500..c2675bd8f8 100644
--- a/src/settings/SettingsStore.ts
+++ b/src/settings/SettingsStore.ts
@@ -42,7 +42,7 @@ for (const key of Object.keys(SETTINGS)) {
     if (SETTINGS[key].invertedSettingName) {
         // Invert now so that the rest of the system will invert it back
         // to what was intended.
-        invertedDefaultSettings[key] = !SETTINGS[key].default;
+        invertedDefaultSettings[SETTINGS[key].invertedSettingName] = !SETTINGS[key].default;
     }
 }
 
@@ -61,7 +61,7 @@ for (const key of Object.keys(LEVEL_HANDLERS)) {
     LEVEL_HANDLERS[key] = new LocalEchoWrapper(LEVEL_HANDLERS[key]);
 }
 
-const LEVEL_ORDER = [
+export const LEVEL_ORDER = [
     SettingLevel.DEVICE,
     SettingLevel.ROOM_DEVICE,
     SettingLevel.ROOM_ACCOUNT,
@@ -276,7 +276,7 @@ export default class SettingsStore {
      * @param {boolean} excludeDefault True to disable using the default value.
      * @return {*} The value, or null if not found
      */
-    public static getValue(settingName: string, roomId: string = null, excludeDefault = false): any {
+    public static getValue<T = any>(settingName: string, roomId: string = null, excludeDefault = false): T {
         // Verify that the setting is actually a setting
         if (!SETTINGS[settingName]) {
             throw new Error("Setting '" + settingName + "' does not appear to be a setting.");
@@ -467,6 +467,32 @@ export default class SettingsStore {
         return LEVEL_HANDLERS[level].isSupported();
     }
 
+    /**
+     * Determines the first supported level out of all the levels that can be used for a
+     * specific setting.
+     * @param {string} settingName The setting name.
+     * @return {SettingLevel}
+     */
+    public static firstSupportedLevel(settingName: string): SettingLevel {
+        // Verify that the setting is actually a setting
+        const setting = SETTINGS[settingName];
+        if (!setting) {
+            throw new Error("Setting '" + settingName + "' does not appear to be a setting.");
+        }
+
+        const levelOrder = (setting.supportedLevelsAreOrdered ? setting.supportedLevels : LEVEL_ORDER);
+        if (!levelOrder.includes(SettingLevel.DEFAULT)) levelOrder.push(SettingLevel.DEFAULT); // always include default
+
+        const handlers = SettingsStore.getHandlers(settingName);
+
+        for (const level of levelOrder) {
+            const handler = handlers[level];
+            if (!handler) continue;
+            return level;
+        }
+        return null;
+    }
+
     /**
      * Debugging function for reading explicit setting values without going through the
      * complicated/biased functions in the SettingsStore. This will print information to
diff --git a/src/settings/UIFeature.ts b/src/settings/UIFeature.ts
index 231752e19c..82dfdf0bb5 100644
--- a/src/settings/UIFeature.ts
+++ b/src/settings/UIFeature.ts
@@ -31,4 +31,5 @@ export enum UIFeature {
     Flair = "UIFeature.flair",
     Communities = "UIFeature.communities",
     AdvancedSettings = "UIFeature.advancedSettings",
+    RoomHistorySettings = "UIFeature.roomHistorySettings",
 }
diff --git a/src/settings/controllers/IncompatibleController.ts b/src/settings/controllers/IncompatibleController.ts
new file mode 100644
index 0000000000..c48ce0a60b
--- /dev/null
+++ b/src/settings/controllers/IncompatibleController.ts
@@ -0,0 +1,46 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import SettingController from "./SettingController";
+import { SettingLevel } from "../SettingLevel";
+import SettingsStore from "../SettingsStore";
+
+/**
+ * Enforces that a boolean setting cannot be enabled if the incompatible setting
+ * is also enabled, to prevent cascading undefined behaviour between conflicting
+ * labs flags.
+ */
+export default class IncompatibleController extends SettingController {
+    public constructor(private settingName: string, private forcedValue = false) {
+        super();
+    }
+
+    public getValueOverride(
+        level: SettingLevel,
+        roomId: string,
+        calculatedValue: any,
+        calculatedAtLevel: SettingLevel,
+    ): any {
+        if (this.incompatibleSettingEnabled) {
+            return this.forcedValue;
+        }
+        return null; // no override
+    }
+
+    public get incompatibleSettingEnabled(): boolean {
+        return SettingsStore.getValue(this.settingName);
+    }
+}
diff --git a/src/settings/controllers/ReducedMotionController.ts b/src/settings/controllers/ReducedMotionController.ts
new file mode 100644
index 0000000000..d98ca16513
--- /dev/null
+++ b/src/settings/controllers/ReducedMotionController.ts
@@ -0,0 +1,45 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import SettingController from "./SettingController";
+import { SettingLevel } from "../SettingLevel";
+
+/**
+ * For animation-like settings, this controller checks whether the user has
+ * indicated they prefer reduced motion via browser or OS level settings.
+ * If they have, this forces the setting value to false.
+ */
+export default class ReducedMotionController extends SettingController {
+    public getValueOverride(
+        level: SettingLevel,
+        roomId: string,
+        calculatedValue: any,
+        calculatedAtLevel: SettingLevel,
+    ): any {
+        if (this.prefersReducedMotion()) {
+            return false;
+        }
+        return null; // no override
+    }
+
+    public get settingDisabled(): boolean {
+        return this.prefersReducedMotion();
+    }
+
+    private prefersReducedMotion(): boolean {
+        return window.matchMedia("(prefers-reduced-motion: reduce)").matches;
+    }
+}
diff --git a/src/settings/handlers/AccountSettingsHandler.ts b/src/settings/handlers/AccountSettingsHandler.ts
index d609fd3231..e75faa49c1 100644
--- a/src/settings/handlers/AccountSettingsHandler.ts
+++ b/src/settings/handlers/AccountSettingsHandler.ts
@@ -169,7 +169,7 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa
 
     public isSupported(): boolean {
         const cli = MatrixClientPeg.get();
-        return cli !== undefined && cli !== null;
+        return cli !== undefined && cli !== null && !cli.isGuest();
     }
 
     private getSettings(eventType = "im.vector.web.settings"): any { // TODO: [TS] Types on return
diff --git a/src/settings/handlers/DeviceSettingsHandler.ts b/src/settings/handlers/DeviceSettingsHandler.ts
index 2096203598..208a265e04 100644
--- a/src/settings/handlers/DeviceSettingsHandler.ts
+++ b/src/settings/handlers/DeviceSettingsHandler.ts
@@ -20,6 +20,7 @@ import SettingsHandler from "./SettingsHandler";
 import {MatrixClientPeg} from "../../MatrixClientPeg";
 import {SettingLevel} from "../SettingLevel";
 import { CallbackFn, WatchManager } from "../WatchManager";
+import { Layout } from "../Layout";
 
 /**
  * Gets and sets settings at the "device" level for the current device.
@@ -67,6 +68,13 @@ export default class DeviceSettingsHandler extends SettingsHandler {
             return val['value'];
         }
 
+        // Special case for old useIRCLayout setting
+        if (settingName === "layout") {
+            const settings = this.getSettings() || {};
+            if (settings["useIRCLayout"]) return Layout.IRC;
+            return settings[settingName];
+        }
+
         const settings = this.getSettings() || {};
         return settings[settingName];
     }
@@ -106,6 +114,18 @@ export default class DeviceSettingsHandler extends SettingsHandler {
             return Promise.resolve();
         }
 
+        // Special case for old useIRCLayout setting
+        if (settingName === "layout") {
+            const settings = this.getSettings() || {};
+
+            delete settings["useIRCLayout"];
+            settings["layout"] = newValue;
+            localStorage.setItem("mx_local_settings", JSON.stringify(settings));
+
+            this.watchers.notifyUpdate(settingName, null, SettingLevel.DEVICE, newValue);
+            return Promise.resolve();
+        }
+
         const settings = this.getSettings() || {};
         settings[settingName] = newValue;
         localStorage.setItem("mx_local_settings", JSON.stringify(settings));
diff --git a/src/settings/handlers/RoomAccountSettingsHandler.ts b/src/settings/handlers/RoomAccountSettingsHandler.ts
index 53e29653f8..416bdddb90 100644
--- a/src/settings/handlers/RoomAccountSettingsHandler.ts
+++ b/src/settings/handlers/RoomAccountSettingsHandler.ts
@@ -129,7 +129,7 @@ export default class RoomAccountSettingsHandler extends MatrixClientBackedSettin
 
     public isSupported(): boolean {
         const cli = MatrixClientPeg.get();
-        return cli !== undefined && cli !== null;
+        return cli !== undefined && cli !== null && !cli.isGuest();
     }
 
     private getSettings(roomId: string, eventType = "im.vector.web.settings"): any { // TODO: [TS] Type return
diff --git a/src/stores/AsyncStoreWithClient.ts b/src/stores/AsyncStoreWithClient.ts
index 1ed7c6a547..7ed9bbd249 100644
--- a/src/stores/AsyncStoreWithClient.ts
+++ b/src/stores/AsyncStoreWithClient.ts
@@ -18,22 +18,33 @@ import { MatrixClient } from "matrix-js-sdk/src/client";
 import { AsyncStore } from "./AsyncStore";
 import { ActionPayload } from "../dispatcher/payloads";
 import { Dispatcher } from "flux";
-import { MatrixClientPeg } from "../MatrixClientPeg";
+import { ReadyWatchingStore } from "./ReadyWatchingStore";
 
 export abstract class AsyncStoreWithClient<T extends Object> extends AsyncStore<T> {
-    protected matrixClient: MatrixClient;
-
-    protected abstract async onAction(payload: ActionPayload);
+    protected readyStore: ReadyWatchingStore;
 
     protected constructor(dispatcher: Dispatcher<ActionPayload>, initialState: T = <T>{}) {
         super(dispatcher, initialState);
 
-        if (MatrixClientPeg.get()) {
-            this.matrixClient = MatrixClientPeg.get();
+        // Create an anonymous class to avoid code duplication
+        const asyncStore = this; // eslint-disable-line @typescript-eslint/no-this-alias
+        this.readyStore = new (class extends ReadyWatchingStore {
+            public get mxClient(): MatrixClient {
+                return this.matrixClient;
+            }
 
-            // noinspection JSIgnoredPromiseFromCall
-            this.onReady();
-        }
+            protected async onReady(): Promise<any> {
+                return asyncStore.onReady();
+            }
+
+            protected async onNotReady(): Promise<any> {
+                return asyncStore.onNotReady();
+            }
+        })(dispatcher);
+    }
+
+    get matrixClient(): MatrixClient {
+        return this.readyStore.mxClient;
     }
 
     protected async onReady() {
@@ -44,30 +55,9 @@ export abstract class AsyncStoreWithClient<T extends Object> extends AsyncStore<
         // Default implementation is to do nothing.
     }
 
+    protected abstract onAction(payload: ActionPayload): Promise<void>;
+
     protected async onDispatch(payload: ActionPayload) {
         await this.onAction(payload);
-
-        if (payload.action === 'MatrixActions.sync') {
-            // Only set the client on the transition into the PREPARED state.
-            // Everything after this is unnecessary (we only need to know once we have a client)
-            // and we intentionally don't set the client before this point to avoid stores
-            // updating for every event emitted during the cached sync.
-            if (!(payload.prevState === 'PREPARED' && payload.state !== 'PREPARED')) {
-                return;
-            }
-
-            if (this.matrixClient !== payload.matrixClient) {
-                if (this.matrixClient) {
-                    await this.onNotReady();
-                }
-                this.matrixClient = payload.matrixClient;
-                await this.onReady();
-            }
-        } else if (payload.action === 'on_client_not_viable' || payload.action === 'on_logged_out') {
-            if (this.matrixClient) {
-                await this.onNotReady();
-                this.matrixClient = null;
-            }
-        }
     }
 }
diff --git a/src/stores/BreadcrumbsStore.ts b/src/stores/BreadcrumbsStore.ts
index 24906f678c..393f4f27a1 100644
--- a/src/stores/BreadcrumbsStore.ts
+++ b/src/stores/BreadcrumbsStore.ts
@@ -122,6 +122,7 @@ export class BreadcrumbsStore extends AsyncStoreWithClient<IState> {
     }
 
     private async appendRoom(room: Room) {
+        if (room.isSpaceRoom() && SettingsStore.getValue("feature_spaces")) return; // hide space rooms
         let updated = false;
         const rooms = (this.state.rooms || []).slice(); // cheap clone
 
diff --git a/src/stores/CommunityPrototypeStore.ts b/src/stores/CommunityPrototypeStore.ts
index 95d56bd40e..92e094c83b 100644
--- a/src/stores/CommunityPrototypeStore.ts
+++ b/src/stores/CommunityPrototypeStore.ts
@@ -48,6 +48,10 @@ export class CommunityPrototypeStore extends AsyncStoreWithClient<IState> {
         return CommunityPrototypeStore.internalInstance;
     }
 
+    public static getUpdateEventName(roomId: string): string {
+        return `${UPDATE_EVENT}:${roomId}`;
+    }
+
     public getSelectedCommunityId(): string {
         if (SettingsStore.getValue("feature_communities_v2_prototypes")) {
             return GroupFilterOrderStore.getSelectedTags()[0];
@@ -134,7 +138,8 @@ export class CommunityPrototypeStore extends AsyncStoreWithClient<IState> {
             }
         } else if (payload.action === "MatrixActions.accountData") {
             if (payload.event_type.startsWith("im.vector.group_info.")) {
-                this.emit(UPDATE_EVENT, payload.event_type.substring("im.vector.group_info.".length));
+                const roomId = payload.event_type.substring("im.vector.group_info.".length);
+                this.emit(CommunityPrototypeStore.getUpdateEventName(roomId), roomId);
             }
         } else if (payload.action === "select_tag") {
             // Automatically select the general chat when switching communities
@@ -167,7 +172,7 @@ export class CommunityPrototypeStore extends AsyncStoreWithClient<IState> {
             if (getEffectiveMembership(myMember.membership) === EffectiveMembership.Invite) {
                 // Fake an update for anything that might have started listening before the invite
                 // data was available (eg: RoomPreviewBar after a refresh)
-                this.emit(UPDATE_EVENT, room.roomId);
+                this.emit(CommunityPrototypeStore.getUpdateEventName(room.roomId), room.roomId);
             }
         }
     }
diff --git a/src/stores/HostSignupStore.ts b/src/stores/HostSignupStore.ts
new file mode 100644
index 0000000000..d50a7f6b43
--- /dev/null
+++ b/src/stores/HostSignupStore.ts
@@ -0,0 +1,49 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import defaultDispatcher from "../dispatcher/dispatcher";
+import {AsyncStore} from "./AsyncStore";
+import {ActionPayload} from "../dispatcher/payloads";
+
+interface IState {
+    hostSignupActive?: boolean;
+}
+
+export class HostSignupStore extends AsyncStore<IState> {
+    private static internalInstance = new HostSignupStore();
+
+    private constructor() {
+        super(defaultDispatcher, {hostSignupActive: false});
+    }
+
+    public static get instance(): HostSignupStore {
+        return HostSignupStore.internalInstance;
+    }
+
+    public get isHostSignupActive(): boolean {
+        return this.state.hostSignupActive;
+    }
+
+    public async setHostSignupActive(status: boolean) {
+        return this.updateState({
+            hostSignupActive: status,
+        });
+    }
+
+    protected onDispatch(payload: ActionPayload) {
+        // Nothing to do
+    }
+}
diff --git a/src/stores/ModalWidgetStore.ts b/src/stores/ModalWidgetStore.ts
new file mode 100644
index 0000000000..9c0da49c8c
--- /dev/null
+++ b/src/stores/ModalWidgetStore.ts
@@ -0,0 +1,92 @@
+/*
+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 { AsyncStoreWithClient } from "./AsyncStoreWithClient";
+import defaultDispatcher from "../dispatcher/dispatcher";
+import { ActionPayload } from "../dispatcher/payloads";
+import Modal, {IHandle, IModal} from "../Modal";
+import ModalWidgetDialog from "../components/views/dialogs/ModalWidgetDialog";
+import {WidgetMessagingStore} from "./widgets/WidgetMessagingStore";
+import {IModalWidgetOpenRequestData, IModalWidgetReturnData, Widget} from "matrix-widget-api";
+
+interface IState {
+    modal?: IModal<any>;
+    openedFromId?: string;
+}
+
+export class ModalWidgetStore extends AsyncStoreWithClient<IState> {
+    private static internalInstance = new ModalWidgetStore();
+    private modalInstance: IHandle<void[]> = null;
+    private openSourceWidgetId: string = null;
+
+    private constructor() {
+        super(defaultDispatcher, {});
+    }
+
+    public static get instance(): ModalWidgetStore {
+        return ModalWidgetStore.internalInstance;
+    }
+
+    protected async onAction(payload: ActionPayload): Promise<any> {
+        // nothing
+    }
+
+    public canOpenModalWidget = () => {
+        return !this.modalInstance;
+    };
+
+    public openModalWidget = (
+        requestData: IModalWidgetOpenRequestData,
+        sourceWidget: Widget,
+        widgetRoomId?: string,
+    ) => {
+        if (this.modalInstance) return;
+        this.openSourceWidgetId = sourceWidget.id;
+        this.modalInstance = Modal.createTrackedDialog('Modal Widget', '', ModalWidgetDialog, {
+            widgetDefinition: {...requestData},
+            widgetRoomId,
+            sourceWidgetId: sourceWidget.id,
+            onFinished: (success: boolean, data?: IModalWidgetReturnData) => {
+                if (!success) {
+                    this.closeModalWidget(sourceWidget, { "m.exited": true });
+                } else {
+                    this.closeModalWidget(sourceWidget, data);
+                }
+
+                this.openSourceWidgetId = null;
+                this.modalInstance = null;
+            },
+        }, null, /* priority = */ false, /* static = */ true);
+    };
+
+    public closeModalWidget = (sourceWidget: Widget, data?: IModalWidgetReturnData) => {
+        if (!this.modalInstance) return;
+        if (this.openSourceWidgetId === sourceWidget.id) {
+            this.openSourceWidgetId = null;
+            this.modalInstance.close();
+            this.modalInstance = null;
+
+            const sourceMessaging = WidgetMessagingStore.instance.getMessaging(sourceWidget);
+            if (!sourceMessaging) {
+                console.error("No source widget messaging for modal widget");
+                return;
+            }
+            sourceMessaging.notifyModalWidgetClose(data);
+        }
+    };
+}
+
+window.mxModalWidgetStore = ModalWidgetStore.instance;
diff --git a/src/stores/ReadyWatchingStore.ts b/src/stores/ReadyWatchingStore.ts
new file mode 100644
index 0000000000..4bb577c784
--- /dev/null
+++ b/src/stores/ReadyWatchingStore.ts
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { MatrixClient } from "matrix-js-sdk/src/client";
+import { MatrixClientPeg } from "../MatrixClientPeg";
+import { ActionPayload } from "../dispatcher/payloads";
+import { Dispatcher } from "flux";
+import { IDestroyable } from "../utils/IDestroyable";
+import { EventEmitter } from "events";
+
+export abstract class ReadyWatchingStore extends EventEmitter implements IDestroyable {
+    protected matrixClient: MatrixClient;
+    private readonly dispatcherRef: string;
+
+    constructor(protected readonly dispatcher: Dispatcher<ActionPayload>) {
+        super();
+
+        this.dispatcherRef = this.dispatcher.register(this.onAction);
+
+        if (MatrixClientPeg.get()) {
+            this.matrixClient = MatrixClientPeg.get();
+
+            // noinspection JSIgnoredPromiseFromCall
+            this.onReady();
+        }
+    }
+
+    public get mxClient(): MatrixClient {
+        return this.matrixClient; // for external readonly access
+    }
+
+    public useUnitTestClient(cli: MatrixClient) {
+        this.matrixClient = cli;
+    }
+
+    public destroy() {
+        this.dispatcher.unregister(this.dispatcherRef);
+    }
+
+    protected async onReady() {
+        // Default implementation is to do nothing.
+    }
+
+    protected async onNotReady() {
+        // Default implementation is to do nothing.
+    }
+
+    private onAction = async (payload: ActionPayload) => {
+        if (payload.action === 'MatrixActions.sync') {
+            // Only set the client on the transition into the PREPARED state.
+            // Everything after this is unnecessary (we only need to know once we have a client)
+            // and we intentionally don't set the client before this point to avoid stores
+            // updating for every event emitted during the cached sync.
+            if (!(payload.prevState === 'PREPARED' && payload.state !== 'PREPARED')) {
+                return;
+            }
+
+            if (this.matrixClient !== payload.matrixClient) {
+                if (this.matrixClient) {
+                    await this.onNotReady();
+                }
+                this.matrixClient = payload.matrixClient;
+                await this.onReady();
+            }
+        } else if (payload.action === 'on_client_not_viable' || payload.action === 'on_logged_out') {
+            if (this.matrixClient) {
+                await this.onNotReady();
+                this.matrixClient = null;
+            }
+        }
+    };
+}
diff --git a/src/stores/RightPanelStorePhases.ts b/src/stores/RightPanelStorePhases.ts
index 11b51dfc2d..aea78c7460 100644
--- a/src/stores/RightPanelStorePhases.ts
+++ b/src/stores/RightPanelStorePhases.ts
@@ -31,6 +31,11 @@ export enum RightPanelPhases {
     GroupRoomList = 'GroupRoomList',
     GroupRoomInfo = 'GroupRoomInfo',
     GroupMemberInfo = 'GroupMemberInfo',
+
+    // Space stuff
+    SpaceMemberList = "SpaceMemberList",
+    SpaceMemberInfo = "SpaceMemberInfo",
+    Space3pidMemberInfo = "Space3pidMemberInfo",
 }
 
 // These are the phases that are safe to persist (the ones that don't require additional
@@ -43,3 +48,10 @@ export const RIGHT_PANEL_PHASES_NO_ARGS = [
     RightPanelPhases.GroupMemberList,
     RightPanelPhases.GroupRoomList,
 ];
+
+// Subset of phases visible in the Space View
+export const RIGHT_PANEL_SPACE_PHASES = [
+    RightPanelPhases.SpaceMemberList,
+    RightPanelPhases.Space3pidMemberInfo,
+    RightPanelPhases.SpaceMemberInfo,
+];
diff --git a/src/stores/RoomViewStore.tsx b/src/stores/RoomViewStore.tsx
index be1141fa1e..f4c0c1b15c 100644
--- a/src/stores/RoomViewStore.tsx
+++ b/src/stores/RoomViewStore.tsx
@@ -28,6 +28,7 @@ import { _t } from '../languageHandler';
 import { getCachedRoomIDForAlias, storeRoomAliasInCache } from '../RoomAliasCache';
 import {ActionPayload} from "../dispatcher/payloads";
 import {retry} from "../utils/promise";
+import CountlyAnalytics from "../CountlyAnalytics";
 
 const NUM_JOIN_RETRY = 5;
 
@@ -264,6 +265,7 @@ class RoomViewStore extends Store<ActionPayload> {
     }
 
     private async joinRoom(payload: ActionPayload) {
+        const startTime = CountlyAnalytics.getTimestamp();
         this.setState({
             joining: true,
         });
@@ -275,6 +277,7 @@ class RoomViewStore extends Store<ActionPayload> {
                 // if we received a Gateway timeout then retry
                 return err.httpStatus === 504;
             });
+            CountlyAnalytics.instance.trackRoomJoin(startTime, this.state.roomId, payload._type);
 
             // We do *not* clear the 'joining' flag because the Room object and/or our 'joined' member event may not
             // have come down the sync stream yet, and that's the point at which we'd consider the user joined to the
diff --git a/src/stores/SpaceStore.tsx b/src/stores/SpaceStore.tsx
new file mode 100644
index 0000000000..d675879138
--- /dev/null
+++ b/src/stores/SpaceStore.tsx
@@ -0,0 +1,462 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import {throttle, sortBy} from "lodash";
+import {EventType} from "matrix-js-sdk/src/@types/event";
+import {Room} from "matrix-js-sdk/src/models/room";
+import {MatrixEvent} from "matrix-js-sdk/src/models/event";
+
+import {AsyncStoreWithClient} from "./AsyncStoreWithClient";
+import defaultDispatcher from "../dispatcher/dispatcher";
+import {ActionPayload} from "../dispatcher/payloads";
+import RoomListStore from "./room-list/RoomListStore";
+import SettingsStore from "../settings/SettingsStore";
+import DMRoomMap from "../utils/DMRoomMap";
+import {FetchRoomFn} from "./notifications/ListNotificationState";
+import {SpaceNotificationState} from "./notifications/SpaceNotificationState";
+import {RoomNotificationStateStore} from "./notifications/RoomNotificationStateStore";
+import {DefaultTagID} from "./room-list/models";
+import {EnhancedMap, mapDiff} from "../utils/maps";
+import {setHasDiff} from "../utils/sets";
+import {objectDiff} from "../utils/objects";
+import {arrayHasDiff} from "../utils/arrays";
+
+type SpaceKey = string | symbol;
+
+interface IState {}
+
+const ACTIVE_SPACE_LS_KEY = "mx_active_space";
+
+export const HOME_SPACE = Symbol("home-space");
+
+export const UPDATE_TOP_LEVEL_SPACES = Symbol("top-level-spaces");
+export const UPDATE_SELECTED_SPACE = Symbol("selected-space");
+// Space Room ID/HOME_SPACE will be emitted when a Space's children change
+
+const partitionSpacesAndRooms = (arr: Room[]): [Room[], Room[]] => { // [spaces, rooms]
+    return arr.reduce((result, room: Room) => {
+        result[room.isSpaceRoom() ? 0 : 1].push(room);
+        return result;
+    }, [[], []]);
+};
+
+const getOrder = (ev: MatrixEvent): string | null => {
+    const content = ev.getContent();
+    if (typeof content.order === "string" && Array.from(content.order).every((c: string) => {
+        const charCode = c.charCodeAt(0);
+        return charCode >= 0x20 && charCode <= 0x7F;
+    })) {
+        return content.order;
+    }
+    return null;
+}
+
+const getRoomFn: FetchRoomFn = (room: Room) => {
+    return RoomNotificationStateStore.instance.getRoomState(room);
+};
+
+export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
+    constructor() {
+        super(defaultDispatcher, {});
+    }
+
+    // The spaces representing the roots of the various tree-like hierarchies
+    private rootSpaces: Room[] = [];
+    // The list of rooms not present in any currently joined spaces
+    private orphanedRooms = new Set<string>();
+    // Map from room ID to set of spaces which list it as a child
+    private parentMap = new EnhancedMap<string, Set<string>>();
+    // Map from space key to SpaceNotificationState instance representing that space
+    private notificationStateMap = new Map<SpaceKey, SpaceNotificationState>();
+    // Map from space key to Set of room IDs that should be shown as part of that space's filter
+    private spaceFilteredRooms = new Map<string | symbol, Set<string>>();
+    // The space currently selected in the Space Panel - if null then `Home` is selected
+    private _activeSpace?: Room = null;
+
+    public get spacePanelSpaces(): Room[] {
+        return this.rootSpaces;
+    }
+
+    public get activeSpace(): Room | null {
+        return this._activeSpace || null;
+    }
+
+    public setActiveSpace(space: Room | null) {
+        if (space === this.activeSpace) return;
+
+        this._activeSpace = space;
+        this.emit(UPDATE_SELECTED_SPACE, this.activeSpace);
+
+        // persist space selected
+        if (space) {
+            window.localStorage.setItem(ACTIVE_SPACE_LS_KEY, space.roomId);
+        } else {
+            window.localStorage.removeItem(ACTIVE_SPACE_LS_KEY);
+        }
+    }
+
+    public addRoomToSpace(space: Room, roomId: string, via: string[], autoJoin = false) {
+        return this.matrixClient.sendStateEvent(space.roomId, EventType.SpaceChild, {
+            via,
+            auto_join: autoJoin,
+        }, roomId);
+    }
+
+    private getChildren(spaceId: string): Room[] {
+        const room = this.matrixClient?.getRoom(spaceId);
+        const childEvents = room?.currentState.getStateEvents(EventType.SpaceChild).filter(ev => ev.getContent()?.via);
+        return sortBy(childEvents, getOrder)
+            .map(ev => this.matrixClient.getRoom(ev.getStateKey()))
+            .filter(room => room?.getMyMembership() === "join") || [];
+    }
+
+    public getChildRooms(spaceId: string): Room[] {
+        return this.getChildren(spaceId).filter(r => !r.isSpaceRoom());
+    }
+
+    public getChildSpaces(spaceId: string): Room[] {
+        return this.getChildren(spaceId).filter(r => r.isSpaceRoom());
+    }
+
+    public getParents(roomId: string, canonicalOnly = false): Room[] {
+        const room = this.matrixClient?.getRoom(roomId);
+        return room?.currentState.getStateEvents(EventType.SpaceParent)
+            .filter(ev => {
+                const content = ev.getContent();
+                if (!content?.via) return false;
+                // TODO apply permissions check to verify that the parent mapping is valid
+                if (canonicalOnly && !content?.canonical) return false;
+                return true;
+            })
+            .map(ev => this.matrixClient.getRoom(ev.getStateKey()))
+            .filter(Boolean) || [];
+    }
+
+    public getCanonicalParent(roomId: string): Room | null {
+        const parents = this.getParents(roomId, true);
+        return sortBy(parents, r => r.roomId)?.[0] || null;
+    }
+
+    public getSpaces = () => {
+        return this.matrixClient.getRooms().filter(r => r.isSpaceRoom() && r.getMyMembership() === "join");
+    };
+
+    public getSpaceFilteredRoomIds = (space: Room | null): Set<string> => {
+        return this.spaceFilteredRooms.get(space?.roomId || HOME_SPACE) || new Set();
+    };
+
+    public rebuild = throttle(() => { // exported for tests
+        const visibleRooms = this.matrixClient.getVisibleRooms();
+
+        // Sort spaces by room ID to force the loop breaking to be deterministic
+        const spaces = sortBy(this.getSpaces(), space => space.roomId);
+        const unseenChildren = new Set<Room>([...visibleRooms, ...spaces]);
+
+        const backrefs = new EnhancedMap<string, Set<string>>();
+
+        // TODO handle cleaning up links when a Space is removed
+        spaces.forEach(space => {
+            const children = this.getChildren(space.roomId);
+            children.forEach(child => {
+                unseenChildren.delete(child);
+
+                backrefs.getOrCreate(child.roomId, new Set()).add(space.roomId);
+            });
+        });
+
+        const [rootSpaces, orphanedRooms] = partitionSpacesAndRooms(Array.from(unseenChildren));
+
+        // untested algorithm to handle full-cycles
+        const detachedNodes = new Set<Room>(spaces);
+
+        const markTreeChildren = (rootSpace: Room, unseen: Set<Room>) => {
+            const stack = [rootSpace];
+            while (stack.length) {
+                const op = stack.pop();
+                unseen.delete(op);
+                this.getChildSpaces(op.roomId).forEach(space => {
+                    if (unseen.has(space)) {
+                        stack.push(space);
+                    }
+                });
+            }
+        };
+
+        rootSpaces.forEach(rootSpace => {
+            markTreeChildren(rootSpace, detachedNodes);
+        });
+
+        // Handle spaces forming fully cyclical relationships.
+        // In order, assume each detachedNode is a root unless it has already
+        // been claimed as the child of prior detached node.
+        // Work from a copy of the detachedNodes set as it will be mutated as part of this operation.
+        Array.from(detachedNodes).forEach(detachedNode => {
+            if (!detachedNodes.has(detachedNode)) return;
+            // declare this detached node a new root, find its children, without ever looping back to it
+            detachedNodes.delete(detachedNode);
+            rootSpaces.push(detachedNode);
+            markTreeChildren(detachedNode, detachedNodes);
+
+            // TODO only consider a detached node a root space if it has no *parents other than the ones forming cycles
+        });
+
+        // TODO neither of these handle an A->B->C->A with an additional C->D
+        // detachedNodes.forEach(space => {
+        //     rootSpaces.push(space);
+        // });
+
+        this.orphanedRooms = new Set(orphanedRooms);
+        this.rootSpaces = rootSpaces;
+        this.parentMap = backrefs;
+
+        // if the currently selected space no longer exists, remove its selection
+        if (this._activeSpace && detachedNodes.has(this._activeSpace)) {
+            this.setActiveSpace(null);
+        }
+
+        this.onRoomsUpdate(); // TODO only do this if a change has happened
+        this.emit(UPDATE_TOP_LEVEL_SPACES, this.spacePanelSpaces);
+    }, 100, {trailing: true, leading: true});
+
+    onSpaceUpdate = () => {
+        this.rebuild();
+    }
+
+    private showInHomeSpace = (room: Room) => {
+        return !this.parentMap.get(room.roomId)?.size // put all orphaned rooms in the Home Space
+            || DMRoomMap.shared().getUserIdForRoomId(room.roomId) // put all DMs in the Home Space
+            || RoomListStore.instance.getTagsForRoom(room).includes(DefaultTagID.Favourite) // show all favourites
+    };
+
+    // Update a given room due to its tag changing (e.g DM-ness or Fav-ness)
+    // This can only change whether it shows up in the HOME_SPACE or not
+    private onRoomUpdate = (room: Room) => {
+        if (this.showInHomeSpace(room)) {
+            this.spaceFilteredRooms.get(HOME_SPACE)?.add(room.roomId);
+            this.emit(HOME_SPACE);
+        } else if (!this.orphanedRooms.has(room.roomId)) {
+            this.spaceFilteredRooms.get(HOME_SPACE)?.delete(room.roomId);
+            this.emit(HOME_SPACE);
+        }
+    };
+
+    private onRoomsUpdate = throttle(() => {
+        // TODO resolve some updates as deltas
+        const visibleRooms = this.matrixClient.getVisibleRooms();
+
+        const oldFilteredRooms = this.spaceFilteredRooms;
+        this.spaceFilteredRooms = new Map();
+
+        // put all invites (rooms & spaces) in the Home Space
+        const invites = this.matrixClient.getRooms().filter(r => r.getMyMembership() === "invite");
+        this.spaceFilteredRooms.set(HOME_SPACE, new Set<string>(invites.map(room => room.roomId)));
+
+        visibleRooms.forEach(room => {
+            if (this.showInHomeSpace(room)) {
+                this.spaceFilteredRooms.get(HOME_SPACE).add(room.roomId);
+            }
+        });
+
+        this.rootSpaces.forEach(s => {
+            // traverse each space tree in DFS to build up the supersets as you go up,
+            // reusing results from like subtrees.
+            const fn = (spaceId: string, parentPath: Set<string>): Set<string> => {
+                if (parentPath.has(spaceId)) return; // prevent cycles
+
+                // reuse existing results if multiple similar branches exist
+                if (this.spaceFilteredRooms.has(spaceId)) {
+                    return this.spaceFilteredRooms.get(spaceId);
+                }
+
+                const [childSpaces, childRooms] = partitionSpacesAndRooms(this.getChildren(spaceId));
+                const roomIds = new Set(childRooms.map(r => r.roomId));
+                const space = this.matrixClient?.getRoom(spaceId);
+
+                // Add relevant DMs
+                space?.getJoinedMembers().forEach(member => {
+                    DMRoomMap.shared().getDMRoomsForUserId(member.userId).forEach(roomId => {
+                        roomIds.add(roomId);
+                    });
+                });
+
+                const newPath = new Set(parentPath).add(spaceId);
+                childSpaces.forEach(childSpace => {
+                    fn(childSpace.roomId, newPath)?.forEach(roomId => {
+                        roomIds.add(roomId);
+                    });
+                });
+                this.spaceFilteredRooms.set(spaceId, roomIds);
+                return roomIds;
+            };
+
+            fn(s.roomId, new Set());
+        });
+
+        const diff = mapDiff(oldFilteredRooms, this.spaceFilteredRooms);
+        // filter out keys which changed by reference only by checking whether the sets differ
+        const changed = diff.changed.filter(k => setHasDiff(oldFilteredRooms.get(k), this.spaceFilteredRooms.get(k)));
+        [...diff.added, ...diff.removed, ...changed].forEach(k => {
+            this.emit(k);
+        });
+
+        this.spaceFilteredRooms.forEach((roomIds, s) => {
+            // Update NotificationStates
+            const rooms = this.matrixClient.getRooms().filter(room => roomIds.has(room.roomId));
+            this.getNotificationState(s)?.setRooms(rooms);
+        });
+    }, 100, {trailing: true, leading: true});
+
+    private onRoom = (room: Room) => {
+        if (room?.isSpaceRoom()) {
+            this.onSpaceUpdate();
+            this.emit(room.roomId);
+        } else {
+            // this.onRoomUpdate(room);
+            this.onRoomsUpdate();
+        }
+    };
+
+    private onRoomState = (ev: MatrixEvent) => {
+        const room = this.matrixClient.getRoom(ev.getRoomId());
+        if (!room) return;
+
+        if (ev.getType() === EventType.SpaceChild && room.isSpaceRoom()) {
+            this.onSpaceUpdate();
+            this.emit(room.roomId);
+        } else if (ev.getType() === EventType.SpaceParent) {
+            // TODO rebuild the space parent and not the room - check permissions?
+            // TODO confirm this after implementing parenting behaviour
+            if (room.isSpaceRoom()) {
+                this.onSpaceUpdate();
+            } else {
+                this.onRoomUpdate(room);
+            }
+            this.emit(room.roomId);
+        }
+    };
+
+    private onRoomAccountData = (ev: MatrixEvent, room: Room, lastEvent: MatrixEvent) => {
+        if (ev.getType() === EventType.Tag && !room.isSpaceRoom()) {
+            // If the room was in favourites and now isn't or the opposite then update its position in the trees
+            if (!!ev.getContent()[DefaultTagID.Favourite] !== !!lastEvent.getContent()[DefaultTagID.Favourite]) {
+                this.onRoomUpdate(room);
+            }
+        }
+    }
+
+    private onAccountData = (ev: MatrixEvent, lastEvent: MatrixEvent) => {
+        if (ev.getType() === EventType.Direct) {
+            const lastContent = lastEvent.getContent();
+            const content = ev.getContent();
+
+            const diff = objectDiff<Record<string, string[]>>(lastContent, content);
+            // filter out keys which changed by reference only by checking whether the sets differ
+            const changed = diff.changed.filter(k => arrayHasDiff(lastContent[k], content[k]));
+            // DM tag changes, refresh relevant rooms
+            new Set([...diff.added, ...diff.removed, ...changed]).forEach(roomId => {
+                const room = this.matrixClient?.getRoom(roomId);
+                if (room) {
+                    this.onRoomUpdate(room);
+                }
+            });
+        }
+    };
+
+    protected async onNotReady() {
+        if (!SettingsStore.getValue("feature_spaces")) return;
+        if (this.matrixClient) {
+            this.matrixClient.removeListener("Room", this.onRoom);
+            this.matrixClient.removeListener("Room.myMembership", this.onRoom);
+            this.matrixClient.removeListener("RoomState.events", this.onRoomState);
+            this.matrixClient.removeListener("Room.accountData", this.onRoomAccountData);
+            this.matrixClient.removeListener("accountData", this.onAccountData);
+        }
+        await this.reset({});
+    }
+
+    protected async onReady() {
+        if (!SettingsStore.getValue("feature_spaces")) return;
+        this.matrixClient.on("Room", this.onRoom);
+        this.matrixClient.on("Room.myMembership", this.onRoom);
+        this.matrixClient.on("RoomState.events", this.onRoomState);
+        this.matrixClient.on("Room.accountData", this.onRoomAccountData);
+        this.matrixClient.on("accountData", this.onAccountData);
+
+        await this.onSpaceUpdate(); // trigger an initial update
+
+        // restore selected state from last session if any and still valid
+        const lastSpaceId = window.localStorage.getItem(ACTIVE_SPACE_LS_KEY);
+        if (lastSpaceId) {
+            const space = this.rootSpaces.find(s => s.roomId === lastSpaceId);
+            if (space) {
+                this.setActiveSpace(space);
+            }
+        }
+    }
+
+    protected async onAction(payload: ActionPayload) {
+        switch (payload.action) {
+            case "view_room": {
+                const room = this.matrixClient?.getRoom(payload.room_id);
+
+                if (room?.getMyMembership() === "join") {
+                    if (room.isSpaceRoom()) {
+                        this.setActiveSpace(room);
+                    } else if (!this.spaceFilteredRooms.get(this._activeSpace?.roomId || HOME_SPACE).has(room.roomId)) {
+                        // TODO maybe reverse these first 2 clauses once space panel active is fixed
+                        let parent = this.rootSpaces.find(s => this.spaceFilteredRooms.get(s.roomId)?.has(room.roomId));
+                        if (!parent) {
+                            parent = this.getCanonicalParent(room.roomId);
+                        }
+                        if (!parent) {
+                            const parents = Array.from(this.parentMap.get(room.roomId) || []);
+                            parent = parents.find(p => this.matrixClient.getRoom(p));
+                        }
+                        if (parent) {
+                            this.setActiveSpace(parent);
+                        }
+                    }
+                }
+                break;
+            }
+            case "after_leave_room":
+                if (this._activeSpace && payload.room_id === this._activeSpace.roomId) {
+                    this.setActiveSpace(null);
+                }
+                break;
+        }
+    }
+
+    public getNotificationState(key: SpaceKey): SpaceNotificationState {
+        if (this.notificationStateMap.has(key)) {
+            return this.notificationStateMap.get(key);
+        }
+
+        const state = new SpaceNotificationState(key, getRoomFn);
+        this.notificationStateMap.set(key, state);
+        return state;
+    }
+}
+
+export default class SpaceStore {
+    private static internalInstance = new SpaceStoreClass();
+
+    public static get instance(): SpaceStoreClass {
+        return SpaceStore.internalInstance;
+    }
+}
+
+window.mxSpaceStore = SpaceStore.instance;
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/stores/WidgetEchoStore.js b/src/stores/WidgetEchoStore.js
index 7dd093d45e..3aef1beb3e 100644
--- a/src/stores/WidgetEchoStore.js
+++ b/src/stores/WidgetEchoStore.js
@@ -55,7 +55,7 @@ class WidgetEchoStore extends EventEmitter {
             const widgetId = w.getStateKey();
             // If there's no echo, or the echo still has a widget present, show the *old* widget
             // we don't include widgets that have changed for the same reason we don't include new ones,
-            // ie. we'd need to fake matrix events to do so and therte's currently no need.
+            // ie. we'd need to fake matrix events to do so and there's currently no need.
             if (!roomEchoState[widgetId] || Object.keys(roomEchoState[widgetId]).length !== 0) {
                 echoedWidgets.push(w);
             }
diff --git a/src/stores/WidgetStore.ts b/src/stores/WidgetStore.ts
index d9cbdec76d..8961581964 100644
--- a/src/stores/WidgetStore.ts
+++ b/src/stores/WidgetStore.ts
@@ -16,34 +16,33 @@ limitations under the License.
 
 import { Room } from "matrix-js-sdk/src/models/room";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { IWidget } from "matrix-widget-api";
 
 import { ActionPayload } from "../dispatcher/payloads";
 import { AsyncStoreWithClient } from "./AsyncStoreWithClient";
 import defaultDispatcher from "../dispatcher/dispatcher";
-import SettingsStore from "../settings/SettingsStore";
 import WidgetEchoStore from "../stores/WidgetEchoStore";
 import ActiveWidgetStore from "../stores/ActiveWidgetStore";
 import WidgetUtils from "../utils/WidgetUtils";
-import {SettingLevel} from "../settings/SettingLevel";
 import {WidgetType} from "../widgets/WidgetType";
 import {UPDATE_EVENT} from "./AsyncStore";
+import { MatrixClientPeg } from "../MatrixClientPeg";
 
 interface IState {}
 
-export interface IApp {
-    id: string;
-    type: string;
+export interface IApp extends IWidget {
     roomId: string;
     eventId: string;
-    creatorUserId: string;
-    waitForIframeLoad?: boolean;
     // eslint-disable-next-line camelcase
     avatar_url: string; // MSC2765 https://github.com/matrix-org/matrix-doc/pull/2765
 }
 
 interface IRoomWidgets {
     widgets: IApp[];
-    pinned: Record<string, boolean>;
+}
+
+function widgetUid(app: IApp): string {
+    return `${app.roomId ?? MatrixClientPeg.get().getUserId()}::${app.id}`;
 }
 
 // TODO consolidate WidgetEchoStore into this
@@ -51,13 +50,12 @@ interface IRoomWidgets {
 export default class WidgetStore extends AsyncStoreWithClient<IState> {
     private static internalInstance = new WidgetStore();
 
-    private widgetMap = new Map<string, IApp>();
-    private roomMap = new Map<string, IRoomWidgets>();
+    private widgetMap = new Map<string, IApp>(); // Key is widget Unique ID (UID)
+    private roomMap = new Map<string, IRoomWidgets>(); // Key is room ID
 
     private constructor() {
         super(defaultDispatcher, {});
 
-        SettingsStore.watchSetting("Widgets.pinned", null, this.onPinnedWidgetsChange);
         WidgetEchoStore.on("update", this.onWidgetEchoStoreUpdate);
     }
 
@@ -68,31 +66,22 @@ export default class WidgetStore extends AsyncStoreWithClient<IState> {
     private initRoom(roomId: string) {
         if (!this.roomMap.has(roomId)) {
             this.roomMap.set(roomId, {
-                pinned: {},
                 widgets: [],
             });
         }
     }
 
     protected async onReady(): Promise<any> {
+        this.matrixClient.on("Room", this.onRoom);
         this.matrixClient.on("RoomState.events", this.onRoomStateEvents);
         this.matrixClient.getRooms().forEach((room: Room) => {
-            const pinned = SettingsStore.getValue("Widgets.pinned", room.roomId);
-
-            if (pinned || WidgetUtils.getRoomWidgets(room).length) {
-                this.initRoom(room.roomId);
-            }
-
-            if (pinned) {
-                this.getRoom(room.roomId).pinned = pinned;
-            }
-
             this.loadRoomWidgets(room);
         });
-        this.emit(UPDATE_EVENT);
+        this.emit(UPDATE_EVENT, null); // emit for all rooms
     }
 
     protected async onNotReady(): Promise<any> {
+        this.matrixClient.off("Room", this.onRoom);
         this.matrixClient.off("RoomState.events", this.onRoomStateEvents);
         this.widgetMap = new Map();
         this.roomMap = new Map();
@@ -107,7 +96,7 @@ export default class WidgetStore extends AsyncStoreWithClient<IState> {
     private onWidgetEchoStoreUpdate = (roomId: string, widgetId: string) => {
         this.initRoom(roomId);
         this.loadRoomWidgets(this.matrixClient.getRoom(roomId));
-        this.emit(UPDATE_EVENT);
+        this.emit(UPDATE_EVENT, roomId);
     };
 
     private generateApps(room: Room): IApp[] {
@@ -120,94 +109,59 @@ export default class WidgetStore extends AsyncStoreWithClient<IState> {
 
     private loadRoomWidgets(room: Room) {
         if (!room) return;
-        const roomInfo = this.roomMap.get(room.roomId);
+        const roomInfo = this.roomMap.get(room.roomId) || <IRoomWidgets>{};
         roomInfo.widgets = [];
-        this.generateApps(room).forEach(app => {
-            this.widgetMap.set(app.id, app);
-            roomInfo.widgets.push(app);
+
+        // first clean out old widgets from the map which originate from this room
+        // otherwise we are out of sync with the rest of the app with stale widget events during removal
+        Array.from(this.widgetMap.values()).forEach(app => {
+            if (app.roomId !== room.roomId) return; // skip - wrong room
+            this.widgetMap.delete(widgetUid(app));
         });
+
+        let edited = false;
+        this.generateApps(room).forEach(app => {
+            // Sanity check for https://github.com/vector-im/element-web/issues/15705
+            const existingApp = this.widgetMap.get(widgetUid(app));
+            if (existingApp) {
+                console.warn(
+                    `Possible widget ID conflict for ${app.id} - wants to store in room ${app.roomId} ` +
+                    `but is currently stored as ${existingApp.roomId} - letting the want win`,
+                );
+            }
+
+            this.widgetMap.set(widgetUid(app), app);
+            roomInfo.widgets.push(app);
+            edited = true;
+        });
+        if (edited && !this.roomMap.has(room.roomId)) {
+            this.roomMap.set(room.roomId, roomInfo);
+        }
         this.emit(room.roomId);
     }
 
+    private onRoom = (room: Room) => {
+        this.initRoom(room.roomId);
+        this.loadRoomWidgets(room);
+        this.emit(UPDATE_EVENT, room.roomId);
+    };
+
     private onRoomStateEvents = (ev: MatrixEvent) => {
-        if (ev.getType() !== "im.vector.modular.widgets") return;
+        if (ev.getType() !== "im.vector.modular.widgets") return; // TODO: Support m.widget too
         const roomId = ev.getRoomId();
         this.initRoom(roomId);
         this.loadRoomWidgets(this.matrixClient.getRoom(roomId));
-        this.emit(UPDATE_EVENT);
+        this.emit(UPDATE_EVENT, roomId);
     };
 
-    public getRoomId = (widgetId: string) => {
-        const app = this.widgetMap.get(widgetId);
-        if (!app) return null;
-        return app.roomId;
-    }
-
-    public getRoom = (roomId: string) => {
+    public getRoom = (roomId: string, initIfNeeded = false) => {
+        if (initIfNeeded) this.initRoom(roomId); // internally handles "if needed"
         return this.roomMap.get(roomId);
     };
 
-    private onPinnedWidgetsChange = (settingName: string, roomId: string) => {
-        this.initRoom(roomId);
-        this.getRoom(roomId).pinned = SettingsStore.getValue(settingName, roomId);
-        this.emit(roomId);
-        this.emit(UPDATE_EVENT);
-    };
-
-    public isPinned(widgetId: string) {
-        const roomId = this.getRoomId(widgetId);
+    public getApps(roomId: string): IApp[] {
         const roomInfo = this.getRoom(roomId);
-
-        let pinned = roomInfo && roomInfo.pinned[widgetId];
-        // Jitsi widgets should be pinned by default
-        const widget = this.widgetMap.get(widgetId);
-        if (pinned === undefined && WidgetType.JITSI.matches(widget?.type)) pinned = true;
-        return pinned;
-    }
-
-    public canPin(widgetId: string) {
-        // only allow pinning up to a max of two as we do not yet have grid splits
-        // the only case it will go to three is if you have two and then a Jitsi gets added
-        const roomId = this.getRoomId(widgetId);
-        const roomInfo = this.getRoom(roomId);
-        return roomInfo && Object.keys(roomInfo.pinned).filter(k => {
-            return roomInfo.pinned[k] && roomInfo.widgets.some(app => app.id === k);
-        }).length < 2;
-    }
-
-    public pinWidget(widgetId: string) {
-        this.setPinned(widgetId, true);
-    }
-
-    public unpinWidget(widgetId: string) {
-        this.setPinned(widgetId, false);
-    }
-
-    private setPinned(widgetId: string, value: boolean) {
-        const roomId = this.getRoomId(widgetId);
-        const roomInfo = this.getRoom(roomId);
-        if (!roomInfo) return;
-        roomInfo.pinned[widgetId] = value;
-
-        // Clean up the pinned record
-        Object.keys(roomInfo).forEach(wId => {
-            if (!roomInfo.widgets.some(w => w.id === wId)) {
-                delete roomInfo.pinned[wId];
-            }
-        });
-
-        SettingsStore.setValue("Widgets.pinned", roomId, SettingLevel.ROOM_ACCOUNT, roomInfo.pinned);
-        this.emit(roomId);
-        this.emit(UPDATE_EVENT);
-    }
-
-    public getApps(room: Room, pinned?: boolean): IApp[] {
-        const roomInfo = this.getRoom(room.roomId);
-        if (!roomInfo) return [];
-        if (pinned) {
-            return roomInfo.widgets.filter(app => this.isPinned(app.id));
-        }
-        return roomInfo.widgets;
+        return roomInfo?.widgets || [];
     }
 
     public doesRoomHaveConference(room: Room): boolean {
diff --git a/src/stores/notifications/SpaceNotificationState.ts b/src/stores/notifications/SpaceNotificationState.ts
new file mode 100644
index 0000000000..61a9701a07
--- /dev/null
+++ b/src/stores/notifications/SpaceNotificationState.ts
@@ -0,0 +1,82 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { Room } from "matrix-js-sdk/src/models/room";
+
+import { NotificationColor } from "./NotificationColor";
+import { arrayDiff } from "../../utils/arrays";
+import { RoomNotificationState } from "./RoomNotificationState";
+import { NOTIFICATION_STATE_UPDATE, NotificationState } from "./NotificationState";
+import { FetchRoomFn } from "./ListNotificationState";
+
+export class SpaceNotificationState extends NotificationState {
+    private rooms: Room[] = [];
+    private states: { [spaceId: string]: RoomNotificationState } = {};
+
+    constructor(private spaceId: string | symbol, private getRoomFn: FetchRoomFn) {
+        super();
+    }
+
+    public get symbol(): string {
+        return null; // This notification state doesn't support symbols
+    }
+
+    public setRooms(rooms: Room[]) {
+        const oldRooms = this.rooms;
+        const diff = arrayDiff(oldRooms, rooms);
+        this.rooms = rooms;
+        for (const oldRoom of diff.removed) {
+            const state = this.states[oldRoom.roomId];
+            if (!state) continue; // We likely just didn't have a badge (race condition)
+            delete this.states[oldRoom.roomId];
+            state.off(NOTIFICATION_STATE_UPDATE, this.onRoomNotificationStateUpdate);
+        }
+        for (const newRoom of diff.added) {
+            const state = this.getRoomFn(newRoom);
+            state.on(NOTIFICATION_STATE_UPDATE, this.onRoomNotificationStateUpdate);
+            this.states[newRoom.roomId] = state;
+        }
+
+        this.calculateTotalState();
+    }
+
+    public destroy() {
+        super.destroy();
+        for (const state of Object.values(this.states)) {
+            state.off(NOTIFICATION_STATE_UPDATE, this.onRoomNotificationStateUpdate);
+        }
+        this.states = {};
+    }
+
+    private onRoomNotificationStateUpdate = () => {
+        this.calculateTotalState();
+    };
+
+    private calculateTotalState() {
+        const snapshot = this.snapshot();
+
+        this._count = 0;
+        this._color = NotificationColor.None;
+        for (const state of Object.values(this.states)) {
+            this._count += state.count;
+            this._color = Math.max(this.color, state.color);
+        }
+
+        // finally, publish an update if needed
+        this.emitIfUpdated(snapshot);
+    }
+}
+
diff --git a/src/stores/room-list/MessagePreviewStore.ts b/src/stores/room-list/MessagePreviewStore.ts
index 2803f0a23e..1da0e661e8 100644
--- a/src/stores/room-list/MessagePreviewStore.ts
+++ b/src/stores/room-list/MessagePreviewStore.ts
@@ -30,7 +30,7 @@ import { UPDATE_EVENT } from "../AsyncStore";
 
 // Emitted event for when a room's preview has changed. First argument will the room for which
 // the change happened.
-export const ROOM_PREVIEW_CHANGED = "room_preview_changed";
+const ROOM_PREVIEW_CHANGED = "room_preview_changed";
 
 const PREVIEWS = {
     'm.room.message': {
@@ -84,6 +84,10 @@ export class MessagePreviewStore extends AsyncStoreWithClient<IState> {
         return MessagePreviewStore.internalInstance;
     }
 
+    public static getPreviewChangedEventName(room: Room): string {
+        return `${ROOM_PREVIEW_CHANGED}:${room?.roomId}`;
+    }
+
     /**
      * Gets the pre-translated preview for a given room
      * @param room The room to get the preview for.
@@ -120,7 +124,10 @@ export class MessagePreviewStore extends AsyncStoreWithClient<IState> {
 
         let changed = false;
         for (let i = events.length - 1; i >= 0; i--) {
-            if (i === events.length - MAX_EVENTS_BACKWARDS) return; // limit reached
+            if (i === events.length - MAX_EVENTS_BACKWARDS) {
+                // limit reached - clear the preview by breaking out of the loop
+                break;
+            }
 
             const event = events[i];
             const previewDef = PREVIEWS[event.getType()];
@@ -150,7 +157,7 @@ export class MessagePreviewStore extends AsyncStoreWithClient<IState> {
                 // We've muted the underlying Map, so just emit that we've changed.
                 this.previews.set(room.roomId, map);
                 this.emit(UPDATE_EVENT, this);
-                this.emit(ROOM_PREVIEW_CHANGED, room);
+                this.emit(MessagePreviewStore.getPreviewChangedEventName(room), room);
             }
             return; // we're done
         }
@@ -158,7 +165,7 @@ export class MessagePreviewStore extends AsyncStoreWithClient<IState> {
         // At this point, we didn't generate a preview so clear it
         this.previews.set(room.roomId, new Map<TagID|TAG_ANY, string|null>());
         this.emit(UPDATE_EVENT, this);
-        this.emit(ROOM_PREVIEW_CHANGED, room);
+        this.emit(MessagePreviewStore.getPreviewChangedEventName(room), room);
     }
 
     protected async onAction(payload: ActionPayload) {
diff --git a/src/stores/room-list/RoomListStore.ts b/src/stores/room-list/RoomListStore.ts
index 0f3138fe9e..60a960261c 100644
--- a/src/stores/room-list/RoomListStore.ts
+++ b/src/stores/room-list/RoomListStore.ts
@@ -34,6 +34,8 @@ import { MarkedExecution } from "../../utils/MarkedExecution";
 import { AsyncStoreWithClient } from "../AsyncStoreWithClient";
 import { NameFilterCondition } from "./filters/NameFilterCondition";
 import { RoomNotificationStateStore } from "../notifications/RoomNotificationStateStore";
+import { VisibilityProvider } from "./filters/VisibilityProvider";
+import { SpaceWatcher } from "./SpaceWatcher";
 
 interface IState {
     tagsEnabled?: boolean;
@@ -55,10 +57,11 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
     private initialListsGenerated = false;
     private algorithm = new Algorithm();
     private filterConditions: IFilterCondition[] = [];
-    private tagWatcher = new TagWatcher(this);
+    private tagWatcher: TagWatcher;
+    private spaceWatcher: SpaceWatcher;
     private updateFn = new MarkedExecution(() => {
-        for (const tagId of Object.keys(this.unfilteredLists)) {
-            RoomNotificationStateStore.instance.getListState(tagId).setRooms(this.unfilteredLists[tagId]);
+        for (const tagId of Object.keys(this.orderedLists)) {
+            RoomNotificationStateStore.instance.getListState(tagId).setRooms(this.orderedLists[tagId]);
         }
         this.emit(LISTS_UPDATE_EVENT);
     });
@@ -76,6 +79,15 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
         RoomViewStore.addListener(() => this.handleRVSUpdate({}));
         this.algorithm.on(LIST_UPDATED_EVENT, this.onAlgorithmListUpdated);
         this.algorithm.on(FILTER_CHANGED, this.onAlgorithmFilterUpdated);
+        this.setupWatchers();
+    }
+
+    private setupWatchers() {
+        if (SettingsStore.getValue("feature_spaces")) {
+            this.spaceWatcher = new SpaceWatcher(this);
+        } else {
+            this.tagWatcher = new TagWatcher(this);
+        }
     }
 
     public get unfilteredLists(): ITagMap {
@@ -88,16 +100,12 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
         return this.algorithm.getOrderedRooms();
     }
 
-    public get matrixClient(): MatrixClient {
-        return super.matrixClient;
-    }
-
     // Intended for test usage
     public async resetStore() {
         await this.reset();
-        this.tagWatcher = new TagWatcher(this);
         this.filterConditions = [];
         this.initialListsGenerated = false;
+        this.setupWatchers();
 
         this.algorithm.off(LIST_UPDATED_EVENT, this.onAlgorithmListUpdated);
         this.algorithm.off(FILTER_CHANGED, this.onAlgorithmListUpdated);
@@ -113,7 +121,7 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
     // Public for test usage. Do not call this.
     public async makeReady(forcedClient?: MatrixClient) {
         if (forcedClient) {
-            super.matrixClient = forcedClient;
+            this.readyStore.useUnitTestClient(forcedClient);
         }
 
         this.checkLoggingEnabled();
@@ -401,6 +409,19 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
     }
 
     private async handleRoomUpdate(room: Room, cause: RoomUpdateCause): Promise<any> {
+        if (cause === RoomUpdateCause.NewRoom) {
+            // Let the visibility provider know that there is a new invited room. It would be nice
+            // if this could just be an event that things listen for but the point of this is that
+            // we delay doing anything about this room until the VoipUserMapper had had a chance
+            // to do the things it needs to do to decide if we should show this room or not, so
+            // an even wouldn't et us do that.
+            await VisibilityProvider.instance.onNewInvitedRoom(room);
+        }
+
+        if (!VisibilityProvider.instance.isRoomVisible(room)) {
+            return; // don't do anything on rooms that aren't visible
+        }
+
         const shouldUpdate = await this.algorithm.handleRoomUpdate(room, cause);
         if (shouldUpdate) {
             if (SettingsStore.getValue("advancedRoomListLogging")) {
@@ -544,7 +565,12 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
     public async regenerateAllLists({trigger = true}) {
         console.warn("Regenerating all room lists");
 
-        const rooms = this.matrixClient.getVisibleRooms();
+        const rooms = [
+            ...this.matrixClient.getVisibleRooms(),
+            // also show space invites in the room list
+            ...this.matrixClient.getRooms().filter(r => r.isSpaceRoom() && r.getMyMembership() === "invite"),
+        ].filter(r => VisibilityProvider.instance.isRoomVisible(r));
+
         const customTags = new Set<TagID>();
         if (this.state.tagsEnabled) {
             for (const room of rooms) {
diff --git a/src/stores/room-list/SpaceWatcher.ts b/src/stores/room-list/SpaceWatcher.ts
new file mode 100644
index 0000000000..d26f563a91
--- /dev/null
+++ b/src/stores/room-list/SpaceWatcher.ts
@@ -0,0 +1,39 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { Room } from "matrix-js-sdk/src/models/room";
+
+import { RoomListStoreClass } from "./RoomListStore";
+import { SpaceFilterCondition } from "./filters/SpaceFilterCondition";
+import SpaceStore, { UPDATE_SELECTED_SPACE } from "../SpaceStore";
+
+/**
+ * Watches for changes in spaces to manage the filter on the provided RoomListStore
+ */
+export class SpaceWatcher {
+    private filter = new SpaceFilterCondition();
+    private activeSpace: Room = SpaceStore.instance.activeSpace;
+
+    constructor(private store: RoomListStoreClass) {
+        this.filter.updateSpace(this.activeSpace); // get the filter into a consistent state
+        store.addFilter(this.filter);
+        SpaceStore.instance.on(UPDATE_SELECTED_SPACE, this.onSelectedSpaceUpdated);
+    }
+
+    private onSelectedSpaceUpdated = (activeSpace) => {
+        this.filter.updateSpace(this.activeSpace = activeSpace);
+    };
+}
diff --git a/src/stores/room-list/algorithms/Algorithm.ts b/src/stores/room-list/algorithms/Algorithm.ts
index 439141edb4..fed3099325 100644
--- a/src/stores/room-list/algorithms/Algorithm.ts
+++ b/src/stores/room-list/algorithms/Algorithm.ts
@@ -34,6 +34,7 @@ import { EffectiveMembership, getEffectiveMembership, splitRoomsByMembership } f
 import { OrderingAlgorithm } from "./list-ordering/OrderingAlgorithm";
 import { getListAlgorithmInstance } from "./list-ordering";
 import SettingsStore from "../../../settings/SettingsStore";
+import { VisibilityProvider } from "../filters/VisibilityProvider";
 
 /**
  * Fired when the Algorithm has determined a list has been updated.
@@ -185,9 +186,16 @@ export class Algorithm extends EventEmitter {
     }
 
     private async doUpdateStickyRoom(val: Room) {
+        // no-op sticky rooms for spaces - they're effectively virtual rooms
+        if (val?.isSpaceRoom() && val.getMyMembership() !== "invite") val = null;
+
         // Note throughout: We need async so we can wait for handleRoomUpdate() to do its thing,
         // otherwise we risk duplicating rooms.
 
+        if (val && !VisibilityProvider.instance.isRoomVisible(val)) {
+            val = null; // the room isn't visible - lie to the rest of this function
+        }
+
         // Set the last sticky room to indicate that we're in a change. The code throughout the
         // class can safely handle a null room, so this should be safe to do as a backup.
         this._lastStickyRoom = this._stickyRoom || <IStickyRoom>{};
@@ -206,7 +214,7 @@ export class Algorithm extends EventEmitter {
         }
 
         // When we do have a room though, we expect to be able to find it
-        let tag = this.roomIdsToTags[val.roomId][0];
+        let tag = this.roomIdsToTags[val.roomId]?.[0];
         if (!tag) throw new Error(`${val.roomId} does not belong to a tag and cannot be sticky`);
 
         // We specifically do NOT use the ordered rooms set as it contains the sticky room, which
diff --git a/src/stores/room-list/filters/CommunityFilterCondition.ts b/src/stores/room-list/filters/CommunityFilterCondition.ts
index 924a85e86a..fbdfefb983 100644
--- a/src/stores/room-list/filters/CommunityFilterCondition.ts
+++ b/src/stores/room-list/filters/CommunityFilterCondition.ts
@@ -19,17 +19,17 @@ import { FILTER_CHANGED, FilterPriority, IFilterCondition } from "./IFilterCondi
 import { Group } from "matrix-js-sdk/src/models/group";
 import { EventEmitter } from "events";
 import GroupStore from "../../GroupStore";
-import { arrayHasDiff } from "../../../utils/arrays";
 import { IDestroyable } from "../../../utils/IDestroyable";
 import DMRoomMap from "../../../utils/DMRoomMap";
+import { setHasDiff } from "../../../utils/sets";
 
 /**
  * A filter condition for the room list which reveals rooms which
  * are a member of a given community.
  */
 export class CommunityFilterCondition extends EventEmitter implements IFilterCondition, IDestroyable {
-    private roomIds: string[] = [];
-    private userIds: string[] = [];
+    private roomIds = new Set<string>();
+    private userIds = new Set<string>();
 
     constructor(private community: Group) {
         super();
@@ -45,19 +45,18 @@ export class CommunityFilterCondition extends EventEmitter implements IFilterCon
     }
 
     public isVisible(room: Room): boolean {
-        return this.roomIds.includes(room.roomId) ||
-            this.userIds.includes(DMRoomMap.shared().getUserIdForRoomId(room.roomId));
+        return this.roomIds.has(room.roomId) || this.userIds.has(DMRoomMap.shared().getUserIdForRoomId(room.roomId));
     }
 
     private onStoreUpdate = async (): Promise<any> => {
         // We don't actually know if the room list changed for the community, so just check it again.
         const beforeRoomIds = this.roomIds;
-        this.roomIds = (await GroupStore.getGroupRooms(this.community.groupId)).map(r => r.roomId);
+        this.roomIds = new Set((await GroupStore.getGroupRooms(this.community.groupId)).map(r => r.roomId));
 
         const beforeUserIds = this.userIds;
-        this.userIds = (await GroupStore.getGroupMembers(this.community.groupId)).map(u => u.userId);
+        this.userIds = new Set((await GroupStore.getGroupMembers(this.community.groupId)).map(u => u.userId));
 
-        if (arrayHasDiff(beforeRoomIds, this.roomIds) || arrayHasDiff(beforeUserIds, this.userIds)) {
+        if (setHasDiff(beforeRoomIds, this.roomIds) || setHasDiff(beforeUserIds, this.userIds)) {
             this.emit(FILTER_CHANGED);
         }
     };
diff --git a/src/stores/room-list/filters/SpaceFilterCondition.ts b/src/stores/room-list/filters/SpaceFilterCondition.ts
new file mode 100644
index 0000000000..49c58c9d1d
--- /dev/null
+++ b/src/stores/room-list/filters/SpaceFilterCondition.ts
@@ -0,0 +1,69 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { EventEmitter } from "events";
+import { Room } from "matrix-js-sdk/src/models/room";
+
+import { FILTER_CHANGED, FilterPriority, IFilterCondition } from "./IFilterCondition";
+import { IDestroyable } from "../../../utils/IDestroyable";
+import SpaceStore, {HOME_SPACE} from "../../SpaceStore";
+import { setHasDiff } from "../../../utils/sets";
+
+/**
+ * A filter condition for the room list which reveals rooms which
+ * are a member of a given space or if no space is selected shows:
+ *  + Orphaned rooms (ones not in any space you are a part of)
+ *  + All DMs
+ */
+export class SpaceFilterCondition extends EventEmitter implements IFilterCondition, IDestroyable {
+    private roomIds = new Set<Room>();
+    private space: Room = null;
+
+    public get relativePriority(): FilterPriority {
+        // Lowest priority so we can coarsely find rooms.
+        return FilterPriority.Lowest;
+    }
+
+    public isVisible(room: Room): boolean {
+        return this.roomIds.has(room.roomId);
+    }
+
+    private onStoreUpdate = async (): Promise<void> => {
+        const beforeRoomIds = this.roomIds;
+        this.roomIds = SpaceStore.instance.getSpaceFilteredRoomIds(this.space);
+
+        if (setHasDiff(beforeRoomIds, this.roomIds)) {
+            // XXX: Room List Store has a bug where rooms which are synced after the filter is set
+            // are excluded from the filter, this is a workaround for it.
+            this.emit(FILTER_CHANGED);
+            setTimeout(() => {
+                this.emit(FILTER_CHANGED);
+            }, 500);
+        }
+    };
+
+    private getSpaceEventKey = (space: Room | null) => space ? space.roomId : HOME_SPACE;
+
+    public updateSpace(space: Room) {
+        SpaceStore.instance.off(this.getSpaceEventKey(this.space), this.onStoreUpdate);
+        SpaceStore.instance.on(this.getSpaceEventKey(this.space = space), this.onStoreUpdate);
+        this.onStoreUpdate(); // initial update from the change to the space
+    }
+
+    public destroy(): void {
+        SpaceStore.instance.off(this.getSpaceEventKey(this.space), this.onStoreUpdate);
+    }
+}
diff --git a/src/stores/room-list/filters/VisibilityProvider.ts b/src/stores/room-list/filters/VisibilityProvider.ts
new file mode 100644
index 0000000000..388bb061e3
--- /dev/null
+++ b/src/stores/room-list/filters/VisibilityProvider.ts
@@ -0,0 +1,60 @@
+/*
+ * 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 {Room} from "matrix-js-sdk/src/models/room";
+import CallHandler from "../../../CallHandler";
+import { RoomListCustomisations } from "../../../customisations/RoomList";
+import VoipUserMapper from "../../../VoipUserMapper";
+import SettingsStore from "../../../settings/SettingsStore";
+
+export class VisibilityProvider {
+    private static internalInstance: VisibilityProvider;
+
+    private constructor() {
+    }
+
+    public static get instance(): VisibilityProvider {
+        if (!VisibilityProvider.internalInstance) {
+            VisibilityProvider.internalInstance = new VisibilityProvider();
+        }
+        return VisibilityProvider.internalInstance;
+    }
+
+    public async onNewInvitedRoom(room: Room) {
+        await VoipUserMapper.sharedInstance().onNewInvitedRoom(room);
+    }
+
+    public isRoomVisible(room: Room): boolean {
+        if (
+            CallHandler.sharedInstance().getSupportsVirtualRooms() &&
+            VoipUserMapper.sharedInstance().isVirtualRoom(room)
+        ) {
+            return false;
+        }
+
+        // hide space rooms as they'll be shown in the SpacePanel
+        if (room.isSpaceRoom() && SettingsStore.getValue("feature_spaces")) {
+            return false;
+        }
+
+        const isVisibleFn = RoomListCustomisations.isRoomVisible;
+        if (isVisibleFn) {
+            return isVisibleFn(room);
+        }
+
+        return true; // default
+    }
+}
diff --git a/src/stores/room-list/previews/CallHangupEvent.ts b/src/stores/room-list/previews/CallHangupEvent.ts
index adc7d1aac8..fdab8a9de5 100644
--- a/src/stores/room-list/previews/CallHangupEvent.ts
+++ b/src/stores/room-list/previews/CallHangupEvent.ts
@@ -24,9 +24,9 @@ export class CallHangupEvent implements IPreview {
     public getTextFor(event: MatrixEvent, tagId?: TagID): string {
         if (shouldPrefixMessagesIn(event.getRoomId(), tagId)) {
             if (isSelf(event)) {
-                return _t("You left the call");
+                return _t("You ended the call");
             } else {
-                return _t("%(senderName)s left the call", {senderName: getSenderName(event)});
+                return _t("%(senderName)s ended the call", {senderName: getSenderName(event)});
             }
         } else {
             return _t("Call ended");
diff --git a/src/stores/widgets/ElementWidgetActions.ts b/src/stores/widgets/ElementWidgetActions.ts
index b101a119a4..de48746a74 100644
--- a/src/stores/widgets/ElementWidgetActions.ts
+++ b/src/stores/widgets/ElementWidgetActions.ts
@@ -14,8 +14,24 @@
  * limitations under the License.
  */
 
+import { IWidgetApiRequest } from "matrix-widget-api";
+
 export enum ElementWidgetActions {
     ClientReady = "im.vector.ready",
     HangupCall = "im.vector.hangup",
     OpenIntegrationManager = "integration_manager_open",
+
+    /**
+     * @deprecated Use MSC2931 instead
+     */
+    ViewRoom = "io.element.view_room",
+}
+
+/**
+ * @deprecated Use MSC2931 instead
+ */
+export interface IViewRoomApiRequest extends IWidgetApiRequest {
+    data: {
+        room_id: string; // eslint-disable-line camelcase
+    };
 }
diff --git a/src/stores/widgets/ElementWidgetCapabilities.ts b/src/stores/widgets/ElementWidgetCapabilities.ts
new file mode 100644
index 0000000000..e493d5618f
--- /dev/null
+++ b/src/stores/widgets/ElementWidgetCapabilities.ts
@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+
+export enum ElementWidgetCapabilities {
+    /**
+     * @deprecated Use MSC2931 instead.
+     */
+    CanChangeViewedRoom = "io.element.view_room",
+}
diff --git a/src/stores/widgets/StopGapWidget.ts b/src/stores/widgets/StopGapWidget.ts
index 7f437dfce0..17371d6d45 100644
--- a/src/stores/widgets/StopGapWidget.ts
+++ b/src/stores/widgets/StopGapWidget.ts
@@ -28,6 +28,9 @@ import {
     runTemplate,
     Widget,
     WidgetApiFromWidgetAction,
+    IModalWidgetOpenRequest,
+    IWidgetApiErrorResponseData,
+    WidgetKind,
 } from "matrix-widget-api";
 import { StopGapWidgetDriver } from "./StopGapWidgetDriver";
 import { EventEmitter } from "events";
@@ -42,7 +45,13 @@ import { WidgetType } from "../../widgets/WidgetType";
 import ActiveWidgetStore from "../ActiveWidgetStore";
 import { objectShallowClone } from "../../utils/objects";
 import defaultDispatcher from "../../dispatcher/dispatcher";
-import { ElementWidgetActions } from "./ElementWidgetActions";
+import { ElementWidgetActions, IViewRoomApiRequest } from "./ElementWidgetActions";
+import {ModalWidgetStore} from "../ModalWidgetStore";
+import ThemeWatcher from "../../settings/watchers/ThemeWatcher";
+import {getCustomTheme} from "../../theme";
+import CountlyAnalytics from "../../CountlyAnalytics";
+import { ElementWidgetCapabilities } from "./ElementWidgetCapabilities";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 
 // TODO: Destroy all of this code
 
@@ -59,16 +68,16 @@ interface IAppTileProps {
 }
 
 // TODO: Don't use this because it's wrong
-class ElementWidget extends Widget {
-    constructor(w) {
-        super(w);
+export class ElementWidget extends Widget {
+    constructor(private rawDefinition: IWidget) {
+        super(rawDefinition);
     }
 
     public get templateUrl(): string {
         if (WidgetType.JITSI.matches(this.type)) {
             return WidgetUtils.getLocalJitsiWrapperUrl({
                 forLocalRender: true,
-                auth: super.rawData?.auth, // this.rawData can call templateUrl, do this to prevent looping
+                auth: super.rawData?.auth as string, // this.rawData can call templateUrl, do this to prevent looping
             });
         }
         return super.templateUrl;
@@ -78,7 +87,7 @@ class ElementWidget extends Widget {
         if (WidgetType.JITSI.matches(this.type)) {
             return WidgetUtils.getLocalJitsiWrapperUrl({
                 forLocalRender: false, // The only important difference between this and templateUrl()
-                auth: super.rawData?.auth,
+                auth: super.rawData?.auth as string,
             });
         }
         return this.templateUrl; // use this instead of super to ensure we get appropriate templating
@@ -96,9 +105,25 @@ class ElementWidget extends Widget {
             // v1 widgets default to jitsi.riot.im regardless of user settings
             domain = "jitsi.riot.im";
         }
+
+        let theme = new ThemeWatcher().getEffectiveTheme();
+        if (theme.startsWith("custom-")) {
+            const customTheme = getCustomTheme(theme.substr(7));
+            // Jitsi only understands light/dark
+            theme = customTheme.is_dark ? "dark" : "light";
+        }
+
+        // only allow light/dark through, defaulting to dark as that was previously the only state
+        // accounts for legacy-light/legacy-dark themes too
+        if (theme.includes("light")) {
+            theme = "light";
+        } else {
+            theme = "dark";
+        }
+
         return {
             ...super.rawData,
-            theme: SettingsStore.getValue("theme"),
+            theme,
             conferenceId,
             domain,
         };
@@ -106,12 +131,7 @@ class ElementWidget extends Widget {
 
     public getCompleteUrl(params: ITemplateParams, asPopout=false): string {
         return runTemplate(asPopout ? this.popoutTemplateUrl : this.templateUrl, {
-            // we need to supply a whole widget to the template, but don't have
-            // easy access to the definition the superclass is using, so be sad
-            // and gutwrench it.
-            // This isn't a problem when the widget architecture is fixed and this
-            // subclass gets deleted.
-            ...super['definition'], // XXX: Private member access
+            ...this.rawDefinition,
             data: this.rawData,
         }, params);
     }
@@ -121,6 +141,8 @@ export class StopGapWidget extends EventEmitter {
     private messaging: ClientWidgetApi;
     private mockWidget: ElementWidget;
     private scalarToken: string;
+    private roomId?: string;
+    private kind: WidgetKind;
 
     constructor(private appTileProps: IAppTileProps) {
         super();
@@ -133,6 +155,19 @@ export class StopGapWidget extends EventEmitter {
         }
 
         this.mockWidget = new ElementWidget(app);
+        this.roomId = appTileProps.room?.roomId;
+        this.kind = appTileProps.userWidget ? WidgetKind.Account : WidgetKind.Room; // probably
+    }
+
+    private get eventListenerRoomId(): string {
+        // When widgets are listening to events, we need to make sure they're only
+        // receiving events for the right room. In particular, room widgets get locked
+        // to the room they were added in while account widgets listen to the currently
+        // active room.
+
+        if (this.roomId) return this.roomId;
+
+        return RoomViewStore.getRoomId();
     }
 
     public get widgetApi(): ClientWidgetApi {
@@ -155,7 +190,7 @@ export class StopGapWidget extends EventEmitter {
 
     private runUrlTemplate(opts = {asPopout: false}): string {
         const templated = this.mockWidget.getCompleteUrl({
-            currentRoomId: RoomViewStore.getRoomId(),
+            widgetRoomId: this.roomId,
             currentUserId: MatrixClientPeg.get().getUserId(),
             userDisplayName: OwnProfileStore.instance.displayName,
             userHttpAvatarUrl: OwnProfileStore.instance.getHttpAvatarUrl(),
@@ -190,30 +225,105 @@ export class StopGapWidget extends EventEmitter {
         return !!this.messaging;
     }
 
+    private get widgetId() {
+        return this.messaging.widget.id;
+    }
+
+    private onOpenModal = async (ev: CustomEvent<IModalWidgetOpenRequest>) => {
+        ev.preventDefault();
+        if (ModalWidgetStore.instance.canOpenModalWidget()) {
+            ModalWidgetStore.instance.openModalWidget(ev.detail.data, this.mockWidget);
+            this.messaging.transport.reply(ev.detail, {}); // ack
+        } else {
+            this.messaging.transport.reply(ev.detail, {
+                error: {
+                    message: "Unable to open modal at this time",
+                },
+            })
+        }
+    };
+
     public start(iframe: HTMLIFrameElement) {
         if (this.started) return;
-        const driver = new StopGapWidgetDriver( this.appTileProps.whitelistCapabilities || []);
+        const allowedCapabilities = this.appTileProps.whitelistCapabilities || [];
+        const driver = new StopGapWidgetDriver(allowedCapabilities, this.mockWidget, this.kind, this.roomId);
         this.messaging = new ClientWidgetApi(this.mockWidget, iframe, driver);
-        this.messaging.addEventListener("preparing", () => this.emit("preparing"));
-        this.messaging.addEventListener("ready", () => this.emit("ready"));
+        this.messaging.on("preparing", () => this.emit("preparing"));
+        this.messaging.on("ready", () => this.emit("ready"));
+        this.messaging.on(`action:${WidgetApiFromWidgetAction.OpenModalWidget}`, this.onOpenModal);
         WidgetMessagingStore.instance.storeMessaging(this.mockWidget, this.messaging);
 
         if (!this.appTileProps.userWidget && this.appTileProps.room) {
             ActiveWidgetStore.setRoomId(this.mockWidget.id, this.appTileProps.room.roomId);
         }
 
-        if (WidgetType.JITSI.matches(this.mockWidget.type)) {
-            this.messaging.addEventListener("action:set_always_on_screen",
-                (ev: CustomEvent<IStickyActionRequest>) => {
-                    if (this.messaging.hasCapability(MatrixCapabilities.AlwaysOnScreen)) {
-                        ActiveWidgetStore.setWidgetPersistence(this.mockWidget.id, ev.detail.data.value);
-                        ev.preventDefault();
-                        this.messaging.transport.reply(ev.detail, <IWidgetApiRequestEmptyData>{}); // ack
+        // Always attach a handler for ViewRoom, but permission check it internally
+        this.messaging.on(`action:${ElementWidgetActions.ViewRoom}`, (ev: CustomEvent<IViewRoomApiRequest>) => {
+            ev.preventDefault(); // stop the widget API from auto-rejecting this
+
+            // Check up front if this is even a valid request
+            const targetRoomId = (ev.detail.data || {}).room_id;
+            if (!targetRoomId) {
+                return this.messaging.transport.reply(ev.detail, <IWidgetApiErrorResponseData>{
+                    error: {message: "Room ID not supplied."},
+                });
+            }
+
+            // Check the widget's permission
+            if (!this.messaging.hasCapability(ElementWidgetCapabilities.CanChangeViewedRoom)) {
+                return this.messaging.transport.reply(ev.detail, <IWidgetApiErrorResponseData>{
+                    error: {message: "This widget does not have permission for this action (denied)."},
+                });
+            }
+
+            // at this point we can change rooms, so do that
+            defaultDispatcher.dispatch({
+                action: 'view_room',
+                room_id: targetRoomId,
+            });
+
+            // acknowledge so the widget doesn't freak out
+            this.messaging.transport.reply(ev.detail, <IWidgetApiRequestEmptyData>{});
+        });
+
+        // Attach listeners for feeding events - the underlying widget classes handle permissions for us
+        MatrixClientPeg.get().on('event', this.onEvent);
+        MatrixClientPeg.get().on('Event.decrypted', this.onEventDecrypted);
+
+        this.messaging.on(`action:${WidgetApiFromWidgetAction.UpdateAlwaysOnScreen}`,
+            (ev: CustomEvent<IStickyActionRequest>) => {
+                if (this.messaging.hasCapability(MatrixCapabilities.AlwaysOnScreen)) {
+                    if (WidgetType.JITSI.matches(this.mockWidget.type)) {
+                        CountlyAnalytics.instance.trackJoinCall(this.appTileProps.room.roomId, true, true);
                     }
-                },
-            );
-        } else if (WidgetType.STICKERPICKER.matches(this.mockWidget.type)) {
-            this.messaging.addEventListener(`action:${ElementWidgetActions.OpenIntegrationManager}`,
+                    ActiveWidgetStore.setWidgetPersistence(this.mockWidget.id, ev.detail.data.value);
+                    ev.preventDefault();
+                    this.messaging.transport.reply(ev.detail, <IWidgetApiRequestEmptyData>{}); // ack
+                }
+            },
+        );
+
+        // TODO: Replace this event listener with appropriate driver functionality once the API
+        // establishes a sane way to send events back and forth.
+        this.messaging.on(`action:${WidgetApiFromWidgetAction.SendSticker}`,
+            (ev: CustomEvent<IStickerActionRequest>) => {
+                if (this.messaging.hasCapability(MatrixCapabilities.StickerSending)) {
+                    // Acknowledge first
+                    ev.preventDefault();
+                    this.messaging.transport.reply(ev.detail, <IWidgetApiRequestEmptyData>{});
+
+                    // Send the sticker
+                    defaultDispatcher.dispatch({
+                        action: 'm.sticker',
+                        data: ev.detail.data,
+                        widgetId: this.mockWidget.id,
+                    });
+                }
+            },
+        );
+
+        if (WidgetType.STICKERPICKER.matches(this.mockWidget.type)) {
+            this.messaging.on(`action:${ElementWidgetActions.OpenIntegrationManager}`,
                 (ev: CustomEvent<IWidgetApiRequest>) => {
                     // Acknowledge first
                     ev.preventDefault();
@@ -244,23 +354,6 @@ export class StopGapWidget extends EventEmitter {
                     }
                 },
             );
-
-            // TODO: Replace this event listener with appropriate driver functionality once the API
-            // establishes a sane way to send events back and forth.
-            this.messaging.addEventListener(`action:${WidgetApiFromWidgetAction.SendSticker}`,
-                (ev: CustomEvent<IStickerActionRequest>) => {
-                    // Acknowledge first
-                    ev.preventDefault();
-                    this.messaging.transport.reply(ev.detail, <IWidgetApiRequestEmptyData>{});
-
-                    // Send the sticker
-                    defaultDispatcher.dispatch({
-                        action: 'm.sticker',
-                        data: ev.detail.data,
-                        widgetId: this.mockWidget.id,
-                    });
-                },
-            );
         }
     }
 
@@ -294,5 +387,31 @@ export class StopGapWidget extends EventEmitter {
         if (!this.started) return;
         WidgetMessagingStore.instance.stopMessaging(this.mockWidget);
         ActiveWidgetStore.delRoomId(this.mockWidget.id);
+
+        if (MatrixClientPeg.get()) {
+            MatrixClientPeg.get().off('event', this.onEvent);
+            MatrixClientPeg.get().off('Event.decrypted', this.onEventDecrypted);
+        }
+    }
+
+    private onEvent = (ev: MatrixEvent) => {
+        if (ev.isBeingDecrypted() || ev.isDecryptionFailure()) return;
+        if (ev.getRoomId() !== this.eventListenerRoomId) return;
+        this.feedEvent(ev);
+    };
+
+    private onEventDecrypted = (ev: MatrixEvent) => {
+        if (ev.isDecryptionFailure()) return;
+        if (ev.getRoomId() !== this.eventListenerRoomId) return;
+        this.feedEvent(ev);
+    };
+
+    private feedEvent(ev: MatrixEvent) {
+        if (!this.messaging) return;
+
+        const raw = ev.event;
+        this.messaging.feedEvent(raw).catch(e => {
+            console.error("Error sending event to widget: ", e);
+        });
     }
 }
diff --git a/src/stores/widgets/StopGapWidgetDriver.ts b/src/stores/widgets/StopGapWidgetDriver.ts
index b54e4a5f7d..8a286d909b 100644
--- a/src/stores/widgets/StopGapWidgetDriver.ts
+++ b/src/stores/widgets/StopGapWidgetDriver.ts
@@ -14,17 +14,174 @@
  * limitations under the License.
  */
 
-import { Capability, WidgetDriver } from "matrix-widget-api";
-import { iterableUnion } from "../../utils/iterables";
+import {
+    Capability,
+    EventDirection,
+    IOpenIDCredentials,
+    IOpenIDUpdate,
+    ISendEventDetails,
+    MatrixCapabilities,
+    OpenIDRequestState,
+    SimpleObservable,
+    Widget,
+    WidgetDriver,
+    WidgetEventCapability,
+    WidgetKind,
+} from "matrix-widget-api";
+import { iterableDiff, iterableUnion } from "../../utils/iterables";
+import { MatrixClientPeg } from "../../MatrixClientPeg";
+import ActiveRoomObserver from "../../ActiveRoomObserver";
+import Modal from "../../Modal";
+import WidgetOpenIDPermissionsDialog from "../../components/views/dialogs/WidgetOpenIDPermissionsDialog";
+import WidgetCapabilitiesPromptDialog, {
+    getRememberedCapabilitiesForWidget,
+} from "../../components/views/dialogs/WidgetCapabilitiesPromptDialog";
+import { WidgetPermissionCustomisations } from "../../customisations/WidgetPermissions";
+import { OIDCState, WidgetPermissionStore } from "./WidgetPermissionStore";
+import { WidgetType } from "../../widgets/WidgetType";
+import { EventType } from "matrix-js-sdk/src/@types/event";
+import { CHAT_EFFECTS } from "../../effects";
+import { containsEmoji } from "../../effects/utils";
+import dis from "../../dispatcher/dispatcher";
+import {tryTransformPermalinkToLocalHref} from "../../utils/permalinks/Permalinks";
 
 // TODO: Purge this from the universe
 
 export class StopGapWidgetDriver extends WidgetDriver {
-    constructor(private allowedCapabilities: Capability[]) {
+    private allowedCapabilities: Set<Capability>;
+
+    // TODO: Refactor widgetKind into the Widget class
+    constructor(
+        allowedCapabilities: Capability[],
+        private forWidget: Widget,
+        private forWidgetKind: WidgetKind,
+        private inRoomId?: string,
+    ) {
         super();
+
+        // Always allow screenshots to be taken because it's a client-induced flow. The widget can't
+        // spew screenshots at us and can't request screenshots of us, so it's up to us to provide the
+        // button if the widget says it supports screenshots.
+        this.allowedCapabilities = new Set([...allowedCapabilities, MatrixCapabilities.Screenshots]);
+
+        // Grant the permissions that are specific to given widget types
+        if (WidgetType.JITSI.matches(this.forWidget.type) && forWidgetKind === WidgetKind.Room) {
+            this.allowedCapabilities.add(MatrixCapabilities.AlwaysOnScreen);
+        } else if (WidgetType.STICKERPICKER.matches(this.forWidget.type) && forWidgetKind === WidgetKind.Account) {
+            const stickerSendingCap = WidgetEventCapability.forRoomEvent(EventDirection.Send, EventType.Sticker).raw;
+            this.allowedCapabilities.add(MatrixCapabilities.StickerSending); // legacy as far as MSC2762 is concerned
+            this.allowedCapabilities.add(stickerSendingCap);
+
+            // Auto-approve the legacy visibility capability. We send it regardless of capability.
+            // Widgets don't technically need to request this capability, but Scalar still does.
+            this.allowedCapabilities.add("visibility");
+        }
     }
 
     public async validateCapabilities(requested: Set<Capability>): Promise<Set<Capability>> {
-        return new Set(iterableUnion(requested, this.allowedCapabilities));
+        // Check to see if any capabilities aren't automatically accepted (such as sticker pickers
+        // allowing stickers to be sent). If there are excess capabilities to be approved, the user
+        // will be prompted to accept them.
+        const diff = iterableDiff(requested, this.allowedCapabilities);
+        const missing = new Set(diff.removed); // "removed" is "in A (requested) but not in B (allowed)"
+        const allowedSoFar = new Set(this.allowedCapabilities);
+        getRememberedCapabilitiesForWidget(this.forWidget).forEach(cap => {
+            allowedSoFar.add(cap);
+            missing.delete(cap);
+        });
+        if (WidgetPermissionCustomisations.preapproveCapabilities) {
+            const approved = await WidgetPermissionCustomisations.preapproveCapabilities(this.forWidget, requested);
+            if (approved) {
+                approved.forEach(cap => {
+                    allowedSoFar.add(cap);
+                    missing.delete(cap);
+                });
+            }
+        }
+        // TODO: Do something when the widget requests new capabilities not yet asked for
+        if (missing.size > 0) {
+            try {
+                const [result] = await Modal.createTrackedDialog(
+                    'Approve Widget Caps', '',
+                    WidgetCapabilitiesPromptDialog,
+                    {
+                        requestedCapabilities: missing,
+                        widget: this.forWidget,
+                        widgetKind: this.forWidgetKind,
+                    }).finished;
+                (result.approved || []).forEach(cap => allowedSoFar.add(cap));
+            } catch (e) {
+                console.error("Non-fatal error getting capabilities: ", e);
+            }
+        }
+
+        return new Set(iterableUnion(allowedSoFar, requested));
+    }
+
+    public async sendEvent(eventType: string, content: any, stateKey: string = null): Promise<ISendEventDetails> {
+        const client = MatrixClientPeg.get();
+        const roomId = ActiveRoomObserver.activeRoomId;
+
+        if (!client || !roomId) throw new Error("Not in a room or not attached to a client");
+
+        let r: { event_id: string } = null; // eslint-disable-line camelcase
+        if (stateKey !== null) {
+            // state event
+            r = await client.sendStateEvent(roomId, eventType, content, stateKey);
+        } else {
+            // message event
+            r = await client.sendEvent(roomId, eventType, content);
+
+            if (eventType === EventType.RoomMessage) {
+                CHAT_EFFECTS.forEach((effect) => {
+                    if (containsEmoji(content, effect.emojis)) {
+                        dis.dispatch({action: `effects.${effect.command}`});
+                    }
+                });
+            }
+        }
+
+        return {roomId, eventId: r.event_id};
+    }
+
+    public async askOpenID(observer: SimpleObservable<IOpenIDUpdate>) {
+        const oidcState = WidgetPermissionStore.instance.getOIDCState(
+            this.forWidget, this.forWidgetKind, this.inRoomId,
+        );
+
+        const getToken = (): Promise<IOpenIDCredentials> => {
+            return MatrixClientPeg.get().getOpenIdToken();
+        };
+
+        if (oidcState === OIDCState.Denied) {
+            return observer.update({state: OpenIDRequestState.Blocked});
+        }
+        if (oidcState === OIDCState.Allowed) {
+            return observer.update({state: OpenIDRequestState.Allowed, token: await getToken()});
+        }
+
+        observer.update({state: OpenIDRequestState.PendingUserConfirmation});
+
+        Modal.createTrackedDialog("OpenID widget permissions", '', WidgetOpenIDPermissionsDialog, {
+            widget: this.forWidget,
+            widgetKind: this.forWidgetKind,
+            inRoomId: this.inRoomId,
+
+            onFinished: async (confirm) => {
+                if (!confirm) {
+                    return observer.update({state: OpenIDRequestState.Blocked});
+                }
+
+                return observer.update({state: OpenIDRequestState.Allowed, token: await getToken()});
+            },
+        });
+    }
+
+    public async navigate(uri: string): Promise<void> {
+        const localUri = tryTransformPermalinkToLocalHref(uri);
+        if (!localUri || localUri === uri) { // parse failure can lead to an unmodified URL
+            throw new Error("Failed to transform URI");
+        }
+        window.location.hash = localUri; // it'll just be a fragment
     }
 }
diff --git a/src/stores/widgets/WidgetLayoutStore.ts b/src/stores/widgets/WidgetLayoutStore.ts
new file mode 100644
index 0000000000..e6ef534202
--- /dev/null
+++ b/src/stores/widgets/WidgetLayoutStore.ts
@@ -0,0 +1,497 @@
+/*
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import SettingsStore from "../../settings/SettingsStore";
+import { Room } from "matrix-js-sdk/src/models/room";
+import WidgetStore, { IApp } from "../WidgetStore";
+import { WidgetType } from "../../widgets/WidgetType";
+import { clamp, defaultNumber, sum } from "../../utils/numbers";
+import defaultDispatcher from "../../dispatcher/dispatcher";
+import { ReadyWatchingStore } from "../ReadyWatchingStore";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { SettingLevel } from "../../settings/SettingLevel";
+import { arrayFastClone } from "../../utils/arrays";
+import { UPDATE_EVENT } from "../AsyncStore";
+
+export const WIDGET_LAYOUT_EVENT_TYPE = "io.element.widgets.layout";
+
+export enum Container {
+    // "Top" is the app drawer, and currently the only sensible value.
+    Top = "top",
+
+    // "Right" is the right panel, and the default for widgets. Setting
+    // this as a container on a widget is essentially like saying "no
+    // changes needed", though this may change in the future.
+    Right = "right",
+
+    // ... more as needed. Note that most of this code assumes that there
+    // are only two containers, and that only the top container is special.
+}
+
+export interface IStoredLayout {
+    // Where to store the widget. Required.
+    container: Container;
+
+    // The index (order) to position the widgets in. Only applies for
+    // ordered containers (like the top container). Smaller numbers first,
+    // and conflicts resolved by comparing widget IDs.
+    index?: number;
+
+    // Percentage (integer) for relative width of the container to consume.
+    // Clamped to 0-100 and may have minimums imposed upon it. Only applies
+    // to containers which support inner resizing (currently only the top
+    // container).
+    width?: number;
+
+    // Percentage (integer) for relative height of the container. Note that
+    // this only applies to the top container currently, and that container
+    // will take the highest value among widgets in the container. Clamped
+    // to 0-100 and may have minimums imposed on it.
+    height?: number;
+
+    // TODO: [Deferred] Maximizing (fullscreen) widgets by default.
+}
+
+interface IWidgetLayouts {
+    [widgetId: string]: IStoredLayout;
+}
+
+interface ILayoutStateEvent {
+    // TODO: [Deferred] Forced layout (fixed with no changes)
+
+    // The widget layouts.
+    widgets: IWidgetLayouts;
+}
+
+interface ILayoutSettings extends ILayoutStateEvent {
+    overrides?: string; // event ID for layout state event, if present
+}
+
+// Dev note: "Pinned" widgets are ones in the top container.
+export const MAX_PINNED = 3;
+
+// These two are whole percentages and don't really mean anything. Later values will decide
+// minimum, but these help determine proportions during our calculations here. In fact, these
+// values should be *smaller* than the actual minimums imposed by later components.
+const MIN_WIDGET_WIDTH_PCT = 10; // 10%
+const MIN_WIDGET_HEIGHT_PCT = 2; // 2%
+
+export class WidgetLayoutStore extends ReadyWatchingStore {
+    private static internalInstance: WidgetLayoutStore;
+
+    private byRoom: {
+        [roomId: string]: {
+            // @ts-ignore - TS wants a string key, but we know better
+            [container: Container]: {
+                ordered: IApp[];
+                height?: number;
+                distributions?: number[];
+            };
+        };
+    } = {};
+
+    private pinnedRef: string;
+    private layoutRef: string;
+
+    private constructor() {
+        super(defaultDispatcher);
+    }
+
+    public static get instance(): WidgetLayoutStore {
+        if (!WidgetLayoutStore.internalInstance) {
+            WidgetLayoutStore.internalInstance = new WidgetLayoutStore();
+        }
+        return WidgetLayoutStore.internalInstance;
+    }
+
+    public static emissionForRoom(room: Room): string {
+        return `update_${room.roomId}`;
+    }
+
+    private emitFor(room: Room) {
+        this.emit(WidgetLayoutStore.emissionForRoom(room));
+    }
+
+    protected async onReady(): Promise<any> {
+        this.updateAllRooms();
+
+        this.matrixClient.on("RoomState.events", this.updateRoomFromState);
+        this.pinnedRef = SettingsStore.watchSetting("Widgets.pinned", null, this.updateFromSettings);
+        this.layoutRef = SettingsStore.watchSetting("Widgets.layout", null, this.updateFromSettings);
+        WidgetStore.instance.on(UPDATE_EVENT, this.updateFromWidgetStore);
+    }
+
+    protected async onNotReady(): Promise<any> {
+        this.byRoom = {};
+
+        SettingsStore.unwatchSetting(this.pinnedRef);
+        SettingsStore.unwatchSetting(this.layoutRef);
+        WidgetStore.instance.off(UPDATE_EVENT, this.updateFromWidgetStore);
+    }
+
+    private updateAllRooms = () => {
+        this.byRoom = {};
+        for (const room of this.matrixClient.getVisibleRooms()) {
+            this.recalculateRoom(room);
+        }
+    };
+
+    private updateFromWidgetStore = (roomId?: string) => {
+        if (roomId) {
+            const room = this.matrixClient.getRoom(roomId);
+            if (room) this.recalculateRoom(room);
+        } else {
+            this.updateAllRooms();
+        }
+    };
+
+    private updateRoomFromState = (ev: MatrixEvent) => {
+        if (ev.getType() !== WIDGET_LAYOUT_EVENT_TYPE) return;
+        const room = this.matrixClient.getRoom(ev.getRoomId());
+        if (room) this.recalculateRoom(room);
+    };
+
+    private updateFromSettings = (settingName: string, roomId: string /* and other stuff */) => {
+        if (roomId) {
+            const room = this.matrixClient.getRoom(roomId);
+            if (room) this.recalculateRoom(room);
+        } else {
+            this.updateAllRooms();
+        }
+    };
+
+    private recalculateRoom(room: Room) {
+        const widgets = WidgetStore.instance.getApps(room.roomId);
+        if (!widgets?.length) {
+            this.byRoom[room.roomId] = {};
+            this.emitFor(room);
+            return;
+        }
+
+        const beforeChanges = JSON.stringify(this.byRoom[room.roomId]);
+
+        const layoutEv = room.currentState.getStateEvents(WIDGET_LAYOUT_EVENT_TYPE, "");
+        const legacyPinned = SettingsStore.getValue("Widgets.pinned", room.roomId);
+        let userLayout = SettingsStore.getValue<ILayoutSettings>("Widgets.layout", room.roomId);
+
+        if (layoutEv && userLayout && userLayout.overrides !== layoutEv.getId()) {
+            // For some other layout that we don't really care about. The user can reset this
+            // by updating their personal layout.
+            userLayout = null;
+        }
+
+        const roomLayout: ILayoutStateEvent = layoutEv ? layoutEv.getContent() : null;
+
+        // We essentially just need to find the top container's widgets because we
+        // only have two containers. Anything not in the top widget by the end of this
+        // function will go into the right container.
+        const topWidgets: IApp[] = [];
+        const rightWidgets: IApp[] = [];
+        for (const widget of widgets) {
+            const stateContainer = roomLayout?.widgets?.[widget.id]?.container;
+            const manualContainer = userLayout?.widgets?.[widget.id]?.container;
+            const isLegacyPinned = !!legacyPinned?.[widget.id];
+            const defaultContainer = WidgetType.JITSI.matches(widget.type) ? Container.Top : Container.Right;
+
+            if (manualContainer === Container.Right) {
+                rightWidgets.push(widget);
+            } else if (manualContainer === Container.Top || stateContainer === Container.Top) {
+                topWidgets.push(widget);
+            } else if (isLegacyPinned && !stateContainer) {
+                topWidgets.push(widget);
+            } else {
+                (defaultContainer === Container.Top ? topWidgets : rightWidgets).push(widget);
+            }
+        }
+
+        // Trim to MAX_PINNED
+        const runoff = topWidgets.slice(MAX_PINNED);
+        rightWidgets.push(...runoff);
+
+        // Order the widgets in the top container, putting autopinned Jitsi widgets first
+        // unless they have a specific order in mind
+        topWidgets.sort((a, b) => {
+            const layoutA = roomLayout?.widgets?.[a.id];
+            const layoutB = roomLayout?.widgets?.[b.id];
+
+            const userLayoutA = userLayout?.widgets?.[a.id];
+            const userLayoutB = userLayout?.widgets?.[b.id];
+
+            // Jitsi widgets are defaulted to be the leftmost widget whereas other widgets
+            // default to the right side.
+            const defaultA = WidgetType.JITSI.matches(a.type) ? Number.MIN_SAFE_INTEGER : Number.MAX_SAFE_INTEGER;
+            const defaultB = WidgetType.JITSI.matches(b.type) ? Number.MIN_SAFE_INTEGER : Number.MAX_SAFE_INTEGER;
+
+            const orderA = defaultNumber(userLayoutA?.index, defaultNumber(layoutA?.index, defaultA));
+            const orderB = defaultNumber(userLayoutB?.index, defaultNumber(layoutB?.index, defaultB));
+
+            if (orderA === orderB) {
+                // We just need a tiebreak
+                return a.id.localeCompare(b.id);
+            }
+
+            return orderA - orderB;
+        });
+
+        // Determine width distribution and height of the top container now (the only relevant one)
+        const widths: number[] = [];
+        let maxHeight = null; // null == default
+        let doAutobalance = true;
+        for (let i = 0; i < topWidgets.length; i++) {
+            const widget = topWidgets[i];
+            const widgetLayout = roomLayout?.widgets?.[widget.id];
+            const userWidgetLayout = userLayout?.widgets?.[widget.id];
+
+            if (Number.isFinite(userWidgetLayout?.width) || Number.isFinite(widgetLayout?.width)) {
+                const val = userWidgetLayout?.width || widgetLayout?.width;
+                const normalized = clamp(val, MIN_WIDGET_WIDTH_PCT, 100);
+                widths.push(normalized);
+                doAutobalance = false; // a manual width was specified
+            } else {
+                widths.push(100); // we'll figure this out later
+            }
+
+            if (widgetLayout?.height || userWidgetLayout?.height) {
+                const defRoomHeight = defaultNumber(widgetLayout?.height, MIN_WIDGET_HEIGHT_PCT);
+                const h = defaultNumber(userWidgetLayout?.height, defRoomHeight);
+                maxHeight = Math.max(maxHeight, clamp(h, MIN_WIDGET_HEIGHT_PCT, 100));
+            }
+        }
+        if (doAutobalance) {
+            for (let i = 0; i < widths.length; i++) {
+                widths[i] = 100 / widths.length;
+            }
+        } else {
+            // If we're not autobalancing then it means that we're trying to make
+            // sure that widgets make up exactly 100% of space (not over, not under)
+            const difference = sum(...widths) - 100; // positive = over, negative = under
+            if (difference < 0) {
+                // For a deficit we just fill everything in equally
+                for (let i = 0; i < widths.length; i++) {
+                    widths[i] += Math.abs(difference) / widths.length;
+                }
+            } else if (difference > 0) {
+                // When we're over, we try to scale all the widgets within range first.
+                // We clamp values to try and keep ourselves sane and within range.
+                for (let i = 0; i < widths.length; i++) {
+                    widths[i] = clamp(widths[i] - (difference / widths.length), MIN_WIDGET_WIDTH_PCT, 100);
+                }
+
+                // If we're still over, find the widgets which have more width than the minimum
+                // and balance them out until we're at 100%. This should keep us as close as possible
+                // to the intended distributions.
+                //
+                // Note: if we ever decide to set a minimum which is larger than 100%/MAX_WIDGETS then
+                // we probably have other issues - this code assumes we don't do that.
+                const toReclaim = sum(...widths) - 100;
+                if (toReclaim > 0) {
+                    const largeIndices = widths
+                        .map((v, i) => ([i, v]))
+                        .filter(p => p[1] > MIN_WIDGET_WIDTH_PCT)
+                        .map(p => p[0]);
+                    for (const idx of largeIndices) {
+                        widths[idx] -= toReclaim / largeIndices.length;
+                    }
+                }
+            }
+        }
+
+        // Finally, fill in our cache and update
+        this.byRoom[room.roomId] = {};
+        if (topWidgets.length) {
+            this.byRoom[room.roomId][Container.Top] = {
+                ordered: topWidgets,
+                distributions: widths,
+                height: maxHeight,
+            };
+        }
+        if (rightWidgets.length) {
+            this.byRoom[room.roomId][Container.Right] = {
+                ordered: rightWidgets,
+            };
+        }
+
+        const afterChanges = JSON.stringify(this.byRoom[room.roomId]);
+        if (afterChanges !== beforeChanges) {
+            this.emitFor(room);
+        }
+    }
+
+    public getContainerWidgets(room: Room, container: Container): IApp[] {
+        return this.byRoom[room.roomId]?.[container]?.ordered || [];
+    }
+
+    public isInContainer(room: Room, widget: IApp, container: Container): boolean {
+        return this.getContainerWidgets(room, container).some(w => w.id === widget.id);
+    }
+
+    public canAddToContainer(room: Room, container: Container): boolean {
+        return this.getContainerWidgets(room, container).length < MAX_PINNED;
+    }
+
+    public getResizerDistributions(room: Room, container: Container): string[] { // yes, string.
+        let distributions = this.byRoom[room.roomId]?.[container]?.distributions;
+        if (!distributions || distributions.length < 2) return [];
+
+        // The distributor actually expects to be fed N-1 sizes and expands the middle section
+        // instead of the edges. Therefore, we need to return [0] when there's two widgets or
+        // [0, 2] when there's three (skipping [1] because it's irrelevant).
+
+        if (distributions.length === 2) distributions = [distributions[0]];
+        if (distributions.length === 3) distributions = [distributions[0], distributions[2]];
+        return distributions.map(d => `${d.toFixed(1)}%`); // actual percents - these are decoded later
+    }
+
+    public setResizerDistributions(room: Room, container: Container, distributions: string[]) {
+        if (container !== Container.Top) return; // ignore - not relevant
+
+        const numbers = distributions.map(d => Number(Number(d.substring(0, d.length - 1)).toFixed(1)));
+        const widgets = this.getContainerWidgets(room, container);
+
+        // From getResizerDistributions, we need to fill in the middle size if applicable.
+        const remaining = 100 - sum(...numbers);
+        if (numbers.length === 2) numbers.splice(1, 0, remaining);
+        if (numbers.length === 1) numbers.push(remaining);
+
+        const localLayout = {};
+        widgets.forEach((w, i) => {
+            localLayout[w.id] = {
+                container: container,
+                width: numbers[i],
+                index: i,
+                height: this.byRoom[room.roomId]?.[container]?.height || MIN_WIDGET_HEIGHT_PCT,
+            };
+        });
+        this.updateUserLayout(room, localLayout);
+    }
+
+    public getContainerHeight(room: Room, container: Container): number {
+        return this.byRoom[room.roomId]?.[container]?.height; // let the default get returned if needed
+    }
+
+    public setContainerHeight(room: Room, container: Container, height: number) {
+        const widgets = this.getContainerWidgets(room, container);
+        const widths = this.byRoom[room.roomId]?.[container]?.distributions;
+        const localLayout = {};
+        widgets.forEach((w, i) => {
+            localLayout[w.id] = {
+                container: container,
+                width: widths[i],
+                index: i,
+                height: height,
+            };
+        });
+        this.updateUserLayout(room, localLayout);
+    }
+
+    public moveWithinContainer(room: Room, container: Container, widget: IApp, delta: number) {
+        const widgets = arrayFastClone(this.getContainerWidgets(room, container));
+        const currentIdx = widgets.findIndex(w => w.id === widget.id);
+        if (currentIdx < 0) return; // no change needed
+
+        widgets.splice(currentIdx, 1); // remove existing widget
+        const newIdx = clamp(currentIdx + delta, 0, widgets.length);
+        widgets.splice(newIdx, 0, widget);
+
+        const widths = this.byRoom[room.roomId]?.[container]?.distributions;
+        const height = this.byRoom[room.roomId]?.[container]?.height;
+        const localLayout = {};
+        widgets.forEach((w, i) => {
+            localLayout[w.id] = {
+                container: container,
+                width: widths[i],
+                index: i,
+                height: height,
+            };
+        });
+        this.updateUserLayout(room, localLayout);
+    }
+
+    public moveToContainer(room: Room, widget: IApp, toContainer: Container) {
+        const allWidgets = this.getAllWidgets(room);
+        if (!allWidgets.some(([w])=> w.id === widget.id)) return; // invalid
+        this.updateUserLayout(room, {
+            [widget.id]: {container: toContainer},
+        });
+    }
+
+    public canCopyLayoutToRoom(room: Room): boolean {
+        if (!this.matrixClient) return false; // not ready yet
+        return room.currentState.maySendStateEvent(WIDGET_LAYOUT_EVENT_TYPE, this.matrixClient.getUserId());
+    }
+
+    public copyLayoutToRoom(room: Room) {
+        const allWidgets = this.getAllWidgets(room);
+        const evContent: ILayoutStateEvent = {widgets: {}};
+        for (const [widget, container] of allWidgets) {
+            evContent.widgets[widget.id] = {container};
+            if (container === Container.Top) {
+                const containerWidgets = this.getContainerWidgets(room, container);
+                const idx = containerWidgets.findIndex(w => w.id === widget.id);
+                const widths = this.byRoom[room.roomId]?.[container]?.distributions;
+                const height = this.byRoom[room.roomId]?.[container]?.height;
+                evContent.widgets[widget.id] = {
+                    ...evContent.widgets[widget.id],
+                    height: height ? Math.round(height) : null,
+                    width: widths[idx] ? Math.round(widths[idx]) : null,
+                    index: idx,
+                };
+            }
+        }
+        this.matrixClient.sendStateEvent(room.roomId, WIDGET_LAYOUT_EVENT_TYPE, evContent, "");
+    }
+
+    private getAllWidgets(room: Room): [IApp, Container][] {
+        const containers = this.byRoom[room.roomId];
+        if (!containers) return [];
+
+        const ret = [];
+        for (const container of Object.keys(containers)) {
+            const widgets = containers[container].ordered;
+            for (const widget of widgets) {
+                ret.push([widget, container]);
+            }
+        }
+        return ret;
+    }
+
+    private updateUserLayout(room: Room, newLayout: IWidgetLayouts) {
+        // Polyfill any missing widgets
+        const allWidgets = this.getAllWidgets(room);
+        for (const [widget, container] of allWidgets) {
+            const containerWidgets = this.getContainerWidgets(room, container);
+            const idx = containerWidgets.findIndex(w => w.id === widget.id);
+            const widths = this.byRoom[room.roomId]?.[container]?.distributions;
+            if (!newLayout[widget.id]) {
+                newLayout[widget.id] = {
+                    container: container,
+                    index: idx,
+                    height: this.byRoom[room.roomId]?.[container]?.height,
+                    width: widths?.[idx],
+                };
+            }
+        }
+
+        const layoutEv = room.currentState.getStateEvents(WIDGET_LAYOUT_EVENT_TYPE, "");
+        SettingsStore.setValue("Widgets.layout", room.roomId, SettingLevel.ROOM_ACCOUNT, {
+            overrides: layoutEv?.getId(),
+            widgets: newLayout,
+        }).catch(() => this.recalculateRoom(room));
+        this.recalculateRoom(room); // call to try local echo on changes (the catch above undoes any errors)
+    }
+}
+
+window.mxWidgetLayoutStore = WidgetLayoutStore.instance;
diff --git a/src/stores/widgets/WidgetPermissionStore.ts b/src/stores/widgets/WidgetPermissionStore.ts
new file mode 100644
index 0000000000..41e8bc6652
--- /dev/null
+++ b/src/stores/widgets/WidgetPermissionStore.ts
@@ -0,0 +1,88 @@
+/*
+ * 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 SettingsStore from "../../settings/SettingsStore";
+import { Widget, WidgetKind } from "matrix-widget-api";
+import { MatrixClientPeg } from "../../MatrixClientPeg";
+import { SettingLevel } from "../../settings/SettingLevel";
+
+export enum OIDCState {
+    Allowed, // user has set the remembered value as allowed
+    Denied, // user has set the remembered value as disallowed
+    Unknown, // user has not set a remembered value
+}
+
+export class WidgetPermissionStore {
+    private static internalInstance: WidgetPermissionStore;
+
+    private constructor() {
+    }
+
+    public static get instance(): WidgetPermissionStore {
+        if (!WidgetPermissionStore.internalInstance) {
+            WidgetPermissionStore.internalInstance = new WidgetPermissionStore();
+        }
+        return WidgetPermissionStore.internalInstance;
+    }
+
+    // TODO (all functions here): Merge widgetKind with the widget definition
+
+    private packSettingKey(widget: Widget, kind: WidgetKind, roomId?: string): string {
+        let location = roomId;
+        if (kind !== WidgetKind.Room) {
+            location = MatrixClientPeg.get().getUserId();
+        }
+        if (kind === WidgetKind.Modal) {
+            location = '*MODAL*-' + location; // to guarantee differentiation from whatever spawned it
+        }
+        if (!location) {
+            throw new Error("Failed to determine a location to check the widget's OIDC state with");
+        }
+
+        return encodeURIComponent(`${location}::${widget.templateUrl}`);
+    }
+
+    public getOIDCState(widget: Widget, kind: WidgetKind, roomId?: string): OIDCState {
+        const settingsKey = this.packSettingKey(widget, kind, roomId);
+        const settings = SettingsStore.getValue("widgetOpenIDPermissions");
+        if (settings?.deny?.includes(settingsKey)) {
+            return OIDCState.Denied;
+        }
+        if (settings?.allow?.includes(settingsKey)) {
+            return OIDCState.Allowed;
+        }
+        return OIDCState.Unknown;
+    }
+
+    public setOIDCState(widget: Widget, kind: WidgetKind, roomId: string, newState: OIDCState) {
+        const settingsKey = this.packSettingKey(widget, kind, roomId);
+
+        const currentValues = SettingsStore.getValue("widgetOpenIDPermissions");
+        if (!currentValues.allow) currentValues.allow = [];
+        if (!currentValues.deny) currentValues.deny = [];
+
+        if (newState === OIDCState.Allowed) {
+            currentValues.allow.push(settingsKey);
+        } else if (newState === OIDCState.Denied) {
+            currentValues.deny.push(settingsKey);
+        } else {
+            currentValues.allow = currentValues.allow.filter(c => c !== settingsKey);
+            currentValues.deny = currentValues.deny.filter(c => c !== settingsKey);
+        }
+
+        SettingsStore.setValue("widgetOpenIDPermissions", null, SettingLevel.DEVICE, currentValues);
+    }
+}
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,
     });
 };
diff --git a/src/toasts/DesktopNotificationsToast.ts b/src/toasts/DesktopNotificationsToast.ts
index d8aa7647a3..e10a6d46c6 100644
--- a/src/toasts/DesktopNotificationsToast.ts
+++ b/src/toasts/DesktopNotificationsToast.ts
@@ -29,15 +29,15 @@ const onReject = () => {
 
 const TOAST_KEY = "desktopnotifications";
 
-export const showToast = () => {
+export const showToast = (fromMessageSend: boolean) => {
     ToastStore.sharedInstance().addOrReplaceToast({
         key: TOAST_KEY,
-        title: _t("Notifications"),
+        title: fromMessageSend ? _t("Don't miss a reply") : _t("Notifications"),
         props: {
-            description: _t("You are not receiving desktop notifications"),
-            acceptLabel: _t("Enable them now"),
+            description: _t("Enable desktop notifications"),
+            acceptLabel: _t("Enable"),
             onAccept,
-            rejectLabel: _t("Close"),
+            rejectLabel: _t("Dismiss"),
             onReject,
         },
         component: GenericToast,
diff --git a/src/toasts/MobileGuideToast.ts b/src/toasts/MobileGuideToast.ts
new file mode 100644
index 0000000000..5d872192c8
--- /dev/null
+++ b/src/toasts/MobileGuideToast.ts
@@ -0,0 +1,61 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { _t } from "../languageHandler";
+import GenericToast from "../components/views/toasts/GenericToast";
+import ToastStore from "../stores/ToastStore";
+
+const onAccept = () => {
+    window.location.href = "mobile_guide/";
+};
+
+const onReject = () => {
+    document.cookie = "element_mobile_redirect_to_guide=false;path=/;max-age=14400";
+    hideToast();
+};
+
+const TOAST_KEY = "mobileguide";
+
+export const showToast = () => {
+    const isIos = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
+    const isAndroid = /Android/.test(navigator.userAgent);
+    if (!isIos && !isAndroid) {
+        return;
+    }
+    if (document.cookie.includes("element_mobile_redirect_to_guide=false")) {
+        return;
+    }
+    ToastStore.sharedInstance().addOrReplaceToast({
+        key: TOAST_KEY,
+        title: _t("Use app for a better experience"),
+        props: {
+            description: _t(
+                "Element Web is experimental on mobile. " +
+                "For a better experience and the latest features, use our free native app.",
+            ),
+            acceptLabel: _t("Use app"),
+            onAccept,
+            rejectLabel: _t("Dismiss"),
+            onReject,
+        },
+        component: GenericToast,
+        priority: 99,
+    });
+};
+
+export const hideToast = () => {
+    ToastStore.sharedInstance().dismissToast(TOAST_KEY);
+};
diff --git a/src/toasts/ServerLimitToast.tsx b/src/toasts/ServerLimitToast.tsx
index d35140be3d..81b5492402 100644
--- a/src/toasts/ServerLimitToast.tsx
+++ b/src/toasts/ServerLimitToast.tsx
@@ -23,7 +23,7 @@ import {messageForResourceLimitError} from "../utils/ErrorUtils";
 
 const TOAST_KEY = "serverlimit";
 
-export const showToast = (limitType: string, adminContact?: string, syncError?: boolean) => {
+export const showToast = (limitType: string, onHideToast: () => void, adminContact?: string, syncError?: boolean) => {
     const errorText = messageForResourceLimitError(limitType, adminContact, {
         'monthly_active_user': _td("Your homeserver has exceeded its user limit."),
         '': _td("Your homeserver has exceeded one of its resource limits."),
@@ -38,7 +38,10 @@ export const showToast = (limitType: string, adminContact?: string, syncError?:
         props: {
             description: <React.Fragment>{errorText} {contactText}</React.Fragment>,
             acceptLabel: _t("Ok"),
-            onAccept: hideToast,
+            onAccept: () => {
+                hideToast()
+                if (onHideToast) onHideToast();
+            },
         },
         component: GenericToast,
         priority: 70,
diff --git a/src/toasts/UpdateToast.tsx b/src/toasts/UpdateToast.tsx
index dfd06cf3a0..eb35c41512 100644
--- a/src/toasts/UpdateToast.tsx
+++ b/src/toasts/UpdateToast.tsx
@@ -74,18 +74,18 @@ export const showToast = (version: string, newVersion: string, releaseNotes?: st
         };
     } else {
         onAccept = installUpdate;
-        acceptLabel = _t("Restart");
+        acceptLabel = _t("Update");
     }
 
     const brand = SdkConfig.get().brand;
     ToastStore.sharedInstance().addOrReplaceToast({
         key: TOAST_KEY,
-        title: _t("Upgrade your %(brand)s", { brand }),
+        title: _t("Update %(brand)s", { brand }),
         props: {
-            description: _t("A new version of %(brand)s is available!", { brand }),
+            description: _t("New version of %(brand)s is available", { brand }),
             acceptLabel,
             onAccept,
-            rejectLabel: _t("Later"),
+            rejectLabel: _t("Dismiss"),
             onReject,
         },
         component: GenericToast,
diff --git a/src/usercontent/index.js b/src/usercontent/index.js
index 2e87e182af..6ecd17dcd7 100644
--- a/src/usercontent/index.js
+++ b/src/usercontent/index.js
@@ -1,10 +1,3 @@
-const params = window.location.search.substring(1).split('&');
-let lockOrigin;
-for (let i = 0; i < params.length; ++i) {
-    const parts = params[i].split('=');
-    if (parts[0] === 'origin') lockOrigin = decodeURIComponent(parts[1]);
-}
-
 function remoteRender(event) {
     const data = event.data;
 
@@ -45,7 +38,7 @@ function remoteSetTint(event) {
 }
 
 window.onmessage = function(e) {
-    if (e.origin === lockOrigin) {
+    if (e.origin === window.location.origin) {
         if (e.data.blob) remoteRender(e);
         else remoteSetTint(e);
     }
diff --git a/src/utils/AutoDiscoveryUtils.js b/src/utils/AutoDiscoveryUtils.js
index 94aa0c3544..18b6451d3e 100644
--- a/src/utils/AutoDiscoveryUtils.js
+++ b/src/utils/AutoDiscoveryUtils.js
@@ -34,6 +34,8 @@ export class ValidatedServerConfig {
     isUrl: string;
 
     isDefault: boolean;
+    // when the server config is based on static URLs the hsName is not resolvable and things may wish to use hsUrl
+    isNameResolvable: boolean;
 
     warning: string;
 }
@@ -161,7 +163,7 @@ export default class AutoDiscoveryUtils {
         const url = new URL(homeserverUrl);
         const serverName = url.hostname;
 
-        return AutoDiscoveryUtils.buildValidatedConfigFromDiscovery(serverName, result, syntaxOnly);
+        return AutoDiscoveryUtils.buildValidatedConfigFromDiscovery(serverName, result, syntaxOnly, true);
     }
 
     /**
@@ -179,12 +181,12 @@ export default class AutoDiscoveryUtils {
      * input.
      * @param {string} serverName The domain name the AutoDiscovery result is for.
      * @param {*} discoveryResult The AutoDiscovery result.
-     * @param {boolean} syntaxOnly If true, errors relating to liveliness of the servers will
-     * not be raised.
+     * @param {boolean} syntaxOnly If true, errors relating to liveliness of the servers will not be raised.
+     * @param {boolean} isSynthetic If true, then the discoveryResult was synthesised locally.
      * @returns {Promise<ValidatedServerConfig>} Resolves to the validated configuration.
      */
     static buildValidatedConfigFromDiscovery(
-        serverName: string, discoveryResult, syntaxOnly=false): ValidatedServerConfig {
+        serverName: string, discoveryResult, syntaxOnly=false, isSynthetic=false): ValidatedServerConfig {
         if (!discoveryResult || !discoveryResult["m.homeserver"]) {
             // This shouldn't happen without major misconfiguration, so we'll log a bit of information
             // in the log so we can find this bit of codee but otherwise tell teh user "it broke".
@@ -252,6 +254,7 @@ export default class AutoDiscoveryUtils {
             isUrl: preferredIdentityUrl,
             isDefault: false,
             warning: hsResult.error,
+            isNameResolvable: !isSynthetic,
         });
     }
 }
diff --git a/src/utils/DMRoomMap.js b/src/utils/DMRoomMap.ts
similarity index 76%
rename from src/utils/DMRoomMap.js
rename to src/utils/DMRoomMap.ts
index 4e219b1611..e49b74c380 100644
--- a/src/utils/DMRoomMap.js
+++ b/src/utils/DMRoomMap.ts
@@ -1,6 +1,5 @@
 /*
-Copyright 2016 OpenMarket Ltd
-Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
+Copyright 2016, 2019, 2021 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,7 +16,9 @@ limitations under the License.
 
 import {MatrixClientPeg} from '../MatrixClientPeg';
 import {uniq} from "lodash";
-import {Room} from "matrix-js-sdk/src/matrix";
+import {Room} from "matrix-js-sdk/src/models/room";
+import {Event} from "matrix-js-sdk/src/models/event";
+import {MatrixClient} from "matrix-js-sdk/src/client";
 
 /**
  * Class that takes a Matrix Client and flips the m.direct map
@@ -27,29 +28,31 @@ import {Room} from "matrix-js-sdk/src/matrix";
  * With 'start', this can also keep itself up to date over time.
  */
 export default class DMRoomMap {
+    private static sharedInstance: DMRoomMap;
+
+    private matrixClient: MatrixClient;
+    // TODO: convert these to maps
+    private roomToUser: {[key: string]: string} = null;
+    private userToRooms: {[key: string]: string[]} = null;
+    private hasSentOutPatchDirectAccountDataPatch: boolean;
+    private mDirectEvent: Event;
+
     constructor(matrixClient) {
         this.matrixClient = matrixClient;
-        this.roomToUser = null;
-        // see _onAccountData
-        this._hasSentOutPatchDirectAccountDataPatch = false;
-
-        // XXX: Force-bind the event handler method because it
-        // doesn't call it with our object as the 'this'
-        // (use a static property arrow function for this when we can)
-        this._onAccountData = this._onAccountData.bind(this);
+        // see onAccountData
+        this.hasSentOutPatchDirectAccountDataPatch = false;
 
         const mDirectEvent = matrixClient.getAccountData('m.direct');
         this.mDirectEvent = mDirectEvent ? mDirectEvent.getContent() : {};
-        this.userToRooms = null;
     }
 
     /**
      * Makes and returns a new shared instance that can then be accessed
      * with shared(). This returned instance is not automatically started.
      */
-    static makeShared() {
-        DMRoomMap._sharedInstance = new DMRoomMap(MatrixClientPeg.get());
-        return DMRoomMap._sharedInstance;
+    public static makeShared(): DMRoomMap {
+        DMRoomMap.sharedInstance = new DMRoomMap(MatrixClientPeg.get());
+        return DMRoomMap.sharedInstance;
     }
 
     /**
@@ -57,32 +60,33 @@ export default class DMRoomMap {
      * that uses the singleton matrix client
      * The shared instance must be started before use.
      */
-    static shared() {
-        return DMRoomMap._sharedInstance;
+    public static shared(): DMRoomMap {
+        return DMRoomMap.sharedInstance;
     }
 
-    start() {
-        this._populateRoomToUser();
-        this.matrixClient.on("accountData", this._onAccountData);
+    public start() {
+        this.populateRoomToUser();
+        this.matrixClient.on("accountData", this.onAccountData);
     }
 
-    stop() {
-        this.matrixClient.removeListener("accountData", this._onAccountData);
+    public stop() {
+        this.matrixClient.removeListener("accountData", this.onAccountData);
     }
 
-    _onAccountData(ev) {
+    private onAccountData = (ev) => {
         if (ev.getType() == 'm.direct') {
             this.mDirectEvent = this.matrixClient.getAccountData('m.direct').getContent() || {};
             this.userToRooms = null;
             this.roomToUser = null;
         }
     }
+
     /**
      * some client bug somewhere is causing some DMs to be marked
      * with ourself, not the other user. Fix it by guessing the other user and
      * modifying userToRooms
      */
-    _patchUpSelfDMs(userToRooms) {
+    private patchUpSelfDMs(userToRooms) {
         const myUserId = this.matrixClient.getUserId();
         const selfRoomIds = userToRooms[myUserId];
         if (selfRoomIds) {
@@ -118,10 +122,10 @@ export default class DMRoomMap {
         }
     }
 
-    getDMRoomsForUserId(userId) {
+    public getDMRoomsForUserId(userId): string[] {
         // Here, we return the empty list if there are no rooms,
         // since the number of conversations you have with this user is zero.
-        return this._getUserToRooms()[userId] || [];
+        return this.getUserToRooms()[userId] || [];
     }
 
     /**
@@ -129,7 +133,7 @@ export default class DMRoomMap {
      * @param {string[]} ids The identifiers (user IDs and email addresses) to look for.
      * @returns {Room} The DM room which all IDs given share, or falsey if no common room.
      */
-    getDMRoomForIdentifiers(ids) {
+    public getDMRoomForIdentifiers(ids: string[]): Room {
         // TODO: [Canonical DMs] Handle lookups for email addresses.
         // For now we'll pretend we only get user IDs and end up returning nothing for email addresses
 
@@ -145,7 +149,7 @@ export default class DMRoomMap {
         return joinedRooms[0];
     }
 
-    getUserIdForRoomId(roomId) {
+    public getUserIdForRoomId(roomId: string) {
         if (this.roomToUser == null) {
             // we lazily populate roomToUser so you can use
             // this class just to call getDMRoomsForUserId
@@ -153,7 +157,7 @@ export default class DMRoomMap {
             // convenient wrapper and there's no point
             // iterating through the map if getUserIdForRoomId()
             // is never called.
-            this._populateRoomToUser();
+            this.populateRoomToUser();
         }
         // Here, we return undefined if the room is not in the map:
         // the room ID you gave is not a DM room for any user.
@@ -167,7 +171,7 @@ export default class DMRoomMap {
         return this.roomToUser[roomId];
     }
 
-    getUniqueRoomsWithIndividuals(): {[userId: string]: Room} {
+    public getUniqueRoomsWithIndividuals(): {[userId: string]: Room} {
         if (!this.roomToUser) return {}; // No rooms means no map.
         return Object.keys(this.roomToUser)
             .map(r => ({userId: this.getUserIdForRoomId(r), room: this.matrixClient.getRoom(r)}))
@@ -175,20 +179,20 @@ export default class DMRoomMap {
             .reduce((obj, r) => (obj[r.userId] = r.room) && obj, {});
     }
 
-    _getUserToRooms() {
+    private getUserToRooms(): {[key: string]: string[]} {
         if (!this.userToRooms) {
-            const userToRooms = this.mDirectEvent;
+            const userToRooms = this.mDirectEvent as {[key: string]: string[]};
             const myUserId = this.matrixClient.getUserId();
             const selfDMs = userToRooms[myUserId];
             if (selfDMs && selfDMs.length) {
-                const neededPatching = this._patchUpSelfDMs(userToRooms);
+                const neededPatching = this.patchUpSelfDMs(userToRooms);
                 // to avoid multiple devices fighting to correct
                 // the account data, only try to send the corrected
                 // version once.
                 console.warn(`Invalid m.direct account data detected ` +
                     `(self-chats that shouldn't be), patching it up.`);
-                if (neededPatching && !this._hasSentOutPatchDirectAccountDataPatch) {
-                    this._hasSentOutPatchDirectAccountDataPatch = true;
+                if (neededPatching && !this.hasSentOutPatchDirectAccountDataPatch) {
+                    this.hasSentOutPatchDirectAccountDataPatch = true;
                     this.matrixClient.setAccountData('m.direct', userToRooms);
                 }
             }
@@ -197,9 +201,9 @@ export default class DMRoomMap {
         return this.userToRooms;
     }
 
-    _populateRoomToUser() {
+    private populateRoomToUser() {
         this.roomToUser = {};
-        for (const user of Object.keys(this._getUserToRooms())) {
+        for (const user of Object.keys(this.getUserToRooms())) {
             for (const roomId of this.userToRooms[user]) {
                 this.roomToUser[roomId] = user;
             }
diff --git a/src/utils/DecryptFile.js b/src/utils/DecryptFile.js
index dcdc2f9fdb..d3625d614a 100644
--- a/src/utils/DecryptFile.js
+++ b/src/utils/DecryptFile.js
@@ -78,12 +78,13 @@ const ALLOWED_BLOB_MIMETYPES = {
 
 /**
  * Decrypt a file attached to a matrix event.
- * @param file {Object} The json taken from the matrix event.
+ * @param {Object} file The json taken from the matrix event.
  *   This passed to [link]{@link https://github.com/matrix-org/browser-encrypt-attachments}
  *   as the encryption info object, so will also have the those keys in addition to
  *   the keys below.
- * @param file.url {string} An mxc:// URL for the encrypted file.
- * @param file.mimetype {string} The MIME-type of the plaintext file.
+ * @param {string} file.url An mxc:// URL for the encrypted file.
+ * @param {string} file.mimetype The MIME-type of the plaintext file.
+ * @returns {Promise}
  */
 export function decryptFile(file) {
     const url = MatrixClientPeg.get().mxcUrlToHttp(file.url);
diff --git a/src/utils/DirectoryUtils.js b/src/utils/DirectoryUtils.js
index 72e44681b6..577a6441f8 100644
--- a/src/utils/DirectoryUtils.js
+++ b/src/utils/DirectoryUtils.js
@@ -1,23 +1,39 @@
+/*
+Copyright 2018 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.
+*/
+
 // Find a protocol 'instance' with a given instance_id
 // in the supplied protocols dict
-export function instanceForInstanceId(protocols, instance_id) {
-    if (!instance_id) return null;
+export function instanceForInstanceId(protocols, instanceId) {
+    if (!instanceId) return null;
     for (const proto of Object.keys(protocols)) {
         if (!protocols[proto].instances && protocols[proto].instances instanceof Array) continue;
         for (const instance of protocols[proto].instances) {
-            if (instance.instance_id == instance_id) return instance;
+            if (instance.instance_id == instanceId) return instance;
         }
     }
 }
 
 // given an instance_id, return the name of the protocol for
 // that instance ID in the supplied protocols dict
-export function protocolNameForInstanceId(protocols, instance_id) {
-    if (!instance_id) return null;
+export function protocolNameForInstanceId(protocols, instanceId) {
+    if (!instanceId) return null;
     for (const proto of Object.keys(protocols)) {
         if (!protocols[proto].instances && protocols[proto].instances instanceof Array) continue;
         for (const instance of protocols[proto].instances) {
-            if (instance.instance_id == instance_id) return proto;
+            if (instance.instance_id == instanceId) return proto;
         }
     }
 }
diff --git a/src/utils/Receipt.js b/src/utils/Receipt.js
index 04bd4a4d8f..d88c67fb18 100644
--- a/src/utils/Receipt.js
+++ b/src/utils/Receipt.js
@@ -18,6 +18,10 @@ limitations under the License.
  * Given MatrixEvent containing receipts, return the first
  * read receipt from the given user ID, or null if no such
  * receipt exists.
+ *
+ * @param {Object} receiptEvent A Matrix Event
+ * @param {string} userId A user ID
+ * @returns {Object} Read receipt
  */
 export function findReadReceiptFromUserId(receiptEvent, userId) {
     const receiptKeys = Object.keys(receiptEvent.getContent());
diff --git a/src/utils/ResizeNotifier.js b/src/utils/ResizeNotifier.js
index 512946828b..fd12a454f6 100644
--- a/src/utils/ResizeNotifier.js
+++ b/src/utils/ResizeNotifier.js
@@ -40,10 +40,12 @@ export default class ResizeNotifier extends EventEmitter {
 
     startResizing() {
         this._isResizing = true;
+        this.emit("isResizing", true);
     }
 
     stopResizing() {
         this._isResizing = false;
+        this.emit("isResizing", false);
     }
 
     _noisyMiddlePanel() {
diff --git a/src/utils/StorageManager.js b/src/utils/StorageManager.js
index e29b6d9b0e..c90281bacf 100644
--- a/src/utils/StorageManager.js
+++ b/src/utils/StorageManager.js
@@ -190,3 +190,79 @@ export function trackStores(client) {
 export function setCryptoInitialised(cryptoInited) {
     localStorage.setItem("mx_crypto_initialised", cryptoInited);
 }
+
+/* Simple wrapper functions around IndexedDB.
+ */
+
+let idb = null;
+
+async function idbInit(): Promise<void> {
+    if (!indexedDB) {
+        throw new Error("IndexedDB not available");
+    }
+    idb = await new Promise((resolve, reject) => {
+        const request = indexedDB.open("matrix-react-sdk", 1);
+        request.onerror = reject;
+        request.onsuccess = (event) => { resolve(request.result); };
+        request.onupgradeneeded = (event) => {
+            const db = request.result;
+            db.createObjectStore("pickleKey");
+            db.createObjectStore("account");
+        };
+    });
+}
+
+export async function idbLoad(
+    table: string,
+    key: string | string[],
+): Promise<any> {
+    if (!idb) {
+        await idbInit();
+    }
+    return new Promise((resolve, reject) => {
+        const txn = idb.transaction([table], "readonly");
+        txn.onerror = reject;
+
+        const objectStore = txn.objectStore(table);
+        const request = objectStore.get(key);
+        request.onerror = reject;
+        request.onsuccess = (event) => { resolve(request.result); };
+    });
+}
+
+export async function idbSave(
+    table: string,
+    key: string | string[],
+    data: any,
+): Promise<void> {
+    if (!idb) {
+        await idbInit();
+    }
+    return new Promise((resolve, reject) => {
+        const txn = idb.transaction([table], "readwrite");
+        txn.onerror = reject;
+
+        const objectStore = txn.objectStore(table);
+        const request = objectStore.put(data, key);
+        request.onerror = reject;
+        request.onsuccess = (event) => { resolve(); };
+    });
+}
+
+export async function idbDelete(
+    table: string,
+    key: string | string[],
+): Promise<void> {
+    if (!idb) {
+        await idbInit();
+    }
+    return new Promise((resolve, reject) => {
+        const txn = idb.transaction([table], "readwrite");
+        txn.onerror = reject;
+
+        const objectStore = txn.objectStore(table);
+        const request = objectStore.delete(key);
+        request.onerror = reject;
+        request.onsuccess = (event) => { resolve(); };
+    });
+}
diff --git a/src/utils/WellKnownUtils.ts b/src/utils/WellKnownUtils.ts
index 69ed39e0ee..30759cafc1 100644
--- a/src/utils/WellKnownUtils.ts
+++ b/src/utils/WellKnownUtils.ts
@@ -16,10 +16,15 @@ limitations under the License.
 
 import {MatrixClientPeg} from '../MatrixClientPeg';
 
+const CALL_BEHAVIOUR_WK_KEY = "io.element.call_behaviour";
 const E2EE_WK_KEY = "io.element.e2ee";
 const E2EE_WK_KEY_DEPRECATED = "im.vector.riot.e2ee";
 
 /* eslint-disable camelcase */
+export interface ICallBehaviourWellKnown {
+    widget_build_url?: string;
+}
+
 export interface IE2EEWellKnown {
     default?: boolean;
     secure_backup_required?: boolean;
@@ -27,6 +32,11 @@ export interface IE2EEWellKnown {
 }
 /* eslint-enable camelcase */
 
+export function getCallBehaviourWellKnown(): ICallBehaviourWellKnown {
+    const clientWellKnown = MatrixClientPeg.get().getClientWellKnown();
+    return clientWellKnown?.[CALL_BEHAVIOUR_WK_KEY];
+}
+
 export function getE2EEWellKnown(): IE2EEWellKnown {
     const clientWellKnown = MatrixClientPeg.get().getClientWellKnown();
     if (clientWellKnown && clientWellKnown[E2EE_WK_KEY]) {
diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.ts
similarity index 85%
rename from src/utils/WidgetUtils.js
rename to src/utils/WidgetUtils.ts
index 6cc95efb25..c67f3bad13 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.ts
@@ -1,7 +1,6 @@
 /*
-Copyright 2017 Vector Creations Ltd
-Copyright 2018 New Vector Ltd
 Copyright 2019 Travis Ralston
+Copyright 2017 - 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.
@@ -16,23 +15,33 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import * as url from "url";
+
 import {MatrixClientPeg} from '../MatrixClientPeg';
 import SdkConfig from "../SdkConfig";
 import dis from '../dispatcher/dispatcher';
-import * as url from "url";
 import WidgetEchoStore from '../stores/WidgetEchoStore';
-
-// How long we wait for the state event echo to come back from the server
-// before waitFor[Room/User]Widget rejects its promise
-const WIDGET_WAIT_TIME = 20000;
 import SettingsStore from "../settings/SettingsStore";
-import ActiveWidgetStore from "../stores/ActiveWidgetStore";
 import {IntegrationManagers} from "../integrations/IntegrationManagers";
 import {Room} from "matrix-js-sdk/src/models/room";
 import {WidgetType} from "../widgets/WidgetType";
 import {objectClone} from "./objects";
 import {_t} from "../languageHandler";
-import {MatrixCapabilities} from "matrix-widget-api";
+import {Capability, IWidget, IWidgetData, MatrixCapabilities} from "matrix-widget-api";
+import {IApp} from "../stores/WidgetStore";
+
+// How long we wait for the state event echo to come back from the server
+// before waitFor[Room/User]Widget rejects its promise
+const WIDGET_WAIT_TIME = 20000;
+
+export interface IWidgetEvent {
+    id: string;
+    type: string;
+    sender: string;
+    // eslint-disable-next-line camelcase
+    state_key: string;
+    content: Partial<IApp>;
+}
 
 export default class WidgetUtils {
     /* Returns true if user is able to send state events to modify widgets in this room
@@ -41,7 +50,7 @@ export default class WidgetUtils {
      * @return Boolean -- true if the user can modify widgets in this room
      * @throws Error -- specifies the error reason
      */
-    static canUserModifyWidgets(roomId) {
+    static canUserModifyWidgets(roomId: string): boolean {
         if (!roomId) {
             console.warn('No room ID specified');
             return false;
@@ -80,7 +89,7 @@ export default class WidgetUtils {
      * @param  {[type]}  testUrlString URL to check
      * @return {Boolean} True if specified URL is a scalar URL
      */
-    static isScalarUrl(testUrlString) {
+    static isScalarUrl(testUrlString: string): boolean {
         if (!testUrlString) {
             console.error('Scalar URL check failed. No URL specified');
             return false;
@@ -123,7 +132,7 @@ export default class WidgetUtils {
      * @returns {Promise} that resolves when the widget is in the
      *     requested state according to the `add` param
      */
-    static waitForUserWidget(widgetId, add) {
+    static waitForUserWidget(widgetId: string, add: boolean): Promise<void> {
         return new Promise((resolve, reject) => {
             // Tests an account data event, returning true if it's in the state
             // we're waiting for it to be in
@@ -170,7 +179,7 @@ export default class WidgetUtils {
      * @returns {Promise} that resolves when the widget is in the
      *     requested state according to the `add` param
      */
-    static waitForRoomWidget(widgetId, roomId, add) {
+    static waitForRoomWidget(widgetId: string, roomId: string, add: boolean): Promise<void> {
         return new Promise((resolve, reject) => {
             // Tests a list of state events, returning true if it's in the state
             // we're waiting for it to be in
@@ -213,7 +222,13 @@ export default class WidgetUtils {
         });
     }
 
-    static setUserWidget(widgetId, widgetType: WidgetType, widgetUrl, widgetName, widgetData) {
+    static setUserWidget(
+        widgetId: string,
+        widgetType: WidgetType,
+        widgetUrl: string,
+        widgetName: string,
+        widgetData: IWidgetData,
+    ) {
         const content = {
             type: widgetType.preferred,
             url: widgetUrl,
@@ -257,7 +272,14 @@ export default class WidgetUtils {
         });
     }
 
-    static setRoomWidget(roomId, widgetId, widgetType: WidgetType, widgetUrl, widgetName, widgetData) {
+    static setRoomWidget(
+        roomId: string,
+        widgetId: string,
+        widgetType?: WidgetType,
+        widgetUrl?: string,
+        widgetName?: string,
+        widgetData?: object,
+    ) {
         let content;
 
         const addingWidget = Boolean(widgetUrl);
@@ -275,6 +297,16 @@ export default class WidgetUtils {
             content = {};
         }
 
+        return WidgetUtils.setRoomWidgetContent(roomId, widgetId, content);
+    }
+
+    static setRoomWidgetContent(
+        roomId: string,
+        widgetId: string,
+        content: IWidget,
+    ) {
+        const addingWidget = !!content.url;
+
         WidgetEchoStore.setRoomWidgetEcho(roomId, widgetId, content);
 
         const client = MatrixClientPeg.get();
@@ -307,7 +339,7 @@ export default class WidgetUtils {
      * Get user specific widgets (not linked to a specific room)
      * @return {object} Event content object containing current / active user widgets
      */
-    static getUserWidgets() {
+    static getUserWidgets(): Record<string, IWidgetEvent> {
         const client = MatrixClientPeg.get();
         if (!client) {
             throw new Error('User not logged in');
@@ -323,7 +355,7 @@ export default class WidgetUtils {
      * Get user specific widgets (not linked to a specific room) as an array
      * @return {[object]} Array containing current / active user widgets
      */
-    static getUserWidgetsArray() {
+    static getUserWidgetsArray(): IWidgetEvent[] {
         return Object.values(WidgetUtils.getUserWidgets());
     }
 
@@ -331,7 +363,7 @@ export default class WidgetUtils {
      * Get active stickerpicker widgets (stickerpickers are user widgets by nature)
      * @return {[object]} Array containing current / active stickerpicker widgets
      */
-    static getStickerpickerWidgets() {
+    static getStickerpickerWidgets(): IWidgetEvent[] {
         const widgets = WidgetUtils.getUserWidgetsArray();
         return widgets.filter((widget) => widget.content && widget.content.type === "m.stickerpicker");
     }
@@ -340,12 +372,12 @@ export default class WidgetUtils {
      * Get all integration manager widgets for this user.
      * @returns {Object[]} An array of integration manager user widgets.
      */
-    static getIntegrationManagerWidgets() {
+    static getIntegrationManagerWidgets(): IWidgetEvent[] {
         const widgets = WidgetUtils.getUserWidgetsArray();
         return widgets.filter(w => w.content && w.content.type === "m.integration_manager");
     }
 
-    static getRoomWidgetsOfType(room: Room, type: WidgetType) {
+    static getRoomWidgetsOfType(room: Room, type: WidgetType): IWidgetEvent[] {
         const widgets = WidgetUtils.getRoomWidgets(room);
         return (widgets || []).filter(w => {
             const content = w.getContent();
@@ -353,14 +385,14 @@ export default class WidgetUtils {
         });
     }
 
-    static removeIntegrationManagerWidgets() {
+    static removeIntegrationManagerWidgets(): Promise<void> {
         const client = MatrixClientPeg.get();
         if (!client) {
             throw new Error('User not logged in');
         }
         const widgets = client.getAccountData('m.widgets');
         if (!widgets) return;
-        const userWidgets = widgets.getContent() || {};
+        const userWidgets: IWidgetEvent[] = widgets.getContent() || {};
         Object.entries(userWidgets).forEach(([key, widget]) => {
             if (widget.content && widget.content.type === "m.integration_manager") {
                 delete userWidgets[key];
@@ -369,7 +401,7 @@ export default class WidgetUtils {
         return client.setAccountData('m.widgets', userWidgets);
     }
 
-    static addIntegrationManagerWidget(name: string, uiUrl: string, apiUrl: string) {
+    static addIntegrationManagerWidget(name: string, uiUrl: string, apiUrl: string): Promise<void> {
         return WidgetUtils.setUserWidget(
             "integration_manager_" + (new Date().getTime()),
             WidgetType.INTEGRATION_MANAGER,
@@ -383,14 +415,14 @@ export default class WidgetUtils {
      * Remove all stickerpicker widgets (stickerpickers are user widgets by nature)
      * @return {Promise} Resolves on account data updated
      */
-    static removeStickerpickerWidgets() {
+    static removeStickerpickerWidgets(): Promise<void> {
         const client = MatrixClientPeg.get();
         if (!client) {
             throw new Error('User not logged in');
         }
         const widgets = client.getAccountData('m.widgets');
         if (!widgets) return;
-        const userWidgets = widgets.getContent() || {};
+        const userWidgets: Record<string, IWidgetEvent> = widgets.getContent() || {};
         Object.entries(userWidgets).forEach(([key, widget]) => {
             if (widget.content && widget.content.type === 'm.stickerpicker') {
                 delete userWidgets[key];
@@ -399,7 +431,13 @@ export default class WidgetUtils {
         return client.setAccountData('m.widgets', userWidgets);
     }
 
-    static makeAppConfig(appId, app, senderUserId, roomId, eventId) {
+    static makeAppConfig(
+        appId: string,
+        app: Partial<IApp>,
+        senderUserId: string,
+        roomId: string | null,
+        eventId: string,
+    ): IApp {
         if (!senderUserId) {
             throw new Error("Widgets must be created by someone - provide a senderUserId");
         }
@@ -410,10 +448,10 @@ export default class WidgetUtils {
         app.eventId = eventId;
         app.name = app.name || app.type;
 
-        return app;
+        return app as IApp;
     }
 
-    static getCapWhitelistForAppTypeInRoomId(appType, roomId) {
+    static getCapWhitelistForAppTypeInRoomId(appType: string, roomId: string): Capability[] {
         const enableScreenshots = SettingsStore.getValue("enableWidgetScreenshots", roomId);
 
         const capWhitelist = enableScreenshots ? [MatrixCapabilities.Screenshots] : [];
@@ -428,28 +466,7 @@ export default class WidgetUtils {
         return capWhitelist;
     }
 
-    static getWidgetSecurityKey(widgetId, widgetUrl, isUserWidget) {
-        let widgetLocation = ActiveWidgetStore.getRoomId(widgetId);
-
-        if (isUserWidget) {
-            const userWidget = WidgetUtils.getUserWidgetsArray()
-                .find((w) => w.id === widgetId && w.content && w.content.url === widgetUrl);
-
-            if (!userWidget) {
-                throw new Error("No matching user widget to form security key");
-            }
-
-            widgetLocation = userWidget.sender;
-        }
-
-        if (!widgetLocation) {
-            throw new Error("Failed to locate where the widget resides");
-        }
-
-        return encodeURIComponent(`${widgetLocation}::${widgetUrl}`);
-    }
-
-    static getLocalJitsiWrapperUrl(opts: {forLocalRender?: boolean, auth?: string}={}) {
+    static getLocalJitsiWrapperUrl(opts: {forLocalRender?: boolean, auth?: string} = {}) {
         // NB. we can't just encodeURIComponent all of these because the $ signs need to be there
         const queryStringParts = [
             'conferenceDomain=$domain',
@@ -459,13 +476,15 @@ export default class WidgetUtils {
             'avatarUrl=$matrix_avatar_url',
             'userId=$matrix_user_id',
             'roomId=$matrix_room_id',
+            'theme=$theme',
+            'roomName=$roomName',
         ];
         if (opts.auth) {
             queryStringParts.push(`auth=${opts.auth}`);
         }
         const queryString = queryStringParts.join('&');
 
-        let baseUrl = window.location;
+        let baseUrl = window.location.href;
         if (window.location.protocol !== "https:" && !opts.forLocalRender) {
             // Use an external wrapper if we're not locally rendering the widget. This is usually
             // the URL that will end up in the widget event, so we want to make sure it's relatively
@@ -478,15 +497,15 @@ export default class WidgetUtils {
         return url.href;
     }
 
-    static getWidgetName(app) {
+    static getWidgetName(app?: IApp): string {
         return app?.name?.trim() || _t("Unknown App");
     }
 
-    static getWidgetDataTitle(app) {
+    static getWidgetDataTitle(app?: IApp): string {
         return app?.data?.title?.trim() || "";
     }
 
-    static editWidget(room, app) {
+    static editWidget(room: Room, app: IApp): void {
         // TODO: Open the right manager for the widget
         if (SettingsStore.getValue("feature_many_integration_managers")) {
             IntegrationManagers.sharedInstance().openAll(room, 'type_' + app.type, app.id);
@@ -494,4 +513,16 @@ export default class WidgetUtils {
             IntegrationManagers.sharedInstance().getPrimaryManager().open(room, 'type_' + app.type, app.id);
         }
     }
+
+    static isManagedByManager(app) {
+        if (WidgetUtils.isScalarUrl(app.url)) {
+            const managers = IntegrationManagers.sharedInstance();
+            if (managers.hasManager()) {
+                // TODO: Pick the right manager for the widget
+                const defaultManager = managers.getPrimaryManager();
+                return WidgetUtils.isScalarUrl(defaultManager.apiUrl);
+            }
+        }
+        return false;
+    }
 }
diff --git a/src/utils/iterables.ts b/src/utils/iterables.ts
index 56e0bca1b7..7883b2257a 100644
--- a/src/utils/iterables.ts
+++ b/src/utils/iterables.ts
@@ -14,8 +14,12 @@
  * limitations under the License.
  */
 
-import { arrayUnion } from "./arrays";
+import { arrayDiff, arrayUnion } from "./arrays";
 
 export function iterableUnion<T>(a: Iterable<T>, b: Iterable<T>): Iterable<T> {
     return arrayUnion(Array.from(a), Array.from(b));
 }
+
+export function iterableDiff<T>(a: Iterable<T>, b: Iterable<T>): { added: Iterable<T>, removed: Iterable<T> } {
+    return arrayDiff(Array.from(a), Array.from(b));
+}
diff --git a/src/utils/membership.ts b/src/utils/membership.ts
index 68ac958490..80f04dfe76 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);
@@ -135,6 +140,6 @@ export async function leaveRoomBehaviour(roomId: string) {
     }
 
     if (RoomViewStore.getRoomId() === roomId) {
-        dis.dispatch({action: 'view_next_room'});
+        dis.dispatch({action: 'view_home_page'});
     }
 }
diff --git a/src/utils/numbers.ts b/src/utils/numbers.ts
new file mode 100644
index 0000000000..6ba19d0bef
--- /dev/null
+++ b/src/utils/numbers.ts
@@ -0,0 +1,42 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/**
+ * Returns the default number if the given value, i, is not a number. Otherwise
+ * returns the given value.
+ * @param {*} i The value to check.
+ * @param {number} def The default value.
+ * @returns {number} Either the value or the default value, whichever is a number.
+ */
+export function defaultNumber(i: unknown, def: number): number {
+    return Number.isFinite(i) ? Number(i) : def;
+}
+
+export function clamp(i: number, min: number, max: number): number {
+    return Math.min(Math.max(i, min), max);
+}
+
+export function sum(...i: number[]): number {
+    return [...i].reduce((p, c) => c + p, 0);
+}
+
+export function percentageWithin(pct: number, min: number, max: number): number {
+    return (pct * (max - min)) + min;
+}
+
+export function percentageOf(val: number, min: number, max: number): number {
+    return (val - min) / (max - min);
+}
diff --git a/src/utils/objects.ts b/src/utils/objects.ts
index bc74ab9ee0..e7f4f0f907 100644
--- a/src/utils/objects.ts
+++ b/src/utils/objects.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { arrayDiff, arrayHasDiff, arrayMerge, arrayUnion } from "./arrays";
+import { arrayDiff, arrayMerge, arrayUnion } from "./arrays";
 
 type ObjectExcluding<O extends {}, P extends (keyof O)[]> = {[k in Exclude<keyof O, P[number]>]: O[k]};
 
@@ -86,11 +86,14 @@ export function objectShallowClone<O extends {}>(a: O, propertyCloner?: (k: keyo
  * @returns True if there's a difference between the objects, false otherwise
  */
 export function objectHasDiff<O extends {}>(a: O, b: O): boolean {
+    if (a === b) return false;
     const aKeys = Object.keys(a);
     const bKeys = Object.keys(b);
-    if (arrayHasDiff(aKeys, bKeys)) return true;
-
+    if (aKeys.length !== bKeys.length) return true;
     const possibleChanges = arrayUnion(aKeys, bKeys);
+    // if the amalgamation of both sets of keys has the a different length to the inputs then there must be a change
+    if (possibleChanges.length !== aKeys.length) return true;
+
     return possibleChanges.some(k => a[k] !== b[k]);
 }
 
diff --git a/src/utils/permalinks/RiotPermalinkConstructor.js b/src/utils/permalinks/ElementPermalinkConstructor.js
similarity index 61%
rename from src/utils/permalinks/RiotPermalinkConstructor.js
rename to src/utils/permalinks/ElementPermalinkConstructor.js
index 176100aa8b..da7f5797ea 100644
--- a/src/utils/permalinks/RiotPermalinkConstructor.js
+++ b/src/utils/permalinks/ElementPermalinkConstructor.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2021 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -19,32 +19,32 @@ import PermalinkConstructor, {PermalinkParts} from "./PermalinkConstructor";
 /**
  * Generates permalinks that self-reference the running webapp
  */
-export default class RiotPermalinkConstructor extends PermalinkConstructor {
-    _riotUrl: string;
+export default class ElementPermalinkConstructor extends PermalinkConstructor {
+    _elementUrl: string;
 
-    constructor(riotUrl: string) {
+    constructor(elementUrl: string) {
         super();
-        this._riotUrl = riotUrl;
+        this._elementUrl = elementUrl;
 
-        if (!this._riotUrl.startsWith("http:") && !this._riotUrl.startsWith("https:")) {
-            throw new Error("Riot prefix URL does not appear to be an HTTP(S) URL");
+        if (!this._elementUrl.startsWith("http:") && !this._elementUrl.startsWith("https:")) {
+            throw new Error("Element prefix URL does not appear to be an HTTP(S) URL");
         }
     }
 
     forEvent(roomId: string, eventId: string, serverCandidates: string[]): string {
-        return `${this._riotUrl}/#/room/${roomId}/${eventId}${this.encodeServerCandidates(serverCandidates)}`;
+        return `${this._elementUrl}/#/room/${roomId}/${eventId}${this.encodeServerCandidates(serverCandidates)}`;
     }
 
     forRoom(roomIdOrAlias: string, serverCandidates: string[]): string {
-        return `${this._riotUrl}/#/room/${roomIdOrAlias}${this.encodeServerCandidates(serverCandidates)}`;
+        return `${this._elementUrl}/#/room/${roomIdOrAlias}${this.encodeServerCandidates(serverCandidates)}`;
     }
 
     forUser(userId: string): string {
-        return `${this._riotUrl}/#/user/${userId}`;
+        return `${this._elementUrl}/#/user/${userId}`;
     }
 
     forGroup(groupId: string): string {
-        return `${this._riotUrl}/#/group/${groupId}`;
+        return `${this._elementUrl}/#/group/${groupId}`;
     }
 
     forEntity(entityId: string): string {
@@ -58,7 +58,7 @@ export default class RiotPermalinkConstructor extends PermalinkConstructor {
     }
 
     isPermalinkHost(testHost: string): boolean {
-        const parsedUrl = new URL(this._riotUrl);
+        const parsedUrl = new URL(this._elementUrl);
         return testHost === (parsedUrl.host || parsedUrl.hostname); // one of the hosts should match
     }
 
@@ -69,17 +69,34 @@ export default class RiotPermalinkConstructor extends PermalinkConstructor {
 
     // Heavily inspired by/borrowed from the matrix-bot-sdk (with permission):
     // https://github.com/turt2live/matrix-js-bot-sdk/blob/7c4665c9a25c2c8e0fe4e509f2616505b5b66a1c/src/Permalinks.ts#L33-L61
-    // Adapted for Riot's URL format
+    // Adapted for Element's URL format
     parsePermalink(fullUrl: string): PermalinkParts {
-        if (!fullUrl || !fullUrl.startsWith(this._riotUrl)) {
+        if (!fullUrl || !fullUrl.startsWith(this._elementUrl)) {
             throw new Error("Does not appear to be a permalink");
         }
 
-        const parts = fullUrl.substring(`${this._riotUrl}/#/`.length).split("/");
+        const parts = fullUrl.substring(`${this._elementUrl}/#/`.length);
+        return ElementPermalinkConstructor.parseAppRoute(parts);
+    }
+
+    /**
+     * Parses an app route (`(user|room|group)/identifer`) to a Matrix entity
+     * (room, user, group).
+     * @param {string} route The app route
+     * @returns {PermalinkParts}
+     */
+    static parseAppRoute(route: string): PermalinkParts {
+        const parts = route.split("/");
+
         if (parts.length < 2) { // we're expecting an entity and an ID of some kind at least
             throw new Error("URL is missing parts");
         }
 
+        // Split optional query out of last part
+        const [lastPartMaybeWithQuery] = parts.splice(-1, 1);
+        const [lastPart, query = ""] = lastPartMaybeWithQuery.split("?");
+        parts.push(lastPart);
+
         const entityType = parts[0];
         const entity = parts[1];
         if (entityType === 'user') {
@@ -89,20 +106,9 @@ export default class RiotPermalinkConstructor extends PermalinkConstructor {
             // Probably a group, no further parsing needed.
             return PermalinkParts.forGroup(entity);
         } else if (entityType === 'room') {
-            if (parts.length === 2) {
-                return PermalinkParts.forRoom(entity, []);
-            }
-
-            // rejoin the rest because v3 events can have slashes (annoyingly)
-            const eventIdAndQuery = parts.length > 2 ? parts.slice(2).join('/') : "";
-            const secondaryParts = eventIdAndQuery.split("?");
-
-            const eventId = secondaryParts[0];
-            const query = secondaryParts.length > 1 ? secondaryParts[1] : "";
-
-            // TODO: Verify Riot works with via args
-            const via = query.split("via=").filter(p => !!p);
-
+            // Rejoin the rest because v3 events can have slashes (annoyingly)
+            const eventId = parts.length > 2 ? parts.slice(2).join('/') : "";
+            const via = query.split(/&?via=/).filter(p => !!p);
             return PermalinkParts.forEvent(entity, eventId, via);
         } else {
             throw new Error("Unknown entity type in permalink");
diff --git a/src/utils/permalinks/PermalinkConstructor.js b/src/utils/permalinks/PermalinkConstructor.js
index f74c432bf0..25855eb024 100644
--- a/src/utils/permalinks/PermalinkConstructor.js
+++ b/src/utils/permalinks/PermalinkConstructor.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2021 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -80,4 +80,12 @@ export class PermalinkParts {
     static forEvent(roomId: string, eventId: string, viaServers: string[]): PermalinkParts {
         return new PermalinkParts(roomId, eventId, null, null, viaServers || []);
     }
+
+    get primaryEntityId(): string {
+        return this.roomIdOrAlias || this.userId || this.groupId;
+    }
+
+    get sigil(): string {
+        return this.primaryEntityId[0];
+    }
 }
diff --git a/src/utils/permalinks/Permalinks.js b/src/utils/permalinks/Permalinks.js
index 3e510ffee9..bcf4d87136 100644
--- a/src/utils/permalinks/Permalinks.js
+++ b/src/utils/permalinks/Permalinks.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 New Vector Ltd
+Copyright 2019, 2021 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,12 +14,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {MatrixClientPeg} from "../../MatrixClientPeg";
 import isIp from "is-ip";
-import * as utils from 'matrix-js-sdk/src/utils';
+import * as utils from "matrix-js-sdk/src/utils";
+import {Room} from "matrix-js-sdk/src/models/room";
+
+import {MatrixClientPeg} from "../../MatrixClientPeg";
 import SpecPermalinkConstructor, {baseUrl as matrixtoBaseUrl} from "./SpecPermalinkConstructor";
 import PermalinkConstructor, {PermalinkParts} from "./PermalinkConstructor";
-import RiotPermalinkConstructor from "./RiotPermalinkConstructor";
+import ElementPermalinkConstructor from "./ElementPermalinkConstructor";
 import matrixLinkify from "../../linkify-matrix";
 import SdkConfig from "../../SdkConfig";
 
@@ -121,6 +123,10 @@ export class RoomPermalinkCreator {
         this._started = false;
     }
 
+    get serverCandidates() {
+        return this._serverCandidates;
+    }
+
     isStarted() {
         return this._started;
     }
@@ -129,6 +135,17 @@ export class RoomPermalinkCreator {
         return getPermalinkConstructor().forEvent(this._roomId, eventId, this._serverCandidates);
     }
 
+    forShareableRoom() {
+        if (this._room) {
+            // Prefer to use canonical alias for permalink if possible
+            const alias = this._room.getCanonicalAlias();
+            if (alias) {
+                return getPermalinkConstructor().forRoom(alias, this._serverCandidates);
+            }
+        }
+        return getPermalinkConstructor().forRoom(this._roomId, this._serverCandidates);
+    }
+
     forRoom() {
         return getPermalinkConstructor().forRoom(this._roomId, this._serverCandidates);
     }
@@ -320,12 +337,12 @@ export function tryTransformPermalinkToLocalHref(permalink: string): string {
         return permalink;
     }
 
-    const m = permalink.match(matrixLinkify.VECTOR_URL_PATTERN);
+    const m = permalink.match(matrixLinkify.ELEMENT_URL_PATTERN);
     if (m) {
         return m[1];
     }
 
-    // A bit of a hack to convert permalinks of unknown origin to Riot links
+    // A bit of a hack to convert permalinks of unknown origin to Element links
     try {
         const permalinkParts = parsePermalink(permalink);
         if (permalinkParts) {
@@ -354,10 +371,10 @@ export function getPrimaryPermalinkEntity(permalink: string): string {
 
         // If not a permalink, try the vector patterns.
         if (!permalinkParts) {
-            const m = permalink.match(matrixLinkify.VECTOR_URL_PATTERN);
+            const m = permalink.match(matrixLinkify.ELEMENT_URL_PATTERN);
             if (m) {
                 // A bit of a hack, but it gets the job done
-                const handler = new RiotPermalinkConstructor("http://localhost");
+                const handler = new ElementPermalinkConstructor("http://localhost");
                 const entityInfo = m[1].split('#').slice(1).join('#');
                 permalinkParts = handler.parsePermalink(`http://localhost/#${entityInfo}`);
             }
@@ -375,25 +392,42 @@ export function getPrimaryPermalinkEntity(permalink: string): string {
 }
 
 function getPermalinkConstructor(): PermalinkConstructor {
-    const riotPrefix = SdkConfig.get()['permalinkPrefix'];
-    if (riotPrefix && riotPrefix !== matrixtoBaseUrl) {
-        return new RiotPermalinkConstructor(riotPrefix);
+    const elementPrefix = SdkConfig.get()['permalinkPrefix'];
+    if (elementPrefix && elementPrefix !== matrixtoBaseUrl) {
+        return new ElementPermalinkConstructor(elementPrefix);
     }
 
     return new SpecPermalinkConstructor();
 }
 
 export function parsePermalink(fullUrl: string): PermalinkParts {
-    const riotPrefix = SdkConfig.get()['permalinkPrefix'];
+    const elementPrefix = SdkConfig.get()['permalinkPrefix'];
     if (fullUrl.startsWith(matrixtoBaseUrl)) {
         return new SpecPermalinkConstructor().parsePermalink(fullUrl);
-    } else if (riotPrefix && fullUrl.startsWith(riotPrefix)) {
-        return new RiotPermalinkConstructor(riotPrefix).parsePermalink(fullUrl);
+    } else if (elementPrefix && fullUrl.startsWith(elementPrefix)) {
+        return new ElementPermalinkConstructor(elementPrefix).parsePermalink(fullUrl);
     }
 
     return null; // not a permalink we can handle
 }
 
+/**
+ * Parses an app local link (`#/(user|room|group)/identifer`) to a Matrix entity
+ * (room, user, group). Such links are produced by `HtmlUtils` when encountering
+ * links, which calls `tryTransformPermalinkToLocalHref` in this module.
+ * @param {string} localLink The app local link
+ * @returns {PermalinkParts}
+ */
+export function parseAppLocalLink(localLink: string): PermalinkParts {
+    try {
+        const segments = localLink.replace("#/", "");
+        return ElementPermalinkConstructor.parseAppRoute(segments);
+    } catch (e) {
+        // Ignore failures
+    }
+    return null;
+}
+
 function getServerName(userId) {
     return userId.split(":").splice(1).join(":");
 }
@@ -423,3 +457,9 @@ function isHostnameIpAddress(hostname) {
 
     return isIp(hostname);
 }
+
+export const calculateRoomVia = (room: Room) => {
+    const permalinkCreator = new RoomPermalinkCreator(room);
+    permalinkCreator.load();
+    return permalinkCreator.serverCandidates;
+};
diff --git a/src/utils/pillify.js b/src/utils/pillify.js
index 432771592a..72e0e5a4db 100644
--- a/src/utils/pillify.js
+++ b/src/utils/pillify.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020, 2021 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -19,7 +19,8 @@ import ReactDOM from 'react-dom';
 import {MatrixClientPeg} from '../MatrixClientPeg';
 import SettingsStore from "../settings/SettingsStore";
 import {PushProcessor} from 'matrix-js-sdk/src/pushprocessor';
-import * as sdk from '../index';
+import Pill from "../components/views/elements/Pill";
+import { parseAppLocalLink } from "./permalinks/Permalinks";
 
 /**
  * Recurses depth-first through a DOM tree, converting matrix.to links
@@ -43,10 +44,10 @@ export function pillifyLinks(nodes, mxEvent, pills) {
 
         if (node.tagName === "A" && node.getAttribute("href")) {
             const href = node.getAttribute("href");
-
+            const parts = parseAppLocalLink(href);
             // If the link is a (localised) matrix.to link, replace it with a pill
-            const Pill = sdk.getComponent('elements.Pill');
-            if (Pill.isMessagePillUrl(href)) {
+            // We don't want to pill event permalinks, so those are ignored.
+            if (parts && !parts.eventId) {
                 const pillContainer = document.createElement('span');
 
                 const pill = <Pill
@@ -72,8 +73,6 @@ export function pillifyLinks(nodes, mxEvent, pills) {
             // to clear the pills from the last run of pillifyLinks
             !node.parentElement.classList.contains("mx_AtRoomPill")
         ) {
-            const Pill = sdk.getComponent('elements.Pill');
-
             let currentTextNode = node;
             const roomNotifTextNodes = [];
 
diff --git a/src/utils/sets.ts b/src/utils/sets.ts
new file mode 100644
index 0000000000..e5427b2e94
--- /dev/null
+++ b/src/utils/sets.ts
@@ -0,0 +1,34 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/**
+ * Determines if two sets are different through a shallow comparison.
+ * @param a The first set. Must be defined.
+ * @param b The second set. Must be defined.
+ * @returns True if they are different, false otherwise.
+ */
+export function setHasDiff<T>(a: Set<T>, b: Set<T>): boolean {
+    if (a.size === b.size) {
+        // When the lengths are equal, check to see if either set is missing an element from the other.
+        if (Array.from(b).some(i => !a.has(i))) return true;
+        if (Array.from(a).some(i => !b.has(i))) return true;
+
+        // if all the keys are common, say so
+        return false;
+    } else {
+        return true; // different lengths means they are naturally diverged
+    }
+}
diff --git a/src/utils/space.ts b/src/utils/space.ts
new file mode 100644
index 0000000000..bc31829f45
--- /dev/null
+++ b/src/utils/space.ts
@@ -0,0 +1,81 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import {Room} from "matrix-js-sdk/src/models/room";
+import {MatrixClient} from "matrix-js-sdk/src/client";
+import {EventType} from "matrix-js-sdk/src/@types/event";
+
+import {calculateRoomVia} from "../utils/permalinks/Permalinks";
+import Modal from "../Modal";
+import SpaceSettingsDialog from "../components/views/dialogs/SpaceSettingsDialog";
+import AddExistingToSpaceDialog from "../components/views/dialogs/AddExistingToSpaceDialog";
+import CreateRoomDialog from "../components/views/dialogs/CreateRoomDialog";
+import createRoom, {IOpts} from "../createRoom";
+
+export const shouldShowSpaceSettings = (cli: MatrixClient, space: Room) => {
+    const userId = cli.getUserId();
+    return space.getMyMembership() === "join"
+        && (space.currentState.maySendStateEvent(EventType.RoomAvatar, userId)
+            || space.currentState.maySendStateEvent(EventType.RoomName, userId)
+            || space.currentState.maySendStateEvent(EventType.RoomTopic, userId)
+            || space.currentState.maySendStateEvent(EventType.RoomJoinRules, userId));
+};
+
+export const makeSpaceParentEvent = (room: Room, canonical = false) => ({
+    type: EventType.SpaceParent,
+    content: {
+        "via": calculateRoomVia(room),
+        "canonical": canonical,
+    },
+    state_key: room.roomId,
+});
+
+export const showSpaceSettings = (cli: MatrixClient, space: Room) => {
+    Modal.createTrackedDialog("Space Settings", "", SpaceSettingsDialog, {
+        matrixClient: cli,
+        space,
+    }, /*className=*/null, /*isPriority=*/false, /*isStatic=*/true);
+};
+
+export const showAddExistingRooms = async (cli: MatrixClient, space: Room) => {
+    return Modal.createTrackedDialog(
+        "Space Landing",
+        "Add Existing",
+        AddExistingToSpaceDialog,
+        {
+            matrixClient: cli,
+            onCreateRoomClick: showCreateNewRoom,
+            space,
+        },
+        "mx_AddExistingToSpaceDialog_wrapper",
+    ).finished;
+};
+
+export const showCreateNewRoom = async (cli: MatrixClient, space: Room) => {
+    const modal = Modal.createTrackedDialog<[boolean, IOpts]>(
+        "Space Landing",
+        "Create Room",
+        CreateRoomDialog,
+        {
+            defaultPublic: space.getJoinRule() === "public",
+            parentSpace: space,
+        },
+    );
+    const [shouldCreate, opts] = await modal.finished;
+    if (shouldCreate) {
+        await createRoom(opts);
+    }
+};
diff --git a/src/verification.js b/src/verification.js
index 819370f239..74e3897d3a 100644
--- a/src/verification.js
+++ b/src/verification.js
@@ -74,6 +74,10 @@ function UntrustedDeviceDialog(props) {
 
 export async function verifyDevice(user, device) {
     const cli = MatrixClientPeg.get();
+    if (cli.isGuest()) {
+        dis.dispatch({action: 'require_registration'});
+        return;
+    }
     // if cross-signing is not explicitly disabled, check if it should be enabled first.
     if (cli.getCryptoTrustCrossSignedDevices()) {
         if (!await enable4SIfNeeded()) {
@@ -113,6 +117,10 @@ export async function verifyDevice(user, device) {
 
 export async function legacyVerifyUser(user) {
     const cli = MatrixClientPeg.get();
+    if (cli.isGuest()) {
+        dis.dispatch({action: 'require_registration'});
+        return;
+    }
     // if cross-signing is not explicitly disabled, check if it should be enabled first.
     if (cli.getCryptoTrustCrossSignedDevices()) {
         if (!await enable4SIfNeeded()) {
@@ -128,6 +136,11 @@ export async function legacyVerifyUser(user) {
 }
 
 export async function verifyUser(user) {
+    const cli = MatrixClientPeg.get();
+    if (cli.isGuest()) {
+        dis.dispatch({action: 'require_registration'});
+        return;
+    }
     if (!await enable4SIfNeeded()) {
         return;
     }
diff --git a/src/widgets/CapabilityText.tsx b/src/widgets/CapabilityText.tsx
new file mode 100644
index 0000000000..273d22dc81
--- /dev/null
+++ b/src/widgets/CapabilityText.tsx
@@ -0,0 +1,345 @@
+/*
+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 { Capability, EventDirection, MatrixCapabilities, WidgetEventCapability, WidgetKind } from "matrix-widget-api";
+import { _t, _td, TranslatedString } from "../languageHandler";
+import { EventType, MsgType } from "matrix-js-sdk/src/@types/event";
+import { ElementWidgetCapabilities } from "../stores/widgets/ElementWidgetCapabilities";
+import React from "react";
+
+type GENERIC_WIDGET_KIND = "generic";
+const GENERIC_WIDGET_KIND: GENERIC_WIDGET_KIND = "generic";
+
+interface ISendRecvStaticCapText {
+    // @ts-ignore - TS wants the key to be a string, but we know better
+    [eventType: EventType]: {
+        // @ts-ignore - TS wants the key to be a string, but we know better
+        [widgetKind: WidgetKind | GENERIC_WIDGET_KIND]: {
+            // @ts-ignore - TS wants the key to be a string, but we know better
+            [direction: EventDirection]: string;
+        };
+    };
+}
+
+interface IStaticCapText {
+    // @ts-ignore - TS wants the key to be a string, but we know better
+    [capability: Capability]: {
+        // @ts-ignore - TS wants the key to be a string, but we know better
+        [widgetKind: WidgetKind | GENERIC_WIDGET_KIND]: string;
+    };
+}
+
+export interface TranslatedCapabilityText {
+    primary: TranslatedString;
+    byline?: TranslatedString;
+}
+
+export class CapabilityText {
+    private static simpleCaps: IStaticCapText = {
+        [MatrixCapabilities.AlwaysOnScreen]: {
+            [WidgetKind.Room]: _td("Remain on your screen when viewing another room, when running"),
+            [GENERIC_WIDGET_KIND]: _td("Remain on your screen while running"),
+        },
+        [MatrixCapabilities.StickerSending]: {
+            [WidgetKind.Room]: _td("Send stickers into this room"),
+            [GENERIC_WIDGET_KIND]: _td("Send stickers into your active room"),
+        },
+        [ElementWidgetCapabilities.CanChangeViewedRoom]: {
+            [GENERIC_WIDGET_KIND]: _td("Change which room you're viewing"),
+        },
+        [MatrixCapabilities.MSC2931Navigate]: {
+            [GENERIC_WIDGET_KIND]: _td("Change which room, message, or user you're viewing"),
+        },
+    };
+
+    private static stateSendRecvCaps: ISendRecvStaticCapText = {
+        [EventType.RoomTopic]: {
+            [WidgetKind.Room]: {
+                [EventDirection.Send]: _td("Change the topic of this room"),
+                [EventDirection.Receive]: _td("See when the topic changes in this room"),
+            },
+            [GENERIC_WIDGET_KIND]: {
+                [EventDirection.Send]: _td("Change the topic of your active room"),
+                [EventDirection.Receive]: _td("See when the topic changes in your active room"),
+            },
+        },
+        [EventType.RoomName]: {
+            [WidgetKind.Room]: {
+                [EventDirection.Send]: _td("Change the name of this room"),
+                [EventDirection.Receive]: _td("See when the name changes in this room"),
+            },
+            [GENERIC_WIDGET_KIND]: {
+                [EventDirection.Send]: _td("Change the name of your active room"),
+                [EventDirection.Receive]: _td("See when the name changes in your active room"),
+            },
+        },
+        [EventType.RoomAvatar]: {
+            [WidgetKind.Room]: {
+                [EventDirection.Send]: _td("Change the avatar of this room"),
+                [EventDirection.Receive]: _td("See when the avatar changes in this room"),
+            },
+            [GENERIC_WIDGET_KIND]: {
+                [EventDirection.Send]: _td("Change the avatar of your active room"),
+                [EventDirection.Receive]: _td("See when the avatar changes in your active room"),
+            },
+        },
+    };
+
+    private static nonStateSendRecvCaps: ISendRecvStaticCapText = {
+        [EventType.Sticker]: {
+            [WidgetKind.Room]: {
+                [EventDirection.Send]: _td("Send stickers to this room as you"),
+                [EventDirection.Receive]: _td("See when a sticker is posted in this room"),
+            },
+            [GENERIC_WIDGET_KIND]: {
+                [EventDirection.Send]: _td("Send stickers to your active room as you"),
+                [EventDirection.Receive]: _td("See when anyone posts a sticker to your active room"),
+            },
+        },
+    };
+
+    private static bylineFor(eventCap: WidgetEventCapability): TranslatedString {
+        if (eventCap.isState) {
+            return !eventCap.keyStr
+                ? _t("with an empty state key")
+                : _t("with state key %(stateKey)s", {stateKey: eventCap.keyStr});
+        }
+        return null; // room messages are handled specially
+    }
+
+    public static for(capability: Capability, kind: WidgetKind): TranslatedCapabilityText {
+        // First see if we have a super simple line of text to provide back
+        if (CapabilityText.simpleCaps[capability]) {
+            const textForKind = CapabilityText.simpleCaps[capability];
+            if (textForKind[kind]) return {primary: _t(textForKind[kind])};
+            if (textForKind[GENERIC_WIDGET_KIND]) return {primary: _t(textForKind[GENERIC_WIDGET_KIND])};
+
+            // ... we'll fall through to the generic capability processing at the end of this
+            // function if we fail to locate a simple string and the capability isn't for an
+            // event.
+        }
+
+        // We didn't have a super simple line of text, so try processing the capability as the
+        // more complex event send/receive permission type.
+        const [eventCap] = WidgetEventCapability.findEventCapabilities([capability]);
+        if (eventCap) {
+            // Special case room messages so they show up a bit cleaner to the user. Result is
+            // effectively "Send images" instead of "Send messages... of type images" if we were
+            // to handle the msgtype nuances in this function.
+            if (!eventCap.isState && eventCap.eventType === EventType.RoomMessage) {
+                return CapabilityText.forRoomMessageCap(eventCap, kind);
+            }
+
+            // See if we have a static line of text to provide for the given event type and
+            // direction. The hope is that we do for common event types for friendlier copy.
+            const evSendRecv = eventCap.isState
+                ? CapabilityText.stateSendRecvCaps
+                : CapabilityText.nonStateSendRecvCaps;
+            if (evSendRecv[eventCap.eventType]) {
+                const textForKind = evSendRecv[eventCap.eventType];
+                const textForDirection = textForKind[kind] || textForKind[GENERIC_WIDGET_KIND];
+                if (textForDirection && textForDirection[eventCap.direction]) {
+                    return {
+                        primary: _t(textForDirection[eventCap.direction]),
+                        // no byline because we would have already represented the event properly
+                    };
+                }
+            }
+
+            // We don't have anything simple, so just return a generic string for the event cap
+            if (kind === WidgetKind.Room) {
+                if (eventCap.direction === EventDirection.Send) {
+                    return {
+                        primary: _t("Send <b>%(eventType)s</b> events as you in this room", {
+                            eventType: eventCap.eventType,
+                        }, {
+                            b: sub => <b>{sub}</b>,
+                        }),
+                        byline: CapabilityText.bylineFor(eventCap),
+                    };
+                } else {
+                    return {
+                        primary: _t("See <b>%(eventType)s</b> events posted to this room", {
+                            eventType: eventCap.eventType,
+                        }, {
+                            b: sub => <b>{sub}</b>,
+                        }),
+                        byline: CapabilityText.bylineFor(eventCap),
+                    };
+                }
+            } else { // assume generic
+                if (eventCap.direction === EventDirection.Send) {
+                    return {
+                        primary: _t("Send <b>%(eventType)s</b> events as you in your active room", {
+                            eventType: eventCap.eventType,
+                        }, {
+                            b: sub => <b>{sub}</b>,
+                        }),
+                        byline: CapabilityText.bylineFor(eventCap),
+                    };
+                } else {
+                    return {
+                        primary: _t("See <b>%(eventType)s</b> events posted to your active room", {
+                            eventType: eventCap.eventType,
+                        }, {
+                            b: sub => <b>{sub}</b>,
+                        }),
+                        byline: CapabilityText.bylineFor(eventCap),
+                    };
+                }
+            }
+        }
+
+        // We don't have enough context to render this capability specially, so we'll present it as-is
+        return {
+            primary: _t("The <b>%(capability)s</b> capability", {capability}, {
+                b: sub => <b>{sub}</b>,
+            }),
+        };
+    }
+
+    private static forRoomMessageCap(eventCap: WidgetEventCapability, kind: WidgetKind): TranslatedCapabilityText {
+        // First handle the case of "all messages" to make the switch later on a bit clearer
+        if (!eventCap.keyStr) {
+            if (eventCap.direction === EventDirection.Send) {
+                return {
+                    primary: kind === WidgetKind.Room
+                        ? _t("Send messages as you in this room")
+                        : _t("Send messages as you in your active room"),
+                };
+            } else {
+                return {
+                    primary: kind === WidgetKind.Room
+                        ? _t("See messages posted to this room")
+                        : _t("See messages posted to your active room"),
+                };
+            }
+        }
+
+        // Now handle all the message types we care about. There are more message types available, however
+        // they are not as common so we don't bother rendering them. They'll fall into the generic case.
+        switch (eventCap.keyStr) {
+            case MsgType.Text: {
+                if (eventCap.direction === EventDirection.Send) {
+                    return {
+                        primary: kind === WidgetKind.Room
+                            ? _t("Send text messages as you in this room")
+                            : _t("Send text messages as you in your active room"),
+                    };
+                } else {
+                    return {
+                        primary: kind === WidgetKind.Room
+                            ? _t("See text messages posted to this room")
+                            : _t("See text messages posted to your active room"),
+                    };
+                }
+            }
+            case MsgType.Emote: {
+                if (eventCap.direction === EventDirection.Send) {
+                    return {
+                        primary: kind === WidgetKind.Room
+                            ? _t("Send emotes as you in this room")
+                            : _t("Send emotes as you in your active room"),
+                    };
+                } else {
+                    return {
+                        primary: kind === WidgetKind.Room
+                            ? _t("See emotes posted to this room")
+                            : _t("See emotes posted to your active room"),
+                    };
+                }
+            }
+            case MsgType.Image: {
+                if (eventCap.direction === EventDirection.Send) {
+                    return {
+                        primary: kind === WidgetKind.Room
+                            ? _t("Send images as you in this room")
+                            : _t("Send images as you in your active room"),
+                    };
+                } else {
+                    return {
+                        primary: kind === WidgetKind.Room
+                            ? _t("See images posted to this room")
+                            : _t("See images posted to your active room"),
+                    };
+                }
+            }
+            case MsgType.Video: {
+                if (eventCap.direction === EventDirection.Send) {
+                    return {
+                        primary: kind === WidgetKind.Room
+                            ? _t("Send videos as you in this room")
+                            : _t("Send videos as you in your active room"),
+                    };
+                } else {
+                    return {
+                        primary: kind === WidgetKind.Room
+                            ? _t("See videos posted to this room")
+                            : _t("See videos posted to your active room"),
+                    };
+                }
+            }
+            case MsgType.File: {
+                if (eventCap.direction === EventDirection.Send) {
+                    return {
+                        primary: kind === WidgetKind.Room
+                            ? _t("Send general files as you in this room")
+                            : _t("Send general files as you in your active room"),
+                    };
+                } else {
+                    return {
+                        primary: kind === WidgetKind.Room
+                            ? _t("See general files posted to this room")
+                            : _t("See general files posted to your active room"),
+                    };
+                }
+            }
+            default: {
+                let primary: TranslatedString;
+                if (eventCap.direction === EventDirection.Send) {
+                    if (kind === WidgetKind.Room) {
+                        primary = _t("Send <b>%(msgtype)s</b> messages as you in this room", {
+                            msgtype: eventCap.keyStr,
+                        }, {
+                            b: sub => <b>{sub}</b>,
+                        });
+                    } else {
+                        primary = _t("Send <b>%(msgtype)s</b> messages as you in your active room", {
+                            msgtype: eventCap.keyStr,
+                        }, {
+                            b: sub => <b>{sub}</b>,
+                        });
+                    }
+                } else {
+                    if (kind === WidgetKind.Room) {
+                        primary = _t("See <b>%(msgtype)s</b> messages posted to this room", {
+                            msgtype: eventCap.keyStr,
+                        }, {
+                            b: sub => <b>{sub}</b>,
+                        });
+                    } else {
+                        primary = _t("See <b>%(msgtype)s</b> messages posted to your active room", {
+                            msgtype: eventCap.keyStr,
+                        }, {
+                            b: sub => <b>{sub}</b>,
+                        });
+                    }
+                }
+                return {primary};
+            }
+        }
+    }
+}
diff --git a/src/widgets/ManagedHybrid.ts b/src/widgets/ManagedHybrid.ts
new file mode 100644
index 0000000000..f05df0a6ce
--- /dev/null
+++ b/src/widgets/ManagedHybrid.ts
@@ -0,0 +1,109 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { IWidget } from "matrix-widget-api";
+import { MatrixClientPeg } from "../MatrixClientPeg";
+import { getCallBehaviourWellKnown } from "../utils/WellKnownUtils";
+import WidgetUtils from "../utils/WidgetUtils";
+import { IStoredLayout, WidgetLayoutStore } from "../stores/widgets/WidgetLayoutStore";
+import WidgetEchoStore from "../stores/WidgetEchoStore";
+import WidgetStore from "../stores/WidgetStore";
+import SdkConfig from "../SdkConfig";
+
+/* eslint-disable camelcase */
+interface IManagedHybridWidgetData {
+    widget_id: string;
+    widget: IWidget;
+    layout: IStoredLayout;
+}
+/* eslint-enable camelcase */
+
+function getWidgetBuildUrl(): string {
+    if (SdkConfig.get().widget_build_url) {
+        return SdkConfig.get().widget_build_url;
+    }
+    /* eslint-disable-next-line camelcase */
+    return getCallBehaviourWellKnown()?.widget_build_url
+}
+
+export function isManagedHybridWidgetEnabled(): boolean {
+    return !!getWidgetBuildUrl();
+}
+
+export async function addManagedHybridWidget(roomId: string) {
+    const cli = MatrixClientPeg.get();
+    const room = cli.getRoom(roomId);
+    if (!room) {
+        return;
+    }
+
+    // Check for permission
+    if (!WidgetUtils.canUserModifyWidgets(roomId)) {
+        console.error(`User not allowed to modify widgets in ${roomId}`);
+        return;
+    }
+
+    // Get widget data
+    /* eslint-disable-next-line camelcase */
+    const widgetBuildUrl = getWidgetBuildUrl();
+    if (!widgetBuildUrl) {
+        return;
+    }
+    let widgetData: IManagedHybridWidgetData;
+    try {
+        const response = await fetch(`${widgetBuildUrl}?roomId=${roomId}`);
+        widgetData = await response.json();
+    } catch (e) {
+        console.error(`Managed hybrid widget builder failed for room ${roomId}`, e);
+        return;
+    }
+    if (!widgetData) {
+        return;
+    }
+    const { widget_id: widgetId, widget: widgetContent, layout } = widgetData;
+
+    // Ensure the widget is not already present in the room
+    let widgets = WidgetStore.instance.getApps(roomId);
+    const existing = (
+        widgets.some(w => w.id === widgetId) ||
+        WidgetEchoStore.roomHasPendingWidgets(roomId, [])
+    );
+    if (existing) {
+        console.error(`Managed hybrid widget already present in room ${roomId}`);
+        return;
+    }
+
+    // Add the widget
+    try {
+        await WidgetUtils.setRoomWidgetContent(roomId, widgetId, widgetContent);
+    } catch (e) {
+        console.error(`Unable to add managed hybrid widget in room ${roomId}`, e);
+        return;
+    }
+
+    // Move the widget into position
+    if (!WidgetLayoutStore.instance.canCopyLayoutToRoom(room)) {
+        return;
+    }
+    widgets = WidgetStore.instance.getApps(roomId);
+    const installedWidget = widgets.find(w => w.id === widgetId);
+    if (!installedWidget) {
+        return;
+    }
+    WidgetLayoutStore.instance.moveToContainer(room, installedWidget, layout.container);
+    WidgetLayoutStore.instance.setContainerHeight(room, layout.container, layout.height);
+    WidgetLayoutStore.instance.copyLayoutToRoom(room);
+}
diff --git a/test/PhasedRollOut-test.js b/test/PhasedRollOut-test.js
deleted file mode 100644
index f02411d78d..0000000000
--- a/test/PhasedRollOut-test.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-Copyright 2018 New Vector 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 {phasedRollOutExpiredForUser} from '../src/PhasedRollOut';
-
-const OFFSET = 6000000;
-// phasedRollOutExpiredForUser enables users in bucks of 1 minute
-const MS_IN_MINUTE = 60 * 1000;
-
-describe('PhasedRollOut', function() {
-    it('should return true if phased rollout is not configured', function() {
-        expect(phasedRollOutExpiredForUser("@user:hs", "feature_test", 0, null)).toBeTruthy();
-    });
-
-    it('should return true if phased rollout feature is not configured', function() {
-        expect(phasedRollOutExpiredForUser("@user:hs", "feature_test", 0, {
-            "feature_other": {offset: 0, period: 0},
-        })).toBeTruthy();
-    });
-
-    it('should return false if phased rollout for feature is misconfigured', function() {
-        expect(phasedRollOutExpiredForUser("@user:hs", "feature_test", 0, {
-            "feature_test": {},
-        })).toBeFalsy();
-    });
-
-    it("should return false if phased rollout hasn't started yet", function() {
-        expect(phasedRollOutExpiredForUser("@user:hs", "feature_test", 5000000, {
-            "feature_test": {offset: OFFSET, period: MS_IN_MINUTE},
-        })).toBeFalsy();
-    });
-
-    it("should start to return true in bucket 2/10 for '@user:hs'", function() {
-        expect(phasedRollOutExpiredForUser("@user:hs", "feature_test",
-            OFFSET + (MS_IN_MINUTE * 2) - 1, {
-            "feature_test": {offset: OFFSET, period: MS_IN_MINUTE * 10},
-        })).toBeFalsy();
-        expect(phasedRollOutExpiredForUser("@user:hs", "feature_test",
-            OFFSET + (MS_IN_MINUTE * 2), {
-            "feature_test": {offset: OFFSET, period: MS_IN_MINUTE * 10},
-        })).toBeTruthy();
-    });
-
-    it("should start to return true in bucket 4/10 for 'alice@other-hs'", function() {
-        expect(phasedRollOutExpiredForUser("alice@other-hs", "feature_test",
-            OFFSET + (MS_IN_MINUTE * 4) - 1, {
-            "feature_test": {offset: OFFSET, period: MS_IN_MINUTE * 10},
-        })).toBeFalsy();
-        expect(phasedRollOutExpiredForUser("alice@other-hs", "feature_test",
-            OFFSET + (MS_IN_MINUTE * 4), {
-            "feature_test": {offset: OFFSET, period: MS_IN_MINUTE * 10},
-        })).toBeTruthy();
-    });
-
-    it("should return true after complete rollout period'", function() {
-        expect(phasedRollOutExpiredForUser("user:hs", "feature_test",
-            OFFSET + (MS_IN_MINUTE * 20), {
-            "feature_test": {offset: OFFSET, period: MS_IN_MINUTE * 10},
-        })).toBeTruthy();
-    });
-});
diff --git a/test/UserActivity-test.js b/test/UserActivity-test.js
index 51fb720bce..2c622b2638 100644
--- a/test/UserActivity-test.js
+++ b/test/UserActivity-test.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 New Vector Ltd
+Copyright 2019, 2021 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import lolex from 'lolex';
+import FakeTimers from '@sinonjs/fake-timers';
 import EventEmitter from 'events';
 import UserActivity from '../src/UserActivity';
 
@@ -39,7 +39,7 @@ describe('UserActivity', function() {
         fakeDocument = new FakeDomEventEmitter();
         userActivity = new UserActivity(fakeWindow, fakeDocument);
         userActivity.start();
-        clock = lolex.install();
+        clock = FakeTimers.install();
     });
 
     afterEach(function() {
diff --git a/test/components/structures/MessagePanel-test.js b/test/components/structures/MessagePanel-test.js
index 235ae94010..2fd5bd6ad1 100644
--- a/test/components/structures/MessagePanel-test.js
+++ b/test/components/structures/MessagePanel-test.js
@@ -35,9 +35,9 @@ const mockclock = require('../../mock-clock');
 import Adapter from "enzyme-adapter-react-16";
 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() });
 
@@ -52,7 +52,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>;
@@ -74,16 +74,10 @@ describe('MessagePanel', function() {
             return arg === "showDisplaynameChanges";
         });
 
-        // This option clobbers the duration of all animations to be 1ms
-        // which makes unit testing a lot simpler (the animation doesn't
-        // 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() {
-        delete Velocity.mock;
-
         clock.uninstall();
     });
 
@@ -433,8 +427,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();
diff --git a/test/components/structures/auth/Login-test.js b/test/components/structures/auth/Login-test.js
index 7ca210ff93..9b73137936 100644
--- a/test/components/structures/auth/Login-test.js
+++ b/test/components/structures/auth/Login-test.js
@@ -52,7 +52,7 @@ describe('Login', function() {
 
         // Set non-empty flows & matrixClient to get past the loading spinner
         root.setState({
-            currentFlow: "m.login.password",
+            flows: [{ type: "m.login.password" }],
         });
 
         const form = ReactTestUtils.findRenderedComponentWithType(
@@ -61,10 +61,7 @@ describe('Login', function() {
         );
         expect(form).toBeTruthy();
 
-        const changeServerLink = ReactTestUtils.findRenderedDOMComponentWithClass(
-            root,
-            'mx_AuthBody_editServerDetails',
-        );
+        const changeServerLink = ReactTestUtils.findRenderedDOMComponentWithClass(root, 'mx_ServerPicker_change');
         expect(changeServerLink).toBeTruthy();
     });
 
@@ -77,7 +74,7 @@ describe('Login', function() {
 
         // Set non-empty flows & matrixClient to get past the loading spinner
         root.setState({
-            currentFlow: "m.login.password",
+            flows: [{ type: "m.login.password" }],
         });
 
         const form = ReactTestUtils.findRenderedComponentWithType(
@@ -86,10 +83,70 @@ describe('Login', function() {
         );
         expect(form).toBeTruthy();
 
-        const changeServerLinks = ReactTestUtils.scryRenderedDOMComponentsWithClass(
-            root,
-            'mx_AuthBody_editServerDetails',
-        );
+        const changeServerLinks = ReactTestUtils.scryRenderedDOMComponentsWithClass(root, 'mx_ServerPicker_change');
         expect(changeServerLinks).toHaveLength(0);
     });
+
+    it("should show SSO button if that flow is available", () => {
+        jest.spyOn(SdkConfig, "get").mockReturnValue({
+            disable_custom_urls: true,
+        });
+
+        const root = render();
+
+        // Set non-empty flows & matrixClient to get past the loading spinner
+        root.setState({
+            flows: [{ type: "m.login.sso" }],
+        });
+
+        const ssoButton = ReactTestUtils.findRenderedDOMComponentWithClass(root, "mx_SSOButton");
+        expect(ssoButton).toBeTruthy();
+    });
+
+    it("should show both SSO button and username+password if both are available", () => {
+        jest.spyOn(SdkConfig, "get").mockReturnValue({
+            disable_custom_urls: true,
+        });
+
+        const root = render();
+
+        // Set non-empty flows & matrixClient to get past the loading spinner
+        root.setState({
+            flows: [{ type: "m.login.password" }, { type: "m.login.sso" }],
+        });
+
+        const form = ReactTestUtils.findRenderedComponentWithType(root, sdk.getComponent('auth.PasswordLogin'));
+        expect(form).toBeTruthy();
+
+        const ssoButton = ReactTestUtils.findRenderedDOMComponentWithClass(root, "mx_SSOButton");
+        expect(ssoButton).toBeTruthy();
+    });
+
+    it("should show multiple SSO buttons if multiple identity_providers are available", () => {
+        jest.spyOn(SdkConfig, "get").mockReturnValue({
+            disable_custom_urls: true,
+        });
+
+        const root = render();
+
+        // Set non-empty flows & matrixClient to get past the loading spinner
+        root.setState({
+            flows: [{
+                "type": "m.login.sso",
+                "org.matrix.msc2858.identity_providers": [{
+                    id: "a",
+                    name: "Provider 1",
+                }, {
+                    id: "b",
+                    name: "Provider 2",
+                }, {
+                    id: "c",
+                    name: "Provider 3",
+                }],
+            }],
+        });
+
+        const ssoButtons = ReactTestUtils.scryRenderedDOMComponentsWithClass(root, "mx_SSOButton");
+        expect(ssoButtons.length).toBe(3);
+    });
 });
diff --git a/test/components/structures/auth/Registration-test.js b/test/components/structures/auth/Registration-test.js
index bf26763a79..3e8e887329 100644
--- a/test/components/structures/auth/Registration-test.js
+++ b/test/components/structures/auth/Registration-test.js
@@ -48,12 +48,9 @@ describe('Registration', function() {
         />, parentDiv);
     }
 
-    it('should show server type selector', function() {
+    it('should show server picker', function() {
         const root = render();
-        const selector = ReactTestUtils.findRenderedComponentWithType(
-            root,
-            sdk.getComponent('auth.ServerTypeSelector'),
-        );
+        const selector = ReactTestUtils.findRenderedDOMComponentWithClass(root, "mx_ServerPicker");
         expect(selector).toBeTruthy();
     });
 
@@ -79,4 +76,27 @@ describe('Registration', function() {
         );
         expect(form).toBeTruthy();
     });
+
+    it("should show SSO options if those are available", () => {
+        jest.spyOn(SdkConfig, "get").mockReturnValue({
+            disable_custom_urls: true,
+        });
+
+        const root = render();
+
+        // Set non-empty flows & matrixClient to get past the loading spinner
+        root.setState({
+            flows: [{
+                stages: [],
+            }],
+            ssoFlow: {
+                type: "m.login.sso",
+            },
+            matrixClient: {},
+            busy: false,
+        });
+
+        const ssoButton = ReactTestUtils.findRenderedDOMComponentWithClass(root, "mx_SSOButton");
+        expect(ssoButton).toBeTruthy();
+    });
 });
diff --git a/test/components/views/dialogs/AccessSecretStorageDialog-test.js b/test/components/views/dialogs/AccessSecretStorageDialog-test.js
index 7c4b2996c9..76412a6a82 100644
--- a/test/components/views/dialogs/AccessSecretStorageDialog-test.js
+++ b/test/components/views/dialogs/AccessSecretStorageDialog-test.js
@@ -58,7 +58,7 @@ describe("AccessSecretStorageDialog", function() {
         expect(recoveryKeyValid).toBe(true);
     });
 
-    it("Notifies the user if they input an invalid recovery key", async function(done) {
+    it("Notifies the user if they input an invalid Security Key", async function(done) {
         const testInstance = TestRenderer.create(
             <AccessSecretStorageDialog
               checkPrivateKey={async () => false}
@@ -80,7 +80,7 @@ describe("AccessSecretStorageDialog", function() {
             className: "mx_AccessSecretStorageDialog_recoveryKeyFeedback " +
                 "mx_AccessSecretStorageDialog_recoveryKeyFeedback_invalid",
         });
-        expect(notification.props.children).toEqual("Invalid Recovery Key");
+        expect(notification.props.children).toEqual("Invalid Security Key");
         done();
     });
 
@@ -105,7 +105,7 @@ describe("AccessSecretStorageDialog", function() {
         });
         expect(notification.props.children).toEqual(
             ["\uD83D\uDC4E ", "Unable to access secret storage. Please verify that you " +
-                     "entered the correct recovery passphrase."]);
+                     "entered the correct Security Phrase."]);
         done();
     });
 });
diff --git a/test/components/views/messages/TextualBody-test.js b/test/components/views/messages/TextualBody-test.js
index 07cd51edbd..d5b80b6756 100644
--- a/test/components/views/messages/TextualBody-test.js
+++ b/test/components/views/messages/TextualBody-test.js
@@ -36,6 +36,7 @@ describe("<TextualBody />", () => {
         MatrixClientPeg.matrixClient = {
             getRoom: () => mkStubRoom("room_id"),
             getAccountData: () => undefined,
+            isGuest: () => false,
         };
 
         const ev = mkEvent({
@@ -59,6 +60,7 @@ describe("<TextualBody />", () => {
         MatrixClientPeg.matrixClient = {
             getRoom: () => mkStubRoom("room_id"),
             getAccountData: () => undefined,
+            isGuest: () => false,
         };
 
         const ev = mkEvent({
@@ -83,6 +85,7 @@ describe("<TextualBody />", () => {
             MatrixClientPeg.matrixClient = {
                 getRoom: () => mkStubRoom("room_id"),
                 getAccountData: () => undefined,
+                isGuest: () => false,
             };
         });
 
@@ -135,6 +138,7 @@ describe("<TextualBody />", () => {
                 getHomeserverUrl: () => "https://my_server/",
                 on: () => undefined,
                 removeListener: () => undefined,
+                isGuest: () => false,
             };
         });
 
@@ -209,6 +213,67 @@ describe("<TextualBody />", () => {
                 'style="width: 16px; height: 16px;" title="@member:domain.bla" alt="" aria-hidden="true">Member</a>' +
                 '</span></span>');
         });
+
+        it("pills do not appear for event permalinks", () => {
+            const ev = mkEvent({
+                type: "m.room.message",
+                room: "room_id",
+                user: "sender",
+                content: {
+                    body:
+                        "An [event link](https://matrix.to/#/!ZxbRYPQXDXKGmDnJNg:example.com/" +
+                        "$16085560162aNpaH:example.com?via=example.com) with text",
+                    msgtype: "m.text",
+                    format: "org.matrix.custom.html",
+                    formatted_body:
+                        "An <a href=\"https://matrix.to/#/!ZxbRYPQXDXKGmDnJNg:example.com/" +
+                        "$16085560162aNpaH:example.com?via=example.com\">event link</a> with text",
+                },
+                event: true,
+            });
+
+            const wrapper = mount(<TextualBody mxEvent={ev} />);
+            expect(wrapper.text()).toBe("An event link with text");
+            const content = wrapper.find(".mx_EventTile_body");
+            expect(content.html()).toBe(
+                '<span class="mx_EventTile_body markdown-body" dir="auto">' +
+                'An <a href="#/room/!ZxbRYPQXDXKGmDnJNg:example.com/' +
+                '$16085560162aNpaH:example.com?via=example.com" ' +
+                'rel="noreferrer noopener">event link</a> with text</span>',
+            );
+        });
+
+        it("pills appear for room links with vias", () => {
+            const ev = mkEvent({
+                type: "m.room.message",
+                room: "room_id",
+                user: "sender",
+                content: {
+                    body:
+                        "A [room link](https://matrix.to/#/!ZxbRYPQXDXKGmDnJNg:example.com" +
+                        "?via=example.com&via=bob.com) with vias",
+                    msgtype: "m.text",
+                    format: "org.matrix.custom.html",
+                    formatted_body:
+                        "A <a href=\"https://matrix.to/#/!ZxbRYPQXDXKGmDnJNg:example.com" +
+                        "?via=example.com&amp;via=bob.com\">room link</a> with vias",
+                },
+                event: true,
+            });
+
+            const wrapper = mount(<TextualBody mxEvent={ev} />);
+            expect(wrapper.text()).toBe("A !ZxbRYPQXDXKGmDnJNg:example.com with vias");
+            const content = wrapper.find(".mx_EventTile_body");
+            expect(content.html()).toBe(
+                '<span class="mx_EventTile_body markdown-body" dir="auto">' +
+                'A <span><a class="mx_Pill mx_RoomPill" href="#/room/!ZxbRYPQXDXKGmDnJNg:example.com' +
+                '?via=example.com&amp;via=bob.com" ' +
+                'title="!ZxbRYPQXDXKGmDnJNg:example.com"><img class="mx_BaseAvatar mx_BaseAvatar_image" ' +
+                'src="mxc://avatar.url/room.png" ' +
+                'style="width: 16px; height: 16px;" alt="" aria-hidden="true">' +
+                '!ZxbRYPQXDXKGmDnJNg:example.com</a></span> with vias</span>',
+            );
+        });
     });
 
     it("renders url previews correctly", () => {
@@ -218,6 +283,7 @@ describe("<TextualBody />", () => {
             getRoom: () => mkStubRoom("room_id"),
             getAccountData: () => undefined,
             getUrlPreview: (url) => new Promise(() => {}),
+            isGuest: () => false,
         };
 
         const ev = mkEvent({
diff --git a/test/components/views/rooms/MemberList-test.js b/test/components/views/rooms/MemberList-test.js
index 24b6391c93..068d358dcd 100644
--- a/test/components/views/rooms/MemberList-test.js
+++ b/test/components/views/rooms/MemberList-test.js
@@ -88,7 +88,7 @@ describe('MemberList', () => {
         };
         memberListRoom.currentState = {
             members: {},
-            getStateEvents: () => [], // ignore 3pid invites
+            getStateEvents: (eventType, stateKey) => stateKey === undefined ? [] : null, // ignore 3pid invites
         };
         for (const member of [...adminUsers, ...moderatorUsers, ...defaultUsers]) {
             memberListRoom.currentState.members[member.userId] = member;
diff --git a/test/components/views/rooms/RoomList-test.js b/test/components/views/rooms/RoomList-test.js
index c2cad431f4..1c2a1c9992 100644
--- a/test/components/views/rooms/RoomList-test.js
+++ b/test/components/views/rooms/RoomList-test.js
@@ -9,8 +9,8 @@ import sdk from '../../../skinned-sdk';
 import { DragDropContext } from 'react-beautiful-dnd';
 
 import dis from '../../../../src/dispatcher/dispatcher';
-import DMRoomMap from '../../../../src/utils/DMRoomMap.js';
-import GroupStore from '../../../../src/stores/GroupStore.js';
+import DMRoomMap from '../../../../src/utils/DMRoomMap';
+import GroupStore from '../../../../src/stores/GroupStore';
 
 import { MatrixClient, Room, RoomMember } from 'matrix-js-sdk';
 import {DefaultTagID} from "../../../../src/stores/room-list/models";
diff --git a/test/components/views/rooms/SendMessageComposer-test.js b/test/components/views/rooms/SendMessageComposer-test.js
index 83a9388609..6eeac7ceea 100644
--- a/test/components/views/rooms/SendMessageComposer-test.js
+++ b/test/components/views/rooms/SendMessageComposer-test.js
@@ -18,8 +18,10 @@ import Adapter from "enzyme-adapter-react-16";
 import { configure, mount } from "enzyme";
 import React from "react";
 import {act} from "react-dom/test-utils";
-
-import SendMessageComposer, {createMessageContent} from "../../../../src/components/views/rooms/SendMessageComposer";
+import SendMessageComposer, {
+    createMessageContent,
+    isQuickReaction,
+} from "../../../../src/components/views/rooms/SendMessageComposer";
 import MatrixClientContext from "../../../../src/contexts/MatrixClientContext";
 import EditorModel from "../../../../src/editor/model";
 import {createPartCreator, createRenderer} from "../../../editor/mock";
@@ -227,6 +229,42 @@ describe('<SendMessageComposer/>', () => {
             });
         });
     });
+
+    describe("isQuickReaction", () => {
+        it("correctly detects quick reaction", () => {
+            const model = new EditorModel([], createPartCreator(), createRenderer());
+            model.update("+😊", "insertText", {offset: 3, atNodeEnd: true});
+
+            const isReaction = isQuickReaction(model);
+
+            expect(isReaction).toBeTruthy();
+        });
+
+        it("correctly detects quick reaction with space", () => {
+            const model = new EditorModel([], createPartCreator(), createRenderer());
+            model.update("+ 😊", "insertText", {offset: 4, atNodeEnd: true});
+
+            const isReaction = isQuickReaction(model);
+
+            expect(isReaction).toBeTruthy();
+        });
+
+        it("correctly rejects quick reaction with extra text", () => {
+            const model = new EditorModel([], createPartCreator(), createRenderer());
+            const model2 = new EditorModel([], createPartCreator(), createRenderer());
+            const model3 = new EditorModel([], createPartCreator(), createRenderer());
+            const model4 = new EditorModel([], createPartCreator(), createRenderer());
+            model.update("+😊hello", "insertText", {offset: 8, atNodeEnd: true});
+            model2.update(" +😊", "insertText", {offset: 4, atNodeEnd: true});
+            model3.update("+ 😊😊", "insertText", {offset: 6, atNodeEnd: true});
+            model4.update("+smiley", "insertText", {offset: 7, atNodeEnd: true});
+
+            expect(isQuickReaction(model)).toBeFalsy();
+            expect(isQuickReaction(model2)).toBeFalsy();
+            expect(isQuickReaction(model3)).toBeFalsy();
+            expect(isQuickReaction(model4)).toBeFalsy();
+        });
+    });
 });
 
 
diff --git a/test/end-to-end-tests/.gitignore b/test/end-to-end-tests/.gitignore
index afca1ddcb3..61f9012393 100644
--- a/test/end-to-end-tests/.gitignore
+++ b/test/end-to-end-tests/.gitignore
@@ -1,3 +1,3 @@
 node_modules
 *.png
-riot/env
+element/env
diff --git a/test/end-to-end-tests/README.md b/test/end-to-end-tests/README.md
index 8794ef6c9b..b173fb86c2 100644
--- a/test/end-to-end-tests/README.md
+++ b/test/end-to-end-tests/README.md
@@ -5,9 +5,9 @@ This directory contains tests for matrix-react-sdk. The tests fire up a headless
 ## Setup
 
 Run `./install.sh`. This will:
- - install Synapse, fetches the master branch at the moment. If anything fails here, please refer to the Synapse README to see if you're missing one of the prerequisites.
- - install Riot, this fetches the master branch at the moment.
- - install dependencies (will download copy of chrome)
+ - install Synapse, fetches the develop branch at the moment. If anything fails here, please refer to the Synapse README to see if you're missing one of the prerequisites.
+ - install Element Web, this fetches the develop branch at the moment.
+ - install dependencies (will download copy of Chrome)
 
 ## Running the tests
 
@@ -15,7 +15,7 @@ Run tests with `./run.sh`.
 
 ### Debug tests locally.
 
-`./run.sh` will run the tests against the Riot copy present in `riot/riot-web` served by a static Python HTTP server. You can symlink your `riot-web` develop copy here but that doesn't work well with Webpack recompiling. You can run the test runner directly and specify parameters to get more insight into a failure or run the tests against your local Webpack server.
+`./run.sh` will run the tests against the Element copy present in `element/element-web` served by a static Python HTTP server. You can symlink your `element-web` develop copy here but that doesn't work well with Webpack recompiling. You can run the test runner directly and specify parameters to get more insight into a failure or run the tests against your local Webpack server.
 
 ```
 ./synapse/stop.sh && \
@@ -26,8 +26,7 @@ It's important to always stop and start Synapse before each run of the tests to
 
 start.js accepts these parameters (and more, see `node start.js --help`) that can help running the tests locally:
 
- - `--riot-url <url>` don't use the Riot copy and static server provided by the tests, but use a running server like the Webpack watch server to run the tests against. Make sure to have the following local config:
-   - `welcomeUserId` disabled as the tests assume there is no riot-bot currently.
+ - `--app-url <url>` don't use the Element Web copy and static server provided by the tests, but use a running server like the Webpack watch server to run the tests against.
  - `--slow-mo` type at a human speed, useful with `--windowed`.
  - `--throttle-cpu <factor>` throttle cpu in the browser by the given factor. Useful to reproduce failures because of insufficient timeouts happening on the slower CI server.
  - `--windowed` run the tests in an actual browser window Try to limit interacting with the windows while the tests are running. Hovering over the window tends to fail the tests, dragging the title bar should be fine though.
diff --git a/test/end-to-end-tests/Windows.md b/test/end-to-end-tests/Windows.md
index 39b06a9a62..f6ea87d0af 100644
--- a/test/end-to-end-tests/Windows.md
+++ b/test/end-to-end-tests/Windows.md
@@ -5,14 +5,14 @@ and start following these steps to get going:
 
 1. Navigate to your working directory (`cd /mnt/c/users/travisr/whatever/matrix-react-sdk` for example).
 2. Run `sudo apt-get install unzip python3 virtualenv dos2unix`
-3. Run `dos2unix ./test/end-to-end-tests/*.sh ./test/end-to-end-tests/synapse/*.sh ./test/end-to-end-tests/riot/*.sh`
+3. Run `dos2unix ./test/end-to-end-tests/*.sh ./test/end-to-end-tests/synapse/*.sh ./test/end-to-end-tests/element/*.sh`
 4. Install NodeJS for ubuntu: 
    ```bash
    curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash -
    sudo apt-get update
    sudo apt-get install nodejs
    ```
-5. Start Riot on Windows through `yarn start`
+5. Start Element on Windows through `yarn start`
 6. While that builds... Run:
    ```bash
    sudo apt-get install x11-apps
@@ -25,11 +25,11 @@ and start following these steps to get going:
    cd ./test/end-to-end-tests
    ./synapse/install.sh
    ./install.sh
-   ./run.sh --riot-url http://localhost:8080 --no-sandbox
+   ./run.sh --app-url http://localhost:8080 --no-sandbox
    ```
 
 Note that using `yarn test:e2e` probably won't work for you. You might also have to use the config.json from the
-`riot/config-template` directory in order to actually succeed at the tests.
+`element/config-template` directory in order to actually succeed at the tests.
 
 Also note that you'll have to use `--no-sandbox` otherwise Chrome will complain that there's no sandbox available. You
 could probably fix this with enough effort, or you could run a headless Chrome in the WSL container without a sandbox.
diff --git a/test/end-to-end-tests/element/.gitignore b/test/end-to-end-tests/element/.gitignore
new file mode 100644
index 0000000000..57fac2072f
--- /dev/null
+++ b/test/end-to-end-tests/element/.gitignore
@@ -0,0 +1,2 @@
+element-web
+element.pid
diff --git a/test/end-to-end-tests/riot/config-template/config.json b/test/end-to-end-tests/element/config-template/config.json
similarity index 92%
rename from test/end-to-end-tests/riot/config-template/config.json
rename to test/end-to-end-tests/element/config-template/config.json
index b647d0bec8..b90fefc2cb 100644
--- a/test/end-to-end-tests/riot/config-template/config.json
+++ b/test/end-to-end-tests/element/config-template/config.json
@@ -8,7 +8,7 @@
     "brand": "Element",
     "integrations_ui_url": "https://scalar.vector.im/",
     "integrations_rest_url": "https://scalar.vector.im/api",
-    "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
+    "bug_report_endpoint_url": "https://element.io/bugreports/submit",
     "showLabsSettings": true,
     "default_federate": true,
     "welcomePageUrl": "home.html",
diff --git a/test/end-to-end-tests/riot/install-webserver.sh b/test/end-to-end-tests/element/install-webserver.sh
similarity index 100%
rename from test/end-to-end-tests/riot/install-webserver.sh
rename to test/end-to-end-tests/element/install-webserver.sh
diff --git a/test/end-to-end-tests/element/install.sh b/test/end-to-end-tests/element/install.sh
new file mode 100755
index 0000000000..e38f795df1
--- /dev/null
+++ b/test/end-to-end-tests/element/install.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+set -e
+ELEMENT_BRANCH=develop
+
+if [ -d $BASE_DIR/element-web ]; then
+    echo "Element is already installed"
+    exit
+fi
+
+curl -L https://github.com/vector-im/element-web/archive/${ELEMENT_BRANCH}.zip --output element.zip
+unzip -q element.zip
+rm element.zip
+mv element-web-${ELEMENT_BRANCH} element-web
+cd element-web
+yarn install
+yarn run build
diff --git a/test/end-to-end-tests/riot/start.sh b/test/end-to-end-tests/element/start.sh
similarity index 87%
rename from test/end-to-end-tests/riot/start.sh
rename to test/end-to-end-tests/element/start.sh
index be226ed257..b344f91a19 100755
--- a/test/end-to-end-tests/riot/start.sh
+++ b/test/end-to-end-tests/element/start.sh
@@ -3,7 +3,7 @@ set -e
 
 PORT=5000
 BASE_DIR=$(cd $(dirname $0) && pwd)
-PIDFILE=$BASE_DIR/riot.pid
+PIDFILE=$BASE_DIR/element.pid
 CONFIG_BACKUP=config.e2etests_backup.json
 
 if [ -f $PIDFILE ]; then
@@ -11,8 +11,8 @@ if [ -f $PIDFILE ]; then
 fi
 
 cd $BASE_DIR/
-echo -n "starting riot on http://localhost:$PORT ... "
-pushd riot-web/webapp/ > /dev/null
+echo -n "Starting Element on http://localhost:$PORT ... "
+pushd element-web/webapp/ > /dev/null
 
 # backup config file before we copy template
 if [ -f config.json ]; then
@@ -34,7 +34,7 @@ LOGFILE=$(mktemp)
     # NOT expected SIGTERM (128 + 15)
     # from stop.sh?
     if [ $RESULT -ne 143 ]; then
-        echo "failed"
+        echo "Failed"
         cat $LOGFILE
         rm $PIDFILE 2> /dev/null
     fi
@@ -49,6 +49,6 @@ sleep 0.5 &
 wait -n; RESULT=$?
 # return exit code of first child to exit
 if [ $RESULT -eq 0 ]; then
-    echo "running"
+    echo "Running"
 fi
 exit $RESULT
diff --git a/test/end-to-end-tests/riot/stop.sh b/test/end-to-end-tests/element/stop.sh
similarity index 79%
rename from test/end-to-end-tests/riot/stop.sh
rename to test/end-to-end-tests/element/stop.sh
index eb99fa11cc..e39f0077eb 100755
--- a/test/end-to-end-tests/riot/stop.sh
+++ b/test/end-to-end-tests/element/stop.sh
@@ -2,19 +2,19 @@
 set -e
 
 BASE_DIR=$(cd $(dirname $0) && pwd)
-PIDFILE=riot.pid
+PIDFILE=element.pid
 CONFIG_BACKUP=config.e2etests_backup.json
 
 cd $BASE_DIR
 
 if [ -f $PIDFILE ]; then
-    echo "stopping riot server ..."
+    echo "Stopping Element server ..."
     PID=$(cat $PIDFILE)
     rm $PIDFILE
     kill $PID
 
     # revert config file
-    cd riot-web/webapp
+    cd element-web/webapp
     rm config.json
     if [ -f $CONFIG_BACKUP ]; then
         mv $CONFIG_BACKUP config.json
diff --git a/test/end-to-end-tests/has_custom_riot.js b/test/end-to-end-tests/has-custom-app.js
similarity index 83%
rename from test/end-to-end-tests/has_custom_riot.js
rename to test/end-to-end-tests/has-custom-app.js
index 95f32d8ad0..00184088fd 100644
--- a/test/end-to-end-tests/has_custom_riot.js
+++ b/test/end-to-end-tests/has-custom-app.js
@@ -15,10 +15,10 @@ limitations under the License.
 */
 
 // used from run.sh as getopts doesn't support long parameters
-const idx = process.argv.indexOf("--riot-url");
-let hasRiotUrl = false;
+const idx = process.argv.indexOf("--app-url");
+let hasAppUrl = false;
 if (idx !== -1) {
     const value = process.argv[idx + 1];
-    hasRiotUrl = !!value;
+    hasAppUrl = !!value;
 }
-process.stdout.write(hasRiotUrl ? "1" : "0" );
+process.stdout.write(hasAppUrl ? "1" : "0" );
diff --git a/test/end-to-end-tests/riot/.gitignore b/test/end-to-end-tests/riot/.gitignore
deleted file mode 100644
index 0f07d8e498..0000000000
--- a/test/end-to-end-tests/riot/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-riot-web
-riot.pid
\ No newline at end of file
diff --git a/test/end-to-end-tests/riot/install.sh b/test/end-to-end-tests/riot/install.sh
deleted file mode 100755
index f66ab3224e..0000000000
--- a/test/end-to-end-tests/riot/install.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-set -e
-RIOT_BRANCH=develop
-
-if [ -d $BASE_DIR/riot-web ]; then
-    echo "riot is already installed"
-    exit
-fi
-
-curl -L https://github.com/vector-im/riot-web/archive/${RIOT_BRANCH}.zip --output riot.zip
-unzip -q riot.zip
-rm riot.zip
-mv riot-web-${RIOT_BRANCH} riot-web
-cd riot-web
-yarn install
-yarn run build
diff --git a/test/end-to-end-tests/run.sh b/test/end-to-end-tests/run.sh
index b9d589eed9..f1aa6729b5 100755
--- a/test/end-to-end-tests/run.sh
+++ b/test/end-to-end-tests/run.sh
@@ -9,16 +9,16 @@ echo "Please first run $BASE_DIR/install.sh"
     exit 1
 fi
 
-has_custom_riot=$(node has_custom_riot.js $@)
+has_custom_app=$(node has-custom-app.js $@)
 
-if [ ! -d "riot/riot-web" ] && [ $has_custom_riot -ne "1" ]; then
-    echo "Please provide an instance of riot to test against by passing --riot-url <url> or running $BASE_DIR/riot/install.sh"
+if [ ! -d "element/element-web" ] && [ $has_custom_app -ne "1" ]; then
+    echo "Please provide an instance of Element to test against by passing --app-url <url> or running $BASE_DIR/element/install.sh"
     exit 1
 fi
 
 stop_servers() {
-    if [ $has_custom_riot -ne "1" ]; then
-	   ./riot/stop.sh
+    if [ $has_custom_app -ne "1" ]; then
+	   ./element/stop.sh
 	fi
     ./synapse/stop.sh
 }
@@ -32,8 +32,8 @@ handle_error() {
 trap 'handle_error' ERR
 
 ./synapse/start.sh
-if [ $has_custom_riot -ne "1" ]; then
-    ./riot/start.sh
+if [ $has_custom_app -ne "1" ]; then
+    ./element/start.sh
 fi
 node start.js $@
 stop_servers
diff --git a/test/end-to-end-tests/src/session.js b/test/end-to-end-tests/src/session.js
index 907ee2fb8e..433baa5e48 100644
--- a/test/end-to-end-tests/src/session.js
+++ b/test/end-to-end-tests/src/session.js
@@ -22,12 +22,12 @@ const {delay} = require('./util');
 
 const DEFAULT_TIMEOUT = 20000;
 
-module.exports = class RiotSession {
-    constructor(browser, page, username, riotserver, hsUrl) {
+module.exports = class ElementSession {
+    constructor(browser, page, username, elementServer, hsUrl) {
         this.browser = browser;
         this.page = page;
         this.hsUrl = hsUrl;
-        this.riotserver = riotserver;
+        this.elementServer = elementServer;
         this.username = username;
         this.consoleLog = new LogBuffer(page, "console", (msg) => `${msg.text()}\n`);
         this.networkLog = new LogBuffer(page, "requestfinished", async (req) => {
@@ -38,7 +38,7 @@ module.exports = class RiotSession {
         this.log = new Logger(this.username);
     }
 
-    static async create(username, puppeteerOptions, riotserver, hsUrl, throttleCpuFactor = 1) {
+    static async create(username, puppeteerOptions, elementServer, hsUrl, throttleCpuFactor = 1) {
         const browser = await puppeteer.launch(puppeteerOptions);
         const page = await browser.newPage();
         await page.setViewport({
@@ -50,7 +50,7 @@ module.exports = class RiotSession {
             console.log("throttling cpu by a factor of", throttleCpuFactor);
             await client.send('Emulation.setCPUThrottlingRate', { rate: throttleCpuFactor });
         }
-        return new RiotSession(browser, page, username, riotserver, hsUrl);
+        return new ElementSession(browser, page, username, elementServer, hsUrl);
     }
 
     async tryGetInnertext(selector) {
@@ -194,7 +194,7 @@ module.exports = class RiotSession {
     }
 
     url(path) {
-        return this.riotserver + path;
+        return this.elementServer + path;
     }
 
     delay(ms) {
diff --git a/test/end-to-end-tests/src/usecases/create-room.js b/test/end-to-end-tests/src/usecases/create-room.js
index e05edbc051..35b9d5879e 100644
--- a/test/end-to-end-tests/src/usecases/create-room.js
+++ b/test/end-to-end-tests/src/usecases/create-room.js
@@ -64,7 +64,7 @@ async function createDm(session, invitees) {
     const startChatButton = await dmsSublist.$(".mx_RoomSublist_auxButton");
     await startChatButton.click();
 
-    const inviteesEditor = await session.query('.mx_InviteDialog_editor textarea');
+    const inviteesEditor = await session.query('.mx_InviteDialog_editor input');
     for (const target of invitees) {
         await session.replaceInputText(inviteesEditor, target);
         await session.delay(1000); // give it a moment to figure out a suggestion
diff --git a/test/end-to-end-tests/src/usecases/invite.js b/test/end-to-end-tests/src/usecases/invite.js
index 75ebc61a88..07c9595fe2 100644
--- a/test/end-to-end-tests/src/usecases/invite.js
+++ b/test/end-to-end-tests/src/usecases/invite.js
@@ -31,7 +31,7 @@ module.exports = async function invite(session, userId) {
     }
     const inviteButton = await session.query(".mx_MemberList_invite");
     await inviteButton.click();
-    const inviteTextArea = await session.query(".mx_InviteDialog_editor textarea");
+    const inviteTextArea = await session.query(".mx_InviteDialog_editor input");
     await inviteTextArea.type(userId);
     const selectUserItem = await session.query(".mx_InviteDialog_roomTile");
     await selectUserItem.click();
diff --git a/test/end-to-end-tests/src/usecases/signup.js b/test/end-to-end-tests/src/usecases/signup.js
index ef8a259091..804cee9599 100644
--- a/test/end-to-end-tests/src/usecases/signup.js
+++ b/test/end-to-end-tests/src/usecases/signup.js
@@ -22,24 +22,12 @@ module.exports = async function signup(session, username, password, homeserver)
     await session.goto(session.url('/#/register'));
     // change the homeserver by clicking the advanced section
     if (homeserver) {
-        const advancedButton = await session.query('.mx_ServerTypeSelector_type_Advanced');
-        await advancedButton.click();
+        const changeButton = await session.query('.mx_ServerPicker_change');
+        await changeButton.click();
 
-        // depending on what HS is configured as the default, the advanced registration
-        // goes the HS/IS entry directly (for matrix.org) or takes you to the user/pass entry (not matrix.org).
-        // To work with both, we look for the "Change" link in the user/pass entry but don't fail when we can't find it
-        // As this link should be visible immediately, and to not slow down the case where it isn't present,
-        // pick a lower timeout of 5000ms
-        try {
-            const changeHsField = await session.query('.mx_AuthBody_editServerDetails', 5000);
-            if (changeHsField) {
-                await changeHsField.click();
-            }
-        } catch (err) {}
-
-        const hsInputField = await session.query('#mx_ServerConfig_hsUrl');
+        const hsInputField = await session.query('.mx_ServerPickerDialog_otherHomeserver');
         await session.replaceInputText(hsInputField, homeserver);
-        const nextButton = await session.query('.mx_Login_submit');
+        const nextButton = await session.query('.mx_ServerPickerDialog_continue');
         // accept homeserver
         await nextButton.click();
     }
@@ -68,7 +56,7 @@ module.exports = async function signup(session, username, password, homeserver)
     await registerButton.click();
 
     //confirm dialog saying you cant log back in without e-mail
-    const continueButton = await session.query('.mx_QuestionDialog button.mx_Dialog_primary');
+    const continueButton = await session.query('.mx_RegistrationEmailPromptDialog button.mx_Dialog_primary');
     await continueButton.click();
 
     //find the privacy policy checkbox and check it
diff --git a/test/end-to-end-tests/start.js b/test/end-to-end-tests/start.js
index 6c80608903..234d60da9f 100644
--- a/test/end-to-end-tests/start.js
+++ b/test/end-to-end-tests/start.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-const RiotSession = require('./src/session');
+const ElementSession = require('./src/session');
 const scenario = require('./src/scenario');
 const RestSessionCreator = require('./src/rest/creator');
 const fs = require("fs");
@@ -22,7 +22,7 @@ const fs = require("fs");
 const program = require('commander');
 program
     .option('--no-logs', "don't output logs, document html on error", false)
-    .option('--riot-url [url]', "riot url to test", "http://localhost:5000")
+    .option('--app-url [url]', "url to test", "http://localhost:5000")
     .option('--windowed', "dont run tests headless", false)
     .option('--slow-mo', "type at a human speed", false)
     .option('--dev-tools', "open chrome devtools in browser window", false)
@@ -57,7 +57,7 @@ async function runTests() {
     );
 
     async function createSession(username) {
-        const session = await RiotSession.create(username, options, program.riotUrl, hsUrl, program.throttleCpu);
+        const session = await ElementSession.create(username, options, program.appUrl, hsUrl, program.throttleCpu);
         sessions.push(session);
         return session;
     }
diff --git a/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml b/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml
index 536c017b9e..deb750666f 100644
--- a/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml
+++ b/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml
@@ -875,8 +875,8 @@ password_config:
 
 
 # Enable sending emails for notification events
-# Defining a custom URL for Riot is only needed if email notifications
-# should contain links to a self-hosted installation of Riot; when set
+# Defining a custom URL for Element is only needed if email notifications
+# should contain links to a self-hosted installation of Element; when set
 # the "app_name" setting is ignored.
 #
 # If your SMTP server requires authentication, the optional smtp_user &
@@ -897,7 +897,7 @@ email:
    notif_template_html: notif_mail.html
    notif_template_text: notif_mail.txt
    notif_for_new_users: True
-   riot_base_url: "http://localhost/riot"
+   client_base_url: "http://localhost/element"
 
 
 #password_providers:
diff --git a/test/notifications/ContentRules-test.js b/test/notifications/ContentRules-test.js
index 3bf0a0426d..ca25edf5b1 100644
--- a/test/notifications/ContentRules-test.js
+++ b/test/notifications/ContentRules-test.js
@@ -14,15 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-var notifications = require('../../src/notifications');
+const notifications = require('../../src/notifications');
 
-var ContentRules = notifications.ContentRules;
-var PushRuleVectorState = notifications.PushRuleVectorState;
+const ContentRules = notifications.ContentRules;
+const PushRuleVectorState = notifications.PushRuleVectorState;
 
-var expect = require('expect');
-var test_utils = require('../test-utils');
-
-var NORMAL_RULE = {
+const NORMAL_RULE = {
     actions: [
         "notify",
         { set_tweak: "highlight", value: false },
@@ -32,7 +29,7 @@ var NORMAL_RULE = {
     rule_id: "vdh2",
 };
 
-var LOUD_RULE = {
+const LOUD_RULE = {
     actions: [
         "notify",
         { set_tweak: "highlight" },
@@ -43,7 +40,7 @@ var LOUD_RULE = {
     rule_id: "vdh2",
 };
 
-var USERNAME_RULE = {
+const USERNAME_RULE = {
     actions: [
         "notify",
         { set_tweak: "sound", value: "default" },
@@ -56,26 +53,25 @@ var USERNAME_RULE = {
 };
 
 
-
 describe("ContentRules", function() {
     describe("parseContentRules", function() {
         it("should handle there being no keyword rules", function() {
-            var rules = { 'global': { 'content': [
+            const rules = { 'global': { 'content': [
                     USERNAME_RULE,
             ]}};
-            var parsed = ContentRules.parseContentRules(rules);
+            const parsed = ContentRules.parseContentRules(rules);
             expect(parsed.rules).toEqual([]);
             expect(parsed.vectorState).toEqual(PushRuleVectorState.ON);
             expect(parsed.externalRules).toEqual([]);
         });
 
         it("should parse regular keyword notifications", function() {
-            var rules = { 'global': { 'content': [
+            const rules = { 'global': { 'content': [
                 NORMAL_RULE,
                 USERNAME_RULE,
             ]}};
 
-            var parsed = ContentRules.parseContentRules(rules);
+            const parsed = ContentRules.parseContentRules(rules);
             expect(parsed.rules.length).toEqual(1);
             expect(parsed.rules[0]).toEqual(NORMAL_RULE);
             expect(parsed.vectorState).toEqual(PushRuleVectorState.ON);
@@ -83,12 +79,12 @@ describe("ContentRules", function() {
         });
 
         it("should parse loud keyword notifications", function() {
-            var rules = { 'global': { 'content': [
+            const rules = { 'global': { 'content': [
                 LOUD_RULE,
                 USERNAME_RULE,
             ]}};
 
-            var parsed = ContentRules.parseContentRules(rules);
+            const parsed = ContentRules.parseContentRules(rules);
             expect(parsed.rules.length).toEqual(1);
             expect(parsed.rules[0]).toEqual(LOUD_RULE);
             expect(parsed.vectorState).toEqual(PushRuleVectorState.LOUD);
@@ -96,13 +92,13 @@ describe("ContentRules", function() {
         });
 
         it("should parse mixed keyword notifications", function() {
-            var rules = { 'global': { 'content': [
+            const rules = { 'global': { 'content': [
                 LOUD_RULE,
                 NORMAL_RULE,
                 USERNAME_RULE,
             ]}};
 
-            var parsed = ContentRules.parseContentRules(rules);
+            const parsed = ContentRules.parseContentRules(rules);
             expect(parsed.rules.length).toEqual(1);
             expect(parsed.rules[0]).toEqual(LOUD_RULE);
             expect(parsed.vectorState).toEqual(PushRuleVectorState.LOUD);
diff --git a/test/notifications/PushRuleVectorState-test.js b/test/notifications/PushRuleVectorState-test.js
index ff0de3e470..1127675791 100644
--- a/test/notifications/PushRuleVectorState-test.js
+++ b/test/notifications/PushRuleVectorState-test.js
@@ -14,16 +14,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-var notifications = require('../../src/notifications');
+const notifications = require('../../src/notifications');
 
-var prvs = notifications.PushRuleVectorState;
-
-var expect = require('expect');
+const prvs = notifications.PushRuleVectorState;
 
 describe("PushRuleVectorState", function() {
     describe("contentRuleVectorStateKind", function() {
-        it("should understand normal notifications", function () {
-            var rule = {
+        it("should understand normal notifications", function() {
+            const rule = {
                 actions: [
                     "notify",
                 ],
@@ -33,26 +31,26 @@ describe("PushRuleVectorState", function() {
                 toEqual(prvs.ON);
         });
 
-        it("should handle loud notifications", function () {
-            var rule = {
+        it("should handle loud notifications", function() {
+            const rule = {
                 actions: [
                     "notify",
                     { set_tweak: "highlight", value: true },
                     { set_tweak: "sound", value: "default" },
-                ]
+                ],
             };
 
             expect(prvs.contentRuleVectorStateKind(rule)).
                 toEqual(prvs.LOUD);
         });
 
-        it("should understand missing highlight.value", function () {
-            var rule = {
+        it("should understand missing highlight.value", function() {
+            const rule = {
                 actions: [
                     "notify",
                     { set_tweak: "highlight" },
                     { set_tweak: "sound", value: "default" },
-                ]
+                ],
             };
 
             expect(prvs.contentRuleVectorStateKind(rule)).
diff --git a/test/test-utils.js b/test/test-utils.js
index d006eee823..839e1d6cd8 100644
--- a/test/test-utils.js
+++ b/test/test-utils.js
@@ -242,6 +242,8 @@ export function mkStubRoom(roomId = null) {
         setBlacklistUnverifiedDevices: jest.fn(),
         on: jest.fn(),
         removeListener: jest.fn(),
+        getDMInviter: jest.fn(),
+        getAvatarUrl: () => 'mxc://avatar.url/room.png',
     };
 }
 
diff --git a/test/utils/ShieldUtils-test.js b/test/utils/ShieldUtils-test.js
index e4c0c671e3..8e3b19c1c4 100644
--- a/test/utils/ShieldUtils-test.js
+++ b/test/utils/ShieldUtils-test.js
@@ -42,7 +42,7 @@ describe("mkClient self-test", function() {
 
 describe("shieldStatusForMembership self-trust behaviour", function() {
     beforeAll(() => {
-        DMRoomMap._sharedInstance = {
+        DMRoomMap.sharedInstance = {
             getUserIdForRoomId: (roomId) => roomId === "DM" ? "@any:h" : null,
         };
     });
diff --git a/test/utils/permalinks/Permalinks-test.js b/test/utils/permalinks/Permalinks-test.js
index 72cd66cb69..0bd4466d97 100644
--- a/test/utils/permalinks/Permalinks-test.js
+++ b/test/utils/permalinks/Permalinks-test.js
@@ -34,6 +34,7 @@ function mockRoom(roomId, members, serverACL) {
 
     return {
         roomId,
+        getCanonicalAlias: () => roomId,
         getJoinedMembers: () => members,
         getMember: (userId) => members.find(m => m.userId === userId),
         currentState: {
diff --git a/yarn.lock b/yarn.lock
index 1f06fd6130..f99ea5900d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@babel/cli@^7.10.5":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.10.5.tgz#57df2987c8cf89d0fc7d4b157ec59d7619f1b77a"
-  integrity sha512-j9H9qSf3kLdM0Ao3aGPbGZ73mEA9XazuupcS6cDGWuiyAcANoguhP0r2Lx32H5JGw4sSSoHG3x/mxVnHgvOoyA==
+"@babel/cli@^7.12.10":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.12.10.tgz#67a1015b1cd505bde1696196febf910c4c339a48"
+  integrity sha512-+y4ZnePpvWs1fc/LhZRTHkTesbXkyBYuOB+5CyodZqrEuETXi3zOVfpAQIdgC3lXbHLTDG9dQosxR9BhvLKDLQ==
   dependencies:
     commander "^4.0.1"
     convert-source-map "^1.1.0"
@@ -16,154 +16,57 @@
     slash "^2.0.0"
     source-map "^0.5.0"
   optionalDependencies:
-    chokidar "^2.1.8"
+    "@nicolo-ribaudo/chokidar-2" "2.1.8-no-fsevents"
+    chokidar "^3.4.0"
 
-"@babel/code-frame@^7.0.0":
-  version "7.10.3"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.3.tgz#324bcfd8d35cd3d47dae18cde63d752086435e9a"
-  integrity sha512-fDx9eNW0qz0WkUeqL6tXEXzVlPh6Y5aCDEZesl0xBGA8ndRukX91Uk44ZqnkECp01NAZUdCAl+aiQNGi0k88Eg==
-  dependencies:
-    "@babel/highlight" "^7.10.3"
-
-"@babel/code-frame@^7.10.1", "@babel/code-frame@^7.5.5":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.1.tgz#d5481c5095daa1c57e16e54c6f9198443afb49ff"
-  integrity sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==
-  dependencies:
-    "@babel/highlight" "^7.10.1"
-
-"@babel/code-frame@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
-  integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
+  integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
   dependencies:
     "@babel/highlight" "^7.10.4"
 
-"@babel/compat-data@^7.10.4":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.10.5.tgz#d38425e67ea96b1480a3f50404d1bf85676301a6"
-  integrity sha512-mPVoWNzIpYJHbWje0if7Ck36bpbtTvIxOi9+6WSK9wjGEXearAqlwBoTQvVjsAY2VIwgcs8V940geY3okzRCEw==
-  dependencies:
-    browserslist "^4.12.0"
-    invariant "^2.2.4"
-    semver "^5.5.0"
+"@babel/compat-data@^7.12.5", "@babel/compat-data@^7.12.7":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.7.tgz#9329b4782a7d6bbd7eef57e11addf91ee3ef1e41"
+  integrity sha512-YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw==
 
-"@babel/core@>=7.2.2", "@babel/core@^7.1.0":
-  version "7.10.2"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.10.2.tgz#bd6786046668a925ac2bd2fd95b579b92a23b36a"
-  integrity sha512-KQmV9yguEjQsXqyOUGKjS4+3K8/DlOCE2pZcq4augdQmtTy5iv5EHtmMSJ7V4c1BIPjuwtZYqYLCq9Ga+hGBRQ==
-  dependencies:
-    "@babel/code-frame" "^7.10.1"
-    "@babel/generator" "^7.10.2"
-    "@babel/helper-module-transforms" "^7.10.1"
-    "@babel/helpers" "^7.10.1"
-    "@babel/parser" "^7.10.2"
-    "@babel/template" "^7.10.1"
-    "@babel/traverse" "^7.10.1"
-    "@babel/types" "^7.10.2"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.1"
-    json5 "^2.1.2"
-    lodash "^4.17.13"
-    resolve "^1.3.2"
-    semver "^5.4.1"
-    source-map "^0.5.0"
-
-"@babel/core@^7.10.5":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.10.5.tgz#1f15e2cca8ad9a1d78a38ddba612f5e7cdbbd330"
-  integrity sha512-O34LQooYVDXPl7QWCdW9p4NR+QlzOr7xShPPJz8GsuCU3/8ua/wqTr7gmnxXv+WBESiGU/G5s16i6tUvHkNb+w==
+"@babel/core@>=7.9.0", "@babel/core@^7.1.0", "@babel/core@^7.12.10", "@babel/core@^7.7.5":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.10.tgz#b79a2e1b9f70ed3d84bbfb6d8c4ef825f606bccd"
+  integrity sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w==
   dependencies:
     "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.10.5"
-    "@babel/helper-module-transforms" "^7.10.5"
-    "@babel/helpers" "^7.10.4"
-    "@babel/parser" "^7.10.5"
-    "@babel/template" "^7.10.4"
-    "@babel/traverse" "^7.10.5"
-    "@babel/types" "^7.10.5"
+    "@babel/generator" "^7.12.10"
+    "@babel/helper-module-transforms" "^7.12.1"
+    "@babel/helpers" "^7.12.5"
+    "@babel/parser" "^7.12.10"
+    "@babel/template" "^7.12.7"
+    "@babel/traverse" "^7.12.10"
+    "@babel/types" "^7.12.10"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.1"
     json5 "^2.1.2"
     lodash "^4.17.19"
-    resolve "^1.3.2"
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/core@^7.7.5":
-  version "7.11.6"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.11.6.tgz#3a9455dc7387ff1bac45770650bc13ba04a15651"
-  integrity sha512-Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg==
+"@babel/generator@^7.12.1", "@babel/generator@^7.12.10", "@babel/generator@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.11.tgz#98a7df7b8c358c9a37ab07a24056853016aba3af"
+  integrity sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==
   dependencies:
-    "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.11.6"
-    "@babel/helper-module-transforms" "^7.11.0"
-    "@babel/helpers" "^7.10.4"
-    "@babel/parser" "^7.11.5"
-    "@babel/template" "^7.10.4"
-    "@babel/traverse" "^7.11.5"
-    "@babel/types" "^7.11.5"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.1"
-    json5 "^2.1.2"
-    lodash "^4.17.19"
-    resolve "^1.3.2"
-    semver "^5.4.1"
-    source-map "^0.5.0"
-
-"@babel/generator@^7.10.1", "@babel/generator@^7.10.2", "@babel/generator@^7.4.0":
-  version "7.10.2"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.2.tgz#0fa5b5b2389db8bfdfcc3492b551ee20f5dd69a9"
-  integrity sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==
-  dependencies:
-    "@babel/types" "^7.10.2"
-    jsesc "^2.5.1"
-    lodash "^4.17.13"
-    source-map "^0.5.0"
-
-"@babel/generator@^7.10.4", "@babel/generator@^7.10.5":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.5.tgz#1b903554bc8c583ee8d25f1e8969732e6b829a69"
-  integrity sha512-3vXxr3FEW7E7lJZiWQ3bM4+v/Vyr9C+hpolQ8BGFr9Y8Ri2tFLWTixmwKBafDujO1WVah4fhZBeU1bieKdghig==
-  dependencies:
-    "@babel/types" "^7.10.5"
+    "@babel/types" "^7.12.11"
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.0.tgz#4b90c78d8c12825024568cbe83ee6c9af193585c"
-  integrity sha512-fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ==
+"@babel/helper-annotate-as-pure@^7.10.4", "@babel/helper-annotate-as-pure@^7.12.10":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz#54ab9b000e60a93644ce17b3f37d313aaf1d115d"
+  integrity sha512-XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ==
   dependencies:
-    "@babel/types" "^7.11.0"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
-
-"@babel/generator@^7.11.5", "@babel/generator@^7.11.6":
-  version "7.11.6"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.6.tgz#b868900f81b163b4d464ea24545c61cbac4dc620"
-  integrity sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==
-  dependencies:
-    "@babel/types" "^7.11.5"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
-
-"@babel/helper-annotate-as-pure@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.1.tgz#f6d08acc6f70bbd59b436262553fb2e259a1a268"
-  integrity sha512-ewp3rvJEwLaHgyWGe4wQssC2vjks3E80WiUe2BpMb0KhreTjMROCbxXcEovTrbeGVdQct5VjQfrv9EgC+xMzCw==
-  dependencies:
-    "@babel/types" "^7.10.1"
-
-"@babel/helper-annotate-as-pure@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz#5bf0d495a3f757ac3bda48b5bf3b3ba309c72ba3"
-  integrity sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==
-  dependencies:
-    "@babel/types" "^7.10.4"
+    "@babel/types" "^7.12.10"
 
 "@babel/helper-builder-binary-assignment-operator-visitor@^7.10.4":
   version "7.10.4"
@@ -173,63 +76,34 @@
     "@babel/helper-explode-assignable-expression" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helper-builder-react-jsx-experimental@^7.10.4":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.10.5.tgz#f35e956a19955ff08c1258e44a515a6d6248646b"
-  integrity sha512-Buewnx6M4ttG+NLkKyt7baQn7ScC/Td+e99G914fRU8fGIUivDDgVIQeDHFa5e4CRSJQt58WpNHhsAZgtzVhsg==
+"@babel/helper-compilation-targets@^7.12.5":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz#cb470c76198db6a24e9dbc8987275631e5d29831"
+  integrity sha512-+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.4"
-    "@babel/helper-module-imports" "^7.10.4"
-    "@babel/types" "^7.10.5"
-
-"@babel/helper-builder-react-jsx@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.10.4.tgz#8095cddbff858e6fa9c326daee54a2f2732c1d5d"
-  integrity sha512-5nPcIZ7+KKDxT1427oBivl9V9YTal7qk0diccnh7RrcgrT/pGFOjgGw1dgryyx1GvHEpXVfoDF6Ak3rTiWh8Rg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.4"
-    "@babel/types" "^7.10.4"
-
-"@babel/helper-compilation-targets@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz#804ae8e3f04376607cc791b9d47d540276332bd2"
-  integrity sha512-a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ==
-  dependencies:
-    "@babel/compat-data" "^7.10.4"
-    browserslist "^4.12.0"
-    invariant "^2.2.4"
-    levenary "^1.1.1"
+    "@babel/compat-data" "^7.12.5"
+    "@babel/helper-validator-option" "^7.12.1"
+    browserslist "^4.14.5"
     semver "^5.5.0"
 
-"@babel/helper-create-class-features-plugin@^7.10.4", "@babel/helper-create-class-features-plugin@^7.10.5":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz#9f61446ba80e8240b0a5c85c6fdac8459d6f259d"
-  integrity sha512-0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A==
+"@babel/helper-create-class-features-plugin@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz#3c45998f431edd4a9214c5f1d3ad1448a6137f6e"
+  integrity sha512-hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w==
   dependencies:
     "@babel/helper-function-name" "^7.10.4"
-    "@babel/helper-member-expression-to-functions" "^7.10.5"
+    "@babel/helper-member-expression-to-functions" "^7.12.1"
     "@babel/helper-optimise-call-expression" "^7.10.4"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-replace-supers" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.12.1"
     "@babel/helper-split-export-declaration" "^7.10.4"
 
-"@babel/helper-create-regexp-features-plugin@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.1.tgz#1b8feeab1594cbcfbf3ab5a3bbcabac0468efdbd"
-  integrity sha512-Rx4rHS0pVuJn5pJOqaqcZR4XSgeF9G/pO/79t+4r7380tXFJdzImFnxMU19f83wjSrmKHq6myrM10pFHTGzkUA==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.1"
-    "@babel/helper-regex" "^7.10.1"
-    regexpu-core "^4.7.0"
-
-"@babel/helper-create-regexp-features-plugin@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz#fdd60d88524659a0b6959c0579925e425714f3b8"
-  integrity sha512-2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g==
+"@babel/helper-create-regexp-features-plugin@^7.12.1":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz#2084172e95443fa0a09214ba1bb328f9aea1278f"
+  integrity sha512-idnutvQPdpbduutvi3JVfEgcVIHooQnhvhx0Nk9isOINOIGYkZea1Pk2JlJRiUnMefrlvr0vkByATBY/mB4vjQ==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.10.4"
-    "@babel/helper-regex" "^7.10.4"
-    regexpu-core "^4.7.0"
+    regexpu-core "^4.7.1"
 
 "@babel/helper-define-map@^7.10.4":
   version "7.10.5"
@@ -241,44 +115,27 @@
     lodash "^4.17.19"
 
 "@babel/helper-explode-assignable-expression@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.4.tgz#40a1cd917bff1288f699a94a75b37a1a2dbd8c7c"
-  integrity sha512-4K71RyRQNPRrR85sr5QY4X3VwG4wtVoXZB9+L3r1Gp38DhELyHCtovqydRi7c1Ovb17eRGiQ/FD5s8JdU0Uy5A==
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz#8006a466695c4ad86a2a5f2fb15b5f2c31ad5633"
+  integrity sha512-dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA==
   dependencies:
-    "@babel/traverse" "^7.10.4"
-    "@babel/types" "^7.10.4"
+    "@babel/types" "^7.12.1"
 
-"@babel/helper-function-name@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz#92bd63829bfc9215aca9d9defa85f56b539454f4"
-  integrity sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==
+"@babel/helper-function-name@^7.10.4", "@babel/helper-function-name@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz#1fd7738aee5dcf53c3ecff24f1da9c511ec47b42"
+  integrity sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.10.1"
-    "@babel/template" "^7.10.1"
-    "@babel/types" "^7.10.1"
+    "@babel/helper-get-function-arity" "^7.12.10"
+    "@babel/template" "^7.12.7"
+    "@babel/types" "^7.12.11"
 
-"@babel/helper-function-name@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"
-  integrity sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==
+"@babel/helper-get-function-arity@^7.12.10":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz#b158817a3165b5faa2047825dfa61970ddcc16cf"
+  integrity sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.10.4"
-    "@babel/template" "^7.10.4"
-    "@babel/types" "^7.10.4"
-
-"@babel/helper-get-function-arity@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz#7303390a81ba7cb59613895a192b93850e373f7d"
-  integrity sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==
-  dependencies:
-    "@babel/types" "^7.10.1"
-
-"@babel/helper-get-function-arity@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz#98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"
-  integrity sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==
-  dependencies:
-    "@babel/types" "^7.10.4"
+    "@babel/types" "^7.12.10"
 
 "@babel/helper-hoist-variables@^7.10.4":
   version "7.10.4"
@@ -287,225 +144,115 @@
   dependencies:
     "@babel/types" "^7.10.4"
 
-"@babel/helper-member-expression-to-functions@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.1.tgz#432967fd7e12a4afef66c4687d4ca22bc0456f15"
-  integrity sha512-u7XLXeM2n50gb6PWJ9hoO5oO7JFPaZtrh35t8RqKLT1jFKj9IWeD1zrcrYp1q1qiZTdEarfDWfTIP8nGsu0h5g==
+"@babel/helper-member-expression-to-functions@^7.12.1", "@babel/helper-member-expression-to-functions@^7.12.7":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz#aa77bd0396ec8114e5e30787efa78599d874a855"
+  integrity sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==
   dependencies:
-    "@babel/types" "^7.10.1"
+    "@babel/types" "^7.12.7"
 
-"@babel/helper-member-expression-to-functions@^7.10.4", "@babel/helper-member-expression-to-functions@^7.10.5":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.5.tgz#172f56e7a63e78112f3a04055f24365af702e7ee"
-  integrity sha512-HiqJpYD5+WopCXIAbQDG0zye5XYVvcO9w/DHp5GsaGkRUaamLj2bEtu6i8rnGGprAhHM3qidCMgp71HF4endhA==
+"@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.5":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb"
+  integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==
   dependencies:
-    "@babel/types" "^7.10.5"
+    "@babel/types" "^7.12.5"
 
-"@babel/helper-module-imports@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.1.tgz#dd331bd45bccc566ce77004e9d05fe17add13876"
-  integrity sha512-SFxgwYmZ3HZPyZwJRiVNLRHWuW2OgE5k2nrVs6D9Iv4PPnXVffuEHy83Sfx/l4SqF+5kyJXjAyUmrG7tNm+qVg==
+"@babel/helper-module-transforms@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz#7954fec71f5b32c48e4b303b437c34453fd7247c"
+  integrity sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==
   dependencies:
-    "@babel/types" "^7.10.1"
-
-"@babel/helper-module-imports@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz#4c5c54be04bd31670a7382797d75b9fa2e5b5620"
-  integrity sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==
-  dependencies:
-    "@babel/types" "^7.10.4"
-
-"@babel/helper-module-transforms@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz#24e2f08ee6832c60b157bb0936c86bef7210c622"
-  integrity sha512-RLHRCAzyJe7Q7sF4oy2cB+kRnU4wDZY/H2xJFGof+M+SJEGhZsb+GFj5j1AD8NiSaVBJ+Pf0/WObiXu/zxWpFg==
-  dependencies:
-    "@babel/helper-module-imports" "^7.10.1"
-    "@babel/helper-replace-supers" "^7.10.1"
-    "@babel/helper-simple-access" "^7.10.1"
-    "@babel/helper-split-export-declaration" "^7.10.1"
-    "@babel/template" "^7.10.1"
-    "@babel/types" "^7.10.1"
-    lodash "^4.17.13"
-
-"@babel/helper-module-transforms@^7.10.4", "@babel/helper-module-transforms@^7.10.5":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.10.5.tgz#120c271c0b3353673fcdfd8c053db3c544a260d6"
-  integrity sha512-4P+CWMJ6/j1W915ITJaUkadLObmCRRSC234uctJfn/vHrsLNxsR8dwlcXv9ZhJWzl77awf+mWXSZEKt5t0OnlA==
-  dependencies:
-    "@babel/helper-module-imports" "^7.10.4"
-    "@babel/helper-replace-supers" "^7.10.4"
-    "@babel/helper-simple-access" "^7.10.4"
-    "@babel/helper-split-export-declaration" "^7.10.4"
-    "@babel/template" "^7.10.4"
-    "@babel/types" "^7.10.5"
-    lodash "^4.17.19"
-
-"@babel/helper-module-transforms@^7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz#b16f250229e47211abdd84b34b64737c2ab2d359"
-  integrity sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==
-  dependencies:
-    "@babel/helper-module-imports" "^7.10.4"
-    "@babel/helper-replace-supers" "^7.10.4"
-    "@babel/helper-simple-access" "^7.10.4"
+    "@babel/helper-module-imports" "^7.12.1"
+    "@babel/helper-replace-supers" "^7.12.1"
+    "@babel/helper-simple-access" "^7.12.1"
     "@babel/helper-split-export-declaration" "^7.11.0"
+    "@babel/helper-validator-identifier" "^7.10.4"
     "@babel/template" "^7.10.4"
-    "@babel/types" "^7.11.0"
+    "@babel/traverse" "^7.12.1"
+    "@babel/types" "^7.12.1"
     lodash "^4.17.19"
 
-"@babel/helper-optimise-call-expression@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.1.tgz#b4a1f2561870ce1247ceddb02a3860fa96d72543"
-  integrity sha512-a0DjNS1prnBsoKx83dP2falChcs7p3i8VMzdrSbfLhuQra/2ENC4sbri34dz/rWmDADsmF1q5GbfaXydh0Jbjg==
+"@babel/helper-optimise-call-expression@^7.10.4", "@babel/helper-optimise-call-expression@^7.12.10":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz#94ca4e306ee11a7dd6e9f42823e2ac6b49881e2d"
+  integrity sha512-4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ==
   dependencies:
-    "@babel/types" "^7.10.1"
+    "@babel/types" "^7.12.10"
 
-"@babel/helper-optimise-call-expression@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz#50dc96413d594f995a77905905b05893cd779673"
-  integrity sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==
-  dependencies:
-    "@babel/types" "^7.10.4"
-
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.1", "@babel/helper-plugin-utils@^7.8.0":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz#ec5a5cf0eec925b66c60580328b122c01230a127"
-  integrity sha512-fvoGeXt0bJc7VMWZGCAEBEMo/HAjW2mP8apF5eXK0wSqwLAVHAISCWRoLMBMUs2kqeaG77jltVqu4Hn8Egl3nA==
-
-"@babel/helper-plugin-utils@^7.10.4":
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
   integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==
 
-"@babel/helper-regex@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.1.tgz#021cf1a7ba99822f993222a001cc3fec83255b96"
-  integrity sha512-7isHr19RsIJWWLLFn21ubFt223PjQyg1HY7CZEMRr820HttHPpVvrsIN3bUOo44DEfFV4kBXO7Abbn9KTUZV7g==
-  dependencies:
-    lodash "^4.17.13"
-
-"@babel/helper-regex@^7.10.4":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.5.tgz#32dfbb79899073c415557053a19bd055aae50ae0"
-  integrity sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==
-  dependencies:
-    lodash "^4.17.19"
-
-"@babel/helper-remap-async-to-generator@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.4.tgz#fce8bea4e9690bbe923056ded21e54b4e8b68ed5"
-  integrity sha512-86Lsr6NNw3qTNl+TBcF1oRZMaVzJtbWTyTko+CQL/tvNvcGYEFKbLXDPxtW0HKk3McNOk4KzY55itGWCAGK5tg==
+"@babel/helper-remap-async-to-generator@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz#8c4dbbf916314f6047dc05e6a2217074238347fd"
+  integrity sha512-9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/helper-wrap-function" "^7.10.4"
-    "@babel/template" "^7.10.4"
-    "@babel/traverse" "^7.10.4"
-    "@babel/types" "^7.10.4"
+    "@babel/types" "^7.12.1"
 
-"@babel/helper-replace-supers@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz#ec6859d20c5d8087f6a2dc4e014db7228975f13d"
-  integrity sha512-SOwJzEfpuQwInzzQJGjGaiG578UYmyi2Xw668klPWV5n07B73S0a9btjLk/52Mlcxa+5AdIYqws1KyXRfMoB7A==
+"@babel/helper-replace-supers@^7.12.1":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz#ea511658fc66c7908f923106dd88e08d1997d60d"
+  integrity sha512-q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA==
   dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.10.1"
-    "@babel/helper-optimise-call-expression" "^7.10.1"
-    "@babel/traverse" "^7.10.1"
-    "@babel/types" "^7.10.1"
+    "@babel/helper-member-expression-to-functions" "^7.12.7"
+    "@babel/helper-optimise-call-expression" "^7.12.10"
+    "@babel/traverse" "^7.12.10"
+    "@babel/types" "^7.12.11"
 
-"@babel/helper-replace-supers@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz#d585cd9388ea06e6031e4cd44b6713cbead9e6cf"
-  integrity sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==
+"@babel/helper-simple-access@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz#32427e5aa61547d38eb1e6eaf5fd1426fdad9136"
+  integrity sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==
   dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.10.4"
-    "@babel/helper-optimise-call-expression" "^7.10.4"
-    "@babel/traverse" "^7.10.4"
-    "@babel/types" "^7.10.4"
+    "@babel/types" "^7.12.1"
 
-"@babel/helper-simple-access@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.1.tgz#08fb7e22ace9eb8326f7e3920a1c2052f13d851e"
-  integrity sha512-VSWpWzRzn9VtgMJBIWTZ+GP107kZdQ4YplJlCmIrjoLVSi/0upixezHCDG8kpPVTBJpKfxTH01wDhh+jS2zKbw==
+"@babel/helper-skip-transparent-expression-wrappers@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz#462dc63a7e435ade8468385c63d2b84cce4b3cbf"
+  integrity sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==
   dependencies:
-    "@babel/template" "^7.10.1"
-    "@babel/types" "^7.10.1"
+    "@babel/types" "^7.12.1"
 
-"@babel/helper-simple-access@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz#0f5ccda2945277a2a7a2d3a821e15395edcf3461"
-  integrity sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==
+"@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0", "@babel/helper-split-export-declaration@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz#1b4cc424458643c47d37022223da33d76ea4603a"
+  integrity sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==
   dependencies:
-    "@babel/template" "^7.10.4"
-    "@babel/types" "^7.10.4"
+    "@babel/types" "^7.12.11"
 
-"@babel/helper-split-export-declaration@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz#c6f4be1cbc15e3a868e4c64a17d5d31d754da35f"
-  integrity sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==
-  dependencies:
-    "@babel/types" "^7.10.1"
+"@babel/helper-validator-identifier@^7.10.4", "@babel/helper-validator-identifier@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
+  integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==
 
-"@babel/helper-split-export-declaration@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz#2c70576eaa3b5609b24cb99db2888cc3fc4251d1"
-  integrity sha512-pySBTeoUff56fL5CBU2hWm9TesA4r/rOkI9DyJLvvgz09MB9YtfIYe3iBriVaYNaPe+Alua0vBIOVOLs2buWhg==
-  dependencies:
-    "@babel/types" "^7.10.4"
-
-"@babel/helper-split-export-declaration@^7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f"
-  integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==
-  dependencies:
-    "@babel/types" "^7.11.0"
-
-"@babel/helper-validator-identifier@^7.10.1", "@babel/helper-validator-identifier@^7.10.3":
-  version "7.10.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.3.tgz#60d9847f98c4cea1b279e005fdb7c28be5412d15"
-  integrity sha512-bU8JvtlYpJSBPuj1VUmKpFGaDZuLxASky3LhaKj3bmpSTY6VWooSM8msk+Z0CZoErFye2tlABF6yDkT3FOPAXw==
-
-"@babel/helper-validator-identifier@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
-  integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
+"@babel/helper-validator-option@^7.12.1", "@babel/helper-validator-option@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.11.tgz#d66cb8b7a3e7fe4c6962b32020a131ecf0847f4f"
+  integrity sha512-TBFCyj939mFSdeX7U7DDj32WtzYY7fDcalgq8v3fBZMNOJQNn7nOYzMaUCiPxPYfCup69mtIpqlKgMZLvQ8Xhw==
 
 "@babel/helper-wrap-function@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz#8a6f701eab0ff39f765b5a1cfef409990e624b87"
-  integrity sha512-6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug==
+  version "7.12.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz#3332339fc4d1fbbf1c27d7958c27d34708e990d9"
+  integrity sha512-Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow==
   dependencies:
     "@babel/helper-function-name" "^7.10.4"
     "@babel/template" "^7.10.4"
     "@babel/traverse" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helpers@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.1.tgz#a6827b7cb975c9d9cef5fd61d919f60d8844a973"
-  integrity sha512-muQNHF+IdU6wGgkaJyhhEmI54MOZBKsFfsXFhboz1ybwJ1Kl7IHlbm2a++4jwrmY5UYsgitt5lfqo1wMFcHmyw==
-  dependencies:
-    "@babel/template" "^7.10.1"
-    "@babel/traverse" "^7.10.1"
-    "@babel/types" "^7.10.1"
-
-"@babel/helpers@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.4.tgz#2abeb0d721aff7c0a97376b9e1f6f65d7a475044"
-  integrity sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==
+"@babel/helpers@^7.12.5":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz#1a1ba4a768d9b58310eda516c449913fe647116e"
+  integrity sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==
   dependencies:
     "@babel/template" "^7.10.4"
-    "@babel/traverse" "^7.10.4"
-    "@babel/types" "^7.10.4"
-
-"@babel/highlight@^7.10.1", "@babel/highlight@^7.10.3":
-  version "7.10.3"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.3.tgz#c633bb34adf07c5c13156692f5922c81ec53f28d"
-  integrity sha512-Ih9B/u7AtgEnySE2L2F0Xm0GaM729XqqLfHkalTsbjXGyqmf/6M0Cu0WpvqueUlW+xk88BHw9Nkpj49naU+vWw==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.10.3"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
+    "@babel/traverse" "^7.12.5"
+    "@babel/types" "^7.12.5"
 
 "@babel/highlight@^7.10.4":
   version "7.10.4"
@@ -516,141 +263,135 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.10.1", "@babel/parser@^7.10.2", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0":
-  version "7.10.2"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.2.tgz#871807f10442b92ff97e4783b9b54f6a0ca812d0"
-  integrity sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==
+"@babel/parser@^7.1.0", "@babel/parser@^7.12.10", "@babel/parser@^7.12.11", "@babel/parser@^7.12.7", "@babel/parser@^7.7.0":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.11.tgz#9ce3595bcd74bc5c466905e86c535b8b25011e79"
+  integrity sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==
 
-"@babel/parser@^7.10.4", "@babel/parser@^7.10.5":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.5.tgz#e7c6bf5a7deff957cec9f04b551e2762909d826b"
-  integrity sha512-wfryxy4bE1UivvQKSQDU4/X6dr+i8bctjUjj8Zyt3DQy7NtPizJXT8M52nqpNKL+nq2PW8lxk4ZqLj0fD4B4hQ==
-
-"@babel/parser@^7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.0.tgz#a9d7e11aead25d3b422d17b2c6502c8dddef6a5d"
-  integrity sha512-qvRvi4oI8xii8NllyEc4MDJjuZiNaRzyb7Y7lup1NqJV8TZHF4O27CcP+72WPn/k1zkgJ6WJfnIbk4jTsVAZHw==
-
-"@babel/parser@^7.11.5":
-  version "7.11.5"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.5.tgz#c7ff6303df71080ec7a4f5b8c003c58f1cf51037"
-  integrity sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==
-
-"@babel/plugin-proposal-async-generator-functions@^7.10.4":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz#3491cabf2f7c179ab820606cec27fed15e0e8558"
-  integrity sha512-cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg==
+"@babel/plugin-proposal-async-generator-functions@^7.12.1":
+  version "7.12.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.12.tgz#04b8f24fd4532008ab4e79f788468fd5a8476566"
+  integrity sha512-nrz9y0a4xmUrRq51bYkWJIO5SBZyG2ys2qinHsN0zHDHVsUaModrkpyWWWXfGqYQmOL3x9sQIcTNN/pBGpo09A==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-remap-async-to-generator" "^7.10.4"
+    "@babel/helper-remap-async-to-generator" "^7.12.1"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
 
-"@babel/plugin-proposal-class-properties@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz#a33bf632da390a59c7a8c570045d1115cd778807"
-  integrity sha512-vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg==
+"@babel/plugin-proposal-class-properties@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz#a082ff541f2a29a4821065b8add9346c0c16e5de"
+  integrity sha512-cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.10.4"
+    "@babel/helper-create-class-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-proposal-decorators@^7.10.5":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.10.5.tgz#42898bba478bc4b1ae242a703a953a7ad350ffb4"
-  integrity sha512-Sc5TAQSZuLzgY0664mMDn24Vw2P8g/VhyLyGPaWiHahhgLqeZvcGeyBZOrJW0oSKIK2mvQ22a1ENXBIQLhrEiQ==
+"@babel/plugin-proposal-decorators@^7.12.12":
+  version "7.12.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.12.12.tgz#067a6d3d6ca86d54cf56bb183239199c20daeafe"
+  integrity sha512-fhkE9lJYpw2mjHelBpM2zCbaA11aov2GJs7q4cFaXNrWx0H3bW58H9Esy2rdtYOghFBEYUDRIpvlgi+ZD+AvvQ==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.10.5"
+    "@babel/helper-create-class-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-decorators" "^7.10.4"
+    "@babel/plugin-syntax-decorators" "^7.12.1"
 
-"@babel/plugin-proposal-dynamic-import@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz#ba57a26cb98b37741e9d5bca1b8b0ddf8291f17e"
-  integrity sha512-up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ==
+"@babel/plugin-proposal-dynamic-import@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz#43eb5c2a3487ecd98c5c8ea8b5fdb69a2749b2dc"
+  integrity sha512-a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
 
-"@babel/plugin-proposal-export-default-from@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.10.4.tgz#08f66eef0067cbf6a7bc036977dcdccecaf0c6c5"
-  integrity sha512-G1l00VvDZ7Yk2yRlC5D8Ybvu3gmeHS3rCHoUYdjrqGYUtdeOBoRypnvDZ5KQqxyaiiGHWnVDeSEzA5F9ozItig==
+"@babel/plugin-proposal-export-default-from@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.12.1.tgz#c6e62d668a8abcfe0d28b82f560395fecb611c5a"
+  integrity sha512-z5Q4Ke7j0AexQRfgUvnD+BdCSgpTEKnqQ3kskk2jWtOBulxICzd1X9BGt7kmWftxZ2W3++OZdt5gtmC8KLxdRQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-export-default-from" "^7.10.4"
+    "@babel/plugin-syntax-export-default-from" "^7.12.1"
 
-"@babel/plugin-proposal-json-strings@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz#593e59c63528160233bd321b1aebe0820c2341db"
-  integrity sha512-fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==
+"@babel/plugin-proposal-export-namespace-from@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz#8b9b8f376b2d88f5dd774e4d24a5cc2e3679b6d4"
+  integrity sha512-6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+
+"@babel/plugin-proposal-json-strings@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz#d45423b517714eedd5621a9dfdc03fa9f4eb241c"
+  integrity sha512-GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz#02a7e961fc32e6d5b2db0649e01bf80ddee7e04a"
-  integrity sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==
+"@babel/plugin-proposal-logical-assignment-operators@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz#f2c490d36e1b3c9659241034a5d2cd50263a2751"
+  integrity sha512-k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz#3ed4fff31c015e7f3f1467f190dbe545cd7b046c"
+  integrity sha512-nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
 
-"@babel/plugin-proposal-numeric-separator@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz#ce1590ff0a65ad12970a609d78855e9a4c1aef06"
-  integrity sha512-73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA==
+"@babel/plugin-proposal-numeric-separator@^7.12.7":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz#8bf253de8139099fea193b297d23a9d406ef056b"
+  integrity sha512-8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.4.tgz#50129ac216b9a6a55b3853fdd923e74bf553a4c0"
-  integrity sha512-6vh4SqRuLLarjgeOf4EaROJAHjvu9Gl+/346PbDH9yWbJyfnJ/ah3jmYKYtswEyCoWZiidvVHjHshd4WgjB9BA==
+"@babel/plugin-proposal-object-rest-spread@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz#def9bd03cea0f9b72283dac0ec22d289c7691069"
+  integrity sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-transform-parameters" "^7.10.4"
+    "@babel/plugin-transform-parameters" "^7.12.1"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz#31c938309d24a78a49d68fdabffaa863758554dd"
-  integrity sha512-LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==
+"@babel/plugin-proposal-optional-catch-binding@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz#ccc2421af64d3aae50b558a71cede929a5ab2942"
+  integrity sha512-hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
 
-"@babel/plugin-proposal-optional-chaining@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.4.tgz#750f1255e930a1f82d8cdde45031f81a0d0adff7"
-  integrity sha512-ZIhQIEeavTgouyMSdZRap4VPPHqJJ3NEs2cuHs5p0erH+iz6khB0qfgU8g7UuJkG88+fBMy23ZiU+nuHvekJeQ==
+"@babel/plugin-proposal-optional-chaining@^7.12.7":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz#e02f0ea1b5dc59d401ec16fb824679f683d3303c"
+  integrity sha512-4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
 
-"@babel/plugin-proposal-private-methods@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz#b160d972b8fdba5c7d111a145fc8c421fc2a6909"
-  integrity sha512-wh5GJleuI8k3emgTg5KkJK6kHNsGEr0uBTDBuQUBJwckk9xs1ez79ioheEVVxMLyPscB0LfkbVHslQqIzWV6Bw==
+"@babel/plugin-proposal-private-methods@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz#86814f6e7a21374c980c10d38b4493e703f4a389"
+  integrity sha512-mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.10.4"
+    "@babel/helper-create-class-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz#4483cda53041ce3413b7fe2f00022665ddfaa75d"
-  integrity sha512-H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==
+"@babel/plugin-proposal-unicode-property-regex@^7.12.1", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz#2a183958d417765b9eae334f47758e5d6a82e072"
+  integrity sha512-MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.10.4"
+    "@babel/helper-create-regexp-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.4.4":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.1.tgz#dc04feb25e2dd70c12b05d680190e138fa2c0c6f"
-  integrity sha512-JjfngYRvwmPwmnbRZyNiPFI8zxCZb8euzbCG/LxyKdeTb59tVciKo9GK9bi6JYKInk1H11Dq9j/zRqIH4KigfQ==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-
 "@babel/plugin-syntax-async-generators@^7.8.0", "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
@@ -665,17 +406,17 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-class-properties@^7.10.4", "@babel/plugin-syntax-class-properties@^7.8.3":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz#6644e6a0baa55a61f9e3231f6c9eeb6ee46c124c"
-  integrity sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==
+"@babel/plugin-syntax-class-properties@^7.12.1", "@babel/plugin-syntax-class-properties@^7.8.3":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz#bcb297c5366e79bebadef509549cd93b04f19978"
+  integrity sha512-U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-decorators@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.10.4.tgz#6853085b2c429f9d322d02f5a635018cdeb2360c"
-  integrity sha512-2NaoC6fAk2VMdhY1eerkfHV+lVYC1u8b+jmRJISqANCJlTxYy19HGdIkkQtix2UtkcPuPu+IlDgrVseZnU03bw==
+"@babel/plugin-syntax-decorators@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.1.tgz#81a8b535b284476c41be6de06853a8802b98c5dd"
+  integrity sha512-ir9YW5daRrTYiy9UJ2TzdNIJEZu8KclVzDcfSt4iEmOtwQ4llPtWInNKJyKnVXp1vE4bbVd5S31M/im3mYMO1w==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
@@ -686,17 +427,24 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-export-default-from@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.10.4.tgz#e5494f95006355c10292a0ff1ce42a5746002ec8"
-  integrity sha512-79V6r6Pgudz0RnuMGp5xidu6Z+bPFugh8/Q9eDHonmLp4wKFAZDwygJwYgCzuDu8lFA/sYyT+mc5y2wkd7bTXA==
+"@babel/plugin-syntax-export-default-from@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.12.1.tgz#a9eb31881f4f9a1115a3d2c6d64ac3f6016b5a9d"
+  integrity sha512-dP5eGg6tHEkhnRD2/vRG/KJKRSg8gtxu2i+P/8/yFPJn/CfPU5G0/7Gks2i3M6IOVAPQekmsLN9LPsmXFFL4Uw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-flow@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.10.4.tgz#53351dd7ae01995e567d04ce42af1a6e0ba846a6"
-  integrity sha512-yxQsX1dJixF4qEEdzVbst3SZQ58Nrooz8NV9Z9GL4byTE25BvJgl5lf0RECUf0fh28rZBb/RYTWn/eeKwCMrZQ==
+"@babel/plugin-syntax-export-namespace-from@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a"
+  integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-syntax-flow@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.12.1.tgz#a77670d9abe6d63e8acadf4c31bb1eb5a506bbdd"
+  integrity sha512-1lBLLmtxrwpm4VKmtVFselI/P3pX+G63fAtUUt6b2Nzgao77KNDwyuRt90Mj2/9pKobtt68FdvjfqohZjg/FCA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
@@ -714,14 +462,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-jsx@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.10.4.tgz#39abaae3cbf710c4373d8429484e6ba21340166c"
-  integrity sha512-KCg9mio9jwiARCB7WAcQ7Y1q+qicILjoK8LP/VkPkEKaf5dkaZZK1EcTe91a3JJlZ3qy6L5s9X52boEYi8DM9g==
+"@babel/plugin-syntax-jsx@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz#9d9d357cc818aa7ae7935917c1257f67677a0926"
+  integrity sha512-1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
+"@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
   integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
@@ -742,7 +490,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.8.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3":
+"@babel/plugin-syntax-object-rest-spread@^7.8.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
   integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
@@ -763,446 +511,421 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-top-level-await@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz#4bbeb8917b54fcf768364e0a81f560e33a3ef57d"
-  integrity sha512-ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ==
+"@babel/plugin-syntax-top-level-await@^7.12.1", "@babel/plugin-syntax-top-level-await@^7.8.3":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz#dd6c0b357ac1bb142d98537450a319625d13d2a0"
+  integrity sha512-i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-typescript@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.10.4.tgz#2f55e770d3501e83af217d782cb7517d7bb34d25"
-  integrity sha512-oSAEz1YkBCAKr5Yiq8/BNtvSAPwkp/IyUnwZogd8p+F0RuYQQrLeRUzIQhueQTTBy/F+a40uS7OFKxnkRvmvFQ==
+"@babel/plugin-syntax-typescript@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.1.tgz#460ba9d77077653803c3dd2e673f76d66b4029e5"
+  integrity sha512-UZNEcCY+4Dp9yYRCAHrHDU+9ZXLYaY9MgBXSRLkB9WjYFRR6quJBumfVrEkUxrePPBwFcpWfNKXqVRQQtm7mMA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-arrow-functions@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz#e22960d77e697c74f41c501d44d73dbf8a6a64cd"
-  integrity sha512-9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==
+"@babel/plugin-transform-arrow-functions@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz#8083ffc86ac8e777fbe24b5967c4b2521f3cb2b3"
+  integrity sha512-5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-async-to-generator@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz#41a5017e49eb6f3cda9392a51eef29405b245a37"
-  integrity sha512-F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==
+"@babel/plugin-transform-async-to-generator@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz#3849a49cc2a22e9743cbd6b52926d30337229af1"
+  integrity sha512-SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A==
   dependencies:
-    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/helper-module-imports" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-remap-async-to-generator" "^7.10.4"
+    "@babel/helper-remap-async-to-generator" "^7.12.1"
 
-"@babel/plugin-transform-block-scoped-functions@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz#1afa595744f75e43a91af73b0d998ecfe4ebc2e8"
-  integrity sha512-WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==
+"@babel/plugin-transform-block-scoped-functions@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz#f2a1a365bde2b7112e0a6ded9067fdd7c07905d9"
+  integrity sha512-5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-block-scoping@^7.10.4":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.5.tgz#b81b8aafefbfe68f0f65f7ef397b9ece68a6037d"
-  integrity sha512-6Ycw3hjpQti0qssQcA6AMSFDHeNJ++R6dIMnpRqUjFeBBTmTDPa8zgF90OVfTvAo11mXZTlVUViY1g8ffrURLg==
+"@babel/plugin-transform-block-scoping@^7.12.11":
+  version "7.12.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.12.tgz#d93a567a152c22aea3b1929bb118d1d0a175cdca"
+  integrity sha512-VOEPQ/ExOVqbukuP7BYJtI5ZxxsmegTwzZ04j1aF0dkSypGo9XpDHuOrABsJu+ie+penpSJheDJ11x1BEZNiyQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-classes@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz#405136af2b3e218bc4a1926228bc917ab1a0adc7"
-  integrity sha512-2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==
+"@babel/plugin-transform-classes@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz#65e650fcaddd3d88ddce67c0f834a3d436a32db6"
+  integrity sha512-/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/helper-define-map" "^7.10.4"
     "@babel/helper-function-name" "^7.10.4"
     "@babel/helper-optimise-call-expression" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-replace-supers" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.12.1"
     "@babel/helper-split-export-declaration" "^7.10.4"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz#9ded83a816e82ded28d52d4b4ecbdd810cdfc0eb"
-  integrity sha512-JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==
+"@babel/plugin-transform-computed-properties@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz#d68cf6c9b7f838a8a4144badbe97541ea0904852"
+  integrity sha512-vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-destructuring@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz#70ddd2b3d1bea83d01509e9bb25ddb3a74fc85e5"
-  integrity sha512-+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==
+"@babel/plugin-transform-destructuring@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz#b9a570fe0d0a8d460116413cb4f97e8e08b2f847"
+  integrity sha512-fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-dotall-regex@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz#469c2062105c1eb6a040eaf4fac4b488078395ee"
-  integrity sha512-ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==
+"@babel/plugin-transform-dotall-regex@^7.12.1", "@babel/plugin-transform-dotall-regex@^7.4.4":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz#a1d16c14862817b6409c0a678d6f9373ca9cd975"
+  integrity sha512-B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.10.4"
+    "@babel/helper-create-regexp-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-dotall-regex@^7.4.4":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.1.tgz#920b9fec2d78bb57ebb64a644d5c2ba67cc104ee"
-  integrity sha512-19VIMsD1dp02RvduFUmfzj8uknaO3uiHHF0s3E1OHnVsNj8oge8EQ5RzHRbJjGSetRnkEuBYO7TG1M5kKjGLOA==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-
-"@babel/plugin-transform-duplicate-keys@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz#697e50c9fee14380fe843d1f306b295617431e47"
-  integrity sha512-GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==
+"@babel/plugin-transform-duplicate-keys@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz#745661baba295ac06e686822797a69fbaa2ca228"
+  integrity sha512-iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-exponentiation-operator@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz#5ae338c57f8cf4001bdb35607ae66b92d665af2e"
-  integrity sha512-S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==
+"@babel/plugin-transform-exponentiation-operator@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz#b0f2ed356ba1be1428ecaf128ff8a24f02830ae0"
+  integrity sha512-7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug==
   dependencies:
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-flow-comments@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-comments/-/plugin-transform-flow-comments-7.10.4.tgz#e0aebf9d1dbfe48fdc97e4bc31fc25985db5c07d"
-  integrity sha512-wiwS5fCzeWP71WLIzAoFAPTk0GLnhpUfGV4ygwX+Zib6nYiaLhUOWsjLt6+hCwCoH/bwZSg7Qzlc2AuzXg/mbg==
+"@babel/plugin-transform-flow-comments@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-comments/-/plugin-transform-flow-comments-7.12.1.tgz#92fe5a27e635bd6d2e46f616094d60edff895a0b"
+  integrity sha512-jQd0UQUg98j95JJVQL74mOrzES7dYyd8hy+ZDiMj1wjHw1Nj0Pzkk7tKZdqqAoSZV/yTYLp0lJ0/PTozy2cNDg==
   dependencies:
-    "@babel/generator" "^7.10.4"
+    "@babel/generator" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-flow" "^7.10.4"
+    "@babel/plugin-syntax-flow" "^7.12.1"
 
-"@babel/plugin-transform-flow-strip-types@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.10.4.tgz#c497957f09e86e3df7296271e9eb642876bf7788"
-  integrity sha512-XTadyuqNst88UWBTdLjM+wEY7BFnY2sYtPyAidfC7M/QaZnSuIZpMvLxqGT7phAcnGyWh/XQFLKcGf04CnvxSQ==
+"@babel/plugin-transform-flow-strip-types@^7.12.1":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.12.10.tgz#d85e30ecfa68093825773b7b857e5085bbd32c95"
+  integrity sha512-0ti12wLTLeUIzu9U7kjqIn4MyOL7+Wibc7avsHhj4o1l5C0ATs8p2IMHrVYjm9t9wzhfEO6S3kxax0Rpdo8LTg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-flow" "^7.10.4"
+    "@babel/plugin-syntax-flow" "^7.12.1"
 
-"@babel/plugin-transform-for-of@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz#c08892e8819d3a5db29031b115af511dbbfebae9"
-  integrity sha512-ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==
+"@babel/plugin-transform-for-of@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz#07640f28867ed16f9511c99c888291f560921cfa"
+  integrity sha512-Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-function-name@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz#6a467880e0fc9638514ba369111811ddbe2644b7"
-  integrity sha512-OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==
+"@babel/plugin-transform-function-name@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz#2ec76258c70fe08c6d7da154003a480620eba667"
+  integrity sha512-JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw==
   dependencies:
     "@babel/helper-function-name" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-literals@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz#9f42ba0841100a135f22712d0e391c462f571f3c"
-  integrity sha512-Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==
+"@babel/plugin-transform-literals@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz#d73b803a26b37017ddf9d3bb8f4dc58bfb806f57"
+  integrity sha512-+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-member-expression-literals@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz#b1ec44fcf195afcb8db2c62cd8e551c881baf8b7"
-  integrity sha512-0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw==
+"@babel/plugin-transform-member-expression-literals@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz#496038602daf1514a64d43d8e17cbb2755e0c3ad"
+  integrity sha512-1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-modules-amd@^7.10.4":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz#1b9cddaf05d9e88b3aad339cb3e445c4f020a9b1"
-  integrity sha512-elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==
+"@babel/plugin-transform-modules-amd@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz#3154300b026185666eebb0c0ed7f8415fefcf6f9"
+  integrity sha512-tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.10.5"
+    "@babel/helper-module-transforms" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-commonjs@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz#66667c3eeda1ebf7896d41f1f16b17105a2fbca0"
-  integrity sha512-Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==
+"@babel/plugin-transform-modules-commonjs@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz#fa403124542636c786cf9b460a0ffbb48a86e648"
+  integrity sha512-dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag==
   dependencies:
-    "@babel/helper-module-transforms" "^7.10.4"
+    "@babel/helper-module-transforms" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-simple-access" "^7.10.4"
+    "@babel/helper-simple-access" "^7.12.1"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-systemjs@^7.10.4":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz#6270099c854066681bae9e05f87e1b9cadbe8c85"
-  integrity sha512-f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw==
+"@babel/plugin-transform-modules-systemjs@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz#663fea620d593c93f214a464cd399bf6dc683086"
+  integrity sha512-Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q==
   dependencies:
     "@babel/helper-hoist-variables" "^7.10.4"
-    "@babel/helper-module-transforms" "^7.10.5"
+    "@babel/helper-module-transforms" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-validator-identifier" "^7.10.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-umd@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz#9a8481fe81b824654b3a0b65da3df89f3d21839e"
-  integrity sha512-mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==
+"@babel/plugin-transform-modules-umd@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz#eb5a218d6b1c68f3d6217b8fa2cc82fec6547902"
+  integrity sha512-aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q==
   dependencies:
-    "@babel/helper-module-transforms" "^7.10.4"
+    "@babel/helper-module-transforms" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz#78b4d978810b6f3bcf03f9e318f2fc0ed41aecb6"
-  integrity sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz#b407f5c96be0d9f5f88467497fa82b30ac3e8753"
+  integrity sha512-tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.10.4"
+    "@babel/helper-create-regexp-features-plugin" "^7.12.1"
 
-"@babel/plugin-transform-new-target@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz#9097d753cb7b024cb7381a3b2e52e9513a9c6888"
-  integrity sha512-YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==
+"@babel/plugin-transform-new-target@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz#80073f02ee1bb2d365c3416490e085c95759dec0"
+  integrity sha512-+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-object-super@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz#d7146c4d139433e7a6526f888c667e314a093894"
-  integrity sha512-5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==
+"@babel/plugin-transform-object-super@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz#4ea08696b8d2e65841d0c7706482b048bed1066e"
+  integrity sha512-AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-replace-supers" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.12.1"
 
-"@babel/plugin-transform-parameters@^7.10.4":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz#59d339d58d0b1950435f4043e74e2510005e2c4a"
-  integrity sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.10.4"
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-transform-property-literals@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz#f6fe54b6590352298785b83edd815d214c42e3c0"
-  integrity sha512-ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==
+"@babel/plugin-transform-parameters@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz#d2e963b038771650c922eff593799c96d853255d"
+  integrity sha512-xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-react-display-name@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.10.4.tgz#b5795f4e3e3140419c3611b7a2a3832b9aef328d"
-  integrity sha512-Zd4X54Mu9SBfPGnEcaGcOrVAYOtjT2on8QZkLKEq1S/tHexG39d9XXGZv19VfRrDjPJzFmPfTAqOQS1pfFOujw==
+"@babel/plugin-transform-property-literals@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz#41bc81200d730abb4456ab8b3fbd5537b59adecd"
+  integrity sha512-6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-react-jsx-development@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.10.4.tgz#6ec90f244394604623880e15ebc3c34c356258ba"
-  integrity sha512-RM3ZAd1sU1iQ7rI2dhrZRZGv0aqzNQMbkIUCS1txYpi9wHQ2ZHNjo5TwX+UD6pvFW4AbWqLVYvKy5qJSAyRGjQ==
-  dependencies:
-    "@babel/helper-builder-react-jsx-experimental" "^7.10.4"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-jsx" "^7.10.4"
-
-"@babel/plugin-transform-react-jsx-self@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.10.4.tgz#cd301a5fed8988c182ed0b9d55e9bd6db0bd9369"
-  integrity sha512-yOvxY2pDiVJi0axdTWHSMi5T0DILN+H+SaeJeACHKjQLezEzhLx9nEF9xgpBLPtkZsks9cnb5P9iBEi21En3gg==
+"@babel/plugin-transform-react-display-name@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.1.tgz#1cbcd0c3b1d6648c55374a22fc9b6b7e5341c00d"
+  integrity sha512-cAzB+UzBIrekfYxyLlFqf/OagTvHLcVBb5vpouzkYkBclRPraiygVnafvAoipErZLI8ANv8Ecn6E/m5qPXD26w==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-jsx" "^7.10.4"
 
-"@babel/plugin-transform-react-jsx-source@^7.10.4":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.10.5.tgz#34f1779117520a779c054f2cdd9680435b9222b4"
-  integrity sha512-wTeqHVkN1lfPLubRiZH3o73f4rfon42HpgxUSs86Nc+8QIcm/B9s8NNVXu/gwGcOyd7yDib9ikxoDLxJP0UiDA==
+"@babel/plugin-transform-react-jsx-development@^7.12.7":
+  version "7.12.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.12.tgz#bccca33108fe99d95d7f9e82046bfe762e71f4e7"
+  integrity sha512-i1AxnKxHeMxUaWVXQOSIco4tvVvvCxMSfeBMnMM06mpaJt3g+MpxYQQrDfojUQldP1xxraPSJYSMEljoWM/dCg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-jsx" "^7.10.4"
+    "@babel/plugin-transform-react-jsx" "^7.12.12"
 
-"@babel/plugin-transform-react-jsx@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.10.4.tgz#673c9f913948764a4421683b2bef2936968fddf2"
-  integrity sha512-L+MfRhWjX0eI7Js093MM6MacKU4M6dnCRa/QPDwYMxjljzSCzzlzKzj9Pk4P3OtrPcxr2N3znR419nr3Xw+65A==
+"@babel/plugin-transform-react-jsx@^7.12.10", "@babel/plugin-transform-react-jsx@^7.12.12":
+  version "7.12.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.12.tgz#b0da51ffe5f34b9a900e9f1f5fb814f9e512d25e"
+  integrity sha512-JDWGuzGNWscYcq8oJVCtSE61a5+XAOos+V0HrxnDieUus4UMnBEosDnY1VJqU5iZ4pA04QY7l0+JvHL1hZEfsw==
   dependencies:
-    "@babel/helper-builder-react-jsx" "^7.10.4"
-    "@babel/helper-builder-react-jsx-experimental" "^7.10.4"
+    "@babel/helper-annotate-as-pure" "^7.12.10"
+    "@babel/helper-module-imports" "^7.12.5"
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-jsx" "^7.10.4"
+    "@babel/plugin-syntax-jsx" "^7.12.1"
+    "@babel/types" "^7.12.12"
 
-"@babel/plugin-transform-react-pure-annotations@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.10.4.tgz#3eefbb73db94afbc075f097523e445354a1c6501"
-  integrity sha512-+njZkqcOuS8RaPakrnR9KvxjoG1ASJWpoIv/doyWngId88JoFlPlISenGXjrVacZUIALGUr6eodRs1vmPnF23A==
+"@babel/plugin-transform-react-pure-annotations@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.12.1.tgz#05d46f0ab4d1339ac59adf20a1462c91b37a1a42"
+  integrity sha512-RqeaHiwZtphSIUZ5I85PEH19LOSzxfuEazoY7/pWASCAIBuATQzpSVD+eT6MebeeZT2F4eSL0u4vw6n4Nm0Mjg==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-regenerator@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz#2015e59d839074e76838de2159db421966fd8b63"
-  integrity sha512-3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==
+"@babel/plugin-transform-regenerator@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz#5f0a28d842f6462281f06a964e88ba8d7ab49753"
+  integrity sha512-gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng==
   dependencies:
     regenerator-transform "^0.14.2"
 
-"@babel/plugin-transform-reserved-words@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz#8f2682bcdcef9ed327e1b0861585d7013f8a54dd"
-  integrity sha512-hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==
+"@babel/plugin-transform-reserved-words@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz#6fdfc8cc7edcc42b36a7c12188c6787c873adcd8"
+  integrity sha512-pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-runtime@^7.10.5":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.10.5.tgz#3b39b7b24830e0c2d8ff7a4489fe5cf99fbace86"
-  integrity sha512-tV4V/FjElJ9lQtyjr5xD2IFFbgY46r7EeVu5a8CpEKT5laheHKSlFeHjpkPppW3PqzGLAuv5k2qZX5LgVZIX5w==
+"@babel/plugin-transform-runtime@^7.12.10":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.10.tgz#af0fded4e846c4b37078e8e5d06deac6cd848562"
+  integrity sha512-xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA==
   dependencies:
-    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/helper-module-imports" "^7.12.5"
     "@babel/helper-plugin-utils" "^7.10.4"
-    resolve "^1.8.1"
     semver "^5.5.1"
 
-"@babel/plugin-transform-shorthand-properties@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz#9fd25ec5cdd555bb7f473e5e6ee1c971eede4dd6"
-  integrity sha512-AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==
+"@babel/plugin-transform-shorthand-properties@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz#0bf9cac5550fce0cfdf043420f661d645fdc75e3"
+  integrity sha512-GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-spread@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.4.tgz#4e2c85ea0d6abaee1b24dcfbbae426fe8d674cff"
-  integrity sha512-1e/51G/Ni+7uH5gktbWv+eCED9pP8ZpRhZB3jOaI3mmzfvJTWHkuyYTv0Z5PYtyM+Tr2Ccr9kUdQxn60fI5WuQ==
+"@babel/plugin-transform-spread@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz#527f9f311be4ec7fdc2b79bb89f7bf884b3e1e1e"
+  integrity sha512-vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
+
+"@babel/plugin-transform-sticky-regex@^7.12.7":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz#560224613ab23987453948ed21d0b0b193fa7fad"
+  integrity sha512-VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-sticky-regex@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz#8f3889ee8657581130a29d9cc91d7c73b7c4a28d"
-  integrity sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-regex" "^7.10.4"
-
-"@babel/plugin-transform-template-literals@^7.10.4":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz#78bc5d626a6642db3312d9d0f001f5e7639fde8c"
-  integrity sha512-V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.4"
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-transform-typeof-symbol@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz#9509f1a7eec31c4edbffe137c16cc33ff0bc5bfc"
-  integrity sha512-QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==
+"@babel/plugin-transform-template-literals@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz#b43ece6ed9a79c0c71119f576d299ef09d942843"
+  integrity sha512-b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-typescript@^7.10.4":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.10.5.tgz#edf353944e979f40d8ff9fe4e9975d0a465037c5"
-  integrity sha512-YCyYsFrrRMZ3qR7wRwtSSJovPG5vGyG4ZdcSAivGwTfoasMp3VOB/AKhohu3dFtmB4cCDcsndCSxGtrdliCsZQ==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.10.5"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-typescript" "^7.10.4"
-
-"@babel/plugin-transform-unicode-escapes@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz#feae523391c7651ddac115dae0a9d06857892007"
-  integrity sha512-y5XJ9waMti2J+e7ij20e+aH+fho7Wb7W8rNuu72aKRwCHFqQdhkdU2lo3uZ9tQuboEJcUFayXdARhcxLQ3+6Fg==
+"@babel/plugin-transform-typeof-symbol@^7.12.10":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.10.tgz#de01c4c8f96580bd00f183072b0d0ecdcf0dec4b"
+  integrity sha512-JQ6H8Rnsogh//ijxspCjc21YPd3VLVoYtAwv3zQmqAt8YGYUtdo5usNhdl4b9/Vir2kPFZl6n1h0PfUz4hJhaA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-unicode-regex@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz#e56d71f9282fac6db09c82742055576d5e6d80a8"
-  integrity sha512-wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==
+"@babel/plugin-transform-typescript@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.12.1.tgz#d92cc0af504d510e26a754a7dbc2e5c8cd9c7ab4"
+  integrity sha512-VrsBByqAIntM+EYMqSm59SiMEf7qkmI9dqMt6RbD/wlwueWmYcI0FFK5Fj47pP6DRZm+3teXjosKlwcZJ5lIMw==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.12.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-typescript" "^7.12.1"
+
+"@babel/plugin-transform-unicode-escapes@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz#5232b9f81ccb07070b7c3c36c67a1b78f1845709"
+  integrity sha512-I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/preset-env@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.10.4.tgz#fbf57f9a803afd97f4f32e4f798bb62e4b2bef5f"
-  integrity sha512-tcmuQ6vupfMZPrLrc38d0sF2OjLT3/bZ0dry5HchNCQbrokoQi4reXqclvkkAT5b+gWc23meVWpve5P/7+w/zw==
+"@babel/plugin-transform-unicode-regex@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz#cc9661f61390db5c65e3febaccefd5c6ac3faecb"
+  integrity sha512-SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg==
   dependencies:
-    "@babel/compat-data" "^7.10.4"
-    "@babel/helper-compilation-targets" "^7.10.4"
-    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/helper-create-regexp-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-proposal-async-generator-functions" "^7.10.4"
-    "@babel/plugin-proposal-class-properties" "^7.10.4"
-    "@babel/plugin-proposal-dynamic-import" "^7.10.4"
-    "@babel/plugin-proposal-json-strings" "^7.10.4"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.10.4"
-    "@babel/plugin-proposal-numeric-separator" "^7.10.4"
-    "@babel/plugin-proposal-object-rest-spread" "^7.10.4"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.10.4"
-    "@babel/plugin-proposal-optional-chaining" "^7.10.4"
-    "@babel/plugin-proposal-private-methods" "^7.10.4"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.10.4"
+
+"@babel/preset-env@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.11.tgz#55d5f7981487365c93dbbc84507b1c7215e857f9"
+  integrity sha512-j8Tb+KKIXKYlDBQyIOy4BLxzv1NUOwlHfZ74rvW+Z0Gp4/cI2IMDPBWAgWceGcE7aep9oL/0K9mlzlMGxA8yNw==
+  dependencies:
+    "@babel/compat-data" "^7.12.7"
+    "@babel/helper-compilation-targets" "^7.12.5"
+    "@babel/helper-module-imports" "^7.12.5"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-validator-option" "^7.12.11"
+    "@babel/plugin-proposal-async-generator-functions" "^7.12.1"
+    "@babel/plugin-proposal-class-properties" "^7.12.1"
+    "@babel/plugin-proposal-dynamic-import" "^7.12.1"
+    "@babel/plugin-proposal-export-namespace-from" "^7.12.1"
+    "@babel/plugin-proposal-json-strings" "^7.12.1"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.12.1"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1"
+    "@babel/plugin-proposal-numeric-separator" "^7.12.7"
+    "@babel/plugin-proposal-object-rest-spread" "^7.12.1"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.12.1"
+    "@babel/plugin-proposal-optional-chaining" "^7.12.7"
+    "@babel/plugin-proposal-private-methods" "^7.12.1"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.12.1"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
-    "@babel/plugin-syntax-class-properties" "^7.10.4"
+    "@babel/plugin-syntax-class-properties" "^7.12.1"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
-    "@babel/plugin-syntax-top-level-await" "^7.10.4"
-    "@babel/plugin-transform-arrow-functions" "^7.10.4"
-    "@babel/plugin-transform-async-to-generator" "^7.10.4"
-    "@babel/plugin-transform-block-scoped-functions" "^7.10.4"
-    "@babel/plugin-transform-block-scoping" "^7.10.4"
-    "@babel/plugin-transform-classes" "^7.10.4"
-    "@babel/plugin-transform-computed-properties" "^7.10.4"
-    "@babel/plugin-transform-destructuring" "^7.10.4"
-    "@babel/plugin-transform-dotall-regex" "^7.10.4"
-    "@babel/plugin-transform-duplicate-keys" "^7.10.4"
-    "@babel/plugin-transform-exponentiation-operator" "^7.10.4"
-    "@babel/plugin-transform-for-of" "^7.10.4"
-    "@babel/plugin-transform-function-name" "^7.10.4"
-    "@babel/plugin-transform-literals" "^7.10.4"
-    "@babel/plugin-transform-member-expression-literals" "^7.10.4"
-    "@babel/plugin-transform-modules-amd" "^7.10.4"
-    "@babel/plugin-transform-modules-commonjs" "^7.10.4"
-    "@babel/plugin-transform-modules-systemjs" "^7.10.4"
-    "@babel/plugin-transform-modules-umd" "^7.10.4"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.10.4"
-    "@babel/plugin-transform-new-target" "^7.10.4"
-    "@babel/plugin-transform-object-super" "^7.10.4"
-    "@babel/plugin-transform-parameters" "^7.10.4"
-    "@babel/plugin-transform-property-literals" "^7.10.4"
-    "@babel/plugin-transform-regenerator" "^7.10.4"
-    "@babel/plugin-transform-reserved-words" "^7.10.4"
-    "@babel/plugin-transform-shorthand-properties" "^7.10.4"
-    "@babel/plugin-transform-spread" "^7.10.4"
-    "@babel/plugin-transform-sticky-regex" "^7.10.4"
-    "@babel/plugin-transform-template-literals" "^7.10.4"
-    "@babel/plugin-transform-typeof-symbol" "^7.10.4"
-    "@babel/plugin-transform-unicode-escapes" "^7.10.4"
-    "@babel/plugin-transform-unicode-regex" "^7.10.4"
+    "@babel/plugin-syntax-top-level-await" "^7.12.1"
+    "@babel/plugin-transform-arrow-functions" "^7.12.1"
+    "@babel/plugin-transform-async-to-generator" "^7.12.1"
+    "@babel/plugin-transform-block-scoped-functions" "^7.12.1"
+    "@babel/plugin-transform-block-scoping" "^7.12.11"
+    "@babel/plugin-transform-classes" "^7.12.1"
+    "@babel/plugin-transform-computed-properties" "^7.12.1"
+    "@babel/plugin-transform-destructuring" "^7.12.1"
+    "@babel/plugin-transform-dotall-regex" "^7.12.1"
+    "@babel/plugin-transform-duplicate-keys" "^7.12.1"
+    "@babel/plugin-transform-exponentiation-operator" "^7.12.1"
+    "@babel/plugin-transform-for-of" "^7.12.1"
+    "@babel/plugin-transform-function-name" "^7.12.1"
+    "@babel/plugin-transform-literals" "^7.12.1"
+    "@babel/plugin-transform-member-expression-literals" "^7.12.1"
+    "@babel/plugin-transform-modules-amd" "^7.12.1"
+    "@babel/plugin-transform-modules-commonjs" "^7.12.1"
+    "@babel/plugin-transform-modules-systemjs" "^7.12.1"
+    "@babel/plugin-transform-modules-umd" "^7.12.1"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.12.1"
+    "@babel/plugin-transform-new-target" "^7.12.1"
+    "@babel/plugin-transform-object-super" "^7.12.1"
+    "@babel/plugin-transform-parameters" "^7.12.1"
+    "@babel/plugin-transform-property-literals" "^7.12.1"
+    "@babel/plugin-transform-regenerator" "^7.12.1"
+    "@babel/plugin-transform-reserved-words" "^7.12.1"
+    "@babel/plugin-transform-shorthand-properties" "^7.12.1"
+    "@babel/plugin-transform-spread" "^7.12.1"
+    "@babel/plugin-transform-sticky-regex" "^7.12.7"
+    "@babel/plugin-transform-template-literals" "^7.12.1"
+    "@babel/plugin-transform-typeof-symbol" "^7.12.10"
+    "@babel/plugin-transform-unicode-escapes" "^7.12.1"
+    "@babel/plugin-transform-unicode-regex" "^7.12.1"
     "@babel/preset-modules" "^0.1.3"
-    "@babel/types" "^7.10.4"
-    browserslist "^4.12.0"
-    core-js-compat "^3.6.2"
-    invariant "^2.2.2"
-    levenary "^1.1.1"
+    "@babel/types" "^7.12.11"
+    core-js-compat "^3.8.0"
     semver "^5.5.0"
 
-"@babel/preset-flow@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.10.4.tgz#e0d9c72f8cb02d1633f6a5b7b16763aa2edf659f"
-  integrity sha512-XI6l1CptQCOBv+ZKYwynyswhtOKwpZZp5n0LG1QKCo8erRhqjoQV6nvx61Eg30JHpysWQSBwA2AWRU3pBbSY5g==
+"@babel/preset-flow@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.12.1.tgz#1a81d376c5a9549e75352a3888f8c273455ae940"
+  integrity sha512-UAoyMdioAhM6H99qPoKvpHMzxmNVXno8GYU/7vZmGaHk6/KqfDYL1W0NxszVbJ2EP271b7e6Ox+Vk2A9QsB3Sw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-transform-flow-strip-types" "^7.10.4"
+    "@babel/plugin-transform-flow-strip-types" "^7.12.1"
 
 "@babel/preset-modules@^0.1.3":
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz#13242b53b5ef8c883c3cf7dddd55b36ce80fbc72"
-  integrity sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz#362f2b68c662842970fdb5e254ffc8fc1c2e415e"
+  integrity sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
@@ -1210,31 +933,30 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/preset-react@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.10.4.tgz#92e8a66d816f9911d11d4cc935be67adfc82dbcf"
-  integrity sha512-BrHp4TgOIy4M19JAfO1LhycVXOPWdDbTRep7eVyatf174Hff+6Uk53sDyajqZPu8W1qXRBiYOfIamek6jA7YVw==
+"@babel/preset-react@^7.12.10":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.10.tgz#4fed65f296cbb0f5fb09de6be8cddc85cc909be9"
+  integrity sha512-vtQNjaHRl4DUpp+t+g4wvTHsLQuye+n0H/wsXIZRn69oz/fvNC7gQ4IK73zGJBaxvHoxElDvnYCthMcT7uzFoQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-transform-react-display-name" "^7.10.4"
-    "@babel/plugin-transform-react-jsx" "^7.10.4"
-    "@babel/plugin-transform-react-jsx-development" "^7.10.4"
-    "@babel/plugin-transform-react-jsx-self" "^7.10.4"
-    "@babel/plugin-transform-react-jsx-source" "^7.10.4"
-    "@babel/plugin-transform-react-pure-annotations" "^7.10.4"
+    "@babel/plugin-transform-react-display-name" "^7.12.1"
+    "@babel/plugin-transform-react-jsx" "^7.12.10"
+    "@babel/plugin-transform-react-jsx-development" "^7.12.7"
+    "@babel/plugin-transform-react-pure-annotations" "^7.12.1"
 
-"@babel/preset-typescript@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.10.4.tgz#7d5d052e52a682480d6e2cc5aa31be61c8c25e36"
-  integrity sha512-SdYnvGPv+bLlwkF2VkJnaX/ni1sMNetcGI1+nThF1gyv6Ph8Qucc4ZZAjM5yZcE/AKRXIOTZz7eSRDWOEjPyRQ==
+"@babel/preset-typescript@^7.12.7":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.12.7.tgz#fc7df8199d6aae747896f1e6c61fc872056632a3"
+  integrity sha512-nOoIqIqBmHBSEgBXWR4Dv/XBehtIFcw9PqZw6rFYuKrzsZmOQm3PR5siLBnKZFEsDb03IegG8nSjU/iXXXYRmw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-transform-typescript" "^7.10.4"
+    "@babel/helper-validator-option" "^7.12.1"
+    "@babel/plugin-transform-typescript" "^7.12.1"
 
-"@babel/register@^7.10.5":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.10.5.tgz#354f3574895f1307f79efe37a51525e52fd38d89"
-  integrity sha512-eYHdLv43nyvmPn9bfNfrcC4+iYNwdQ8Pxk1MFJuU/U5LpSYl/PH4dFMazCYZDFVi8ueG3shvO+AQfLrxpYulQw==
+"@babel/register@^7.12.10":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.12.10.tgz#19b87143f17128af4dbe7af54c735663b3999f60"
+  integrity sha512-EvX/BvMMJRAA3jZgILWgbsrHwBQvllC5T8B29McyME8DvkdOxk4ujESfrMvME8IHSDvWXrmMXxPvA/lx2gqPLQ==
   dependencies:
     find-cache-dir "^2.0.0"
     lodash "^4.17.19"
@@ -1242,138 +964,43 @@
     pirates "^4.0.0"
     source-map-support "^0.5.16"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
-  version "7.10.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.2.tgz#d103f21f2602497d38348a32e008637d506db839"
-  integrity sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e"
+  integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.10.5":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.5.tgz#303d8bd440ecd5a491eae6117fd3367698674c5c"
-  integrity sha512-otddXKhdNn7d0ptoFRHtMLa8LqDxLYwTjB4nYgM1yy5N6gU/MUf8zqyyLltCH3yAVitBzmwK4us+DD0l/MauAg==
-  dependencies:
-    regenerator-runtime "^0.13.4"
-
-"@babel/runtime@^7.11.2":
-  version "7.11.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736"
-  integrity sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==
-  dependencies:
-    regenerator-runtime "^0.13.4"
-
-"@babel/template@^7.10.1", "@babel/template@^7.4.0":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.1.tgz#e167154a94cb5f14b28dc58f5356d2162f539811"
-  integrity sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==
-  dependencies:
-    "@babel/code-frame" "^7.10.1"
-    "@babel/parser" "^7.10.1"
-    "@babel/types" "^7.10.1"
-
-"@babel/template@^7.10.4", "@babel/template@^7.3.3":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278"
-  integrity sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==
+"@babel/template@^7.10.4", "@babel/template@^7.12.7", "@babel/template@^7.3.3":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc"
+  integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==
   dependencies:
     "@babel/code-frame" "^7.10.4"
-    "@babel/parser" "^7.10.4"
-    "@babel/types" "^7.10.4"
+    "@babel/parser" "^7.12.7"
+    "@babel/types" "^7.12.7"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.1", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.1.tgz#bbcef3031e4152a6c0b50147f4958df54ca0dd27"
-  integrity sha512-C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ==
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.10", "@babel/traverse@^7.12.12", "@babel/traverse@^7.12.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.4":
+  version "7.12.12"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.12.tgz#d0cd87892704edd8da002d674bc811ce64743376"
+  integrity sha512-s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w==
   dependencies:
-    "@babel/code-frame" "^7.10.1"
-    "@babel/generator" "^7.10.1"
-    "@babel/helper-function-name" "^7.10.1"
-    "@babel/helper-split-export-declaration" "^7.10.1"
-    "@babel/parser" "^7.10.1"
-    "@babel/types" "^7.10.1"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.13"
-
-"@babel/traverse@^7.10.4", "@babel/traverse@^7.10.5":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.5.tgz#77ce464f5b258be265af618d8fddf0536f20b564"
-  integrity sha512-yc/fyv2gUjPqzTz0WHeRJH2pv7jA9kA7mBX2tXl/x5iOE81uaVPuGPtaYk7wmkx4b67mQ7NqI8rmT2pF47KYKQ==
-  dependencies:
-    "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.10.5"
-    "@babel/helper-function-name" "^7.10.4"
-    "@babel/helper-split-export-declaration" "^7.10.4"
-    "@babel/parser" "^7.10.5"
-    "@babel/types" "^7.10.5"
+    "@babel/code-frame" "^7.12.11"
+    "@babel/generator" "^7.12.11"
+    "@babel/helper-function-name" "^7.12.11"
+    "@babel/helper-split-export-declaration" "^7.12.11"
+    "@babel/parser" "^7.12.11"
+    "@babel/types" "^7.12.12"
     debug "^4.1.0"
     globals "^11.1.0"
     lodash "^4.17.19"
 
-"@babel/traverse@^7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.11.0.tgz#9b996ce1b98f53f7c3e4175115605d56ed07dd24"
-  integrity sha512-ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg==
+"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.11", "@babel/types@^7.12.12", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+  version "7.12.12"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.12.tgz#4608a6ec313abbd87afa55004d373ad04a96c299"
+  integrity sha512-lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ==
   dependencies:
-    "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.11.0"
-    "@babel/helper-function-name" "^7.10.4"
-    "@babel/helper-split-export-declaration" "^7.11.0"
-    "@babel/parser" "^7.11.0"
-    "@babel/types" "^7.11.0"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.19"
-
-"@babel/traverse@^7.11.5":
-  version "7.11.5"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.11.5.tgz#be777b93b518eb6d76ee2e1ea1d143daa11e61c3"
-  integrity sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==
-  dependencies:
-    "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.11.5"
-    "@babel/helper-function-name" "^7.10.4"
-    "@babel/helper-split-export-declaration" "^7.11.0"
-    "@babel/parser" "^7.11.5"
-    "@babel/types" "^7.11.5"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.19"
-
-"@babel/types@^7.0.0", "@babel/types@^7.10.1", "@babel/types@^7.10.2", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
-  version "7.10.2"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.10.2.tgz#30283be31cad0dbf6fb00bd40641ca0ea675172d"
-  integrity sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.10.1"
-    lodash "^4.17.13"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.10.4", "@babel/types@^7.10.5":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.10.5.tgz#d88ae7e2fde86bfbfe851d4d81afa70a997b5d15"
-  integrity sha512-ixV66KWfCI6GKoA/2H9v6bQdbfXEwwpOdQ8cRvb4F+eyvhlaHxWFMQB4+3d9QFJXZsiiiqVrewNV0DFEQpyT4Q==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.10.4"
-    lodash "^4.17.19"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.11.0.tgz#2ae6bf1ba9ae8c3c43824e5861269871b206e90d"
-  integrity sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.10.4"
-    lodash "^4.17.19"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.11.5", "@babel/types@^7.3.3":
-  version "7.11.5"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.11.5.tgz#d9de577d01252d77c6800cee039ee64faf75662d"
-  integrity sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.10.4"
+    "@babel/helper-validator-identifier" "^7.12.11"
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
@@ -1390,6 +1017,22 @@
     exec-sh "^0.3.2"
     minimist "^1.2.0"
 
+"@eslint/eslintrc@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.3.0.tgz#d736d6963d7003b6514e6324bec9c602ac340318"
+  integrity sha512-1JTKgrOKAHVivSvOYw+sJOunkBjUOvjqWk1DPja7ZFhIS2mX/4EgTT8M7eTK9jrKhL/FvXXEbQwIs3pg1xp3dg==
+  dependencies:
+    ajv "^6.12.4"
+    debug "^4.1.1"
+    espree "^7.3.0"
+    globals "^12.1.0"
+    ignore "^4.0.6"
+    import-fresh "^3.2.1"
+    js-yaml "^3.13.1"
+    lodash "^4.17.20"
+    minimatch "^3.0.4"
+    strip-json-comments "^3.1.1"
+
 "@istanbuljs/load-nyc-config@^1.0.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
@@ -1406,79 +1049,61 @@
   resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
   integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==
 
-"@jest/console@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.9.0.tgz#79b1bc06fb74a8cfb01cbdedf945584b1b9707f0"
-  integrity sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==
+"@jest/console@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.6.2.tgz#4e04bc464014358b03ab4937805ee36a0aeb98f2"
+  integrity sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g==
   dependencies:
-    "@jest/source-map" "^24.9.0"
-    chalk "^2.0.1"
-    slash "^2.0.0"
-
-"@jest/console@^26.5.2":
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.5.2.tgz#94fc4865b1abed7c352b5e21e6c57be4b95604a6"
-  integrity sha512-lJELzKINpF1v74DXHbCRIkQ/+nUV1M+ntj+X1J8LxCgpmJZjfLmhFejiMSbjjD66fayxl5Z06tbs3HMyuik6rw==
-  dependencies:
-    "@jest/types" "^26.5.2"
+    "@jest/types" "^26.6.2"
     "@types/node" "*"
     chalk "^4.0.0"
-    jest-message-util "^26.5.2"
-    jest-util "^26.5.2"
+    jest-message-util "^26.6.2"
+    jest-util "^26.6.2"
     slash "^3.0.0"
 
-"@jest/core@^26.5.2":
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.5.2.tgz#e39f14676f4ba4632ecabfdc374071ab22131f22"
-  integrity sha512-LLTo1LQMg7eJjG/+P1NYqFof2B25EV1EqzD5FonklihG4UJKiK2JBIvWonunws6W7e+DhNLoFD+g05tCY03eyA==
+"@jest/core@^26.6.3":
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.6.3.tgz#7639fcb3833d748a4656ada54bde193051e45fad"
+  integrity sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw==
   dependencies:
-    "@jest/console" "^26.5.2"
-    "@jest/reporters" "^26.5.2"
-    "@jest/test-result" "^26.5.2"
-    "@jest/transform" "^26.5.2"
-    "@jest/types" "^26.5.2"
+    "@jest/console" "^26.6.2"
+    "@jest/reporters" "^26.6.2"
+    "@jest/test-result" "^26.6.2"
+    "@jest/transform" "^26.6.2"
+    "@jest/types" "^26.6.2"
     "@types/node" "*"
     ansi-escapes "^4.2.1"
     chalk "^4.0.0"
     exit "^0.1.2"
     graceful-fs "^4.2.4"
-    jest-changed-files "^26.5.2"
-    jest-config "^26.5.2"
-    jest-haste-map "^26.5.2"
-    jest-message-util "^26.5.2"
+    jest-changed-files "^26.6.2"
+    jest-config "^26.6.3"
+    jest-haste-map "^26.6.2"
+    jest-message-util "^26.6.2"
     jest-regex-util "^26.0.0"
-    jest-resolve "^26.5.2"
-    jest-resolve-dependencies "^26.5.2"
-    jest-runner "^26.5.2"
-    jest-runtime "^26.5.2"
-    jest-snapshot "^26.5.2"
-    jest-util "^26.5.2"
-    jest-validate "^26.5.2"
-    jest-watcher "^26.5.2"
+    jest-resolve "^26.6.2"
+    jest-resolve-dependencies "^26.6.3"
+    jest-runner "^26.6.3"
+    jest-runtime "^26.6.3"
+    jest-snapshot "^26.6.2"
+    jest-util "^26.6.2"
+    jest-validate "^26.6.2"
+    jest-watcher "^26.6.2"
     micromatch "^4.0.2"
     p-each-series "^2.1.0"
     rimraf "^3.0.0"
     slash "^3.0.0"
     strip-ansi "^6.0.0"
 
-"@jest/environment@^26.5.2":
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.5.2.tgz#eba3cfc698f6e03739628f699c28e8a07f5e65fe"
-  integrity sha512-YjhCD/Zhkz0/1vdlS/QN6QmuUdDkpgBdK4SdiVg4Y19e29g4VQYN5Xg8+YuHjdoWGY7wJHMxc79uDTeTOy9Ngw==
+"@jest/environment@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.6.2.tgz#ba364cc72e221e79cc8f0a99555bf5d7577cf92c"
+  integrity sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA==
   dependencies:
-    "@jest/fake-timers" "^26.5.2"
-    "@jest/types" "^26.5.2"
+    "@jest/fake-timers" "^26.6.2"
+    "@jest/types" "^26.6.2"
     "@types/node" "*"
-    jest-mock "^26.5.2"
-
-"@jest/fake-timers@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-24.9.0.tgz#ba3e6bf0eecd09a636049896434d306636540c93"
-  integrity sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A==
-  dependencies:
-    "@jest/types" "^24.9.0"
-    jest-message-util "^24.9.0"
-    jest-mock "^24.9.0"
+    jest-mock "^26.6.2"
 
 "@jest/fake-timers@^25.1.0":
   version "25.5.0"
@@ -1491,37 +1116,37 @@
     jest-util "^25.5.0"
     lolex "^5.0.0"
 
-"@jest/fake-timers@^26.5.2":
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.5.2.tgz#1291ac81680ceb0dc7daa1f92c059307eea6400a"
-  integrity sha512-09Hn5Oraqt36V1akxQeWMVL0fR9c6PnEhpgLaYvREXZJAh2H2Y+QLCsl0g7uMoJeoWJAuz4tozk1prbR1Fc1sw==
+"@jest/fake-timers@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.6.2.tgz#459c329bcf70cee4af4d7e3f3e67848123535aad"
+  integrity sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA==
   dependencies:
-    "@jest/types" "^26.5.2"
+    "@jest/types" "^26.6.2"
     "@sinonjs/fake-timers" "^6.0.1"
     "@types/node" "*"
-    jest-message-util "^26.5.2"
-    jest-mock "^26.5.2"
-    jest-util "^26.5.2"
+    jest-message-util "^26.6.2"
+    jest-mock "^26.6.2"
+    jest-util "^26.6.2"
 
-"@jest/globals@^26.5.2":
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.5.2.tgz#c333f82c29e19ecb609a75d1a532915a5c956c59"
-  integrity sha512-9PmnFsAUJxpPt1s/stq02acS1YHliVBDNfAWMe1bwdRr1iTCfhbNt3ERQXrO/ZfZSweftoA26Q/2yhSVSWQ3sw==
+"@jest/globals@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.6.2.tgz#5b613b78a1aa2655ae908eba638cc96a20df720a"
+  integrity sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA==
   dependencies:
-    "@jest/environment" "^26.5.2"
-    "@jest/types" "^26.5.2"
-    expect "^26.5.2"
+    "@jest/environment" "^26.6.2"
+    "@jest/types" "^26.6.2"
+    expect "^26.6.2"
 
-"@jest/reporters@^26.5.2":
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.5.2.tgz#0f1c900c6af712b46853d9d486c9c0382e4050f6"
-  integrity sha512-zvq6Wvy6MmJq/0QY0YfOPb49CXKSf42wkJbrBPkeypVa8I+XDxijvFuywo6TJBX/ILPrdrlE/FW9vJZh6Rf9vA==
+"@jest/reporters@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.6.2.tgz#1f518b99637a5f18307bd3ecf9275f6882a667f6"
+  integrity sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw==
   dependencies:
     "@bcoe/v8-coverage" "^0.2.3"
-    "@jest/console" "^26.5.2"
-    "@jest/test-result" "^26.5.2"
-    "@jest/transform" "^26.5.2"
-    "@jest/types" "^26.5.2"
+    "@jest/console" "^26.6.2"
+    "@jest/test-result" "^26.6.2"
+    "@jest/transform" "^26.6.2"
+    "@jest/types" "^26.6.2"
     chalk "^4.0.0"
     collect-v8-coverage "^1.0.0"
     exit "^0.1.2"
@@ -1532,118 +1157,69 @@
     istanbul-lib-report "^3.0.0"
     istanbul-lib-source-maps "^4.0.0"
     istanbul-reports "^3.0.2"
-    jest-haste-map "^26.5.2"
-    jest-resolve "^26.5.2"
-    jest-util "^26.5.2"
-    jest-worker "^26.5.0"
+    jest-haste-map "^26.6.2"
+    jest-resolve "^26.6.2"
+    jest-util "^26.6.2"
+    jest-worker "^26.6.2"
     slash "^3.0.0"
     source-map "^0.6.0"
     string-length "^4.0.1"
     terminal-link "^2.0.0"
-    v8-to-istanbul "^5.0.1"
+    v8-to-istanbul "^7.0.0"
   optionalDependencies:
     node-notifier "^8.0.0"
 
-"@jest/source-map@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-24.9.0.tgz#0e263a94430be4b41da683ccc1e6bffe2a191714"
-  integrity sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==
-  dependencies:
-    callsites "^3.0.0"
-    graceful-fs "^4.1.15"
-    source-map "^0.6.0"
-
-"@jest/source-map@^26.5.0":
-  version "26.5.0"
-  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.5.0.tgz#98792457c85bdd902365cd2847b58fff05d96367"
-  integrity sha512-jWAw9ZwYHJMe9eZq/WrsHlwF8E3hM9gynlcDpOyCb9bR8wEd9ZNBZCi7/jZyzHxC7t3thZ10gO2IDhu0bPKS5g==
+"@jest/source-map@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.6.2.tgz#29af5e1e2e324cafccc936f218309f54ab69d535"
+  integrity sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA==
   dependencies:
     callsites "^3.0.0"
     graceful-fs "^4.2.4"
     source-map "^0.6.0"
 
-"@jest/test-result@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.9.0.tgz#11796e8aa9dbf88ea025757b3152595ad06ba0ca"
-  integrity sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==
+"@jest/test-result@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.6.2.tgz#55da58b62df134576cc95476efa5f7949e3f5f18"
+  integrity sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==
   dependencies:
-    "@jest/console" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    "@types/istanbul-lib-coverage" "^2.0.0"
-
-"@jest/test-result@^26.5.2":
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.5.2.tgz#cc1a44cfd4db2ecee3fb0bc4e9fe087aa54b5230"
-  integrity sha512-E/Zp6LURJEGSCWpoMGmCFuuEI1OWuI3hmZwmULV0GsgJBh7u0rwqioxhRU95euUuviqBDN8ruX/vP/4bwYolXw==
-  dependencies:
-    "@jest/console" "^26.5.2"
-    "@jest/types" "^26.5.2"
+    "@jest/console" "^26.6.2"
+    "@jest/types" "^26.6.2"
     "@types/istanbul-lib-coverage" "^2.0.0"
     collect-v8-coverage "^1.0.0"
 
-"@jest/test-sequencer@^26.5.2":
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.5.2.tgz#c4559c7e134b27b020317303ee5399bf62917a4b"
-  integrity sha512-XmGEh7hh07H2B8mHLFCIgr7gA5Y6Hw1ZATIsbz2fOhpnQ5AnQtZk0gmP0Q5/+mVB2xygO64tVFQxOajzoptkNA==
+"@jest/test-sequencer@^26.6.3":
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz#98e8a45100863886d074205e8ffdc5a7eb582b17"
+  integrity sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw==
   dependencies:
-    "@jest/test-result" "^26.5.2"
+    "@jest/test-result" "^26.6.2"
     graceful-fs "^4.2.4"
-    jest-haste-map "^26.5.2"
-    jest-runner "^26.5.2"
-    jest-runtime "^26.5.2"
+    jest-haste-map "^26.6.2"
+    jest-runner "^26.6.3"
+    jest-runtime "^26.6.3"
 
-"@jest/transform@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-24.9.0.tgz#4ae2768b296553fadab09e9ec119543c90b16c56"
-  integrity sha512-TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ==
+"@jest/transform@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.6.2.tgz#5ac57c5fa1ad17b2aae83e73e45813894dcf2e4b"
+  integrity sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==
   dependencies:
     "@babel/core" "^7.1.0"
-    "@jest/types" "^24.9.0"
-    babel-plugin-istanbul "^5.1.0"
-    chalk "^2.0.1"
-    convert-source-map "^1.4.0"
-    fast-json-stable-stringify "^2.0.0"
-    graceful-fs "^4.1.15"
-    jest-haste-map "^24.9.0"
-    jest-regex-util "^24.9.0"
-    jest-util "^24.9.0"
-    micromatch "^3.1.10"
-    pirates "^4.0.1"
-    realpath-native "^1.1.0"
-    slash "^2.0.0"
-    source-map "^0.6.1"
-    write-file-atomic "2.4.1"
-
-"@jest/transform@^26.5.2":
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.5.2.tgz#6a0033a1d24316a1c75184d010d864f2c681bef5"
-  integrity sha512-AUNjvexh+APhhmS8S+KboPz+D3pCxPvEAGduffaAJYxIFxGi/ytZQkrqcKDUU0ERBAo5R7087fyOYr2oms1seg==
-  dependencies:
-    "@babel/core" "^7.1.0"
-    "@jest/types" "^26.5.2"
+    "@jest/types" "^26.6.2"
     babel-plugin-istanbul "^6.0.0"
     chalk "^4.0.0"
     convert-source-map "^1.4.0"
     fast-json-stable-stringify "^2.0.0"
     graceful-fs "^4.2.4"
-    jest-haste-map "^26.5.2"
+    jest-haste-map "^26.6.2"
     jest-regex-util "^26.0.0"
-    jest-util "^26.5.2"
+    jest-util "^26.6.2"
     micromatch "^4.0.2"
     pirates "^4.0.1"
     slash "^3.0.0"
     source-map "^0.6.1"
     write-file-atomic "^3.0.0"
 
-"@jest/types@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.9.0.tgz#63cb26cb7500d069e5a389441a7c6ab5e909fc59"
-  integrity sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==
-  dependencies:
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^1.1.1"
-    "@types/yargs" "^13.0.0"
-
 "@jest/types@^25.5.0":
   version "25.5.0"
   resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.5.0.tgz#4d6a4793f7b9599fc3680877b856a97dbccf2a9d"
@@ -1654,10 +1230,10 @@
     "@types/yargs" "^15.0.0"
     chalk "^3.0.0"
 
-"@jest/types@^26.5.2":
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.5.2.tgz#44c24f30c8ee6c7f492ead9ec3f3c62a5289756d"
-  integrity sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==
+"@jest/types@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e"
+  integrity sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.0"
     "@types/istanbul-reports" "^3.0.0"
@@ -1665,28 +1241,53 @@
     "@types/yargs" "^15.0.0"
     chalk "^4.0.0"
 
-"@mrmlnc/readdir-enhanced@^2.2.1":
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
-  integrity sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==
+"@nicolo-ribaudo/chokidar-2@2.1.8-no-fsevents":
+  version "2.1.8-no-fsevents"
+  resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.tgz#da7c3996b8e6e19ebd14d82eaced2313e7769f9b"
+  integrity sha512-+nb9vWloHNNMFHjGofEam3wopE3m1yuambrrd/fnPc+lFOMB9ROTqQlche9ByFWNkdNqfSgR/kkQtQ8DzEWt2w==
   dependencies:
-    call-me-maybe "^1.0.1"
-    glob-to-regexp "^0.3.0"
+    anymatch "^2.0.0"
+    async-each "^1.0.1"
+    braces "^2.3.2"
+    glob-parent "^3.1.0"
+    inherits "^2.0.3"
+    is-binary-path "^1.0.0"
+    is-glob "^4.0.0"
+    normalize-path "^3.0.0"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.2.1"
+    upath "^1.1.1"
 
-"@nodelib/fs.stat@^1.1.2":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
-  integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
-
-"@peculiar/asn1-schema@^2.0.12", "@peculiar/asn1-schema@^2.0.13":
-  version "2.0.17"
-  resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-2.0.17.tgz#5c5fcdabefacb1f0fc1579f333f70057d58ab211"
-  integrity sha512-7rJD8bR1r6NFE4skDxXsLsFEO3zM2TfjX9wdq5SERoBNEuxGkAJ3uIH84sIMxvDgJtb3cMfLsv8iNpGN0nAWdw==
+"@nodelib/fs.scandir@2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69"
+  integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==
   dependencies:
-    "@types/asn1js" "^0.0.1"
+    "@nodelib/fs.stat" "2.0.4"
+    run-parallel "^1.1.9"
+
+"@nodelib/fs.stat@2.0.4", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655"
+  integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==
+
+"@nodelib/fs.walk@^1.2.3":
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz#cce9396b30aa5afe9e3756608f5831adcb53d063"
+  integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==
+  dependencies:
+    "@nodelib/fs.scandir" "2.1.4"
+    fastq "^1.6.0"
+
+"@peculiar/asn1-schema@^2.0.12", "@peculiar/asn1-schema@^2.0.26":
+  version "2.0.27"
+  resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-2.0.27.tgz#1ee3b2b869ff3200bcc8ec60e6c87bd5a6f03fe0"
+  integrity sha512-1tIx7iL3Ma3HtnNS93nB7nhyI0soUJypElj9owd4tpMrRDmeJ8eZubsdq1sb0KSaCs5RqZNoABCP6m5WtnlVhQ==
+  dependencies:
+    "@types/asn1js" "^2.0.0"
     asn1js "^2.0.26"
-    pvtsutils "^1.0.11"
-    tslib "^2.0.1"
+    pvtsutils "^1.1.1"
+    tslib "^2.0.3"
 
 "@peculiar/json-schema@^1.1.12":
   version "1.1.12"
@@ -1695,21 +1296,21 @@
   dependencies:
     tslib "^2.0.0"
 
-"@peculiar/webcrypto@^1.1.3":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@peculiar/webcrypto/-/webcrypto-1.1.3.tgz#54301b4cfa22e9d879fd8d460528fa44a1548119"
-  integrity sha512-M1mipPJkWzIf92w3T1Vx5ir3kV9c0oWCcLkeh4vNa/3XDEtQ7xxj5NRKyq67NuVNKLH2/0JD1crlLJyqfYbfBA==
+"@peculiar/webcrypto@^1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@peculiar/webcrypto/-/webcrypto-1.1.4.tgz#cbbe2195e5e6f879780bdac9a66bcbaca75c483c"
+  integrity sha512-gEVxfbseFDV0Za3AmjTrRB+wigEMOejHDzoo571e8/YWD33Ejmk0XPF3+G+VaN8+5C5IWZx4CPvxQZ7mF2dvNA==
   dependencies:
-    "@peculiar/asn1-schema" "^2.0.13"
+    "@peculiar/asn1-schema" "^2.0.26"
     "@peculiar/json-schema" "^1.1.12"
-    pvtsutils "^1.0.11"
-    tslib "^2.0.1"
-    webcrypto-core "^1.1.6"
+    pvtsutils "^1.1.1"
+    tslib "^2.0.3"
+    webcrypto-core "^1.1.8"
 
 "@sinonjs/commons@^1.7.0":
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.0.tgz#c8d68821a854c555bba172f3b06959a0039b236d"
-  integrity sha512-wEj54PfsZ5jGSwMX68G8ZXFawcSglQSXqCftWX3ec8MDUzQdHgcKvw97awHbY0efQEL5iKUOAmmVtoYgmrSG4Q==
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.2.tgz#858f5c4b48d80778fde4b9d541f27edc0d56488b"
+  integrity sha512-sruwd86RJHdsVf/AtBoijDmUqJp3B6hF/DGC23C+JaegnDHaZyewCjoVGTdg3J0uz3Zs7NnIT05OBOmML72lQw==
   dependencies:
     type-detect "4.0.8"
 
@@ -1720,28 +1321,37 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
-"@types/asn1js@^0.0.1":
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/@types/asn1js/-/asn1js-0.0.1.tgz#ef8b9f9708cb1632a1c3a9cd27717caabe793bc2"
-  integrity sha1-74uflwjLFjKhw6nNJ3F8qr55O8I=
+"@sinonjs/fake-timers@^7.0.2":
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-7.0.2.tgz#a53e71d4154ee704ea9b36a6d0b0780e246fadd1"
+  integrity sha512-dF84L5YC90gIOegPDCYymPIsDmwMWWSh7BwfDXQYePi8lVIEp7IZ1UVGkME8FjXOsDPxan12x4aaK+Lo6wVh9A==
   dependencies:
-    "@types/pvutils" "*"
+    "@sinonjs/commons" "^1.7.0"
+
+"@stylelint/postcss-css-in-js@^0.37.2":
+  version "0.37.2"
+  resolved "https://registry.yarnpkg.com/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.2.tgz#7e5a84ad181f4234a2480803422a47b8749af3d2"
+  integrity sha512-nEhsFoJurt8oUmieT8qy4nk81WRHmJynmVwn/Vts08PL9fhgIsMhk1GId5yAN643OzqEEb5S/6At2TZW7pqPDA==
+  dependencies:
+    "@babel/core" ">=7.9.0"
+
+"@stylelint/postcss-markdown@^0.36.2":
+  version "0.36.2"
+  resolved "https://registry.yarnpkg.com/@stylelint/postcss-markdown/-/postcss-markdown-0.36.2.tgz#0a540c4692f8dcdfc13c8e352c17e7bfee2bb391"
+  integrity sha512-2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ==
+  dependencies:
+    remark "^13.0.0"
+    unist-util-find-all-after "^3.0.2"
+
+"@types/asn1js@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@types/asn1js/-/asn1js-2.0.0.tgz#10ca75692575744d0117098148a8dc84cbee6682"
+  integrity sha512-Jjzp5EqU0hNpADctc/UqhiFbY1y2MqIxBVa2S4dBlbnZHTLPMuggoL5q43X63LpsOIINRDirBjP56DUUKIUWIA==
 
 "@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7":
-  version "7.1.10"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.10.tgz#ca58fc195dd9734e77e57c6f2df565623636ab40"
-  integrity sha512-x8OM8XzITIMyiwl5Vmo2B1cR1S1Ipkyv4mdlbJjMa1lmuKvKY9FrBbEANIaMlnWn5Rf7uO+rC/VgYabNkE17Hw==
-  dependencies:
-    "@babel/parser" "^7.1.0"
-    "@babel/types" "^7.0.0"
-    "@types/babel__generator" "*"
-    "@types/babel__template" "*"
-    "@types/babel__traverse" "*"
-
-"@types/babel__core@^7.1.0":
-  version "7.1.8"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.8.tgz#057f725aca3641f49fc11c7a87a9de5ec588a5d7"
-  integrity sha512-KXBiQG2OXvaPWFPDS1rD8yV9vO0OuWIqAEqLsbfX0oU2REN5KuoMnZ1gClWcBhO5I3n6oTVAmrMufOvRqdmFTQ==
+  version "7.1.12"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.12.tgz#4d8e9e51eb265552a7e4f1ff2219ab6133bdfb2d"
+  integrity sha512-wMTHiiTiBAAPebqaPiPDLFA4LYPKr6Ph0Xq/6rq1Ur3v66HXyG+clfR9CNETkD7MQS8ZHvpQOtA53DLws5WAEQ==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -1750,53 +1360,41 @@
     "@types/babel__traverse" "*"
 
 "@types/babel__generator@*":
-  version "7.6.1"
-  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.1.tgz#4901767b397e8711aeb99df8d396d7ba7b7f0e04"
-  integrity sha512-bBKm+2VPJcMRVwNhxKu8W+5/zT7pwNEqeokFOmbvVSqGzFneNxYcEBro9Ac7/N9tlsaPYnZLK8J1LWKkMsLAew==
+  version "7.6.2"
+  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.2.tgz#f3d71178e187858f7c45e30380f8f1b7415a12d8"
+  integrity sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@types/babel__template@*":
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.2.tgz#4ff63d6b52eddac1de7b975a5223ed32ecea9307"
-  integrity sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.0.tgz#0c888dd70b3ee9eebb6e4f200e809da0076262be"
+  integrity sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
 
-"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
-  version "7.0.12"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.12.tgz#22f49a028e69465390f87bb103ebd61bd086b8f5"
-  integrity sha512-t4CoEokHTfcyfb4hUaF9oOHu9RmmNWnm1CP0YmMqOOfClKascOmvlEM736vlqeScuGvBDsHkf8R2INd4DWreQA==
+"@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.0.tgz#b9a1efa635201ba9bc850323a8793ee2d36c04a0"
+  integrity sha512-kSjgDMZONiIfSH1Nxcr5JIRMwUetDki63FSQfpTCz8ogF3Ulqm8+mr5f78dUYs6vMiB6gBusQqfQmBvHZj/lwg==
   dependencies:
     "@babel/types" "^7.3.0"
 
-"@types/babel__traverse@^7.0.4":
-  version "7.0.15"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.15.tgz#db9e4238931eb69ef8aab0ad6523d4d4caa39d03"
-  integrity sha512-Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A==
-  dependencies:
-    "@babel/types" "^7.3.0"
-
-"@types/classnames@^2.2.10":
-  version "2.2.10"
-  resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.2.10.tgz#cc658ca319b6355399efc1f5b9e818f1a24bf999"
-  integrity sha512-1UzDldn9GfYYEsWWnn/P4wkTlkZDH7lDb0wBMGbtIQc9zXEQq7FlKBdZUn6OBqD8sKZZ2RQO2mAjGpXiDGoRmQ==
-
-"@types/color-name@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
-  integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
+"@types/classnames@^2.2.11":
+  version "2.2.11"
+  resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.2.11.tgz#2521cc86f69d15c5b90664e4829d84566052c1cf"
+  integrity sha512-2koNhpWm3DgWRp5tpkiJ8JGc1xTn2q0l+jUNUE7oMKXUf5NpI9AIdC4kbjGNFBdHtcxBD18LAksoudAVhFKCjw==
 
 "@types/counterpart@^0.18.1":
   version "0.18.1"
   resolved "https://registry.yarnpkg.com/@types/counterpart/-/counterpart-0.18.1.tgz#b1b784d9e54d9879f0a8cb12f2caedab65430fe8"
   integrity sha512-PRuFlBBkvdDOtxlIASzTmkEFar+S66Ek48NVVTWMUjtJAdn5vyMSN8y6IZIoIymGpR36q2nZbIYazBWyFxL+IQ==
 
-"@types/eslint-visitor-keys@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d"
-  integrity sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==
+"@types/events@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
+  integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
 
 "@types/fbemitter@*":
   version "2.0.32"
@@ -1811,27 +1409,14 @@
     "@types/fbemitter" "*"
     "@types/react" "*"
 
-"@types/glob@^7.1.1":
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.2.tgz#06ca26521353a545d94a0adc74f38a59d232c987"
-  integrity sha512-VgNIkxK+j7Nz5P7jvUZlRvhuPSmsEfS03b0alKcq5V/STUKAa3Plemsn5mrQUO7am6OErJ4rhGEGJbACclrtRA==
-  dependencies:
-    "@types/minimatch" "*"
-    "@types/node" "*"
-
 "@types/graceful-fs@^4.1.2":
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.3.tgz#039af35fe26bec35003e8d86d2ee9c586354348f"
-  integrity sha512-AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ==
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.4.tgz#4ff9f641a7c6d1a3508ff88bc3141b152772e753"
+  integrity sha512-mWA/4zFQhfvOA8zWkXobwJvBD7vzcxgrOQ0J5CH1votGqdq9m7+FwtGaqyCZqC3NyyBkc9z4m+iry4LlqcMWJg==
   dependencies:
     "@types/node" "*"
 
-"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.2.tgz#79d7a78bad4219f4c03d6557a1c72d9ca6ba62d5"
-  integrity sha512-rsZg7eL+Xcxsxk2XlBt9KcG8nOp9iYdKCOikY9x2RFJCyOdNj4MKPQty0e8oZr29vVAzKXr1BmR+kZauti3o1w==
-
-"@types/istanbul-lib-coverage@^2.0.1":
+"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762"
   integrity sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==
@@ -1858,10 +1443,18 @@
   dependencies:
     "@types/istanbul-lib-report" "*"
 
+"@types/jest@^26.0.20":
+  version "26.0.20"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.20.tgz#cd2f2702ecf69e86b586e1f5223a60e454056307"
+  integrity sha512-9zi2Y+5USJRxd0FsahERhBwlcvFh6D2GLQnY2FH2BzK8J9s9omvNHIbvABwIluXa0fD8XVKMLTO0aOEuUfACAA==
+  dependencies:
+    jest-diff "^26.0.0"
+    pretty-format "^26.0.0"
+
 "@types/json-schema@^7.0.3":
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"
-  integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==
+  version "7.0.7"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
+  integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==
 
 "@types/json5@^0.0.29":
   version "0.0.29"
@@ -1875,30 +1468,32 @@
   dependencies:
     "@types/react" "*"
 
-"@types/lodash@^4.14.158":
-  version "4.14.158"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.158.tgz#b38ea8b6fe799acd076d7a8d7ab71c26ef77f785"
-  integrity sha512-InCEXJNTv/59yO4VSfuvNrZHt7eeNtWQEgnieIA+mIC+MOWM9arOWG2eQ8Vhk6NbOre6/BidiXhkZYeDY9U35w==
+"@types/lodash@^4.14.168":
+  version "4.14.168"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.168.tgz#fe24632e79b7ade3f132891afff86caa5e5ce008"
+  integrity sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q==
 
-"@types/minimatch@*":
+"@types/mdast@^3.0.0":
   version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
-  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
+  resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.3.tgz#2d7d671b1cd1ea3deb306ea75036c2a0407d2deb"
+  integrity sha512-SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw==
+  dependencies:
+    "@types/unist" "*"
+
+"@types/minimist@^1.2.0":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.1.tgz#283f669ff76d7b8260df8ab7a4262cc83d988256"
+  integrity sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==
 
 "@types/modernizr@^3.5.3":
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/@types/modernizr/-/modernizr-3.5.3.tgz#8ef99e6252191c1d88647809109dc29884ba6d7a"
   integrity sha512-jhMOZSS0UGYTS9pqvt6q3wtT3uvOSve5piTEmTMx3zzTuBLvSIMxSIBIc3d5lajVD5h4xc41AMZD2M5orN3PxA==
 
-"@types/node@*":
-  version "14.0.11"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.11.tgz#61d4886e2424da73b7b25547f59fdcb534c165a3"
-  integrity sha512-lCvvI24L21ZVeIiyIUHZ5Oflv1hhHQ5E1S25IRlKIXaRkVgmXpJMI3wUJkmym2bTbCe+WoIibQnMVAU3FguaOg==
-
-"@types/node@^12.12.51":
-  version "12.12.51"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.51.tgz#446a67af8c5ff98947d7cef296484c6ad47ddb16"
-  integrity sha512-6ILqt8iNThALrxDv2Q4LyYFQxULQz96HKNIFd4s9QRQaiHINYeUpLqeU/2IU7YMtvipG1fQVAy//vY8/fX1Y9w==
+"@types/node@*", "@types/node@^14.14.22":
+  version "14.14.22"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.22.tgz#0d29f382472c4ccf3bd96ff0ce47daf5b7b84b18"
+  integrity sha512-g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
@@ -1910,34 +1505,34 @@
   resolved "https://registry.yarnpkg.com/@types/pako/-/pako-1.0.1.tgz#33b237f3c9aff44d0f82fe63acffa4a365ef4a61"
   integrity sha512-GdZbRSJ3Cv5fiwT6I0SQ3ckeN2PWNqxd26W9Z2fCK1tGrrasGy4puvNFtnddqH9UJFMQYXxEuuB7B8UK+LLwSg==
 
+"@types/parse-json@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
+  integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
+
 "@types/prettier@^2.0.0":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.1.1.tgz#be148756d5480a84cde100324c03a86ae5739fb5"
-  integrity sha512-2zs+O+UkDsJ1Vcp667pd3f8xearMdopz/z54i99wtRDI5KLmngk7vlrYZD0ZjKHaROR03EznlBbVY9PfAEyJIQ==
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.1.6.tgz#f4b1efa784e8db479cdb8b14403e2144b1e9ff03"
+  integrity sha512-6gOkRe7OIioWAXfnO/2lFiv+SJichKVSys1mSsgyrYHSEjk8Ctv4tSR/Odvnu+HWlH2C8j53dahU03XmQdd5fA==
 
 "@types/prop-types@*":
   version "15.7.3"
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"
   integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==
 
-"@types/pvutils@*":
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/@types/pvutils/-/pvutils-0.0.2.tgz#e21684962cfa58ac920fd576d90556032dc86009"
-  integrity sha512-CgQAm7pjyeF3Gnv78ty4RBVIfluB+Td+2DR8iPaU0prF18pkzptHHP+DoKPfpsJYknKsVZyVsJEu5AuGgAqQ5w==
-
-"@types/qrcode@^1.3.4":
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/@types/qrcode/-/qrcode-1.3.4.tgz#984d97bb72caa558d470158701081ccb712f616b"
-  integrity sha512-aILE5yvKaqQXlY0YPMEYwK/KwdD43fwQTyagj0ffBBTQj8h//085Zp8LUrOnZ9FT69x64f5UgDo0EueY4BPAdg==
+"@types/qrcode@^1.3.5":
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/@types/qrcode/-/qrcode-1.3.5.tgz#9c97cc2875f03e2b16a0d89856fc48414e380c38"
+  integrity sha512-92QMnMb9m0ErBU20za5Eqtf4lzUcSkk5w/Cz30q5qod0lWHm2loztmFs2EnCY06yT51GY1+m/oFq2D8qVK2Bjg==
   dependencies:
     "@types/node" "*"
 
-"@types/react-dom@^16.9.8":
-  version "16.9.8"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.8.tgz#fe4c1e11dfc67155733dfa6aa65108b4971cb423"
-  integrity sha512-ykkPQ+5nFknnlU6lDd947WbQ6TE3NNzbQAkInC2EKY1qeYdTKp7onFusmYZb+ityzx2YviqT6BXSu+LyWWJwcA==
+"@types/react-dom@^16.9.10":
+  version "16.9.10"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.10.tgz#4485b0bec3d41f856181b717f45fd7831101156f"
+  integrity sha512-ItatOrnXDMAYpv6G8UCk2VhbYVTjZT9aorLtA/OzDN9XJ2GKcfam68jutoAcILdRjsRUO8qb7AmyObF77Q8QFw==
   dependencies:
-    "@types/react" "*"
+    "@types/react" "^16"
 
 "@types/react-transition-group@^4.4.0":
   version "4.4.0"
@@ -1946,18 +1541,18 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react@*", "@types/react@^16.9":
-  version "16.9.35"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.35.tgz#a0830d172e8aadd9bd41709ba2281a3124bbd368"
-  integrity sha512-q0n0SsWcGc8nDqH2GJfWQWUOmZSJhXV64CjVN5SvcNti3TdEaA3AH0D8DwNmMdzjMAC/78tB8nAZIlV8yTz+zQ==
+"@types/react@*", "@types/react@^16", "@types/react@^16.14", "@types/react@^16.9":
+  version "16.14.2"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.2.tgz#85dcc0947d0645349923c04ccef6018a1ab7538c"
+  integrity sha512-BzzcAlyDxXl2nANlabtT4thtvbbnhee8hMmH/CcJrISDBVcJS1iOsP1f0OAgSdGE0MsY9tqcrb9YoZcOFv9dbQ==
   dependencies:
     "@types/prop-types" "*"
-    csstype "^2.2.0"
+    csstype "^3.0.2"
 
-"@types/sanitize-html@^1.23.3":
-  version "1.23.3"
-  resolved "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-1.23.3.tgz#26527783aba3bf195ad8a3c3e51bd3713526fc0d"
-  integrity sha512-Isg8N0ifKdDq6/kaNlIcWfapDXxxquMSk2XC5THsOICRyOIhQGds95XH75/PL/g9mExi4bL8otIqJM/Wo96WxA==
+"@types/sanitize-html@^1.27.0":
+  version "1.27.0"
+  resolved "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-1.27.0.tgz#77702dc856f16efecc005014c1d2e45b1f2cbc56"
+  integrity sha512-j7Vnh3P7W4ZcoRsHNO2HpwA2m1d0c2+l39xqSQqH0+WlfcvKypgZp45eCC7NJ75ZyXPxNb2PSbIL6LtZ6E0Qbw==
   dependencies:
     htmlparser2 "^4.1.0"
 
@@ -1976,38 +1571,15 @@
   resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e"
   integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==
 
-"@types/vfile-message@*":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@types/vfile-message/-/vfile-message-2.0.0.tgz#690e46af0fdfc1f9faae00cd049cc888957927d5"
-  integrity sha512-GpTIuDpb9u4zIO165fUy9+fXcULdD8HFRNli04GehoMVbeNq7D6OBnqSmg3lxZnC+UvgUhEWKxdKiwYUkGltIw==
-  dependencies:
-    vfile-message "*"
-
-"@types/vfile@^3.0.0":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@types/vfile/-/vfile-3.0.2.tgz#19c18cd232df11ce6fa6ad80259bc86c366b09b9"
-  integrity sha512-b3nLFGaGkJ9rzOcuXRfHkZMdjsawuDD0ENL9fzTophtBg8FJHSGbH7daXkEpcwy3v7Xol3pAvsmlYyFhR4pqJw==
-  dependencies:
-    "@types/node" "*"
-    "@types/unist" "*"
-    "@types/vfile-message" "*"
-
 "@types/yargs-parser@*":
-  version "15.0.0"
-  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d"
-  integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==
-
-"@types/yargs@^13.0.0":
-  version "13.0.9"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.9.tgz#44028e974343c7afcf3960f1a2b1099c39a7b5e1"
-  integrity sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==
-  dependencies:
-    "@types/yargs-parser" "*"
+  version "20.2.0"
+  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.0.tgz#dd3e6699ba3237f0348cd085e4698780204842f9"
+  integrity sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==
 
 "@types/yargs@^15.0.0":
-  version "15.0.7"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.7.tgz#dad50a7a234a35ef9460737a56024287a3de1d2b"
-  integrity sha512-Gf4u3EjaPNcC9cTu4/j2oN14nSVhr8PQ+BvBcBQHAhDZfl0bVIiLgvnRXv/dn58XhTm9UXvBpvJpDlwV65QxOA==
+  version "15.0.12"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.12.tgz#6234ce3e3e3fa32c5db301a170f96a599c960d74"
+  integrity sha512-f+fD/fQAo3BCbCDlrUpznF1A5Zp9rB0noS5vnoormHSIPFKL0Z2DcUJ3Gxp5ytH4uLRNxy7AwYUC9exZzqGMAw==
   dependencies:
     "@types/yargs-parser" "*"
 
@@ -2016,110 +1588,76 @@
   resolved "https://registry.yarnpkg.com/@types/zxcvbn/-/zxcvbn-4.4.0.tgz#fbc1d941cc6d9d37d18405c513ba6b294f89b609"
   integrity sha512-GQLOT+SN20a+AI51y3fAimhyTF4Y0RG+YP3gf91OibIZ7CJmPFgoZi+ZR5a+vRbS01LbQosITWum4ATmJ1Z6Pg==
 
-"@typescript-eslint/eslint-plugin@^3.4.0":
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.4.0.tgz#8378062e6be8a1d049259bdbcf27ce5dfbeee62b"
-  integrity sha512-wfkpiqaEVhZIuQRmudDszc01jC/YR7gMSxa6ulhggAe/Hs0KVIuo9wzvFiDbG3JD5pRFQoqnf4m7REDsUvBnMQ==
+"@typescript-eslint/eslint-plugin@^4.14.0":
+  version "4.14.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.14.0.tgz#92db8e7c357ed7d69632d6843ca70b71be3a721d"
+  integrity sha512-IJ5e2W7uFNfg4qh9eHkHRUCbgZ8VKtGwD07kannJvM5t/GU8P8+24NX8gi3Hf5jST5oWPY8kyV1s/WtfiZ4+Ww==
   dependencies:
-    "@typescript-eslint/experimental-utils" "3.4.0"
+    "@typescript-eslint/experimental-utils" "4.14.0"
+    "@typescript-eslint/scope-manager" "4.14.0"
     debug "^4.1.1"
     functional-red-black-tree "^1.0.1"
+    lodash "^4.17.15"
     regexpp "^3.0.0"
     semver "^7.3.2"
     tsutils "^3.17.1"
 
-"@typescript-eslint/eslint-plugin@^3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.7.0.tgz#0f91aa3c83d019591719e597fbdb73a59595a263"
-  integrity sha512-4OEcPON3QIx0ntsuiuFP/TkldmBGXf0uKxPQlGtS/W2F3ndYm8Vgdpj/woPJkzUc65gd3iR+qi3K8SDQP/obFg==
-  dependencies:
-    "@typescript-eslint/experimental-utils" "3.7.0"
-    debug "^4.1.1"
-    functional-red-black-tree "^1.0.1"
-    regexpp "^3.0.0"
-    semver "^7.3.2"
-    tsutils "^3.17.1"
-
-"@typescript-eslint/experimental-utils@3.4.0":
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-3.4.0.tgz#8a44dfc6fb7f1d071937b390fe27608ebda122b8"
-  integrity sha512-rHPOjL43lOH1Opte4+dhC0a/+ks+8gOBwxXnyrZ/K4OTAChpSjP76fbI8Cglj7V5GouwVAGaK+xVwzqTyE/TPw==
+"@typescript-eslint/experimental-utils@4.14.0":
+  version "4.14.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.14.0.tgz#5aa7b006736634f588a69ee343ca959cd09988df"
+  integrity sha512-6i6eAoiPlXMKRbXzvoQD5Yn9L7k9ezzGRvzC/x1V3650rUk3c3AOjQyGYyF9BDxQQDK2ElmKOZRD0CbtdkMzQQ==
   dependencies:
     "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/typescript-estree" "3.4.0"
+    "@typescript-eslint/scope-manager" "4.14.0"
+    "@typescript-eslint/types" "4.14.0"
+    "@typescript-eslint/typescript-estree" "4.14.0"
     eslint-scope "^5.0.0"
     eslint-utils "^2.0.0"
 
-"@typescript-eslint/experimental-utils@3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-3.7.0.tgz#0ee21f6c48b2b30c63211da23827725078d5169a"
-  integrity sha512-xpfXXAfZqhhqs5RPQBfAFrWDHoNxD5+sVB5A46TF58Bq1hRfVROrWHcQHHUM9aCBdy9+cwATcvCbRg8aIRbaHQ==
-  dependencies:
-    "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/types" "3.7.0"
-    "@typescript-eslint/typescript-estree" "3.7.0"
-    eslint-scope "^5.0.0"
-    eslint-utils "^2.0.0"
-
-"@typescript-eslint/parser@^3.4.0":
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-3.4.0.tgz#fe52b68c5cb3bba3f5d875bd17adb70420d49d8d"
-  integrity sha512-ZUGI/de44L5x87uX5zM14UYcbn79HSXUR+kzcqU42gH0AgpdB/TjuJy3m4ezI7Q/jk3wTQd755mxSDLhQP79KA==
-  dependencies:
-    "@types/eslint-visitor-keys" "^1.0.0"
-    "@typescript-eslint/experimental-utils" "3.4.0"
-    "@typescript-eslint/typescript-estree" "3.4.0"
-    eslint-visitor-keys "^1.1.0"
-
-"@typescript-eslint/parser@^3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-3.7.0.tgz#3e9cd9df9ea644536feb6e5acdb8279ecff96ce9"
-  integrity sha512-2LZauVUt7jAWkcIW7djUc3kyW+fSarNEuM3RF2JdLHR9BfX/nDEnyA4/uWz0wseoWVZbDXDF7iF9Jc342flNqQ==
-  dependencies:
-    "@types/eslint-visitor-keys" "^1.0.0"
-    "@typescript-eslint/experimental-utils" "3.7.0"
-    "@typescript-eslint/types" "3.7.0"
-    "@typescript-eslint/typescript-estree" "3.7.0"
-    eslint-visitor-keys "^1.1.0"
-
-"@typescript-eslint/types@3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.7.0.tgz#09897fab0cb95479c01166b10b2c03c224821077"
-  integrity sha512-reCaK+hyKkKF+itoylAnLzFeNYAEktB0XVfSQvf0gcVgpz1l49Lt6Vo9x4MVCCxiDydA0iLAjTF/ODH0pbfnpg==
-
-"@typescript-eslint/typescript-estree@3.4.0":
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-3.4.0.tgz#6a787eb70b48969e4cd1ea67b057083f96dfee29"
-  integrity sha512-zKwLiybtt4uJb4mkG5q2t6+W7BuYx2IISiDNV+IY68VfoGwErDx/RfVI7SWL4gnZ2t1A1ytQQwZ+YOJbHHJ2rw==
+"@typescript-eslint/parser@^4.14.0":
+  version "4.14.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.14.0.tgz#62d4cd2079d5c06683e9bfb200c758f292c4dee7"
+  integrity sha512-sUDeuCjBU+ZF3Lzw0hphTyScmDDJ5QVkyE21pRoBo8iDl7WBtVFS+WDN3blY1CH3SBt7EmYCw6wfmJjF0l/uYg==
   dependencies:
+    "@typescript-eslint/scope-manager" "4.14.0"
+    "@typescript-eslint/types" "4.14.0"
+    "@typescript-eslint/typescript-estree" "4.14.0"
     debug "^4.1.1"
-    eslint-visitor-keys "^1.1.0"
-    glob "^7.1.6"
+
+"@typescript-eslint/scope-manager@4.14.0":
+  version "4.14.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.14.0.tgz#55a4743095d684e1f7b7180c4bac2a0a3727f517"
+  integrity sha512-/J+LlRMdbPh4RdL4hfP1eCwHN5bAhFAGOTsvE6SxsrM/47XQiPSgF5MDgLyp/i9kbZV9Lx80DW0OpPkzL+uf8Q==
+  dependencies:
+    "@typescript-eslint/types" "4.14.0"
+    "@typescript-eslint/visitor-keys" "4.14.0"
+
+"@typescript-eslint/types@4.14.0":
+  version "4.14.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.14.0.tgz#d8a8202d9b58831d6fd9cee2ba12f8a5a5dd44b6"
+  integrity sha512-VsQE4VvpldHrTFuVPY1ZnHn/Txw6cZGjL48e+iBxTi2ksa9DmebKjAeFmTVAYoSkTk7gjA7UqJ7pIsyifTsI4A==
+
+"@typescript-eslint/typescript-estree@4.14.0":
+  version "4.14.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.14.0.tgz#4bcd67486e9acafc3d0c982b23a9ab8ac8911ed7"
+  integrity sha512-wRjZ5qLao+bvS2F7pX4qi2oLcOONIB+ru8RGBieDptq/SudYwshveORwCVU4/yMAd4GK7Fsf8Uq1tjV838erag==
+  dependencies:
+    "@typescript-eslint/types" "4.14.0"
+    "@typescript-eslint/visitor-keys" "4.14.0"
+    debug "^4.1.1"
+    globby "^11.0.1"
     is-glob "^4.0.1"
     lodash "^4.17.15"
     semver "^7.3.2"
     tsutils "^3.17.1"
 
-"@typescript-eslint/typescript-estree@3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-3.7.0.tgz#66872e6da120caa4b64e6b4ca5c8702afc74738d"
-  integrity sha512-xr5oobkYRebejlACGr1TJ0Z/r0a2/HUf0SXqPvlgUMwiMqOCu/J+/Dr9U3T0IxpE5oLFSkqMx1FE/dKaZ8KsOQ==
+"@typescript-eslint/visitor-keys@4.14.0":
+  version "4.14.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.14.0.tgz#b1090d9d2955b044b2ea2904a22496849acbdf54"
+  integrity sha512-MeHHzUyRI50DuiPgV9+LxcM52FCJFYjJiWHtXlbyC27b80mfOwKeiKI+MHOTEpcpfmoPFm/vvQS88bYIx6PZTA==
   dependencies:
-    "@typescript-eslint/types" "3.7.0"
-    "@typescript-eslint/visitor-keys" "3.7.0"
-    debug "^4.1.1"
-    glob "^7.1.6"
-    is-glob "^4.0.1"
-    lodash "^4.17.15"
-    semver "^7.3.2"
-    tsutils "^3.17.1"
-
-"@typescript-eslint/visitor-keys@3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-3.7.0.tgz#ac0417d382a136e4571a0b0dcfe52088cb628177"
-  integrity sha512-k5PiZdB4vklUpUX4NBncn5RBKty8G3ihTY+hqJsCdMuD0v4jofI5xuqwnVcWxfv6iTm2P/dfEa2wMUnsUY8ODw==
-  dependencies:
-    eslint-visitor-keys "^1.1.0"
+    "@typescript-eslint/types" "4.14.0"
+    eslint-visitor-keys "^2.0.0"
 
 abab@^2.0.3:
   version "2.0.5"
@@ -2134,77 +1672,65 @@ acorn-globals@^6.0.0:
     acorn "^7.1.1"
     acorn-walk "^7.1.1"
 
-acorn-jsx@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe"
-  integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==
+acorn-jsx@^5.2.0, acorn-jsx@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
+  integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==
 
 acorn-walk@^7.1.1:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
   integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
 
-acorn@^7.1.1, acorn@^7.3.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz#85010754db53c3fbaf3b9ea3e083aa5c5d147ffd"
-  integrity sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA==
+acorn@^7.1.1, acorn@^7.4.0:
+  version "7.4.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
+  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-agent-base@4, agent-base@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
-  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
+airbnb-prop-types@^2.16.0:
+  version "2.16.0"
+  resolved "https://registry.yarnpkg.com/airbnb-prop-types/-/airbnb-prop-types-2.16.0.tgz#b96274cefa1abb14f623f804173ee97c13971dc2"
+  integrity sha512-7WHOFolP/6cS96PhKNrslCLMYAI8yB1Pp6u6XmxozQOiZbsI5ycglZr5cHhBFfuRcQQjzCMith5ZPZdYiJCxUg==
   dependencies:
-    es6-promisify "^5.0.0"
-
-agent-base@~4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
-  integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
-  dependencies:
-    es6-promisify "^5.0.0"
-
-agentkeepalive@^3.4.1:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.5.2.tgz#a113924dd3fa24a0bc3b78108c450c2abee00f67"
-  integrity sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==
-  dependencies:
-    humanize-ms "^1.2.1"
-
-airbnb-prop-types@^2.15.0:
-  version "2.15.0"
-  resolved "https://registry.yarnpkg.com/airbnb-prop-types/-/airbnb-prop-types-2.15.0.tgz#5287820043af1eb469f5b0af0d6f70da6c52aaef"
-  integrity sha512-jUh2/hfKsRjNFC4XONQrxo/n/3GG4Tn6Hl0WlFQN5PY9OMC9loSCoAYKnZsWaP8wEfd5xcrPloK0Zg6iS1xwVA==
-  dependencies:
-    array.prototype.find "^2.1.0"
-    function.prototype.name "^1.1.1"
-    has "^1.0.3"
-    is-regex "^1.0.4"
-    object-is "^1.0.1"
+    array.prototype.find "^2.1.1"
+    function.prototype.name "^1.1.2"
+    is-regex "^1.1.0"
+    object-is "^1.1.2"
     object.assign "^4.1.0"
-    object.entries "^1.1.0"
+    object.entries "^1.1.2"
     prop-types "^15.7.2"
     prop-types-exact "^1.2.0"
-    react-is "^16.9.0"
+    react-is "^16.13.1"
 
-ajv@^6.10.0, ajv@^6.10.2, ajv@^6.5.5:
-  version "6.12.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd"
-  integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==
+ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4:
+  version "6.12.6"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
   dependencies:
     fast-deep-equal "^3.1.1"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
+ajv@^7.0.2:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.0.3.tgz#13ae747eff125cafb230ac504b2406cf371eece2"
+  integrity sha512-R50QRlXSxqXcQP5SvKUrw8VZeypvo12i2IX0EeR5PiZ7bEKeHWgzgo264LDadUsCU42lTJVhFikTqJwNeH34gQ==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    json-schema-traverse "^1.0.0"
+    require-from-string "^2.0.2"
+    uri-js "^4.2.2"
+
 another-json@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/another-json/-/another-json-0.2.0.tgz#b5f4019c973b6dd5c6506a2d93469cb6d32aeedc"
   integrity sha1-tfQBnJc7bdXGUGotk0acttMq7tw=
 
-ansi-colors@^3.2.1:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
-  integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
+ansi-colors@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
+  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
 
 ansi-escapes@^4.2.1:
   version "4.3.1"
@@ -2213,16 +1739,6 @@ ansi-escapes@^4.2.1:
   dependencies:
     type-fest "^0.11.0"
 
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
-
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
-
 ansi-regex@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
@@ -2240,21 +1756,13 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
-ansi-styles@^4.0.0:
+ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
   integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
   dependencies:
     color-convert "^2.0.1"
 
-ansi-styles@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
-  integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==
-  dependencies:
-    "@types/color-name" "^1.1.1"
-    color-convert "^2.0.1"
-
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@@ -2271,11 +1779,6 @@ anymatch@^3.0.3, anymatch@~3.1.1:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-aproba@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
-
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -2303,38 +1806,28 @@ array-filter@^1.0.0:
   resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-1.0.0.tgz#baf79e62e6ef4c2a4c0b831232daffec251f9d83"
   integrity sha1-uveeYubvTCpMC4MSMtr/7CUfnYM=
 
-array-find-index@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
-  integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
-
-array-includes@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348"
-  integrity sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==
+array-includes@^3.1.1, array-includes@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.2.tgz#a8db03e0b88c8c6aeddc49cb132f9bcab4ebf9c8"
+  integrity sha512-w2GspexNQpx+PutG3QpT437/BenZBj0M/MZGn5mzv/MofYqo0xmRHzn4lFsoDlWJ+THYsGJmFlW68WlDFx7VRw==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0"
+    es-abstract "^1.18.0-next.1"
+    get-intrinsic "^1.0.1"
     is-string "^1.0.5"
 
-array-union@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
-  dependencies:
-    array-uniq "^1.0.1"
-
-array-uniq@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
+array-union@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
-array.prototype.find@^2.1.0:
+array.prototype.find@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.1.1.tgz#3baca26108ca7affb08db06bf0be6cb3115a969c"
   integrity sha512-mi+MYNJYLTx2eNYy+Yh6raoQacCsNeeMUaspFPh9Y141lFSsWxxB8V9mM2ye+eqiRs917J6/pJ4M9ZPzenWckA==
@@ -2343,20 +1836,22 @@ array.prototype.find@^2.1.0:
     es-abstract "^1.17.4"
 
 array.prototype.flat@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b"
-  integrity sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz#6ef638b43312bd401b4c6199fdec7e2dc9e9a123"
+  integrity sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
+    es-abstract "^1.18.0-next.1"
 
 array.prototype.flatmap@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.3.tgz#1c13f84a178566042dd63de4414440db9222e443"
-  integrity sha512-OOEk+lkePcg+ODXIpvuU9PAryCikCJyo7GlDG1upleEpQRx6mzL9puEBkozQ5iAx20KV0l3DbyQwqciJtqe5Pg==
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz#94cfd47cc1556ec0747d97f7c7738c58122004c9"
+  integrity sha512-r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
+    es-abstract "^1.18.0-next.1"
     function-bind "^1.1.1"
 
 arrify@^1.0.1:
@@ -2398,6 +1893,11 @@ astral-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
   integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
 
+astral-regex@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
+  integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
+
 async-each@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
@@ -2413,23 +1913,23 @@ atob@^2.1.2:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autoprefixer@^9.0.0:
-  version "9.8.0"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.0.tgz#68e2d2bef7ba4c3a65436f662d0a56a741e56511"
-  integrity sha512-D96ZiIHXbDmU02dBaemyAg53ez+6F5yZmapmgKcjm35yEe1uVDYI8hGW3VYoGRaG290ZFf91YxHrR518vC0u/A==
+autoprefixer@^9.8.6:
+  version "9.8.6"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f"
+  integrity sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==
   dependencies:
     browserslist "^4.12.0"
-    caniuse-lite "^1.0.30001061"
-    chalk "^2.4.2"
+    caniuse-lite "^1.0.30001109"
+    colorette "^1.2.1"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^7.0.30"
+    postcss "^7.0.32"
     postcss-value-parser "^4.1.0"
 
-await-lock@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/await-lock/-/await-lock-2.0.1.tgz#b3f65fdf66e08f7538260f79b46c15bcfc18cadd"
-  integrity sha512-ntLi9fzlMT/vWjC1wwVI11/cSRJ3nTS35qVekNc9WnaoMOP2eWH0RvIqwLQkDjX4a4YynsKEv+Ere2VONp9wxg==
+await-lock@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/await-lock/-/await-lock-2.1.0.tgz#bc78c51d229a34d5d90965a1c94770e772c6145e"
+  integrity sha512-t7Zm5YGgEEc/3eYAicF32m/TNvL+XOeYZy9CvBUeJY/szM7frLolFylhrlZNWV/ohWhcUXygrBGjYmoQdxF4CQ==
 
 aws-sign2@~0.7.0:
   version "0.7.0"
@@ -2437,9 +1937,9 @@ aws-sign2@~0.7.0:
   integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
 aws4@^1.8.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.0.tgz#a17b3a8ea811060e74d47d306122400ad4497ae2"
-  integrity sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
+  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
 
 babel-eslint@^10.0.1, babel-eslint@^10.1.0:
   version "10.1.0"
@@ -2453,29 +1953,16 @@ babel-eslint@^10.0.1, babel-eslint@^10.1.0:
     eslint-visitor-keys "^1.0.0"
     resolve "^1.12.0"
 
-babel-jest@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.9.0.tgz#3fc327cb8467b89d14d7bc70e315104a783ccd54"
-  integrity sha512-ntuddfyiN+EhMw58PTNL1ph4C9rECiQXjI4nMMBKBaNjXvqLdkXpPRcMSr4iyBrJg/+wz9brFUD6RhOAT6r4Iw==
+babel-jest@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.6.3.tgz#d87d25cb0037577a0c89f82e5755c5d293c01056"
+  integrity sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA==
   dependencies:
-    "@jest/transform" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    "@types/babel__core" "^7.1.0"
-    babel-plugin-istanbul "^5.1.0"
-    babel-preset-jest "^24.9.0"
-    chalk "^2.4.2"
-    slash "^2.0.0"
-
-babel-jest@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.5.2.tgz#164f367a35946c6cf54eaccde8762dec50422250"
-  integrity sha512-U3KvymF3SczA3vOL/cgiUFOznfMET+XDIXiWnoJV45siAp2pLMG8i2+/MGZlAC3f/F6Q40LR4M4qDrWZ9wkK8A==
-  dependencies:
-    "@jest/transform" "^26.5.2"
-    "@jest/types" "^26.5.2"
+    "@jest/transform" "^26.6.2"
+    "@jest/types" "^26.6.2"
     "@types/babel__core" "^7.1.7"
     babel-plugin-istanbul "^6.0.0"
-    babel-preset-jest "^26.5.0"
+    babel-preset-jest "^26.6.2"
     chalk "^4.0.0"
     graceful-fs "^4.2.4"
     slash "^3.0.0"
@@ -2487,16 +1974,6 @@ babel-plugin-dynamic-import-node@^2.3.3:
   dependencies:
     object.assign "^4.1.0"
 
-babel-plugin-istanbul@^5.1.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-5.2.0.tgz#df4ade83d897a92df069c4d9a25cf2671293c854"
-  integrity sha512-5LphC0USA8t4i1zCtjbbNb6jJj/9+X6P37Qfirc/70EQ34xKlMW+a1RHGwxGI+SwWpNwZ27HqvzAobeqaXwiZw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    find-up "^3.0.0"
-    istanbul-lib-instrument "^3.3.0"
-    test-exclude "^5.2.3"
-
 babel-plugin-istanbul@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765"
@@ -2508,27 +1985,20 @@ babel-plugin-istanbul@^6.0.0:
     istanbul-lib-instrument "^4.0.0"
     test-exclude "^6.0.0"
 
-babel-plugin-jest-hoist@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz#4f837091eb407e01447c8843cbec546d0002d756"
-  integrity sha512-2EMA2P8Vp7lG0RAzr4HXqtYwacfMErOuv1U3wrvxHX6rD1sV6xS3WXG3r8TRQ2r6w8OhvSdWt+z41hQNwNm3Xw==
-  dependencies:
-    "@types/babel__traverse" "^7.0.6"
-
-babel-plugin-jest-hoist@^26.5.0:
-  version "26.5.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.5.0.tgz#3916b3a28129c29528de91e5784a44680db46385"
-  integrity sha512-ck17uZFD3CDfuwCLATWZxkkuGGFhMij8quP8CNhwj8ek1mqFgbFzRJ30xwC04LLscj/aKsVFfRST+b5PT7rSuw==
+babel-plugin-jest-hoist@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz#8185bd030348d254c6d7dd974355e6a28b21e62d"
+  integrity sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==
   dependencies:
     "@babel/template" "^7.3.3"
     "@babel/types" "^7.3.3"
     "@types/babel__core" "^7.0.0"
     "@types/babel__traverse" "^7.0.6"
 
-babel-preset-current-node-syntax@^0.1.3:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.4.tgz#826f1f8e7245ad534714ba001f84f7e906c3b615"
-  integrity sha512-5/INNCYhUGqw7VbVjT/hb3ucjgkVHKXY7lX3ZjlN4gm565VyFmJUrJ/h+h16ECVB38R/9SF6aACydpKMLZ/c9w==
+babel-preset-current-node-syntax@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b"
+  integrity sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==
   dependencies:
     "@babel/plugin-syntax-async-generators" "^7.8.4"
     "@babel/plugin-syntax-bigint" "^7.8.3"
@@ -2541,22 +2011,15 @@ babel-preset-current-node-syntax@^0.1.3:
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+    "@babel/plugin-syntax-top-level-await" "^7.8.3"
 
-babel-preset-jest@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz#192b521e2217fb1d1f67cf73f70c336650ad3cdc"
-  integrity sha512-izTUuhE4TMfTRPF92fFwD2QfdXaZW08qvWTFCI51V8rW5x00UuPgc3ajRoWofXOuxjfcOM5zzSYsQS3H8KGCAg==
+babel-preset-jest@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz#747872b1171df032252426586881d62d31798fee"
+  integrity sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ==
   dependencies:
-    "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
-    babel-plugin-jest-hoist "^24.9.0"
-
-babel-preset-jest@^26.5.0:
-  version "26.5.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.5.0.tgz#f1b166045cd21437d1188d29f7fba470d5bdb0e7"
-  integrity sha512-F2vTluljhqkiGSJGBg/jOruA8vIIIL11YrxRcO7nviNTMbbofPSHwnm8mgP7d/wS7wRSexRoI6X1A6T74d4LQA==
-  dependencies:
-    babel-plugin-jest-hoist "^26.5.0"
-    babel-preset-current-node-syntax "^0.1.3"
+    babel-plugin-jest-hoist "^26.6.2"
+    babel-preset-current-node-syntax "^1.0.0"
 
 babel-runtime@^6.26.0:
   version "6.26.0"
@@ -2583,10 +2046,10 @@ base-x@^3.0.2:
   dependencies:
     safe-buffer "^5.0.1"
 
-base64-js@^1.0.2:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
-  integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
+base64-js@^1.3.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
 base@^0.11.1:
   version "0.11.2"
@@ -2614,28 +2077,21 @@ binary-extensions@^1.0.0:
   integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
 
 binary-extensions@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c"
-  integrity sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
+  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
-bindings@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
-  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
-  dependencies:
-    file-uri-to-path "1.0.0"
-
-bluebird@^3.5.0, bluebird@^3.5.5:
+bluebird@^3.5.0:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
-blueimp-canvas-to-blob@^3.27.0:
-  version "3.27.0"
-  resolved "https://registry.yarnpkg.com/blueimp-canvas-to-blob/-/blueimp-canvas-to-blob-3.27.0.tgz#a2bd5c43587b95dedf0f6998603452d1bfcc9b9e"
-  integrity sha512-AcIj+hCw6WquxzJuzC6KzgYmqxLFeTWe88KuY2BEIsW1zbEOfoinDAGlhyvFNGt+U3JElkVSK7anA1FaSdmmfA==
+blueimp-canvas-to-blob@^3.28.0:
+  version "3.28.0"
+  resolved "https://registry.yarnpkg.com/blueimp-canvas-to-blob/-/blueimp-canvas-to-blob-3.28.0.tgz#c8ab4dc6bb08774a7f273798cdf94b0776adf6c8"
+  integrity sha512-5q+YHzgGsuHQ01iouGgJaPJXod2AzTxJXmVv90PpGrRxU7G7IqgPqWXz+PBmt3520jKKi6irWbNV87DicEa7wg==
 
-boolbase@~1.0.0:
+boolbase@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
@@ -2686,15 +2142,16 @@ browser-request@^0.3.3:
   resolved "https://registry.yarnpkg.com/browser-request/-/browser-request-0.3.3.tgz#9ece5b5aca89a29932242e18bf933def9876cc17"
   integrity sha1-ns5bWsqJopkyJC4Yv5M975h2zBc=
 
-browserslist@^4.12.0, browserslist@^4.8.5:
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.12.0.tgz#06c6d5715a1ede6c51fc39ff67fd647f740b656d"
-  integrity sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==
+browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.1:
+  version "4.16.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.1.tgz#bf757a2da376b3447b800a16f0f1c96358138766"
+  integrity sha512-UXhDrwqsNcpTYJBTZsbGATDxZbiVDsx6UjpmRUmtnP10pr8wAYr5LgFoEFw9ixriQH2mv/NX2SfGzE/o8GndLA==
   dependencies:
-    caniuse-lite "^1.0.30001043"
-    electron-to-chromium "^1.3.413"
-    node-releases "^1.1.53"
-    pkg-up "^2.0.0"
+    caniuse-lite "^1.0.30001173"
+    colorette "^1.2.1"
+    electron-to-chromium "^1.3.634"
+    escalade "^3.1.1"
+    node-releases "^1.1.69"
 
 bs58@^4.0.1:
   version "4.0.1"
@@ -2734,33 +2191,12 @@ buffer-from@^1.0.0, buffer-from@^1.1.1:
   integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
 
 buffer@^5.4.3:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.6.0.tgz#a31749dc7d81d84db08abf937b6b8c4033f62786"
-  integrity sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
+  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
   dependencies:
-    base64-js "^1.0.2"
-    ieee754 "^1.1.4"
-
-cacache@^12.0.0:
-  version "12.0.4"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c"
-  integrity sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==
-  dependencies:
-    bluebird "^3.5.5"
-    chownr "^1.1.1"
-    figgy-pudding "^3.5.1"
-    glob "^7.1.4"
-    graceful-fs "^4.1.15"
-    infer-owner "^1.0.3"
-    lru-cache "^5.1.1"
-    mississippi "^3.0.0"
-    mkdirp "^0.5.1"
-    move-concurrently "^1.0.1"
-    promise-inflight "^1.0.1"
-    rimraf "^2.6.3"
-    ssri "^6.0.1"
-    unique-filename "^1.1.1"
-    y18n "^4.0.0"
+    base64-js "^1.3.1"
+    ieee754 "^1.1.13"
 
 cache-base@^1.0.1:
   version "1.0.1"
@@ -2777,48 +2213,27 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
-call-me-maybe@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
-  integrity sha1-JtII6onje1y95gJQoV8DHBak1ms=
-
-caller-callsite@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
-  integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=
+call-bind@^1.0.0, call-bind@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
+  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
   dependencies:
-    callsites "^2.0.0"
-
-caller-path@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
-  integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=
-  dependencies:
-    caller-callsite "^2.0.0"
-
-callsites@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
-  integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=
+    function-bind "^1.1.1"
+    get-intrinsic "^1.0.2"
 
 callsites@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
-camelcase-keys@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77"
-  integrity sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=
+camelcase-keys@^6.2.2:
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0"
+  integrity sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==
   dependencies:
-    camelcase "^4.1.0"
-    map-obj "^2.0.0"
-    quick-lru "^1.0.0"
-
-camelcase@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
-  integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
+    camelcase "^5.3.1"
+    map-obj "^4.0.0"
+    quick-lru "^4.0.1"
 
 camelcase@^5.0.0, camelcase@^5.3.1:
   version "5.3.1"
@@ -2826,14 +2241,14 @@ camelcase@^5.0.0, camelcase@^5.3.1:
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
 camelcase@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.0.0.tgz#5259f7c30e35e278f1bdc2a4d91230b37cad981e"
-  integrity sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809"
+  integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
 
-caniuse-lite@^1.0.30001043, caniuse-lite@^1.0.30001061:
-  version "1.0.30001079"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001079.tgz#ed3e5225cd9a6850984fdd88bf24ce45d69b9c22"
-  integrity sha512-2KaYheg0iOY+CMmDuAB3DHehrXhhb4OZU4KBVGDr/YKyYAcpudaiUQ9PJ9rxrPlKEoJ3ATasQ5AN48MqpwS43Q==
+caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001173:
+  version "1.0.30001178"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001178.tgz#3ad813b2b2c7d585b0be0a2440e1e233c6eabdbc"
+  integrity sha512-VtdZLC0vsXykKni8Uztx45xynytOi71Ufx9T8kHptSw9AL4dpqailUJJHavttuzUe1KYuBYtChiWv+BAb7mPmQ==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -2847,12 +2262,7 @@ caseless@~0.12.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
-ccount@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.0.5.tgz#ac82a944905a65ce204eb03023157edf29425c17"
-  integrity sha512-MOli1W+nfbPLlKEhInaxhRdp7KVLFxLN5ykwzHgLsLI3H3gs5jjFAK4Eoj3OzzcxCtumDaI8onoVDeQyWaNTkw==
-
-chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2:
+chalk@^2.0.0, chalk@^2.1.0, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -2882,11 +2292,6 @@ char-regex@^1.0.2:
   resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
   integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
 
-character-entities-html4@^1.0.0:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.4.tgz#0e64b0a3753ddbf1fdc044c5fd01d0199a02e125"
-  integrity sha512-HRcDxZuZqMx3/a+qrzxdBKBPUpxWEq9xw2OPZ3a/174ihfrQKVsFhqtthBInFy1zZ9GgZyFXOatNujm8M+El3g==
-
 character-entities-legacy@^1.0.0:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1"
@@ -2907,41 +2312,34 @@ chardet@^0.7.0:
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
-cheerio@^1.0.0-rc.3:
-  version "1.0.0-rc.3"
-  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.3.tgz#094636d425b2e9c0f4eb91a46c05630c9a1a8bf6"
-  integrity sha512-0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA==
+cheerio-select-tmp@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/cheerio-select-tmp/-/cheerio-select-tmp-0.1.1.tgz#55bbef02a4771710195ad736d5e346763ca4e646"
+  integrity sha512-YYs5JvbpU19VYJyj+F7oYrIE2BOll1/hRU7rEy/5+v9BzkSo3bK81iAeeQEMI92vRIxz677m72UmJUiVwwgjfQ==
   dependencies:
-    css-select "~1.2.0"
-    dom-serializer "~0.1.1"
-    entities "~1.1.1"
-    htmlparser2 "^3.9.1"
-    lodash "^4.15.0"
-    parse5 "^3.0.1"
+    css-select "^3.1.2"
+    css-what "^4.0.0"
+    domelementtype "^2.1.0"
+    domhandler "^4.0.0"
+    domutils "^2.4.4"
 
-chokidar@^2.1.8:
-  version "2.1.8"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
-  integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
+cheerio@^1.0.0-rc.3, cheerio@^1.0.0-rc.5:
+  version "1.0.0-rc.5"
+  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.5.tgz#88907e1828674e8f9fee375188b27dadd4f0fa2f"
+  integrity sha512-yoqps/VCaZgN4pfXtenwHROTp8NG6/Hlt4Jpz2FEP0ZJQ+ZUkVDd0hAPDNKhj3nakpfPt/CNs57yEtxD1bXQiw==
   dependencies:
-    anymatch "^2.0.0"
-    async-each "^1.0.1"
-    braces "^2.3.2"
-    glob-parent "^3.1.0"
-    inherits "^2.0.3"
-    is-binary-path "^1.0.0"
-    is-glob "^4.0.0"
-    normalize-path "^3.0.0"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.2.1"
-    upath "^1.1.1"
-  optionalDependencies:
-    fsevents "^1.2.7"
+    cheerio-select-tmp "^0.1.0"
+    dom-serializer "~1.2.0"
+    domhandler "^4.0.0"
+    entities "~2.1.0"
+    htmlparser2 "^6.0.0"
+    parse5 "^6.0.0"
+    parse5-htmlparser2-tree-adapter "^6.0.0"
 
-chokidar@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.1.tgz#e905bdecf10eaa0a0b1db0c664481cc4cbc22ba1"
-  integrity sha512-TQTJyr2stihpC4Sya9hs2Xh+O2wf+igjL36Y75xx2WdHuiICcn/XJza46Jwt0eT5hVpQOzo3FpY3cj3RVYLX0g==
+chokidar@^3.4.0, chokidar@^3.5.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a"
+  integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==
   dependencies:
     anymatch "~3.1.1"
     braces "~3.0.2"
@@ -2949,20 +2347,20 @@ chokidar@^3.4.1:
     is-binary-path "~2.1.0"
     is-glob "~4.0.1"
     normalize-path "~3.0.0"
-    readdirp "~3.4.0"
+    readdirp "~3.5.0"
   optionalDependencies:
-    fsevents "~2.1.2"
-
-chownr@^1.1.1:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
-  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
+    fsevents "~2.3.1"
 
 ci-info@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
   integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
 
+cjs-module-lexer@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz#4186fcca0eae175970aee870b9fe2d6cf8d5655f"
+  integrity sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==
+
 class-utils@^0.3.5:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
@@ -2990,15 +2388,6 @@ cli-width@^3.0.0:
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
   integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
 
-cliui@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
-  integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==
-  dependencies:
-    string-width "^2.1.1"
-    strip-ansi "^4.0.0"
-    wrap-ansi "^2.0.0"
-
 cliui@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
@@ -3017,29 +2406,18 @@ cliui@^6.0.0:
     strip-ansi "^6.0.0"
     wrap-ansi "^6.2.0"
 
-clone-regexp@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/clone-regexp/-/clone-regexp-1.0.1.tgz#051805cd33173375d82118fc0918606da39fd60f"
-  integrity sha512-Fcij9IwRW27XedRIJnSOEupS7RVcXtObJXbcUOX93UCLqqOdRpkvzKywOOSizmEK/Is3S/RHX9dLdfo6R1Q1mw==
+clone-regexp@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/clone-regexp/-/clone-regexp-2.2.0.tgz#7d65e00885cd8796405c35a737e7a86b7429e36f"
+  integrity sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==
   dependencies:
-    is-regexp "^1.0.0"
-    is-supported-regexp-flag "^1.0.0"
+    is-regexp "^2.0.0"
 
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
   integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
 
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
-
-collapse-white-space@^1.0.2:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.6.tgz#e63629c0016665792060dbbeb79c42239d2c5287"
-  integrity sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ==
-
 collect-v8-coverage@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"
@@ -3089,7 +2467,7 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.15.1, commander@^2.19.0, commander@^2.20.0:
+commander@^2.19.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -3104,14 +2482,14 @@ commondir@^1.0.1:
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
   integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
 
-commonmark@^0.29.1:
-  version "0.29.1"
-  resolved "https://registry.yarnpkg.com/commonmark/-/commonmark-0.29.1.tgz#fdbf5970ca23600f4a27487e30eed43b66b83ef5"
-  integrity sha512-DafPdNYFXoEhsSiR4O+dJ45UJBfDL4cBTks4B+agKiaWt7qjG0bIhg5xuCE0RqU71ikJcBIf4/sRHh9vYQVF8Q==
+commonmark@^0.29.3:
+  version "0.29.3"
+  resolved "https://registry.yarnpkg.com/commonmark/-/commonmark-0.29.3.tgz#bb1d5733bfe3ea213b412f33f16439cc12999c2c"
+  integrity sha512-fvt/NdOFKaL2gyhltSy6BC4LxbbxbnPxBMl923ittqO/JBM0wQHaoYZliE4tp26cRxX/ZZtRsJlZzQrVdUkXAA==
   dependencies:
-    entities "~1.1.1"
+    entities "~2.0"
     mdurl "~1.0.1"
-    minimist "~1.2.0"
+    minimist ">=1.2.2"
     string.prototype.repeat "^0.2.0"
 
 component-emitter@^1.2.1:
@@ -3124,30 +2502,20 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@^1.5.0:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
-  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
-  dependencies:
-    buffer-from "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^2.2.2"
-    typedarray "^0.0.6"
-
-concurrently@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-4.1.2.tgz#1a683b2b5c41e9ed324c9002b9f6e4c6e1f3b6d7"
-  integrity sha512-Kim9SFrNr2jd8/0yNYqDTFALzUX1tvimmwFWxmp/D4mRI+kbqIIwE2RkBDrxS2ic25O1UgQMI5AtBqdtX3ynYg==
+concurrently@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-5.3.0.tgz#7500de6410d043c912b2da27de3202cb489b1e7b"
+  integrity sha512-8MhqOB6PWlBfA2vJ8a0bSFKATOdWlHiQlk11IfmQBPaHVP8oP2gsh2MObE6UR3hqDHqvaIvLTyceNW6obVuFHQ==
   dependencies:
     chalk "^2.4.2"
-    date-fns "^1.30.1"
+    date-fns "^2.0.1"
     lodash "^4.17.15"
     read-pkg "^4.0.1"
     rxjs "^6.5.2"
     spawn-command "^0.0.2-1"
-    supports-color "^4.5.0"
-    tree-kill "^1.2.1"
-    yargs "^12.0.5"
+    supports-color "^6.1.0"
+    tree-kill "^1.2.2"
+    yargs "^13.3.0"
 
 contains-path@^0.1.0:
   version "0.1.0"
@@ -3166,29 +2534,17 @@ convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.6.0,
   dependencies:
     safe-buffer "~5.1.1"
 
-copy-concurrently@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
-  integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==
-  dependencies:
-    aproba "^1.1.1"
-    fs-write-stream-atomic "^1.0.8"
-    iferr "^0.1.5"
-    mkdirp "^0.5.1"
-    rimraf "^2.5.4"
-    run-queue "^1.0.0"
-
 copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-core-js-compat@^3.6.2:
-  version "3.6.5"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.5.tgz#2a51d9a4e25dfd6e690251aa81f99e3c05481f1c"
-  integrity sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==
+core-js-compat@^3.8.0:
+  version "3.8.3"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.8.3.tgz#9123fb6b9cad30f0651332dc77deba48ef9b0b3f"
+  integrity sha512-1sCb0wBXnBIL16pfFG1Gkvei6UzvKyTNYpiC41yrdjEv0UoJoq9E/abTMzyYJ6JpTkAj15dLjbqifIzEBDVvog==
   dependencies:
-    browserslist "^4.8.5"
+    browserslist "^4.16.1"
     semver "7.0.0"
 
 core-js@^1.0.0:
@@ -3197,24 +2553,25 @@ core-js@^1.0.0:
   integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=
 
 core-js@^2.4.0:
-  version "2.6.11"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
-  integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
+  version "2.6.12"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
+  integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
-cosmiconfig@^5.0.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a"
-  integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==
+cosmiconfig@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3"
+  integrity sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==
   dependencies:
-    import-fresh "^2.0.0"
-    is-directory "^0.3.1"
-    js-yaml "^3.13.1"
-    parse-json "^4.0.0"
+    "@types/parse-json" "^4.0.0"
+    import-fresh "^3.2.1"
+    parse-json "^5.0.0"
+    path-type "^4.0.0"
+    yaml "^1.10.0"
 
 counterpart@^0.18.6:
   version "0.18.6"
@@ -3252,20 +2609,21 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.2:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
-css-select@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
-  integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=
+css-select@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-3.1.2.tgz#d52cbdc6fee379fba97fb0d3925abbd18af2d9d8"
+  integrity sha512-qmss1EihSuBNWNNhHjxzxSfJoFBM/lERB/Q4EnsJQQC62R2evJDW481091oAdOr9uh46/0n4nrg0It5cAnj1RA==
   dependencies:
-    boolbase "~1.0.0"
-    css-what "2.1"
-    domutils "1.5.1"
-    nth-check "~1.0.1"
+    boolbase "^1.0.0"
+    css-what "^4.0.0"
+    domhandler "^4.0.0"
+    domutils "^2.4.3"
+    nth-check "^2.0.0"
 
-css-what@2.1:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2"
-  integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==
+css-what@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-4.0.0.tgz#35e73761cab2eeb3d3661126b23d7aa0e8432233"
+  integrity sha512-teijzG7kwYfNVsUh2H/YN62xW3KK9YhXEgSlbxMlcyjPNvdKJqFx5lrwlJgoFP1ZHlB89iGDlo/JyshKeRhv5A==
 
 cssesc@^3.0.0:
   version "3.0.0"
@@ -3294,22 +2652,10 @@ cssstyle@^2.2.0:
   dependencies:
     cssom "~0.3.6"
 
-csstype@^2.2.0, csstype@^2.6.7:
-  version "2.6.10"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.10.tgz#e63af50e66d7c266edb6b32909cfd0aabe03928b"
-  integrity sha512-D34BqZU4cIlMCY93rZHbrq9pjTAQJ3U8S8rfBqjwHxkGPThWFjzZDQpgMJY0QViLxth6ZKYiwFBo14RdN44U/w==
-
-currently-unhandled@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
-  integrity sha1-mI3zP+qxke95mmE2nddsF635V+o=
-  dependencies:
-    array-find-index "^1.0.1"
-
-cyclist@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
-  integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
+csstype@^3.0.2:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.6.tgz#865d0b5833d7d8d40f4e5b8a6d76aea3de4725ef"
+  integrity sha512-+ZAmfyWMT7TiIlzdqJgjMb7S4f1beorDbWbsocyK4RaiqA5RTX3K14bnBWmmA9QEM0gRdsjyyrEmcyga8Zsxmw==
 
 dashdash@^1.12.0:
   version "1.14.1"
@@ -3327,23 +2673,16 @@ data-urls@^2.0.0:
     whatwg-mimetype "^2.3.0"
     whatwg-url "^8.0.0"
 
-date-fns@^1.30.1:
-  version "1.30.1"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
-  integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==
+date-fns@^2.0.1:
+  version "2.16.1"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.16.1.tgz#05775792c3f3331da812af253e1a935851d3834b"
+  integrity sha512-sAJVKx/FqrLYHAQeN7VpJrPhagZc9R4ImZIWYRFZaaohR3KzmuK88touwsSwSVT8Qcbd4zoDsnGfX4GFB4imyQ==
 
 date-names@^0.1.11:
   version "0.1.13"
   resolved "https://registry.yarnpkg.com/date-names/-/date-names-0.1.13.tgz#c4358f6f77c8056e2f5ea68fdbb05f0bf1e53bd0"
   integrity sha512-IxxoeD9tdx8pXVcmqaRlPvrXIsSrSrIZzfzlOkm9u+hyzKp5Wk/odt9O/gd7Ockzy8n/WHeEpTVJ2bF3mMV4LA==
 
-debug@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
-  dependencies:
-    ms "2.0.0"
-
 debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -3351,21 +2690,14 @@ debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@^3.1.0:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
-  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
+debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
+  integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
   dependencies:
-    ms "^2.1.1"
+    ms "2.1.2"
 
-debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
-  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
-  dependencies:
-    ms "^2.1.1"
-
-decamelize-keys@^1.0.0:
+decamelize-keys@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
   integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=
@@ -3388,11 +2720,6 @@ decode-uri-component@^0.2.0:
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
   integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
-deep-extend@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
-  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
-
 deep-is@^0.1.3, deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
@@ -3403,7 +2730,7 @@ deepmerge@^4.2.2:
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
   integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
 
-define-properties@^1.1.2, define-properties@^1.1.3, define-properties@~1.1.2:
+define-properties@^1.1.3, define-properties@~1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
   integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
@@ -3442,40 +2769,37 @@ detect-newline@^3.0.0:
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
   integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
 
-detect-node@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
-  integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
+detect-node-es@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/detect-node-es/-/detect-node-es-1.0.0.tgz#c0318b9e539a5256ca780dd9575c9345af05b8ed"
+  integrity sha512-S4AHriUkTX9FoFvL4G8hXDcx6t3gp2HpfCza3Q0v6S78gul2hKWifLQbeW+ZF89+hSm2ZIc/uF3J97ZgytgTRg==
 
-diff-dom@^4.1.6:
-  version "4.1.6"
-  resolved "https://registry.yarnpkg.com/diff-dom/-/diff-dom-4.1.6.tgz#ecd20f4b34703d777b7956790fc7e28e5ff3fece"
-  integrity sha512-hzHojf1Ar3x1Db/1ijN/uhwYDgde+RoP8pPAPJlrmxp05Bt+Z9Hd7tmuEyPYu1mEuvcO+0pQRZAOCMKi+0I1PQ==
-  dependencies:
-    rollup-plugin-terser "^5.1.1"
-    updates "^8.5.2"
+diff-dom@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/diff-dom/-/diff-dom-4.2.2.tgz#49a121fe1614675b4f28ed50df9547bb0c3c1d52"
+  integrity sha512-qO0WsnnMF6Wc5MEm0j4LkwvJWs4Mpkj6pyXWMtcjGJPHWDNcnQY8ijYoSrsZuArBmlHLN9Dqr4de/3ZlbjpRVw==
 
 diff-match-patch@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.5.tgz#abb584d5f10cd1196dfc55aa03701592ae3f7b37"
   integrity sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw==
 
-diff-sequences@^26.5.0:
-  version "26.5.0"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.5.0.tgz#ef766cf09d43ed40406611f11c6d8d9dd8b2fefd"
-  integrity sha512-ZXx86srb/iYy6jG71k++wBN9P9J05UNQ5hQHQd9MtMPvcqXPx/vKU69jfHV637D00Q2gSgPk2D+jSx3l1lDW/Q==
+diff-sequences@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1"
+  integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==
 
 dijkstrajs@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/dijkstrajs/-/dijkstrajs-1.0.1.tgz#d3cd81221e3ea40742cfcde556d4e99e98ddc71b"
   integrity sha1-082BIh4+pAdCz83lVtTpnpjdxxs=
 
-dir-glob@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4"
-  integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==
+dir-glob@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
   dependencies:
-    path-type "^3.0.0"
+    path-type "^4.0.0"
 
 discontinuous-range@1.0.0:
   version "1.0.0"
@@ -3505,14 +2829,14 @@ doctrine@^3.0.0:
     esutils "^2.0.2"
 
 dom-helpers@^5.0.1:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.1.4.tgz#4609680ab5c79a45f2531441f1949b79d6587f4b"
-  integrity sha512-TjMyeVUvNEnOnhzs6uAn9Ya47GmMo3qq7m+Lr/3ON0Rs5kHvb8I+SQYjLUSYn7qhEm0QjW0yrBkvz9yOrwwz1A==
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.0.tgz#57fd054c5f8f34c52a3eeffdb7e7e93cd357d95b"
+  integrity sha512-Ru5o9+V8CpunKnz5LGgWXkmrH/20cGKwcHwS4m73zIvs54CN9epEmT/HLqFJW3kXpakAFkEdzgy1hzlJe3E4OQ==
   dependencies:
     "@babel/runtime" "^7.8.7"
-    csstype "^2.6.7"
+    csstype "^3.0.2"
 
-dom-serializer@0, dom-serializer@^0.2.1:
+dom-serializer@0:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
   integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==
@@ -3520,23 +2844,24 @@ dom-serializer@0, dom-serializer@^0.2.1:
     domelementtype "^2.0.1"
     entities "^2.0.0"
 
-dom-serializer@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0"
-  integrity sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==
+dom-serializer@^1.0.1, dom-serializer@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.2.0.tgz#3433d9136aeb3c627981daa385fc7f32d27c48f1"
+  integrity sha512-n6kZFH/KlCrqs/1GHMOd5i2fd/beQHuehKdWvNNffbGHTr/almdhuVvTVFb3V7fglz+nC50fFusu3lY33h12pA==
   dependencies:
-    domelementtype "^1.3.0"
-    entities "^1.1.1"
+    domelementtype "^2.0.1"
+    domhandler "^4.0.0"
+    entities "^2.0.0"
 
-domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1:
+domelementtype@1, domelementtype@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
   integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
 
-domelementtype@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.1.tgz#1f8bdfe91f5a78063274e803b4bdcedf6e94f94d"
-  integrity sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==
+domelementtype@^2.0.1, domelementtype@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.1.0.tgz#a851c080a6d1c3d94344aed151d99f669edf585e"
+  integrity sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==
 
 domexception@^2.0.1:
   version "2.0.1"
@@ -3553,19 +2878,18 @@ domhandler@^2.3.0:
     domelementtype "1"
 
 domhandler@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-3.0.0.tgz#51cd13efca31da95bbb0c5bee3a48300e333b3e9"
-  integrity sha512-eKLdI5v9m67kbXQbJSNn1zjh0SDzvzWVWtX+qEI3eMjZw8daH9k8rlj1FZY9memPwjiskQFbe7vHVVJIAqoEhw==
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-3.3.0.tgz#6db7ea46e4617eb15cf875df68b2b8524ce0037a"
+  integrity sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==
   dependencies:
     domelementtype "^2.0.1"
 
-domutils@1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
-  integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=
+domhandler@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.0.0.tgz#01ea7821de996d85f69029e81fa873c21833098e"
+  integrity sha512-KPTbnGQ1JeEMQyO1iYXoagsI6so/C96HZiFyByU3T6iAzpXn8EGEvct6unm1ZGoed8ByO2oirxgwxBmqKF9haA==
   dependencies:
-    dom-serializer "0"
-    domelementtype "1"
+    domelementtype "^2.1.0"
 
 domutils@^1.5.1:
   version "1.7.0"
@@ -3575,31 +2899,14 @@ domutils@^1.5.1:
     dom-serializer "0"
     domelementtype "1"
 
-domutils@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.1.0.tgz#7ade3201af43703fde154952e3a868eb4b635f16"
-  integrity sha512-CD9M0Dm1iaHfQ1R/TI+z3/JWp/pgub0j4jIQKH89ARR4ATAV2nbaOQS5XxU9maJP5jHaPdDDQSEHuE2UmpUTKg==
+domutils@^2.0.0, domutils@^2.4.3, domutils@^2.4.4:
+  version "2.4.4"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.4.4.tgz#282739c4b150d022d34699797369aad8d19bbbd3"
+  integrity sha512-jBC0vOsECI4OMdD0GC9mGn7NXPLb+Qt6KW1YDQzeQYRUFKmNG8lh7mO5HiELfr+lLQE7loDVI4QcAxV80HS+RA==
   dependencies:
-    dom-serializer "^0.2.1"
+    dom-serializer "^1.0.1"
     domelementtype "^2.0.1"
-    domhandler "^3.0.0"
-
-dot-prop@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz#c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb"
-  integrity sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==
-  dependencies:
-    is-obj "^2.0.0"
-
-duplexify@^3.4.2, duplexify@^3.6.0:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
-  integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
-  dependencies:
-    end-of-stream "^1.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-    stream-shift "^1.0.0"
+    domhandler "^4.0.0"
 
 ecc-jsbn@~0.1.1:
   version "0.1.2"
@@ -3609,15 +2916,15 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-electron-to-chromium@^1.3.413:
-  version "1.3.464"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.464.tgz#fe13feaa08f6f865d3c89d5d72e54c194f463aa5"
-  integrity sha512-Oo+0+CN9d2z6FToQW6Hwvi9ez09Y/usKwr0tsDsyg43a871zVJCi1nR0v03djLbRNcaCKjtrnVf2XJhTxEpPCg==
+electron-to-chromium@^1.3.634:
+  version "1.3.642"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.642.tgz#8b884f50296c2ae2a9997f024d0e3e57facc2b94"
+  integrity sha512-cev+jOrz/Zm1i+Yh334Hed6lQVOkkemk2wRozfMF4MtTR7pxf3r3L5Rbd7uX1zMcEqVJ7alJBnJL7+JffkC6FQ==
 
 emittery@^0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.1.tgz#c02375a927a40948c0345cc903072597f5270451"
-  integrity sha512-d34LN4L6h18Bzz9xpoku2nPwKxCPlPMr3EEKTkoEBi+1/+b0lcRkRJ1UVyyZaKNeqGR3swcGl6s390DNO4YVgQ==
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.2.tgz#25595908e13af0f5674ab419396e2fb394cdfa82"
+  integrity sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ==
 
 emoji-regex@^7.0.1:
   version "7.0.3"
@@ -3629,24 +2936,24 @@ emoji-regex@^8.0.0:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
-emojibase-data@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-5.0.1.tgz#ce6fe36b4affd3578e0be8779211018a2fdae960"
-  integrity sha512-rYWlogJ2q5P78U8Xx1vhsXHcYKu1wFnr7+o6z9QHssZ1SsJLTCkJINZIPHRFWuDreAUK457TkqHpdOXElu0fzA==
+emojibase-data@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-5.1.1.tgz#0a0d63dd07ce1376b3d27642f28cafa46f651de6"
+  integrity sha512-za/ma5SfogHjwUmGFnDbTvSfm8GGFvFaPS27GPti16YZSp5EPgz+UDsZCATXvJGit+oRNBbG/FtybXHKi2UQgQ==
 
-emojibase-regex@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-4.0.1.tgz#a2cd4bbb42825422da9ec72f15e970bc2c90b46a"
-  integrity sha512-S42UHkFfz15i4NNz+wi9iMKFo+B6Kalc6PJLpYX0BUANViXw4vSyYZMFdBGRLduSabWHuEcTLZl9xOa2YP3eJw==
+emojibase-regex@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-4.1.1.tgz#6e781aca520281600fe7a177f1582c33cf1fc545"
+  integrity sha512-KSigB1zQkNKFygLZ5bAfHs87LJa1ni8QTQtq8lc53Y74NF3Dk2r7kfa8MpooTO8JBb5Xz660X4tSjDB+I+7elA==
 
 encoding@^0.1.11:
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
-  integrity sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=
+  version "0.1.13"
+  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
+  integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
   dependencies:
-    iconv-lite "~0.4.13"
+    iconv-lite "^0.6.2"
 
-end-of-stream@^1.0.0, end-of-stream@^1.1.0:
+end-of-stream@^1.1.0:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
   integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
@@ -3654,56 +2961,62 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
     once "^1.4.0"
 
 enquirer@^2.3.5:
-  version "2.3.5"
-  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.5.tgz#3ab2b838df0a9d8ab9e7dff235b0e8712ef92381"
-  integrity sha512-BNT1C08P9XD0vNg3J475yIUG+mVdp9T6towYFHUv897X0KoHBjB1shyrNmhmtHWKP17iSWgo7Gqh7BBuzLZMSA==
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
+  integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
   dependencies:
-    ansi-colors "^3.2.1"
+    ansi-colors "^4.1.1"
 
-entities@^1.1.1, entities@~1.1.1:
+entities@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
   integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
 
-entities@^2.0.0:
+entities@^2.0.0, entities@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
+  integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==
+
+entities@~2.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz#5c487e5742ab93c15abb5da22759b8590ec03b7f"
   integrity sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==
 
-enzyme-adapter-react-16@^1.15.2:
-  version "1.15.2"
-  resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.2.tgz#b16db2f0ea424d58a808f9df86ab6212895a4501"
-  integrity sha512-SkvDrb8xU3lSxID8Qic9rB8pvevDbLybxPK6D/vW7PrT0s2Cl/zJYuXvsd1EBTz0q4o3iqG3FJhpYz3nUNpM2Q==
+enzyme-adapter-react-16@^1.15.6:
+  version "1.15.6"
+  resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.6.tgz#fd677a658d62661ac5afd7f7f541f141f8085901"
+  integrity sha512-yFlVJCXh8T+mcQo8M6my9sPgeGzj85HSHi6Apgf1Cvq/7EL/J9+1JoJmJsRxZgyTvPMAqOEpRSu/Ii/ZpyOk0g==
   dependencies:
-    enzyme-adapter-utils "^1.13.0"
-    enzyme-shallow-equal "^1.0.1"
+    enzyme-adapter-utils "^1.14.0"
+    enzyme-shallow-equal "^1.0.4"
     has "^1.0.3"
-    object.assign "^4.1.0"
-    object.values "^1.1.1"
+    object.assign "^4.1.2"
+    object.values "^1.1.2"
     prop-types "^15.7.2"
-    react-is "^16.12.0"
+    react-is "^16.13.1"
     react-test-renderer "^16.0.0-0"
     semver "^5.7.0"
 
-enzyme-adapter-utils@^1.13.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.13.0.tgz#01c885dde2114b4690bf741f8dc94cee3060eb78"
-  integrity sha512-YuEtfQp76Lj5TG1NvtP2eGJnFKogk/zT70fyYHXK2j3v6CtuHqc8YmgH/vaiBfL8K1SgVVbQXtTcgQZFwzTVyQ==
+enzyme-adapter-utils@^1.14.0:
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.14.0.tgz#afbb0485e8033aa50c744efb5f5711e64fbf1ad0"
+  integrity sha512-F/z/7SeLt+reKFcb7597IThpDp0bmzcH1E9Oabqv+o01cID2/YInlqHbFl7HzWBl4h3OdZYedtwNDOmSKkk0bg==
   dependencies:
-    airbnb-prop-types "^2.15.0"
-    function.prototype.name "^1.1.2"
-    object.assign "^4.1.0"
-    object.fromentries "^2.0.2"
+    airbnb-prop-types "^2.16.0"
+    function.prototype.name "^1.1.3"
+    has "^1.0.3"
+    object.assign "^4.1.2"
+    object.fromentries "^2.0.3"
     prop-types "^15.7.2"
     semver "^5.7.1"
 
-enzyme-shallow-equal@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.1.tgz#7afe03db3801c9b76de8440694096412a8d9d49e"
-  integrity sha512-hGA3i1so8OrYOZSM9whlkNmVHOicJpsjgTzC+wn2JMJXhq1oO4kA4bJ5MsfzSIcC71aLDKzJ6gZpIxrqt3QTAQ==
+enzyme-shallow-equal@^1.0.1, enzyme-shallow-equal@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.4.tgz#b9256cb25a5f430f9bfe073a84808c1d74fced2e"
+  integrity sha512-MttIwB8kKxypwHvRynuC3ahyNc+cFbR8mjVIltnmzQ0uKGqmsfO4bfBuLxb0beLNPhjblUEYvEbsg+VSygvF1Q==
   dependencies:
     has "^1.0.3"
-    object-is "^1.0.2"
+    object-is "^1.1.2"
 
 enzyme@^3.11.0:
   version "3.11.0"
@@ -3733,11 +3046,6 @@ enzyme@^3.11.0:
     rst-selector-parser "^2.2.3"
     string.prototype.trim "^1.2.1"
 
-err-code@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960"
-  integrity sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA=
-
 error-ex@^1.2.0, error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
@@ -3745,29 +3053,50 @@ error-ex@^1.2.0, error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.4, es-abstract@^1.17.5:
-  version "1.17.5"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz#d8c9d1d66c8981fb9200e2251d799eee92774ae9"
-  integrity sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==
+es-abstract@^1.17.0-next.1, es-abstract@^1.17.4:
+  version "1.17.7"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c"
+  integrity sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==
   dependencies:
     es-to-primitive "^1.2.1"
     function-bind "^1.1.1"
     has "^1.0.3"
     has-symbols "^1.0.1"
-    is-callable "^1.1.5"
-    is-regex "^1.0.5"
-    object-inspect "^1.7.0"
+    is-callable "^1.2.2"
+    is-regex "^1.1.1"
+    object-inspect "^1.8.0"
     object-keys "^1.1.1"
-    object.assign "^4.1.0"
-    string.prototype.trimleft "^2.1.1"
-    string.prototype.trimright "^2.1.1"
+    object.assign "^4.1.1"
+    string.prototype.trimend "^1.0.1"
+    string.prototype.trimstart "^1.0.1"
+
+es-abstract@^1.18.0-next.1:
+  version "1.18.0-next.2"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.2.tgz#088101a55f0541f595e7e057199e27ddc8f3a5c2"
+  integrity sha512-Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw==
+  dependencies:
+    call-bind "^1.0.2"
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    get-intrinsic "^1.0.2"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+    is-callable "^1.2.2"
+    is-negative-zero "^2.0.1"
+    is-regex "^1.1.1"
+    object-inspect "^1.9.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.2"
+    string.prototype.trimend "^1.0.3"
+    string.prototype.trimstart "^1.0.3"
 
 es-get-iterator@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.0.tgz#bb98ad9d6d63b31aacdc8f89d5d0ee57bcb5b4c8"
-  integrity sha512-UfrmHuWQlNMTs35e1ypnvikg6jCz3SK8v8ImvmDsh36fCVUR1MqoFDiyn0/k52C8NqO3YsO8Oe0azeesNuqSsQ==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.1.tgz#b93ddd867af16d5118e00881396533c1c6647ad9"
+  integrity sha512-qorBw8Y7B15DVLaJWy6WdEV/ZkieBcu6QCq/xzWzGOKJqgG1j754vXRfZ3NY7HSShneqU43mPB4OkQBTkvHhFw==
   dependencies:
-    es-abstract "^1.17.4"
+    call-bind "^1.0.0"
+    get-intrinsic "^1.0.1"
     has-symbols "^1.0.1"
     is-arguments "^1.0.4"
     is-map "^2.0.1"
@@ -3784,17 +3113,10 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-es6-promise@^4.0.3:
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
-  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
-
-es6-promisify@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
-  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
-  dependencies:
-    es6-promise "^4.0.3"
+escalade@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
 escape-html@^1.0.3:
   version "1.0.3"
@@ -3843,18 +3165,18 @@ eslint-config-google@^0.14.0:
   resolved "https://registry.yarnpkg.com/eslint-config-google/-/eslint-config-google-0.14.0.tgz#4f5f8759ba6e11b424294a219dbfa18c508bcc1a"
   integrity sha512-WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw==
 
-eslint-config-matrix-org@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/eslint-config-matrix-org/-/eslint-config-matrix-org-0.1.2.tgz#b5d7e193e4f3fc5041905967b53c5ddd6924c793"
-  integrity sha512-fD50uevwkFJuIi/txRiW89NO0h/qZwnkYfvO3cVpuIeoVy7FbtvuW7d8S8dry0T+whnQOb5QP1BABwimURcJag==
+eslint-config-matrix-org@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-matrix-org/-/eslint-config-matrix-org-0.2.0.tgz#27571c7c3a9ab6cc1e9d0f3d53a3739d1b004a7f"
+  integrity sha512-Hwgm1Qk0atjWgj5SWxpFPvxy6k6bDlPb9Pqjvb1i59nx8Zm6jDPy1C5vKQpkFpc0ntr+gJHa+ejYhuhaofu6Mw==
   dependencies:
-    "@typescript-eslint/eslint-plugin" "^3.4.0"
-    "@typescript-eslint/parser" "^3.4.0"
+    "@typescript-eslint/eslint-plugin" "^4.14.0"
+    "@typescript-eslint/parser" "^4.14.0"
     babel-eslint "^10.1.0"
     eslint-config-google "^0.14.0"
     eslint-config-recommended "^4.1.0"
-    eslint-plugin-babel "^5.3.0"
-    typescript "^3.9.5"
+    eslint-plugin-babel "^5.3.1"
+    typescript "^4.1.3"
 
 eslint-config-node@^4.1.0:
   version "4.1.0"
@@ -3884,7 +3206,7 @@ eslint-config-recommended@^4.1.0:
     eslint-config-node "^4.1.0"
     eslint-config-react-native "^4.1.0"
 
-eslint-import-resolver-node@^0.3.3:
+eslint-import-resolver-node@^0.3.4:
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717"
   integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==
@@ -3900,38 +3222,32 @@ eslint-module-utils@^2.6.0:
     debug "^2.6.9"
     pkg-dir "^2.0.0"
 
-eslint-plugin-babel@^5.2.1:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-babel/-/eslint-plugin-babel-5.3.0.tgz#2e7f251ccc249326da760c1a4c948a91c32d0023"
-  integrity sha512-HPuNzSPE75O+SnxHIafbW5QB45r2w78fxqwK3HmjqIUoPfPzVrq6rD+CINU3yzoDSzEhUkX07VUphbF73Lth/w==
-  dependencies:
-    eslint-rule-composer "^0.3.0"
-
-eslint-plugin-babel@^5.3.0, eslint-plugin-babel@^5.3.1:
+eslint-plugin-babel@^5.2.1, eslint-plugin-babel@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/eslint-plugin-babel/-/eslint-plugin-babel-5.3.1.tgz#75a2413ffbf17e7be57458301c60291f2cfbf560"
   integrity sha512-VsQEr6NH3dj664+EyxJwO4FCYm/00JhYb3Sk3ft8o+fpKuIfQ9TaW6uVUfvwMXHcf/lsnRIoyFPsLMyiWCSL/g==
   dependencies:
     eslint-rule-composer "^0.3.0"
 
-eslint-plugin-flowtype@^2.50.3:
-  version "2.50.3"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.50.3.tgz#61379d6dce1d010370acd6681740fd913d68175f"
-  integrity sha512-X+AoKVOr7Re0ko/yEXyM5SSZ0tazc6ffdIOocp2fFUlWoDt7DV0Bz99mngOkAFLOAWjqRA5jPwqUCbrx13XoxQ==
+eslint-plugin-flowtype@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-5.2.0.tgz#a4bef5dc18f9b2bdb41569a4ab05d73805a3d261"
+  integrity sha512-z7ULdTxuhlRJcEe1MVljePXricuPOrsWfScRXFhNzVD5dmTHWjIF57AxD0e7AbEoLSbjSsaA5S+hCg43WvpXJQ==
   dependencies:
-    lodash "^4.17.10"
+    lodash "^4.17.15"
+    string-natural-compare "^3.0.1"
 
 eslint-plugin-import@^2.14.0:
-  version "2.22.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.0.tgz#92f7736fe1fde3e2de77623c838dd992ff5ffb7e"
-  integrity sha512-66Fpf1Ln6aIS5Gr/55ts19eUuoDhAbZgnr6UxK5hbDx6l/QgQgx61AePq+BV4PP2uXQFClgMVzep5zZ94qqsxg==
+  version "2.22.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz#0896c7e6a0cf44109a2d97b95903c2bb689d7702"
+  integrity sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==
   dependencies:
     array-includes "^3.1.1"
     array.prototype.flat "^1.2.3"
     contains-path "^0.1.0"
     debug "^2.6.9"
     doctrine "1.5.0"
-    eslint-import-resolver-node "^0.3.3"
+    eslint-import-resolver-node "^0.3.4"
     eslint-module-utils "^2.6.0"
     has "^1.0.3"
     minimatch "^3.0.4"
@@ -3940,10 +3256,10 @@ eslint-plugin-import@^2.14.0:
     resolve "^1.17.0"
     tsconfig-paths "^3.9.0"
 
-eslint-plugin-react-hooks@^2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-2.5.1.tgz#4ef5930592588ce171abeb26f400c7fbcbc23cd0"
-  integrity sha512-Y2c4b55R+6ZzwtTppKwSmK/Kar8AdLiC2f9NADCuxbcTgPPg41Gyqa6b9GppgXSvCtkRw43ZE86CT5sejKC6/g==
+eslint-plugin-react-hooks@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz#8c229c268d468956334c943bb45fc860280f5556"
+  integrity sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ==
 
 eslint-plugin-react-native-globals@^0.1.1:
   version "0.1.2"
@@ -3951,27 +3267,28 @@ eslint-plugin-react-native-globals@^0.1.1:
   integrity sha512-9aEPf1JEpiTjcFAmmyw8eiIXmcNZOqaZyHO77wgm0/dWfT/oxC1SrIq8ET38pMxHYrcB6Uew+TzUVsBeczF88g==
 
 eslint-plugin-react-native@^3.8.1:
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-native/-/eslint-plugin-react-native-3.8.1.tgz#92811e37191ecb0d29c0f0a0c9e5c943ee573821"
-  integrity sha512-6Z4s4nvgFRdda/1s1+uu4a6EMZwEjjJ9Bk/1yBImv0fd9U2CsGu2cUakAtV83cZKhizbWhSouXoaK4JtlScdFg==
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-native/-/eslint-plugin-react-native-3.10.0.tgz#240f7e6979a908af3dfd9ba9652434c33f4d64cd"
+  integrity sha512-4f5+hHYYq5wFhB5eptkPEAR7FfvqbS7AzScUOANfAMZtYw5qgnCxRq45bpfBaQF+iyPMim5Q8pubcpvLv75NAg==
   dependencies:
+    "@babel/traverse" "^7.7.4"
     eslint-plugin-react-native-globals "^0.1.1"
 
-eslint-plugin-react@^7.19.0, eslint-plugin-react@^7.20.3:
-  version "7.20.3"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.20.3.tgz#0590525e7eb83890ce71f73c2cf836284ad8c2f1"
-  integrity sha512-txbo090buDeyV0ugF3YMWrzLIUqpYTsWSDZV9xLSmExE1P/Kmgg9++PD931r+KEWS66O1c9R4srLVVHmeHpoAg==
+eslint-plugin-react@^7.19.0, eslint-plugin-react@^7.22.0:
+  version "7.22.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.22.0.tgz#3d1c542d1d3169c45421c1215d9470e341707269"
+  integrity sha512-p30tuX3VS+NWv9nQot9xIGAHBXR0+xJVaZriEsHoJrASGCJZDJ8JLNM0YqKqI0AKm6Uxaa1VUHoNEibxRCMQHA==
   dependencies:
     array-includes "^3.1.1"
     array.prototype.flatmap "^1.2.3"
     doctrine "^2.1.0"
     has "^1.0.3"
-    jsx-ast-utils "^2.4.1"
+    jsx-ast-utils "^2.4.1 || ^3.0.0"
     object.entries "^1.1.2"
     object.fromentries "^2.0.2"
     object.values "^1.1.1"
     prop-types "^15.7.2"
-    resolve "^1.17.0"
+    resolve "^1.18.1"
     string.prototype.matchall "^4.0.2"
 
 eslint-rule-composer@^0.3.0:
@@ -3979,12 +3296,12 @@ eslint-rule-composer@^0.3.0:
   resolved "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9"
   integrity sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==
 
-eslint-scope@^5.0.0, eslint-scope@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz#d0f971dfe59c69e0cada684b23d49dbf82600ce5"
-  integrity sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==
+eslint-scope@^5.0.0, eslint-scope@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
+  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
   dependencies:
-    esrecurse "^4.1.0"
+    esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
 eslint-utils@^1.4.3:
@@ -3994,14 +3311,7 @@ eslint-utils@^1.4.3:
   dependencies:
     eslint-visitor-keys "^1.1.0"
 
-eslint-utils@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.0.0.tgz#7be1cc70f27a72a76cd14aa698bcabed6890e1cd"
-  integrity sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==
-  dependencies:
-    eslint-visitor-keys "^1.1.0"
-
-eslint-utils@^2.1.0:
+eslint-utils@^2.0.0, eslint-utils@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
   integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
@@ -4013,25 +3323,31 @@ eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
   integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
 
-eslint@7.5.0:
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.5.0.tgz#9ecbfad62216d223b82ac9ffea7ef3444671d135"
-  integrity sha512-vlUP10xse9sWt9SGRtcr1LAC67BENcQMFeV+w5EvLEoFe3xJ8cF1Skd0msziRx/VMC+72B4DxreCE+OR12OA6Q==
+eslint-visitor-keys@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
+  integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
+
+eslint@7.18.0:
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.18.0.tgz#7fdcd2f3715a41fe6295a16234bd69aed2c75e67"
+  integrity sha512-fbgTiE8BfUJZuBeq2Yi7J3RB3WGUQ9PNuNbmgi6jt9Iv8qrkxfy19Ds3OpL1Pm7zg3BtTVhvcUZbIRQ0wmSjAQ==
   dependencies:
     "@babel/code-frame" "^7.0.0"
+    "@eslint/eslintrc" "^0.3.0"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
     debug "^4.0.1"
     doctrine "^3.0.0"
     enquirer "^2.3.5"
-    eslint-scope "^5.1.0"
+    eslint-scope "^5.1.1"
     eslint-utils "^2.1.0"
-    eslint-visitor-keys "^1.3.0"
-    espree "^7.2.0"
+    eslint-visitor-keys "^2.0.0"
+    espree "^7.3.1"
     esquery "^1.2.0"
     esutils "^2.0.2"
-    file-entry-cache "^5.0.1"
+    file-entry-cache "^6.0.0"
     functional-red-black-tree "^1.0.1"
     glob-parent "^5.0.0"
     globals "^12.1.0"
@@ -4042,7 +3358,7 @@ eslint@7.5.0:
     js-yaml "^3.13.1"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
-    lodash "^4.17.19"
+    lodash "^4.17.20"
     minimatch "^3.0.4"
     natural-compare "^1.4.0"
     optionator "^0.9.1"
@@ -4051,7 +3367,7 @@ eslint@7.5.0:
     semver "^7.2.1"
     strip-ansi "^6.0.0"
     strip-json-comments "^3.1.0"
-    table "^5.2.3"
+    table "^6.0.4"
     text-table "^0.2.0"
     v8-compile-cache "^2.0.3"
 
@@ -4107,13 +3423,13 @@ espree@^6.1.2:
     acorn-jsx "^5.2.0"
     eslint-visitor-keys "^1.1.0"
 
-espree@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-7.2.0.tgz#1c263d5b513dbad0ac30c4991b93ac354e948d69"
-  integrity sha512-H+cQ3+3JYRMEIOl87e7QdHX70ocly5iW4+dttuR8iYSPr/hXKFb+7dBsZ7+u1adC4VrnPlTkv0+OwuPnDop19g==
+espree@^7.3.0, espree@^7.3.1:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
+  integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==
   dependencies:
-    acorn "^7.3.1"
-    acorn-jsx "^5.2.0"
+    acorn "^7.4.0"
+    acorn-jsx "^5.3.1"
     eslint-visitor-keys "^1.3.0"
 
 esprima@^4.0.0, esprima@^4.0.1:
@@ -4128,33 +3444,33 @@ esquery@^1.0.1, esquery@^1.2.0:
   dependencies:
     estraverse "^5.1.0"
 
-esrecurse@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
-  integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==
+esrecurse@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
+  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
   dependencies:
-    estraverse "^4.1.0"
+    estraverse "^5.2.0"
 
-estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
+estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
-estraverse@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz#374309d39fd935ae500e7b92e8a6b4c720e59642"
-  integrity sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==
-
-estree-walker@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362"
-  integrity sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==
+estraverse@^5.1.0, estraverse@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
+  integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
 
 esutils@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
+events@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379"
+  integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==
+
 except@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/except/-/except-0.1.3.tgz#98261c91958551536b44482238e9783fb73d292a"
@@ -4181,9 +3497,9 @@ execa@^1.0.0:
     strip-eof "^1.0.0"
 
 execa@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-4.0.3.tgz#0a34dabbad6d66100bd6f2c576c8669403f317f2"
-  integrity sha512-WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A==
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
+  integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
   dependencies:
     cross-spawn "^7.0.0"
     get-stream "^5.0.0"
@@ -4195,12 +3511,12 @@ execa@^4.0.0:
     signal-exit "^3.0.2"
     strip-final-newline "^2.0.0"
 
-execall@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/execall/-/execall-1.0.0.tgz#73d0904e395b3cab0658b08d09ec25307f29bb73"
-  integrity sha1-c9CQTjlbPKsGWLCNCewlMH8pu3M=
+execall@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/execall/-/execall-2.0.0.tgz#16a06b5fe5099df7d00be5d9c06eecded1663b45"
+  integrity sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==
   dependencies:
-    clone-regexp "^1.0.0"
+    clone-regexp "^2.1.0"
 
 exit@^0.1.2:
   version "0.1.2"
@@ -4233,16 +3549,16 @@ expect@^1.20.2:
     object-keys "^1.0.9"
     tmatch "^2.0.1"
 
-expect@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-26.5.2.tgz#3e0631c4a657a83dbec769ad246a2998953a55a6"
-  integrity sha512-ccTGrXZd8DZCcvCz4htGXTkd/LOoy6OEtiDS38x3/VVf6E4AQL0QoeksBiw7BtGR5xDNiRYPB8GN6pfbuTOi7w==
+expect@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-26.6.2.tgz#c6b996bf26bf3fe18b67b2d0f51fc981ba934417"
+  integrity sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==
   dependencies:
-    "@jest/types" "^26.5.2"
+    "@jest/types" "^26.6.2"
     ansi-styles "^4.0.0"
     jest-get-type "^26.3.0"
-    jest-matcher-utils "^26.5.2"
-    jest-message-util "^26.5.2"
+    jest-matcher-utils "^26.6.2"
+    jest-message-util "^26.6.2"
     jest-regex-util "^26.0.0"
 
 extend-shallow@^2.0.1:
@@ -4303,17 +3619,17 @@ fast-deep-equal@^3.1.1:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-glob@^2.2.6:
-  version "2.2.7"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.7.tgz#6953857c3afa475fff92ee6015d52da70a4cd39d"
-  integrity sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==
+fast-glob@^3.1.1, fast-glob@^3.2.5:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661"
+  integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==
   dependencies:
-    "@mrmlnc/readdir-enhanced" "^2.2.1"
-    "@nodelib/fs.stat" "^1.1.2"
-    glob-parent "^3.1.0"
-    is-glob "^4.0.0"
-    merge2 "^1.2.3"
-    micromatch "^3.1.10"
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.0"
+    merge2 "^1.3.0"
+    micromatch "^4.0.2"
+    picomatch "^2.2.1"
 
 fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
@@ -4330,6 +3646,18 @@ fast-memoize@^2.5.1:
   resolved "https://registry.yarnpkg.com/fast-memoize/-/fast-memoize-2.5.2.tgz#79e3bb6a4ec867ea40ba0e7146816f6cdce9b57e"
   integrity sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw==
 
+fastest-levenshtein@^1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2"
+  integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==
+
+fastq@^1.6.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.10.0.tgz#74dbefccade964932cdf500473ef302719c652bb"
+  integrity sha512-NL2Qc5L3iQEsyYzweq7qfgy5OtXCmGzGvhElGEd/SoFWEMOEczNh5s5ocaF01HDetxz+p8ecjNPA6cZxxIHmzA==
+  dependencies:
+    reusify "^1.0.4"
+
 fb-watchman@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85"
@@ -4366,11 +3694,6 @@ fbjs@^0.8.4:
     setimmediate "^1.0.5"
     ua-parser-js "^0.7.18"
 
-figgy-pudding@^3.5.1:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
-  integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==
-
 figures@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
@@ -4378,13 +3701,6 @@ figures@^3.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
-file-entry-cache@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-4.0.0.tgz#633567d15364aefe0b299e1e217735e8f3a9f6e8"
-  integrity sha512-AVSwsnbV8vH/UVbvgEhf3saVQXORNv0ZzSkvkhQIaia5Tia+JhGTaa/ePUSVoPHQyGayQNmYfkzFi3WZV5zcpA==
-  dependencies:
-    flat-cache "^2.0.1"
-
 file-entry-cache@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
@@ -4392,20 +3708,22 @@ file-entry-cache@^5.0.1:
   dependencies:
     flat-cache "^2.0.1"
 
-file-saver@^1.3.8:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-1.3.8.tgz#e68a30c7cb044e2fb362b428469feb291c2e09d8"
-  integrity sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg==
+file-entry-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.0.tgz#7921a89c391c6d93efec2169ac6bf300c527ea0a"
+  integrity sha512-fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA==
+  dependencies:
+    flat-cache "^3.0.4"
 
-file-uri-to-path@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
-  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
+file-saver@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-2.0.5.tgz#d61cfe2ce059f414d899e9dd6d4107ee25670c38"
+  integrity sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==
 
-filesize@3.6.1:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317"
-  integrity sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==
+filesize@6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-6.1.0.tgz#e81bdaa780e2451d714d71c0d7a4f3238d37ad00"
+  integrity sha512-LpCHtPQ3sFx67z+uh2HnSyWSLLu5Jxo21795uRDuar/EOuYWXib5EmPaGIBuSnRqH2IODiKA2k5re/K9OnN/Yg==
 
 fill-range@^4.0.0:
   version "4.0.0"
@@ -4433,14 +3751,6 @@ find-cache-dir@^2.0.0:
     make-dir "^2.0.0"
     pkg-dir "^3.0.0"
 
-find-up@4.1.0, find-up@^4.0.0, find-up@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
-  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
-  dependencies:
-    locate-path "^5.0.0"
-    path-exists "^4.0.0"
-
 find-up@^2.0.0, find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
@@ -4455,6 +3765,14 @@ find-up@^3.0.0:
   dependencies:
     locate-path "^3.0.0"
 
+find-up@^4.0.0, find-up@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
+  dependencies:
+    locate-path "^5.0.0"
+    path-exists "^4.0.0"
+
 flat-cache@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
@@ -4464,18 +3782,23 @@ flat-cache@^2.0.1:
     rimraf "2.6.3"
     write "1.0.3"
 
+flat-cache@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
+  integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
+  dependencies:
+    flatted "^3.1.0"
+    rimraf "^3.0.2"
+
 flatted@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
   integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
 
-flush-write-stream@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
-  integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==
-  dependencies:
-    inherits "^2.0.3"
-    readable-stream "^2.3.6"
+flatted@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469"
+  integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==
 
 flux@2.1.1:
   version "2.1.1"
@@ -4486,15 +3809,17 @@ flux@2.1.1:
     fbjs "0.1.0-alpha.7"
     immutable "^3.7.4"
 
-focus-lock@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/focus-lock/-/focus-lock-0.7.0.tgz#b2bfb0ca7beacc8710a1ff74275fe0dc60a1d88a"
-  integrity sha512-LI7v2mH02R55SekHYdv9pRHR9RajVNyIJ2N5IEkWbg7FT5ZmJ9Hw4mWxHeEUcd+dJo0QmzztHvDvWcc7prVFsw==
+focus-lock@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/focus-lock/-/focus-lock-0.8.1.tgz#bb36968abf77a2063fa173cb6c47b12ac8599d33"
+  integrity sha512-/LFZOIo82WDsyyv7h7oc0MJF9ACOvDRdx9rWPZ2pgMfNWu/z8hQDBtOchuB/0BVLmuFOZjV02YwUVzNsWx/EzA==
+  dependencies:
+    tslib "^1.9.3"
 
-focus-visible@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/focus-visible/-/focus-visible-5.1.0.tgz#4b9d40143b865f53eafbd93ca66672b3bf9e7b6a"
-  integrity sha512-nPer0rjtzdZ7csVIu233P2cUm/ks/4aVSI+5KUkYrYpgA7ujgC3p6J7FtFU+AIMWwnwYQOB/yeiOITxFeYIXiw==
+focus-visible@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/focus-visible/-/focus-visible-5.2.0.tgz#3a9e41fccf587bd25dcc2ef045508284f0a4d6b3"
+  integrity sha512-Rwix9pBtC1Nuy5wysTmKy+UjbDJpIfg8eHjw0rjZ1mX4GNLz1Bmd16uDpI3Gk1i70Fgcs8Csg2lPm8HULFg9DQ==
 
 for-in@^1.0.2:
   version "1.0.2"
@@ -4527,100 +3852,74 @@ fragment-cache@^0.2.1:
   dependencies:
     map-cache "^0.2.2"
 
-from2@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
-  integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
-  dependencies:
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-
 fs-readdir-recursive@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27"
   integrity sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==
 
-fs-write-stream-atomic@^1.0.8:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
-  integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=
-  dependencies:
-    graceful-fs "^4.1.2"
-    iferr "^0.1.5"
-    imurmurhash "^0.1.4"
-    readable-stream "1 || 2"
-
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-fsevents@^1.2.7:
-  version "1.2.13"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
-  integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==
-  dependencies:
-    bindings "^1.5.0"
-    nan "^2.12.1"
-
-fsevents@^2.1.2, fsevents@~2.1.2:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
-  integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==
+fsevents@^2.1.2, fsevents@~2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.1.tgz#b209ab14c61012636c8863507edf7fb68cc54e9f"
+  integrity sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==
 
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
-function.prototype.name@^1.1.1, function.prototype.name@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.2.tgz#5cdf79d7c05db401591dfde83e3b70c5123e9a45"
-  integrity sha512-C8A+LlHBJjB2AdcRPorc5JvJ5VUoWlXdEHLOJdCI7kjHEtGTpHQUiqMvCIKUwIsGwZX2jZJy761AXsn356bJQg==
+function.prototype.name@^1.1.2, function.prototype.name@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.3.tgz#0bb034bb308e7682826f215eb6b2ae64918847fe"
+  integrity sha512-H51qkbNSp8mtkJt+nyW1gyStBiKZxfRqySNUR99ylq6BPXHKI4SEvIlTKp4odLfjRKJV04DFWMU3G/YRlQOsag==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    functions-have-names "^1.2.0"
+    es-abstract "^1.18.0-next.1"
+    functions-have-names "^1.2.1"
 
 functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
   integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
 
-functions-have-names@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.1.tgz#a981ac397fa0c9964551402cdc5533d7a4d52f91"
-  integrity sha512-j48B/ZI7VKs3sgeI2cZp7WXWmZXu7Iq5pl5/vptV5N2mq+DGFuS/ulaDjtaoLpYzuD6u8UgrUKHfgo7fDTSiBA==
-
-fuse.js@^2.7.4:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-2.7.4.tgz#96e420fde7ef011ac49c258a621314fe576536f9"
-  integrity sha1-luQg/efvARrEnCWKYhMU/ldlNvk=
+functions-have-names@^1.2.0, functions-have-names@^1.2.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.2.tgz#98d93991c39da9361f8e50b337c4f6e41f120e21"
+  integrity sha512-bLgc3asbWdwPbx2mNk2S49kmJCuQeu0nfmaOgbs8WIyzzkw3r4htszdIi9Q9EMezDPTYuJx2wvjZ/EwgAthpnA==
 
 gensync@^1.0.0-beta.1:
-  version "1.0.0-beta.1"
-  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
-  integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==
-
-get-caller-file@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
-  integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
+  integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
 get-caller-file@^2.0.1:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
+get-intrinsic@^1.0.1, get-intrinsic@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.2.tgz#6820da226e50b24894e08859469dc68361545d49"
+  integrity sha512-aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+
 get-package-type@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
   integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
 
-get-stdin@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
-  integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==
+get-stdin@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53"
+  integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==
 
 get-stream@^4.0.0:
   version "4.1.0"
@@ -4661,34 +3960,18 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob-parent@^5.0.0, glob-parent@~5.1.0:
+glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@~5.1.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
   integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
   dependencies:
     is-glob "^4.0.1"
 
-glob-to-regexp@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
-  integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
-
 glob-to-regexp@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@^5.0.15:
-  version "5.0.15"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
-  integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "2 || 3"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
@@ -4729,33 +4012,31 @@ globals@^12.1.0:
   dependencies:
     type-fest "^0.8.1"
 
-globby@^9.0.0:
-  version "9.2.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-9.2.0.tgz#fd029a706c703d29bdd170f4b6db3a3f7a7cb63d"
-  integrity sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==
+globby@^11.0.1, globby@^11.0.2:
+  version "11.0.2"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.2.tgz#1af538b766a3b540ebfb58a32b2e2d5897321d83"
+  integrity sha512-2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og==
   dependencies:
-    "@types/glob" "^7.1.1"
-    array-union "^1.0.2"
-    dir-glob "^2.2.2"
-    fast-glob "^2.2.6"
-    glob "^7.1.3"
-    ignore "^4.0.3"
-    pify "^4.0.1"
-    slash "^2.0.0"
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.1.1"
+    ignore "^5.1.4"
+    merge2 "^1.3.0"
+    slash "^3.0.0"
 
 globjoin@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43"
   integrity sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=
 
-gonzales-pe@^4.2.3:
+gonzales-pe@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.3.0.tgz#fe9dec5f3c557eead09ff868c65826be54d067b3"
   integrity sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==
   dependencies:
     minimist "^1.2.5"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.2.4:
+graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.2.4:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
   integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
@@ -4771,17 +4052,17 @@ har-schema@^2.0.0:
   integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
 har-validator@~5.1.3:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
-  integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
+  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
   dependencies:
-    ajv "^6.5.5"
+    ajv "^6.12.3"
     har-schema "^2.0.0"
 
-has-flag@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
-  integrity sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=
+hard-rejection@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
+  integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==
 
 has-flag@^3.0.0:
   version "3.0.0"
@@ -4793,7 +4074,7 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-symbols@^1.0.0, has-symbols@^1.0.1:
+has-symbols@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
   integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
@@ -4836,10 +4117,10 @@ has@^1.0.1, has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
-highlight.js@^10.1.2:
-  version "10.1.2"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.1.2.tgz#c20db951ba1c22c055010648dfffd7b2a968e00c"
-  integrity sha512-Q39v/Mn5mfBlMff9r+zzA+gWxRsCRKwEMvYTiisLr/XUiFI/4puWt0Ojdko3R3JCNWGdOWaA5g/Yxqa23kC5AA==
+highlight.js@^10.5.0:
+  version "10.5.0"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.5.0.tgz#3f09fede6a865757378f2d9ebdcbc15ba268f98f"
+  integrity sha512-xTmvd9HiIHR6L53TMC7TKolEj65zG1XU+Onr8oi86mYa+nLcIbxTTWkpW7CsEwv/vK7u1zb8alZIMLDqqN6KTw==
 
 hoist-non-react-statics@^3.3.0:
   version "3.3.2"
@@ -4848,18 +4129,18 @@ hoist-non-react-statics@^3.3.0:
   dependencies:
     react-is "^16.7.0"
 
-hosted-git-info@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.0.tgz#dd8af49cd01e73cc8e61ba13e217a772fd4ecd2d"
-  integrity sha512-zYSx1cP4MLsvKtTg8DF/PI6e6FHZ3wcawcTGsrLU2TM+UfD4jmSrn2wdQT16TFbH3lO4PIdjLG0E+cuYDgFD9g==
-  dependencies:
-    lru-cache "^5.1.1"
-
 hosted-git-info@^2.1.4:
   version "2.8.8"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
   integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
 
+hosted-git-info@^3.0.6:
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.7.tgz#a30727385ea85acfcee94e0aad9e368c792e036c"
+  integrity sha512-fWqc0IcuXs+BmE9orLDyVykAG9GJtGLGuZAAqgcckPgv5xad4AcXGIv8galtQvlwutxSlaMcdw7BUtq2EIvqCQ==
+  dependencies:
+    lru-cache "^6.0.0"
+
 html-element-map@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/html-element-map/-/html-element-map-1.2.0.tgz#dfbb09efe882806af63d990cf6db37993f099f22"
@@ -4874,22 +4155,22 @@ html-encoding-sniffer@^2.0.1:
   dependencies:
     whatwg-encoding "^1.0.5"
 
-html-entities@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz#fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44"
-  integrity sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==
+html-entities@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.4.0.tgz#cfbd1b01d2afaf9adca1b10ae7dffab98c71d2dc"
+  integrity sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==
 
 html-escaper@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
-html-tags@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-2.0.0.tgz#10b30a386085f43cede353cc8fa7cb0deeea668b"
-  integrity sha1-ELMKOGCF9Dzt41PMj6fLDe7qZos=
+html-tags@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140"
+  integrity sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==
 
-htmlparser2@^3.10.0, htmlparser2@^3.9.1:
+htmlparser2@^3.10.0:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
   integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
@@ -4911,18 +4192,15 @@ htmlparser2@^4.1.0:
     domutils "^2.0.0"
     entities "^2.0.0"
 
-http-cache-semantics@^3.8.1:
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
-  integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==
-
-http-proxy-agent@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
-  integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==
+htmlparser2@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.0.0.tgz#c2da005030390908ca4c91e5629e418e0665ac01"
+  integrity sha512-numTQtDZMoh78zJpaNdJ9MXb2cv5G3jwUoe3dMQODubZvLoGvTE/Ofp6sHvH8OGKcN/8A47pGLi/k58xHP/Tfw==
   dependencies:
-    agent-base "4"
-    debug "3.1.0"
+    domelementtype "^2.0.1"
+    domhandler "^4.0.0"
+    domutils "^2.4.4"
+    entities "^2.0.0"
 
 http-signature@~1.2.0:
   version "1.2.0"
@@ -4933,49 +4211,36 @@ http-signature@~1.2.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
-https-proxy-agent@^2.2.1:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
-  integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
-  dependencies:
-    agent-base "^4.3.0"
-    debug "^3.1.0"
-
 human-signals@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
   integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
 
-humanize-ms@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
-  integrity sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=
-  dependencies:
-    ms "^2.0.0"
-
-iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@~0.4.13:
+iconv-lite@0.4.24, iconv-lite@^0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-ieee754@^1.1.4:
-  version "1.1.13"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
-  integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
+iconv-lite@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz#ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01"
+  integrity sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3.0.0"
 
-iferr@^0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
-  integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
+ieee754@^1.1.13:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
-ignore@^4.0.3, ignore@^4.0.6:
+ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
-ignore@^5.0.4:
+ignore@^5.1.4, ignore@^5.1.8:
   version "5.1.8"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
   integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
@@ -4985,26 +4250,18 @@ immutable@^3.7.4:
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3"
   integrity sha1-wkOZUUVbs5kT2vKBN28VMOEErfM=
 
-import-fresh@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
-  integrity sha1-2BNVwVYS04bGH53dOSLUMEgipUY=
-  dependencies:
-    caller-path "^2.0.0"
-    resolve-from "^3.0.0"
-
-import-fresh@^3.0.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66"
-  integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==
+import-fresh@^3.0.0, import-fresh@^3.2.1:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
+  integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
   dependencies:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
-import-lazy@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-3.1.0.tgz#891279202c8a2280fdbd6674dbd8da1a1dfc67cc"
-  integrity sha512-8/gvXvX2JMn0F+CDlSC4l6kOmVaLOO3XLkksI7CI3Ud95KDYJuYur2b9P/PUt/i/pDAMd/DulQsNbbbmRRsDIQ==
+import-lazy@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153"
+  integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==
 
 import-local@^3.0.2:
   version "3.0.2"
@@ -5019,10 +4276,10 @@ imurmurhash@^0.1.4:
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
 
-indent-string@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
-  integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=
+indent-string@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
+  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
 
 indexes-of@^1.0.1:
   version "1.0.1"
@@ -5034,11 +4291,6 @@ indexof@0.0.1:
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
   integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
 
-infer-owner@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
-  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
-
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -5047,20 +4299,20 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.0, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3:
+inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
-ini@^1.3.5, ini@~1.3.0:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+ini@^1.3.5:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
 inquirer@^7.0.0:
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.2.tgz#25245d2e32dc9f33dbe26eeaada231daa66e9c7c"
-  integrity sha512-DF4osh1FM6l0RJc5YWYhSDB6TawiBRlbV9Cox8MWlidU218Tb7fm3lQTULyUJDfJ0tjbzl0W4q651mrCCEM55w==
+  version "7.3.3"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003"
+  integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==
   dependencies:
     ansi-escapes "^4.2.1"
     chalk "^4.1.0"
@@ -5068,7 +4320,7 @@ inquirer@^7.0.0:
     cli-width "^3.0.0"
     external-editor "^3.0.3"
     figures "^3.0.0"
-    lodash "^4.17.16"
+    lodash "^4.17.19"
     mute-stream "0.0.8"
     run-async "^2.4.0"
     rxjs "^6.6.0"
@@ -5092,20 +4344,15 @@ invariant@^2.2.2, invariant@^2.2.4:
   dependencies:
     loose-envify "^1.0.0"
 
-invert-kv@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
-  integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
-
-ip-regex@^2.0.0, ip-regex@^2.1.0:
+ip-regex@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
   integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
 
-ip@1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
-  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
+ip-regex@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-4.2.0.tgz#a03f5eb661d9a154e3973a03de8b23dd0ad6892e"
+  integrity sha512-n5cDDeTWWRwK1EBoWwRti+8nP4NbytBBY0pldmnIkq6Z55KNFmWofh4rl9dPZpj+U/nVq7gweR3ylrvMt4YZ5A==
 
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
@@ -5126,11 +4373,6 @@ is-alphabetical@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz#9e7d6b94916be22153745d184c298cbf986a686d"
   integrity sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==
 
-is-alphanumeric@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz#4a9cef71daf4c001c1d81d63d140cf53fd6889f4"
-  integrity sha1-Spzvcdr0wAHB2B1j0UDPU/1oifQ=
-
 is-alphanumerical@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz#7eb9a2431f855f6b1ef1a78e326df515696c4dbf"
@@ -5140,9 +4382,11 @@ is-alphanumerical@^1.0.0:
     is-decimal "^1.0.0"
 
 is-arguments@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3"
-  integrity sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.0.tgz#62353031dfbee07ceb34656a6bde59efecae8dd9"
+  integrity sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==
+  dependencies:
+    call-bind "^1.0.0"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
@@ -5156,10 +4400,10 @@ is-arrow-function@^2.0.3:
   dependencies:
     is-callable "^1.0.4"
 
-is-bigint@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.0.tgz#73da8c33208d00f130e9b5e15d23eac9215601c4"
-  integrity sha512-t5mGUXC/xRheCK431ylNiSkGGpBp8bHENBcENTkDT6ppwPzEVxNGZRvgvmOEfbWkFhA7D2GEuE2mmQTr78sl2g==
+is-bigint@^1.0.0, is-bigint@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.1.tgz#6923051dfcbc764278540b9ce0e6b3213aa5ebc2"
+  integrity sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg==
 
 is-binary-path@^1.0.0:
   version "1.0.1"
@@ -5175,10 +4419,12 @@ is-binary-path@~2.1.0:
   dependencies:
     binary-extensions "^2.0.0"
 
-is-boolean-object@^1.0.0, is-boolean-object@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.1.tgz#10edc0900dd127697a92f6f9807c7617d68ac48e"
-  integrity sha512-TqZuVwa/sppcrhUCAYkGBk7w0yxfQQnxq28fjkO53tnK9FQXmdwz2JS5+GjsWQ6RByES1K40nI+yDic5c9/aAQ==
+is-boolean-object@^1.0.0, is-boolean-object@^1.0.1, is-boolean-object@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.0.tgz#e2aaad3a3a8fca34c28f6eee135b156ed2587ff0"
+  integrity sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==
+  dependencies:
+    call-bind "^1.0.0"
 
 is-buffer@^1.1.5:
   version "1.1.6"
@@ -5186,14 +4432,14 @@ is-buffer@^1.1.5:
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
 is-buffer@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623"
-  integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191"
+  integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==
 
-is-callable@^1.0.4, is-callable@^1.1.4, is-callable@^1.1.5:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz#83336560b54a38e35e3a2df7afd0454d691468bb"
-  integrity sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==
+is-callable@^1.0.4, is-callable@^1.1.4, is-callable@^1.1.5, is-callable@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
+  integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==
 
 is-ci@^2.0.0:
   version "2.0.0"
@@ -5202,6 +4448,13 @@ is-ci@^2.0.0:
   dependencies:
     ci-info "^2.0.0"
 
+is-core-module@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
+  integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
+  dependencies:
+    has "^1.0.3"
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -5244,11 +4497,6 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
     is-data-descriptor "^1.0.0"
     kind-of "^6.0.2"
 
-is-directory@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
-  integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
-
 is-docker@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156"
@@ -5295,13 +4543,6 @@ is-extglob@^2.1.0, is-extglob@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
-  dependencies:
-    number-is-nan "^1.0.0"
-
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
@@ -5318,9 +4559,9 @@ is-generator-fn@^2.0.0:
   integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
 
 is-generator-function@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.7.tgz#d2132e529bb0000a7f80794d4bdf5cd5e5813522"
-  integrity sha512-YZc5EwyO4f2kWCax7oegfuSr9mFz1ZvieNYBEjmukLxgXfBUbxAWGVF7GZf0zidYtoBl3WvC07YK0wT76a+Rtw==
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.8.tgz#dfb5c2b120e02b0a8d9d2c6806cd5621aa922f7b"
+  integrity sha512-2Omr/twNtufVZFr1GhxjOMFPAj2sjc/dKaIqBhvo4qciXfJmITGH6ZGd8eZYNHza8t1y0e01AuqRhJwfWp26WQ==
 
 is-glob@^3.1.0:
   version "3.1.0"
@@ -5341,17 +4582,22 @@ is-hexadecimal@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7"
   integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==
 
-is-ip@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-ip/-/is-ip-2.0.0.tgz#68eea07e8a0a0a94c2d080dd674c731ab2a461ab"
-  integrity sha1-aO6gfooKCpTC0IDdZ0xzGrKkYas=
+is-ip@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/is-ip/-/is-ip-3.1.0.tgz#2ae5ddfafaf05cb8008a62093cf29734f657c5d8"
+  integrity sha512-35vd5necO7IitFPjd/YBeqwWnyDWbuLH9ZXQdMfDA8TEo7pv5X8yfrvVO3xbJbLUlERCMvf6X0hTUamQxCYJ9Q==
   dependencies:
-    ip-regex "^2.0.0"
+    ip-regex "^4.0.0"
 
 is-map@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127"
+  integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==
+
+is-negative-zero@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.1.tgz#520dafc4307bb8ebc33b813de5ce7c9400d644a1"
-  integrity sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw==
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
+  integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
 
 is-number-object@^1.0.3, is-number-object@^1.0.4:
   version "1.0.4"
@@ -5370,16 +4616,16 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-is-obj@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
-  integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
-
 is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
   integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
 
+is-plain-obj@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
+  integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
+
 is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
@@ -5397,22 +4643,22 @@ is-potential-custom-element-name@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397"
   integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c=
 
-is-regex@^1.0.3, is-regex@^1.0.4, is-regex@^1.0.5:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.0.tgz#ece38e389e490df0dc21caea2bd596f987f767ff"
-  integrity sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==
+is-regex@^1.0.3, is-regex@^1.0.4, is-regex@^1.0.5, is-regex@^1.1.0, is-regex@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
+  integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==
   dependencies:
     has-symbols "^1.0.1"
 
-is-regexp@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
-  integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk=
+is-regexp@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-2.1.0.tgz#cd734a56864e23b956bf4e7c66c396a4c0b22c2d"
+  integrity sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==
 
 is-set@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.1.tgz#d1604afdab1724986d30091575f54945da7e5f43"
-  integrity sha512-eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec"
+  integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==
 
 is-stream@^1.0.1, is-stream@^1.1.0:
   version "1.1.0"
@@ -5434,11 +4680,6 @@ is-subset@^0.1.1:
   resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
   integrity sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=
 
-is-supported-regexp-flag@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.1.tgz#21ee16518d2c1dd3edd3e9a0d57e50207ac364ca"
-  integrity sha512-3vcJecUUrpgCqc/ca0aWeNu64UGgxcvO60K/Fkr1N6RSvfGCTU60UKN68JDmKokgba0rFFJs12EnzOQa14ubKQ==
-
 is-symbol@^1.0.2, is-symbol@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
@@ -5461,21 +4702,11 @@ is-weakset@^2.0.1:
   resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.1.tgz#e9a0af88dbd751589f5e50d80f4c98b780884f83"
   integrity sha512-pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw==
 
-is-whitespace-character@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz#0858edd94a95594c7c9dd0b5c174ec6e45ee4aa7"
-  integrity sha512-SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w==
-
 is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
   integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
-is-word-character@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.4.tgz#ce0e73216f98599060592f62ff31354ddbeb0230"
-  integrity sha512-5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA==
-
 is-wsl@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
@@ -5523,29 +4754,11 @@ isstream@~0.1.2:
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
   integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
-istanbul-lib-coverage@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#675f0ab69503fad4b1d849f736baaca803344f49"
-  integrity sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==
-
 istanbul-lib-coverage@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec"
   integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==
 
-istanbul-lib-instrument@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz#a5f63d91f0bbc0c3e479ef4c5de027335ec6d630"
-  integrity sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==
-  dependencies:
-    "@babel/generator" "^7.4.0"
-    "@babel/parser" "^7.4.3"
-    "@babel/template" "^7.4.0"
-    "@babel/traverse" "^7.4.3"
-    "@babel/types" "^7.4.0"
-    istanbul-lib-coverage "^2.0.5"
-    semver "^6.0.0"
-
 istanbul-lib-instrument@^4.0.0, istanbul-lib-instrument@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d"
@@ -5590,67 +4803,67 @@ jest-canvas-mock@^2.3.0:
     cssfontparser "^1.2.1"
     moo-color "^1.0.2"
 
-jest-changed-files@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.5.2.tgz#330232c6a5c09a7f040a5870e8f0a9c6abcdbed5"
-  integrity sha512-qSmssmiIdvM5BWVtyK/nqVpN3spR5YyvkvPqz1x3BR1bwIxsWmU/MGwLoCrPNLbkG2ASAKfvmJpOduEApBPh2w==
+jest-changed-files@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.6.2.tgz#f6198479e1cc66f22f9ae1e22acaa0b429c042d0"
+  integrity sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ==
   dependencies:
-    "@jest/types" "^26.5.2"
+    "@jest/types" "^26.6.2"
     execa "^4.0.0"
     throat "^5.0.0"
 
-jest-cli@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.5.2.tgz#0df114399b4036a3f046f0a9f25c50372c76b3a2"
-  integrity sha512-usm48COuUvRp8YEG5OWOaxbSM0my7eHn3QeBWxiGUuFhvkGVBvl1fic4UjC02EAEQtDv8KrNQUXdQTV6ZZBsoA==
+jest-cli@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.6.3.tgz#43117cfef24bc4cd691a174a8796a532e135e92a"
+  integrity sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==
   dependencies:
-    "@jest/core" "^26.5.2"
-    "@jest/test-result" "^26.5.2"
-    "@jest/types" "^26.5.2"
+    "@jest/core" "^26.6.3"
+    "@jest/test-result" "^26.6.2"
+    "@jest/types" "^26.6.2"
     chalk "^4.0.0"
     exit "^0.1.2"
     graceful-fs "^4.2.4"
     import-local "^3.0.2"
     is-ci "^2.0.0"
-    jest-config "^26.5.2"
-    jest-util "^26.5.2"
-    jest-validate "^26.5.2"
+    jest-config "^26.6.3"
+    jest-util "^26.6.2"
+    jest-validate "^26.6.2"
     prompts "^2.0.1"
     yargs "^15.4.1"
 
-jest-config@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.5.2.tgz#6e828e25f10124433dd008fbd83348636de0972a"
-  integrity sha512-dqJOnSegNdE5yDiuGHsjTM5gec7Z4AcAMHiW+YscbOYJAlb3LEtDSobXCq0or9EmGQI5SFmKy4T7P1FxetJOfg==
+jest-config@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.6.3.tgz#64f41444eef9eb03dc51d5c53b75c8c71f645349"
+  integrity sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==
   dependencies:
     "@babel/core" "^7.1.0"
-    "@jest/test-sequencer" "^26.5.2"
-    "@jest/types" "^26.5.2"
-    babel-jest "^26.5.2"
+    "@jest/test-sequencer" "^26.6.3"
+    "@jest/types" "^26.6.2"
+    babel-jest "^26.6.3"
     chalk "^4.0.0"
     deepmerge "^4.2.2"
     glob "^7.1.1"
     graceful-fs "^4.2.4"
-    jest-environment-jsdom "^26.5.2"
-    jest-environment-node "^26.5.2"
+    jest-environment-jsdom "^26.6.2"
+    jest-environment-node "^26.6.2"
     jest-get-type "^26.3.0"
-    jest-jasmine2 "^26.5.2"
+    jest-jasmine2 "^26.6.3"
     jest-regex-util "^26.0.0"
-    jest-resolve "^26.5.2"
-    jest-util "^26.5.2"
-    jest-validate "^26.5.2"
+    jest-resolve "^26.6.2"
+    jest-util "^26.6.2"
+    jest-validate "^26.6.2"
     micromatch "^4.0.2"
-    pretty-format "^26.5.2"
+    pretty-format "^26.6.2"
 
-jest-diff@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.5.2.tgz#8e26cb32dc598e8b8a1b9deff55316f8313c8053"
-  integrity sha512-HCSWDUGwsov5oTlGzrRM+UPJI/Dpqi9jzeV0fdRNi3Ch5bnoXhnyJMmVg2juv9081zLIy3HGPI5mcuGgXM2xRA==
+jest-diff@^26.0.0, jest-diff@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394"
+  integrity sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==
   dependencies:
     chalk "^4.0.0"
-    diff-sequences "^26.5.0"
+    diff-sequences "^26.6.2"
     jest-get-type "^26.3.0"
-    pretty-format "^26.5.2"
+    pretty-format "^26.6.2"
 
 jest-docblock@^26.0.0:
   version "26.0.0"
@@ -5659,16 +4872,16 @@ jest-docblock@^26.0.0:
   dependencies:
     detect-newline "^3.0.0"
 
-jest-each@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.5.2.tgz#35e68d6906a7f826d3ca5803cfe91d17a5a34c31"
-  integrity sha512-w7D9FNe0m2D3yZ0Drj9CLkyF/mGhmBSULMQTypzAKR746xXnjUrK8GUJdlLTWUF6dd0ks3MtvGP7/xNFr9Aphg==
+jest-each@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.6.2.tgz#02526438a77a67401c8a6382dfe5999952c167cb"
+  integrity sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A==
   dependencies:
-    "@jest/types" "^26.5.2"
+    "@jest/types" "^26.6.2"
     chalk "^4.0.0"
     jest-get-type "^26.3.0"
-    jest-util "^26.5.2"
-    pretty-format "^26.5.2"
+    jest-util "^26.6.2"
+    pretty-format "^26.6.2"
 
 jest-environment-jsdom-sixteen@^1.0.3:
   version "1.0.3"
@@ -5680,131 +4893,98 @@ jest-environment-jsdom-sixteen@^1.0.3:
     jest-util "^25.1.0"
     jsdom "^16.2.1"
 
-jest-environment-jsdom@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.5.2.tgz#5feab05b828fd3e4b96bee5e0493464ddd2bb4bc"
-  integrity sha512-fWZPx0bluJaTQ36+PmRpvUtUlUFlGGBNyGX1SN3dLUHHMcQ4WseNEzcGGKOw4U5towXgxI4qDoI3vwR18H0RTw==
+jest-environment-jsdom@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz#78d09fe9cf019a357009b9b7e1f101d23bd1da3e"
+  integrity sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q==
   dependencies:
-    "@jest/environment" "^26.5.2"
-    "@jest/fake-timers" "^26.5.2"
-    "@jest/types" "^26.5.2"
+    "@jest/environment" "^26.6.2"
+    "@jest/fake-timers" "^26.6.2"
+    "@jest/types" "^26.6.2"
     "@types/node" "*"
-    jest-mock "^26.5.2"
-    jest-util "^26.5.2"
+    jest-mock "^26.6.2"
+    jest-util "^26.6.2"
     jsdom "^16.4.0"
 
-jest-environment-node@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.5.2.tgz#275a0f01b5e47447056f1541a15ed4da14acca03"
-  integrity sha512-YHjnDsf/GKFCYMGF1V+6HF7jhY1fcLfLNBDjhAOvFGvt6d8vXvNdJGVM7uTZ2VO/TuIyEFhPGaXMX5j3h7fsrA==
+jest-environment-node@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.6.2.tgz#824e4c7fb4944646356f11ac75b229b0035f2b0c"
+  integrity sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag==
   dependencies:
-    "@jest/environment" "^26.5.2"
-    "@jest/fake-timers" "^26.5.2"
-    "@jest/types" "^26.5.2"
+    "@jest/environment" "^26.6.2"
+    "@jest/fake-timers" "^26.6.2"
+    "@jest/types" "^26.6.2"
     "@types/node" "*"
-    jest-mock "^26.5.2"
-    jest-util "^26.5.2"
+    jest-mock "^26.6.2"
+    jest-util "^26.6.2"
 
 jest-get-type@^26.3.0:
   version "26.3.0"
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0"
   integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==
 
-jest-haste-map@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.9.0.tgz#b38a5d64274934e21fa417ae9a9fbeb77ceaac7d"
-  integrity sha512-kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ==
+jest-haste-map@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.6.2.tgz#dd7e60fe7dc0e9f911a23d79c5ff7fb5c2cafeaa"
+  integrity sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==
   dependencies:
-    "@jest/types" "^24.9.0"
-    anymatch "^2.0.0"
-    fb-watchman "^2.0.0"
-    graceful-fs "^4.1.15"
-    invariant "^2.2.4"
-    jest-serializer "^24.9.0"
-    jest-util "^24.9.0"
-    jest-worker "^24.9.0"
-    micromatch "^3.1.10"
-    sane "^4.0.3"
-    walker "^1.0.7"
-  optionalDependencies:
-    fsevents "^1.2.7"
-
-jest-haste-map@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.5.2.tgz#a15008abfc502c18aa56e4919ed8c96304ceb23d"
-  integrity sha512-lJIAVJN3gtO3k4xy+7i2Xjtwh8CfPcH08WYjZpe9xzveDaqGw9fVNCpkYu6M525wKFVkLmyi7ku+DxCAP1lyMA==
-  dependencies:
-    "@jest/types" "^26.5.2"
+    "@jest/types" "^26.6.2"
     "@types/graceful-fs" "^4.1.2"
     "@types/node" "*"
     anymatch "^3.0.3"
     fb-watchman "^2.0.0"
     graceful-fs "^4.2.4"
     jest-regex-util "^26.0.0"
-    jest-serializer "^26.5.0"
-    jest-util "^26.5.2"
-    jest-worker "^26.5.0"
+    jest-serializer "^26.6.2"
+    jest-util "^26.6.2"
+    jest-worker "^26.6.2"
     micromatch "^4.0.2"
     sane "^4.0.3"
     walker "^1.0.7"
   optionalDependencies:
     fsevents "^2.1.2"
 
-jest-jasmine2@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.5.2.tgz#0e33819d31b1f2aab5efd1e02ce502209c0e64a2"
-  integrity sha512-2J+GYcgLVPTkpmvHEj0/IDTIAuyblGNGlyGe4fLfDT2aktEPBYvoxUwFiOmDDxxzuuEAD2uxcYXr0+1Yw4tjFA==
+jest-jasmine2@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz#adc3cf915deacb5212c93b9f3547cd12958f2edd"
+  integrity sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg==
   dependencies:
     "@babel/traverse" "^7.1.0"
-    "@jest/environment" "^26.5.2"
-    "@jest/source-map" "^26.5.0"
-    "@jest/test-result" "^26.5.2"
-    "@jest/types" "^26.5.2"
+    "@jest/environment" "^26.6.2"
+    "@jest/source-map" "^26.6.2"
+    "@jest/test-result" "^26.6.2"
+    "@jest/types" "^26.6.2"
     "@types/node" "*"
     chalk "^4.0.0"
     co "^4.6.0"
-    expect "^26.5.2"
+    expect "^26.6.2"
     is-generator-fn "^2.0.0"
-    jest-each "^26.5.2"
-    jest-matcher-utils "^26.5.2"
-    jest-message-util "^26.5.2"
-    jest-runtime "^26.5.2"
-    jest-snapshot "^26.5.2"
-    jest-util "^26.5.2"
-    pretty-format "^26.5.2"
+    jest-each "^26.6.2"
+    jest-matcher-utils "^26.6.2"
+    jest-message-util "^26.6.2"
+    jest-runtime "^26.6.3"
+    jest-snapshot "^26.6.2"
+    jest-util "^26.6.2"
+    pretty-format "^26.6.2"
     throat "^5.0.0"
 
-jest-leak-detector@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.5.2.tgz#83fcf9a4a6ef157549552cb4f32ca1d6221eea69"
-  integrity sha512-h7ia3dLzBFItmYERaLPEtEKxy3YlcbcRSjj0XRNJgBEyODuu+3DM2o62kvIFvs3PsaYoIIv+e+nLRI61Dj1CNw==
+jest-leak-detector@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz#7717cf118b92238f2eba65054c8a0c9c653a91af"
+  integrity sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg==
   dependencies:
     jest-get-type "^26.3.0"
-    pretty-format "^26.5.2"
+    pretty-format "^26.6.2"
 
-jest-matcher-utils@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.5.2.tgz#6aa2c76ce8b9c33e66f8856ff3a52bab59e6c85a"
-  integrity sha512-W9GO9KBIC4gIArsNqDUKsLnhivaqf8MSs6ujO/JDcPIQrmY+aasewweXVET8KdrJ6ADQaUne5UzysvF/RR7JYA==
+jest-matcher-utils@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz#8e6fd6e863c8b2d31ac6472eeb237bc595e53e7a"
+  integrity sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==
   dependencies:
     chalk "^4.0.0"
-    jest-diff "^26.5.2"
+    jest-diff "^26.6.2"
     jest-get-type "^26.3.0"
-    pretty-format "^26.5.2"
-
-jest-message-util@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.9.0.tgz#527f54a1e380f5e202a8d1149b0ec872f43119e3"
-  integrity sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@jest/test-result" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    "@types/stack-utils" "^1.0.1"
-    chalk "^2.0.1"
-    micromatch "^3.1.10"
-    slash "^2.0.0"
-    stack-utils "^1.0.1"
+    pretty-format "^26.6.2"
 
 jest-message-util@^25.5.0:
   version "25.5.0"
@@ -5820,27 +5000,21 @@ jest-message-util@^25.5.0:
     slash "^3.0.0"
     stack-utils "^1.0.1"
 
-jest-message-util@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.5.2.tgz#6c4c4c46dcfbabb47cd1ba2f6351559729bc11bb"
-  integrity sha512-Ocp9UYZ5Jl15C5PNsoDiGEk14A4NG0zZKknpWdZGoMzJuGAkVt10e97tnEVMYpk7LnQHZOfuK2j/izLBMcuCZw==
+jest-message-util@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.6.2.tgz#58173744ad6fc0506b5d21150b9be56ef001ca07"
+  integrity sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@jest/types" "^26.5.2"
+    "@jest/types" "^26.6.2"
     "@types/stack-utils" "^2.0.0"
     chalk "^4.0.0"
     graceful-fs "^4.2.4"
     micromatch "^4.0.2"
+    pretty-format "^26.6.2"
     slash "^3.0.0"
     stack-utils "^2.0.2"
 
-jest-mock@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.9.0.tgz#c22835541ee379b908673ad51087a2185c13f1c6"
-  integrity sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w==
-  dependencies:
-    "@jest/types" "^24.9.0"
-
 jest-mock@^25.1.0, jest-mock@^25.5.0:
   version "25.5.0"
   resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-25.5.0.tgz#a91a54dabd14e37ecd61665d6b6e06360a55387a"
@@ -5848,12 +5022,12 @@ jest-mock@^25.1.0, jest-mock@^25.5.0:
   dependencies:
     "@jest/types" "^25.5.0"
 
-jest-mock@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.5.2.tgz#c9302e8ef807f2bfc749ee52e65ad11166a1b6a1"
-  integrity sha512-9SiU4b5PtO51v0MtJwVRqeGEroH66Bnwtq4ARdNP7jNXbpT7+ByeWNAk4NeT/uHfNSVDXEXgQo1XRuwEqS6Rdw==
+jest-mock@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.6.2.tgz#d6cb712b041ed47fe0d9b6fc3474bc6543feb302"
+  integrity sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew==
   dependencies:
-    "@jest/types" "^26.5.2"
+    "@jest/types" "^26.6.2"
     "@types/node" "*"
 
 jest-pnp-resolver@^1.2.2:
@@ -5861,150 +5035,123 @@ jest-pnp-resolver@^1.2.2:
   resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c"
   integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==
 
-jest-regex-util@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.9.0.tgz#c13fb3380bde22bf6575432c493ea8fe37965636"
-  integrity sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==
-
 jest-regex-util@^26.0.0:
   version "26.0.0"
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz#d25e7184b36e39fd466c3bc41be0971e821fee28"
   integrity sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==
 
-jest-resolve-dependencies@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.5.2.tgz#ee30b7cfea81c81bf5e195a9287d7ec07f893170"
-  integrity sha512-LLkc8LuRtxqOx0AtX/Npa2C4I23WcIrwUgNtHYXg4owYF/ZDQShcwBAHjYZIFR06+HpQcZ43+kCTMlQ3aDCYTg==
+jest-resolve-dependencies@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz#6680859ee5d22ee5dcd961fe4871f59f4c784fb6"
+  integrity sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg==
   dependencies:
-    "@jest/types" "^26.5.2"
+    "@jest/types" "^26.6.2"
     jest-regex-util "^26.0.0"
-    jest-snapshot "^26.5.2"
+    jest-snapshot "^26.6.2"
 
-jest-resolve@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.5.2.tgz#0d719144f61944a428657b755a0e5c6af4fc8602"
-  integrity sha512-XsPxojXGRA0CoDD7Vis59ucz2p3cQFU5C+19tz3tLEAlhYKkK77IL0cjYjikY9wXnOaBeEdm1rOgSJjbZWpcZg==
+jest-resolve@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.6.2.tgz#a3ab1517217f469b504f1b56603c5bb541fbb507"
+  integrity sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==
   dependencies:
-    "@jest/types" "^26.5.2"
+    "@jest/types" "^26.6.2"
     chalk "^4.0.0"
     graceful-fs "^4.2.4"
     jest-pnp-resolver "^1.2.2"
-    jest-util "^26.5.2"
+    jest-util "^26.6.2"
     read-pkg-up "^7.0.1"
-    resolve "^1.17.0"
+    resolve "^1.18.1"
     slash "^3.0.0"
 
-jest-runner@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.5.2.tgz#4f9e6b0bb7eb4710c209a9e145b8a10894f4c19f"
-  integrity sha512-GKhYxtSX5+tXZsd2QwfkDqPIj5C2HqOdXLRc2x2qYqWE26OJh17xo58/fN/mLhRkO4y6o60ZVloan7Kk5YA6hg==
+jest-runner@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.6.3.tgz#2d1fed3d46e10f233fd1dbd3bfaa3fe8924be159"
+  integrity sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ==
   dependencies:
-    "@jest/console" "^26.5.2"
-    "@jest/environment" "^26.5.2"
-    "@jest/test-result" "^26.5.2"
-    "@jest/types" "^26.5.2"
+    "@jest/console" "^26.6.2"
+    "@jest/environment" "^26.6.2"
+    "@jest/test-result" "^26.6.2"
+    "@jest/types" "^26.6.2"
     "@types/node" "*"
     chalk "^4.0.0"
     emittery "^0.7.1"
     exit "^0.1.2"
     graceful-fs "^4.2.4"
-    jest-config "^26.5.2"
+    jest-config "^26.6.3"
     jest-docblock "^26.0.0"
-    jest-haste-map "^26.5.2"
-    jest-leak-detector "^26.5.2"
-    jest-message-util "^26.5.2"
-    jest-resolve "^26.5.2"
-    jest-runtime "^26.5.2"
-    jest-util "^26.5.2"
-    jest-worker "^26.5.0"
+    jest-haste-map "^26.6.2"
+    jest-leak-detector "^26.6.2"
+    jest-message-util "^26.6.2"
+    jest-resolve "^26.6.2"
+    jest-runtime "^26.6.3"
+    jest-util "^26.6.2"
+    jest-worker "^26.6.2"
     source-map-support "^0.5.6"
     throat "^5.0.0"
 
-jest-runtime@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.5.2.tgz#b72f5f79eb2fe0c46bfef4cdb9c1e01d1c69ba41"
-  integrity sha512-zArr4DatX/Sn0wswX/AnAuJgmwgAR5rNtrUz36HR8BfMuysHYNq5sDbYHuLC4ICyRdy5ae/KQ+sczxyS9G6Qvw==
+jest-runtime@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.6.3.tgz#4f64efbcfac398331b74b4b3c82d27d401b8fa2b"
+  integrity sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw==
   dependencies:
-    "@jest/console" "^26.5.2"
-    "@jest/environment" "^26.5.2"
-    "@jest/fake-timers" "^26.5.2"
-    "@jest/globals" "^26.5.2"
-    "@jest/source-map" "^26.5.0"
-    "@jest/test-result" "^26.5.2"
-    "@jest/transform" "^26.5.2"
-    "@jest/types" "^26.5.2"
+    "@jest/console" "^26.6.2"
+    "@jest/environment" "^26.6.2"
+    "@jest/fake-timers" "^26.6.2"
+    "@jest/globals" "^26.6.2"
+    "@jest/source-map" "^26.6.2"
+    "@jest/test-result" "^26.6.2"
+    "@jest/transform" "^26.6.2"
+    "@jest/types" "^26.6.2"
     "@types/yargs" "^15.0.0"
     chalk "^4.0.0"
+    cjs-module-lexer "^0.6.0"
     collect-v8-coverage "^1.0.0"
     exit "^0.1.2"
     glob "^7.1.3"
     graceful-fs "^4.2.4"
-    jest-config "^26.5.2"
-    jest-haste-map "^26.5.2"
-    jest-message-util "^26.5.2"
-    jest-mock "^26.5.2"
+    jest-config "^26.6.3"
+    jest-haste-map "^26.6.2"
+    jest-message-util "^26.6.2"
+    jest-mock "^26.6.2"
     jest-regex-util "^26.0.0"
-    jest-resolve "^26.5.2"
-    jest-snapshot "^26.5.2"
-    jest-util "^26.5.2"
-    jest-validate "^26.5.2"
+    jest-resolve "^26.6.2"
+    jest-snapshot "^26.6.2"
+    jest-util "^26.6.2"
+    jest-validate "^26.6.2"
     slash "^3.0.0"
     strip-bom "^4.0.0"
     yargs "^15.4.1"
 
-jest-serializer@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.9.0.tgz#e6d7d7ef96d31e8b9079a714754c5d5c58288e73"
-  integrity sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ==
-
-jest-serializer@^26.5.0:
-  version "26.5.0"
-  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.5.0.tgz#f5425cc4c5f6b4b355f854b5f0f23ec6b962bc13"
-  integrity sha512-+h3Gf5CDRlSLdgTv7y0vPIAoLgX/SI7T4v6hy+TEXMgYbv+ztzbg5PSN6mUXAT/hXYHvZRWm+MaObVfqkhCGxA==
+jest-serializer@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.6.2.tgz#d139aafd46957d3a448f3a6cdabe2919ba0742d1"
+  integrity sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==
   dependencies:
     "@types/node" "*"
     graceful-fs "^4.2.4"
 
-jest-snapshot@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.5.2.tgz#0cf7642eaf8e8d2736bd443f619959bf237f9ccf"
-  integrity sha512-MkXIDvEefzDubI/WaDVSRH4xnkuirP/Pz8LhAIDXcVQTmcEfwxywj5LGwBmhz+kAAIldA7XM4l96vbpzltSjqg==
+jest-snapshot@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.6.2.tgz#f3b0af1acb223316850bd14e1beea9837fb39c84"
+  integrity sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og==
   dependencies:
     "@babel/types" "^7.0.0"
-    "@jest/types" "^26.5.2"
+    "@jest/types" "^26.6.2"
     "@types/babel__traverse" "^7.0.4"
     "@types/prettier" "^2.0.0"
     chalk "^4.0.0"
-    expect "^26.5.2"
+    expect "^26.6.2"
     graceful-fs "^4.2.4"
-    jest-diff "^26.5.2"
+    jest-diff "^26.6.2"
     jest-get-type "^26.3.0"
-    jest-haste-map "^26.5.2"
-    jest-matcher-utils "^26.5.2"
-    jest-message-util "^26.5.2"
-    jest-resolve "^26.5.2"
+    jest-haste-map "^26.6.2"
+    jest-matcher-utils "^26.6.2"
+    jest-message-util "^26.6.2"
+    jest-resolve "^26.6.2"
     natural-compare "^1.4.0"
-    pretty-format "^26.5.2"
+    pretty-format "^26.6.2"
     semver "^7.3.2"
 
-jest-util@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-24.9.0.tgz#7396814e48536d2e85a37de3e4c431d7cb140162"
-  integrity sha512-x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg==
-  dependencies:
-    "@jest/console" "^24.9.0"
-    "@jest/fake-timers" "^24.9.0"
-    "@jest/source-map" "^24.9.0"
-    "@jest/test-result" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    callsites "^3.0.0"
-    chalk "^2.0.1"
-    graceful-fs "^4.1.15"
-    is-ci "^2.0.0"
-    mkdirp "^0.5.1"
-    slash "^2.0.0"
-    source-map "^0.6.0"
-
 jest-util@^25.1.0, jest-util@^25.5.0:
   version "25.5.0"
   resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-25.5.0.tgz#31c63b5d6e901274d264a4fec849230aa3fa35b0"
@@ -6016,68 +5163,60 @@ jest-util@^25.1.0, jest-util@^25.5.0:
     is-ci "^2.0.0"
     make-dir "^3.0.0"
 
-jest-util@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.5.2.tgz#8403f75677902cc52a1b2140f568e91f8ed4f4d7"
-  integrity sha512-WTL675bK+GSSAYgS8z9FWdCT2nccO1yTIplNLPlP0OD8tUk/H5IrWKMMRudIQQ0qp8bb4k+1Qa8CxGKq9qnYdg==
+jest-util@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz#907535dbe4d5a6cb4c47ac9b926f6af29576cbc1"
+  integrity sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==
   dependencies:
-    "@jest/types" "^26.5.2"
+    "@jest/types" "^26.6.2"
     "@types/node" "*"
     chalk "^4.0.0"
     graceful-fs "^4.2.4"
     is-ci "^2.0.0"
     micromatch "^4.0.2"
 
-jest-validate@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.5.2.tgz#7ea266700b64234cd1c0cee982490c5a80e9b0f0"
-  integrity sha512-FmJks0zY36mp6Af/5sqO6CTL9bNMU45yKCJk3hrz8d2aIqQIlN1pr9HPIwZE8blLaewOla134nt5+xAmWsx3SQ==
+jest-validate@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.6.2.tgz#23d380971587150467342911c3d7b4ac57ab20ec"
+  integrity sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==
   dependencies:
-    "@jest/types" "^26.5.2"
+    "@jest/types" "^26.6.2"
     camelcase "^6.0.0"
     chalk "^4.0.0"
     jest-get-type "^26.3.0"
     leven "^3.1.0"
-    pretty-format "^26.5.2"
+    pretty-format "^26.6.2"
 
-jest-watcher@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.5.2.tgz#2957f4461007e0769d74b537379ecf6b7c696916"
-  integrity sha512-i3m1NtWzF+FXfJ3ljLBB/WQEp4uaNhX7QcQUWMokcifFTUQBDFyUMEwk0JkJ1kopHbx7Een3KX0Q7+9koGM/Pw==
+jest-watcher@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.6.2.tgz#a5b683b8f9d68dbcb1d7dae32172d2cca0592975"
+  integrity sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ==
   dependencies:
-    "@jest/test-result" "^26.5.2"
-    "@jest/types" "^26.5.2"
+    "@jest/test-result" "^26.6.2"
+    "@jest/types" "^26.6.2"
     "@types/node" "*"
     ansi-escapes "^4.2.1"
     chalk "^4.0.0"
-    jest-util "^26.5.2"
+    jest-util "^26.6.2"
     string-length "^4.0.1"
 
-jest-worker@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.9.0.tgz#5dbfdb5b2d322e98567898238a9697bcce67b3e5"
-  integrity sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==
-  dependencies:
-    merge-stream "^2.0.0"
-    supports-color "^6.1.0"
-
-jest-worker@^26.5.0:
-  version "26.5.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.5.0.tgz#87deee86dbbc5f98d9919e0dadf2c40e3152fa30"
-  integrity sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug==
+jest-worker@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
+  integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
   dependencies:
     "@types/node" "*"
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
-jest@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-26.5.2.tgz#c6791642b331fe7abd2f993b0a74aa546f7be0fb"
-  integrity sha512-4HFabJVwsgDwul/7rhXJ3yFAF/aUkVIXiJWmgFxb+WMdZG39fVvOwYAs8/3r4AlFPc4m/n5sTMtuMbOL3kNtrQ==
+jest@^26.6.3:
+  version "26.6.3"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-26.6.3.tgz#40e8fdbe48f00dfa1f0ce8121ca74b88ac9148ef"
+  integrity sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q==
   dependencies:
-    "@jest/core" "^26.5.2"
+    "@jest/core" "^26.6.3"
     import-local "^3.0.2"
-    jest-cli "^26.5.2"
+    jest-cli "^26.6.3"
 
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
@@ -6085,9 +5224,9 @@ jest@^26.5.2:
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
 js-yaml@^3.13.1:
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482"
-  integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -6139,7 +5278,7 @@ jsesc@~0.5.0:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
   integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
 
-json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1:
+json-parse-better-errors@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
@@ -6154,6 +5293,11 @@ json-schema-traverse@^0.4.1:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
   integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
+json-schema-traverse@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
+  integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
+
 json-schema@0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
@@ -6193,13 +5337,20 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
-jsx-ast-utils@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.4.1.tgz#1114a4c1209481db06c690c2b4f488cc665f657e"
-  integrity sha512-z1xSldJ6imESSzOjd3NNkieVJKRlKYSOtMG8SFyCj2FIrvSaSuli/WjpBkEzCBoR9bYYYFgqJw61Xhu7Lcgk+w==
+"jsx-ast-utils@^2.4.1 || ^3.0.0":
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz#41108d2cec408c3453c1bbe8a4aae9e1e2bd8f82"
+  integrity sha512-EIsmt3O3ljsU6sot/J4E1zDRxfBNrhjyf/OKjlydwgEimQuznlM4Wv7U+ueONJMyEn1WRE0K8dhi3dVAXYT24Q==
   dependencies:
-    array-includes "^3.1.1"
-    object.assign "^4.1.0"
+    array-includes "^3.1.2"
+    object.assign "^4.1.2"
+
+katex@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/katex/-/katex-0.12.0.tgz#2fb1c665dbd2b043edcf8a1f5c555f46beaa0cb9"
+  integrity sha512-y+8btoc/CK70XqcHqjxiGWBOeIL8upbS0peTPXTvgrh21n1RiWWcIpSWM+4uXq+IAgNh9YYQWdc7LVDPDAEEAg==
+  dependencies:
+    commander "^2.19.0"
 
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
@@ -6220,7 +5371,7 @@ kind-of@^5.0.0:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
   integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
 
-kind-of@^6.0.0, kind-of@^6.0.2:
+kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
@@ -6235,35 +5386,16 @@ klona@^2.0.3:
   resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz#7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0"
   integrity sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==
 
-known-css-properties@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.11.0.tgz#0da784f115ea77c76b81536d7052e90ee6c86a8a"
-  integrity sha512-bEZlJzXo5V/ApNNa5z375mJC6Nrz4vG43UgcSCrg2OHC+yuB6j0iDSrY7RQ/+PRofFB03wNIIt9iXIVLr4wc7w==
-
-lcid@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
-  integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==
-  dependencies:
-    invert-kv "^2.0.0"
-
-leven@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
-  integrity sha1-wuep93IJTe6dNCAq6KzORoeHVYA=
+known-css-properties@^0.20.0:
+  version "0.20.0"
+  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.20.0.tgz#0570831661b47dd835293218381166090ff60e96"
+  integrity sha512-URvsjaA9ypfreqJ2/ylDr5MUERhJZ+DhguoWRr2xgS5C7aGCalXo+ewL+GixgKBfhT2vuL02nbIgNGqVWgTOYw==
 
 leven@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
   integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
 
-levenary@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/levenary/-/levenary-1.1.1.tgz#842a9ee98d2075aa7faeedbe32679e9205f46f77"
-  integrity sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==
-  dependencies:
-    leven "^3.1.0"
-
 levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
@@ -6280,14 +5412,6 @@ levn@^0.4.1:
     prelude-ls "^1.2.1"
     type-check "~0.4.0"
 
-line-column@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/line-column/-/line-column-1.0.2.tgz#d25af2936b6f4849172b312e4792d1d987bc34a2"
-  integrity sha1-0lryk2tvSEkXKzEuR5LR2Ye8NKI=
-  dependencies:
-    isarray "^1.0.0"
-    isobject "^2.0.0"
-
 lines-and-columns@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
@@ -6308,16 +5432,6 @@ load-json-file@^2.0.0:
     pify "^2.0.0"
     strip-bom "^3.0.0"
 
-load-json-file@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
-  integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs=
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^4.0.0"
-    pify "^3.0.0"
-    strip-bom "^3.0.0"
-
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
@@ -6342,9 +5456,9 @@ locate-path@^5.0.0:
     p-locate "^4.1.0"
 
 lodash-es@^4.2.1:
-  version "4.17.15"
-  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.15.tgz#21bd96839354412f23d7a10340e5eac6ee455d78"
-  integrity sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ==
+  version "4.17.20"
+  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.20.tgz#29f6332eefc60e849f869c264bc71126ad61e8f7"
+  integrity sha512-JD1COMZsq8maT6mnuz1UMV0jvYD0E0aUsSOdrr1/nAG3dhqQXwRRgeW0cSqH1U43INKcqxaiVIQNOUDld7gRDA==
 
 lodash.escape@^4.0.1:
   version "4.0.1"
@@ -6366,31 +5480,31 @@ lodash.sortby@^4.7.0:
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
   integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
 
-lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.16, lodash@^4.17.19, lodash@^4.17.4, lodash@^4.2.1:
-  version "4.17.19"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
-  integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
+lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.2.1:
+  version "4.17.20"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
+  integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
 
-log-symbols@^2.0.0, log-symbols@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
-  integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
+log-symbols@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz#69b3cc46d20f448eccdb75ea1fa733d9e821c920"
+  integrity sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==
   dependencies:
-    chalk "^2.0.1"
+    chalk "^4.0.0"
 
-loglevel@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz#728166855a740d59d38db01cf46f042caa041bb0"
-  integrity sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==
+loglevel@^1.7.1:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197"
+  integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==
 
-lolex@^5.0.0, lolex@^5.1.2:
+lolex@^5.0.0:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/lolex/-/lolex-5.1.2.tgz#953694d098ce7c07bc5ed6d0e42bc6c0c6d5a367"
   integrity sha512-h4hmjAvHTmd+25JSwrtTIuwbKdwg5NzZVRMLn9saij4SZaepCrTCxPr35H/3bjwfMJtN+t3CX8672UIkglz28A==
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
-longest-streak@^2.0.1:
+longest-streak@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.4.tgz#b8599957da5b5dab64dee3fe316fa774597d90e4"
   integrity sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==
@@ -6402,20 +5516,12 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0:
   dependencies:
     js-tokens "^3.0.0 || ^4.0.0"
 
-loud-rejection@^1.0.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
-  integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
   dependencies:
-    currently-unhandled "^0.4.1"
-    signal-exit "^3.0.0"
-
-lru-cache@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
-  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
-  dependencies:
-    yallist "^3.0.2"
+    yallist "^4.0.0"
 
 make-dir@^2.0.0, make-dir@^2.1.0:
   version "2.1.0"
@@ -6432,23 +5538,6 @@ make-dir@^3.0.0:
   dependencies:
     semver "^6.0.0"
 
-make-fetch-happen@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-5.0.0.tgz#a8e3fe41d3415dd656fe7b8e8172e1fb4458b38d"
-  integrity sha512-nFr/vpL1Jc60etMVKeaLOqfGjMMb3tAHFVJWxHOFCFS04Zmd7kGlMxo0l1tzfhoQje0/UPnd0X8OeGUiXXnfPA==
-  dependencies:
-    agentkeepalive "^3.4.1"
-    cacache "^12.0.0"
-    http-cache-semantics "^3.8.1"
-    http-proxy-agent "^2.1.0"
-    https-proxy-agent "^2.2.1"
-    lru-cache "^5.1.1"
-    mississippi "^3.0.0"
-    node-fetch-npm "^2.0.2"
-    promise-retry "^1.1.1"
-    socks-proxy-agent "^4.0.0"
-    ssri "^6.0.0"
-
 makeerror@1.0.x:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
@@ -6456,13 +5545,6 @@ makeerror@1.0.x:
   dependencies:
     tmpl "1.0.x"
 
-map-age-cleaner@^0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
-  integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==
-  dependencies:
-    p-defer "^1.0.0"
-
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -6473,10 +5555,10 @@ map-obj@^1.0.0:
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
   integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
 
-map-obj@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9"
-  integrity sha1-plzSkIepJZi4eRJXpSPgISIqwfk=
+map-obj@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.1.0.tgz#b91221b542734b9f14256c0132c897c5d7256fd5"
+  integrity sha512-glc9y00wgtwcDmp7GaE/0b0OnxpNJsVf3ael/An6Fe2Q51LLwN1er6sdomLRzz5h0+yMpiYLhWYF5R7HeqVd4g==
 
 map-visit@^1.0.0:
   version "1.0.0"
@@ -6485,32 +5567,22 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
-markdown-escapes@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535"
-  integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==
-
-markdown-table@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-1.1.3.tgz#9fcb69bcfdb8717bfd0398c6ec2d93036ef8de60"
-  integrity sha512-1RUZVgQlpJSPWYbFSpmudq5nHY1doEIv89gBtF0s4gW1GF2XorxcA/70M5vq7rLv0a6mhOUccRsqkwhwLCIQ2Q==
-
-mathml-tag-names@^2.0.1:
+mathml-tag-names@^2.1.3:
   version "2.1.3"
   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 "8.5.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/d8c4101fdd521e189f4755c6f02a8971b991ef5f"
+  version "9.8.0"
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/fb73ab687826e4d05fb8b424ab013a771213f84f"
   dependencies:
-    "@babel/runtime" "^7.11.2"
+    "@babel/runtime" "^7.12.5"
     another-json "^0.2.0"
     browser-request "^0.3.3"
     bs58 "^4.0.1"
     content-type "^1.0.4"
-    loglevel "^1.7.0"
-    qs "^6.9.4"
+    loglevel "^1.7.1"
+    qs "^6.9.6"
     request "^2.88.2"
     unhomoglyph "^1.0.6"
 
@@ -6527,62 +5599,88 @@ 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.3:
-  version "0.1.0-beta.3"
-  resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.3.tgz#356965ca357172ee056e3fd86fd96879b059a114"
-  integrity sha512-j7nxdhLQfdU6snsdBA29KQR0DmT8/vl6otOvGqPCV0OCHpq1312cP79Eg4JzJKIFI3A76Qha3nYx6G9/aapwXg==
-
-mdast-util-compact@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mdast-util-compact/-/mdast-util-compact-1.0.4.tgz#d531bb7667b5123abf20859be086c4d06c894593"
-  integrity sha512-3YDMQHI5vRiS2uygEFYaqckibpJtKq5Sj2c8JioeOQBU6INpKbdWzfyLqFFnDwEcEnRFIdMsguzs5pC1Jp4Isg==
+matrix-widget-api@^0.1.0-beta.13:
+  version "0.1.0-beta.13"
+  resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.13.tgz#ebddc83eaef39bbb87b621a02a35902e1a29b9ef"
+  integrity sha512-DJAvuX2E7gxc/a9rtJPDh17ba9xGIOAoBHcWirNTN3KGodzsrZ+Ns+M/BREFWMwGS5yEBZko5eq7uhXStEbnyQ==
   dependencies:
-    unist-util-visit "^1.1.0"
+    "@types/events" "^3.0.0"
+    events "^3.2.0"
+
+mdast-util-from-markdown@^0.8.0:
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.4.tgz#2882100c1b9fc967d3f83806802f303666682d32"
+  integrity sha512-jj891B5pV2r63n2kBTFh8cRI2uR9LQHsXG1zSDqfhXkIlDzrTcIlbB5+5aaYEkl8vOPIOPLf8VT7Ere1wWTMdw==
+  dependencies:
+    "@types/mdast" "^3.0.0"
+    mdast-util-to-string "^2.0.0"
+    micromark "~2.11.0"
+    parse-entities "^2.0.0"
+    unist-util-stringify-position "^2.0.0"
+
+mdast-util-to-markdown@^0.6.0:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.2.tgz#8fe6f42a2683c43c5609dfb40407c095409c85b4"
+  integrity sha512-iRczns6WMvu0hUw02LXsPDJshBIwtUPbvHBWo19IQeU0YqmzlA8Pd30U8V7uiI0VPkxzS7A/NXBXH6u+HS87Zg==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    longest-streak "^2.0.0"
+    mdast-util-to-string "^2.0.0"
+    parse-entities "^2.0.0"
+    repeat-string "^1.0.0"
+    zwitch "^1.0.0"
+
+mdast-util-to-string@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz#b8cfe6a713e1091cb5b728fc48885a4767f8b97b"
+  integrity sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==
 
 mdurl@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
   integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
 
-mem@^4.0.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
-  integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==
-  dependencies:
-    map-age-cleaner "^0.1.1"
-    mimic-fn "^2.0.0"
-    p-is-promise "^2.0.0"
-
 memoize-one@^3.0.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-3.1.1.tgz#ef609811e3bc28970eac2884eece64d167830d17"
   integrity sha512-YqVh744GsMlZu6xkhGslPSqSurOv6P+kLN2J3ysBZfagLcL5FdRK/0UpgLoL8hwjjEvvAVkjJZyFP+1T6p1vgA==
 
-meow@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/meow/-/meow-5.0.0.tgz#dfc73d63a9afc714a5e371760eb5c88b91078aa4"
-  integrity sha512-CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig==
+meow@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-9.0.0.tgz#cd9510bc5cac9dee7d03c73ee1f9ad959f4ea364"
+  integrity sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==
   dependencies:
-    camelcase-keys "^4.0.0"
-    decamelize-keys "^1.0.0"
-    loud-rejection "^1.0.0"
-    minimist-options "^3.0.1"
-    normalize-package-data "^2.3.4"
-    read-pkg-up "^3.0.0"
-    redent "^2.0.0"
-    trim-newlines "^2.0.0"
-    yargs-parser "^10.0.0"
+    "@types/minimist" "^1.2.0"
+    camelcase-keys "^6.2.2"
+    decamelize "^1.2.0"
+    decamelize-keys "^1.1.0"
+    hard-rejection "^2.1.0"
+    minimist-options "4.1.0"
+    normalize-package-data "^3.0.0"
+    read-pkg-up "^7.0.1"
+    redent "^3.0.0"
+    trim-newlines "^3.0.0"
+    type-fest "^0.18.0"
+    yargs-parser "^20.2.3"
 
 merge-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
-merge2@^1.2.3:
+merge2@^1.3.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
+micromark@~2.11.0:
+  version "2.11.2"
+  resolved "https://registry.yarnpkg.com/micromark/-/micromark-2.11.2.tgz#e8b6a05f54697d2d3d27fc89600c6bc40dd05f35"
+  integrity sha512-IXuP76p2uj8uMg4FQc1cRE7lPCLsfAXuEfdjtdO55VRiFO1asrCSQ5g43NmPqFtRwzEnEhafRVzn2jg0UiKArQ==
+  dependencies:
+    debug "^4.0.0"
+    parse-entities "^2.0.0"
+
 micromatch@^3.1.10, micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
@@ -6610,64 +5708,49 @@ micromatch@^4.0.2:
     braces "^3.0.1"
     picomatch "^2.0.5"
 
-mime-db@1.44.0:
-  version "1.44.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
-  integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
+mime-db@1.45.0:
+  version "1.45.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea"
+  integrity sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==
 
 mime-types@^2.1.12, mime-types@~2.1.19:
-  version "2.1.27"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
-  integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
+  version "2.1.28"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.28.tgz#1160c4757eab2c5363888e005273ecf79d2a0ecd"
+  integrity sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==
   dependencies:
-    mime-db "1.44.0"
+    mime-db "1.45.0"
 
-mimic-fn@^2.0.0, mimic-fn@^2.1.0:
+mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
-"minimatch@2 || 3", minimatch@^3.0.4:
+min-indent@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
+  integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
+
+minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist-options@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954"
-  integrity sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==
+minimist-options@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
+  integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==
   dependencies:
     arrify "^1.0.1"
     is-plain-obj "^1.1.0"
+    kind-of "^6.0.3"
 
-minimist@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
-
-minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5, minimist@~1.2.0:
+minimist@>=1.2.2, minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
-mississippi@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
-  integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==
-  dependencies:
-    concat-stream "^1.5.0"
-    duplexify "^3.4.2"
-    end-of-stream "^1.1.0"
-    flush-write-stream "^1.0.0"
-    from2 "^2.1.0"
-    parallel-transform "^1.1.0"
-    pump "^3.0.0"
-    pumpify "^1.3.3"
-    stream-each "^1.1.0"
-    through2 "^2.0.0"
-
 mixin-deep@^1.2.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
@@ -6695,24 +5778,12 @@ moo@^0.5.0:
   resolved "https://registry.yarnpkg.com/moo/-/moo-0.5.1.tgz#7aae7f384b9b09f620b6abf6f74ebbcd1b65dbc4"
   integrity sha512-I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w==
 
-move-concurrently@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
-  integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=
-  dependencies:
-    aproba "^1.1.1"
-    copy-concurrently "^1.0.0"
-    fs-write-stream-atomic "^1.0.8"
-    mkdirp "^0.5.1"
-    rimraf "^2.5.4"
-    run-queue "^1.0.3"
-
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
-ms@^2.0.0, ms@^2.1.1:
+ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
@@ -6722,15 +5793,10 @@ mute-stream@0.0.8:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
-nan@^2.12.1:
-  version "2.14.1"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01"
-  integrity sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==
-
-nanoid@^3.1.12:
-  version "3.1.12"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.12.tgz#6f7736c62e8d39421601e4a0c77623a97ea69654"
-  integrity sha512-1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A==
+nanoid@^3.1.20:
+  version "3.1.20"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz#badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788"
+  integrity sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -6755,30 +5821,20 @@ natural-compare@^1.4.0:
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
 nearley@^2.7.10:
-  version "2.19.3"
-  resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.19.3.tgz#ae3b040e27616b5348102c436d1719209476a5a1"
-  integrity sha512-FpAy1PmTsUpOtgxr23g4jRNvJHYzZEW2PixXeSzksLR/ykPfwKhAodc2+9wQhY+JneWLcvkDw6q7FJIsIdF/aQ==
+  version "2.20.1"
+  resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.20.1.tgz#246cd33eff0d012faf197ff6774d7ac78acdd474"
+  integrity sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ==
   dependencies:
     commander "^2.19.0"
     moo "^0.5.0"
     railroad-diagrams "^1.0.0"
     randexp "0.4.6"
-    semver "^5.4.1"
 
 nice-try@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
-node-fetch-npm@^2.0.2:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.4.tgz#6507d0e17a9ec0be3bec516958a497cec54bf5a4"
-  integrity sha512-iOuIQDWDyjhv9qSDrj9aq/klt6F9z1p2otB3AV7v3zBDcL/x+OfGsvGQZZCcMZbUf4Ujw1xGNQkjvGnVT22cKg==
-  dependencies:
-    encoding "^0.1.11"
-    json-parse-better-errors "^1.0.0"
-    safe-buffer "^5.1.1"
-
 node-fetch@^1.0.1:
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
@@ -6798,9 +5854,9 @@ node-modules-regexp@^1.0.0:
   integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=
 
 node-notifier@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.0.tgz#a7eee2d51da6d0f7ff5094bc7108c911240c1620"
-  integrity sha512-46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA==
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.1.tgz#f86e89bbc925f2b068784b31f382afdc6ca56be1"
+  integrity sha512-BvEXF+UmsnAfYfoapKM9nGxnP+Wn7P91YfXmrKnfcYCx6VBeoN5Ez5Ogck6I8Bi5k4RlpqRYaw75pAwzX9OphA==
   dependencies:
     growly "^1.3.0"
     is-wsl "^2.2.0"
@@ -6809,12 +5865,12 @@ node-notifier@^8.0.0:
     uuid "^8.3.0"
     which "^2.0.2"
 
-node-releases@^1.1.53:
-  version "1.1.58"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.58.tgz#8ee20eef30fa60e52755fcc0942def5a734fe935"
-  integrity sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg==
+node-releases@^1.1.69:
+  version "1.1.70"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.70.tgz#66e0ed0273aa65666d7fe78febe7634875426a08"
+  integrity sha512-Slf2s69+2/uAD79pVVQo8uSiC34+g8GWY8UH2Qtqv34ZfhYrxpYpfzs9Js9d6O0mbDmALuxaTlplnBTnSELcrw==
 
-normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.5.0:
+normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
@@ -6824,6 +5880,16 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
+normalize-package-data@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.0.tgz#1f8a7c423b3d2e85eb36985eaf81de381d01301a"
+  integrity sha512-6lUjEI0d3v6kFrtgA/lOx4zHCWULXsFNIjHolnZCKCTLA6m/G625cdn3O7eNmT0iD3jfo6HZ9cdImGZwf21prw==
+  dependencies:
+    hosted-git-info "^3.0.6"
+    resolve "^1.17.0"
+    semver "^7.3.2"
+    validate-npm-package-license "^3.0.1"
+
 normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
@@ -6860,23 +5926,18 @@ npm-run-path@^4.0.0:
   dependencies:
     path-key "^3.0.0"
 
-nth-check@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
-  integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==
+nth-check@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.0.tgz#1bb4f6dac70072fc313e8c9cd1417b5074c0a125"
+  integrity sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q==
   dependencies:
-    boolbase "~1.0.0"
+    boolbase "^1.0.0"
 
 num2fraction@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
   integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
 
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
-
 nwsapi@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
@@ -6901,20 +5962,20 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-inspect@^1.1.0, object-inspect@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
-  integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==
+object-inspect@^1.1.0, object-inspect@^1.7.0, object-inspect@^1.8.0, object-inspect@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a"
+  integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==
 
-object-is@^1.0.1, object-is@^1.0.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.2.tgz#c5d2e87ff9e119f78b7a088441519e2eec1573b6"
-  integrity sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==
+object-is@^1.0.2, object-is@^1.1.2:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.4.tgz#63d6c83c00a43f4cbc9434eb9757c8a5b8565068"
+  integrity sha512-1ZvAZ4wlF7IyPVOcE1Omikt7UpaFlOQq0HlSti+ZvDH3UiD2brwGMwDbyV43jao2bKJ+4+WdPJHSd7kgzKYVqg==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.5"
 
-object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.0.9, object-keys@^1.1.1:
+object-keys@^1.0.12, object-keys@^1.0.9, object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
@@ -6926,43 +5987,36 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
-object.assign@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
-  integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
+object.assign@^4.1.0, object.assign@^4.1.1, object.assign@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
+  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
   dependencies:
-    define-properties "^1.1.2"
-    function-bind "^1.1.1"
-    has-symbols "^1.0.0"
-    object-keys "^1.0.11"
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+    has-symbols "^1.0.1"
+    object-keys "^1.1.1"
 
 object.entries@^1.1.0, object.entries@^1.1.1, object.entries@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.2.tgz#bc73f00acb6b6bb16c203434b10f9a7e797d3add"
-  integrity sha512-BQdB9qKmb/HyNdMNWVr7O3+z5MUIx3aiegEIJqjMBbBf0YT9RRxTJSim4mzFqtyr7PDAHigq0N9dO0m0tRakQA==
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.3.tgz#c601c7f168b62374541a07ddbd3e2d5e4f7711a6"
+  integrity sha512-ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.5"
+    es-abstract "^1.18.0-next.1"
     has "^1.0.3"
 
-object.fromentries@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz#4a09c9b9bb3843dd0f89acdb517a794d4f355ac9"
-  integrity sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ==
+object.fromentries@^2.0.2, object.fromentries@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.3.tgz#13cefcffa702dc67750314a3305e8cb3fad1d072"
+  integrity sha512-IDUSMXs6LOSJBWE++L0lzIbSqHl9KDCfff2x/JSEIDtEUavUnyMYC2ZGay/04Zq4UT8lvd4xNhU4/YHKibAOlw==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    function-bind "^1.1.1"
+    es-abstract "^1.18.0-next.1"
     has "^1.0.3"
 
-object.getownpropertydescriptors@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649"
-  integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-
 object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
@@ -6970,16 +6024,20 @@ object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
-object.values@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"
-  integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==
+object.values@^1.1.1, object.values@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.2.tgz#7a2015e06fcb0f546bd652486ce8583a4731c731"
+  integrity sha512-MYC0jvJopr8EK6dPBiO8Nb9mvjdypOachO5REGk6MXzujbBrAisKo3HmdEI6kZDL6fC31Mwee/5YbtMebixeag==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    function-bind "^1.1.1"
+    es-abstract "^1.18.0-next.1"
     has "^1.0.3"
 
+"olm@https://packages.matrix.org/npm/olm/olm-3.2.1.tgz":
+  version "3.2.1"
+  resolved "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz#d623d76f99c3518dde68be8c86618d68bc7b004a"
+
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
@@ -6988,9 +6046,9 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
     wrappy "1"
 
 onetime@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5"
-  integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
+  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
   dependencies:
     mimic-fn "^2.1.0"
 
@@ -7018,40 +6076,21 @@ optionator@^0.9.1:
     type-check "^0.4.0"
     word-wrap "^1.2.3"
 
-os-locale@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
-  integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
-  dependencies:
-    execa "^1.0.0"
-    lcid "^2.0.0"
-    mem "^4.0.0"
-
 os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-p-defer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
-  integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
-
 p-each-series@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.1.0.tgz#961c8dd3f195ea96c747e636b262b800a6b1af48"
-  integrity sha512-ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.2.0.tgz#105ab0357ce72b202a8a8b94933672657b5e2a9a"
+  integrity sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==
 
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
   integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
-p-is-promise@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
-  integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
-
 p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
@@ -7097,19 +6136,10 @@ p-try@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
-pako@^1.0.11:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
-  integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
-
-parallel-transform@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc"
-  integrity sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==
-  dependencies:
-    cyclist "^1.0.1"
-    inherits "^2.0.3"
-    readable-stream "^2.1.5"
+pako@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-2.0.3.tgz#cdf475e31b678565251406de9e759196a0ea7a43"
+  integrity sha512-WjR1hOeg+kki3ZIOjaf4b5WVcay1jaliKSYiEaB1XzwhMQZJxRdQRv0V31EKBYlxb4T7SK3hjfc/jxyU64BoSw==
 
 parent-module@^1.0.0:
   version "1.0.1"
@@ -7118,10 +6148,10 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
-parse-entities@^1.0.2, parse-entities@^1.1.0:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.2.2.tgz#c31bf0f653b6661354f8973559cb86dd1d5edf50"
-  integrity sha512-NzfpbxW/NPrzZ/yYSoQxyqUZMZXIdCfE0OIN4ESsnptHJECoUk3FZktxNuzQf4tjt5UEopnxpYJbvYuxIFDdsg==
+parse-entities@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-2.0.0.tgz#53c6eb5b9314a1f4ec99fa0fdf7ce01ecda0cbe8"
+  integrity sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==
   dependencies:
     character-entities "^1.0.0"
     character-entities-legacy "^1.0.0"
@@ -7146,26 +6176,31 @@ parse-json@^4.0.0:
     json-parse-better-errors "^1.0.1"
 
 parse-json@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz#f96088cdf24a8faa9aea9a009f2d9d942c999646"
-  integrity sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
+  integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     error-ex "^1.3.1"
     json-parse-even-better-errors "^2.3.0"
     lines-and-columns "^1.1.6"
 
-parse5@5.1.1, parse5@^5.1.1:
+parse5-htmlparser2-tree-adapter@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6"
+  integrity sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==
+  dependencies:
+    parse5 "^6.0.1"
+
+parse5@5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"
   integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==
 
-parse5@^3.0.1:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c"
-  integrity sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==
-  dependencies:
-    "@types/node" "*"
+parse5@^6.0.0, parse5@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
+  integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
 
 pascalcase@^0.1.1:
   version "0.1.1"
@@ -7214,12 +6249,10 @@ path-type@^2.0.0:
   dependencies:
     pify "^2.0.0"
 
-path-type@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
-  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
-  dependencies:
-    pify "^3.0.0"
+path-type@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
+  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
 performance-now@^0.2.0:
   version "0.2.0"
@@ -7246,7 +6279,7 @@ pify@^3.0.0:
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
   integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
 
-pify@^4.0.0, pify@^4.0.1:
+pify@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
   integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
@@ -7279,13 +6312,6 @@ pkg-dir@^4.2.0:
   dependencies:
     find-up "^4.0.0"
 
-pkg-up@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
-  integrity sha1-yBmscoBZpGHKscOImivjxJoATX8=
-  dependencies:
-    find-up "^2.1.0"
-
 pluralizers@^0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/pluralizers/-/pluralizers-0.1.7.tgz#8d38dd0a1b660e739b10ab2eab10b684c9d50142"
@@ -7315,120 +6341,81 @@ postcss-html@^0.36.0:
   dependencies:
     htmlparser2 "^3.10.0"
 
-postcss-jsx@^0.36.0:
-  version "0.36.4"
-  resolved "https://registry.yarnpkg.com/postcss-jsx/-/postcss-jsx-0.36.4.tgz#37a68f300a39e5748d547f19a747b3257240bd50"
-  integrity sha512-jwO/7qWUvYuWYnpOb0+4bIIgJt7003pgU3P6nETBLaOyBXuTD55ho21xnals5nBrlpTIFodyd3/jBi6UO3dHvA==
-  dependencies:
-    "@babel/core" ">=7.2.2"
-
-postcss-less@^3.1.0:
+postcss-less@^3.1.4:
   version "3.1.4"
   resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-3.1.4.tgz#369f58642b5928ef898ffbc1a6e93c958304c5ad"
   integrity sha512-7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA==
   dependencies:
     postcss "^7.0.14"
 
-postcss-markdown@^0.36.0:
-  version "0.36.0"
-  resolved "https://registry.yarnpkg.com/postcss-markdown/-/postcss-markdown-0.36.0.tgz#7f22849ae0e3db18820b7b0d5e7833f13a447560"
-  integrity sha512-rl7fs1r/LNSB2bWRhyZ+lM/0bwKv9fhl38/06gF6mKMo/NPnp55+K1dSTosSVjFZc0e1ppBlu+WT91ba0PMBfQ==
-  dependencies:
-    remark "^10.0.1"
-    unist-util-find-all-after "^1.0.2"
-
 postcss-media-query-parser@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244"
   integrity sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=
 
-postcss-reporter@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-6.0.1.tgz#7c055120060a97c8837b4e48215661aafb74245f"
-  integrity sha512-LpmQjfRWyabc+fRygxZjpRxfhRf9u/fdlKf4VHG4TSPbV2XNsuISzYW1KL+1aQzx53CAppa1bKG4APIB/DOXXw==
-  dependencies:
-    chalk "^2.4.1"
-    lodash "^4.17.11"
-    log-symbols "^2.2.0"
-    postcss "^7.0.7"
-
 postcss-resolve-nested-selector@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz#29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e"
   integrity sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=
 
-postcss-safe-parser@^4.0.0:
+postcss-safe-parser@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz#a6d4e48f0f37d9f7c11b2a581bf00f8ba4870b96"
   integrity sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==
   dependencies:
     postcss "^7.0.26"
 
-postcss-sass@^0.3.5:
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/postcss-sass/-/postcss-sass-0.3.5.tgz#6d3e39f101a53d2efa091f953493116d32beb68c"
-  integrity sha512-B5z2Kob4xBxFjcufFnhQ2HqJQ2y/Zs/ic5EZbCywCkxKd756Q40cIQ/veRDwSrw1BF6+4wUgmpm0sBASqVi65A==
+postcss-sass@^0.4.4:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/postcss-sass/-/postcss-sass-0.4.4.tgz#91f0f3447b45ce373227a98b61f8d8f0785285a3"
+  integrity sha512-BYxnVYx4mQooOhr+zer0qWbSPYnarAy8ZT7hAQtbxtgVf8gy+LSLT/hHGe35h14/pZDTw1DsxdbrwxBN++H+fg==
   dependencies:
-    gonzales-pe "^4.2.3"
-    postcss "^7.0.1"
+    gonzales-pe "^4.3.0"
+    postcss "^7.0.21"
 
-postcss-scss@^2.0.0:
+postcss-scss@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-2.1.1.tgz#ec3a75fa29a55e016b90bf3269026c53c1d2b383"
   integrity sha512-jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA==
   dependencies:
     postcss "^7.0.6"
 
-postcss-selector-parser@^3.1.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz#b310f5c4c0fdaf76f94902bbaa30db6aa84f5270"
-  integrity sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==
-  dependencies:
-    dot-prop "^5.2.0"
-    indexes-of "^1.0.1"
-    uniq "^1.0.1"
-
-postcss-selector-parser@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c"
-  integrity sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==
+postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz#56075a1380a04604c38b063ea7767a129af5c2b3"
+  integrity sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==
   dependencies:
     cssesc "^3.0.0"
     indexes-of "^1.0.1"
     uniq "^1.0.1"
+    util-deprecate "^1.0.2"
 
 postcss-syntax@^0.36.2:
   version "0.36.2"
   resolved "https://registry.yarnpkg.com/postcss-syntax/-/postcss-syntax-0.36.2.tgz#f08578c7d95834574e5593a82dfbfa8afae3b51c"
   integrity sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w==
 
-postcss-value-parser@^3.3.0:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
-  integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
-
 postcss-value-parser@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
   integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
 
-postcss@^7.0.1, postcss@^7.0.13, postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.26, postcss@^7.0.30, postcss@^7.0.6, postcss@^7.0.7:
-  version "7.0.32"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d"
-  integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==
+postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.32, postcss@^7.0.35, postcss@^7.0.6:
+  version "7.0.35"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24"
+  integrity sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
 postcss@^8.0.2:
-  version "8.0.7"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.0.7.tgz#764d26d8bc64a87af6d945238ae6ef36bf6fc32d"
-  integrity sha512-LTCMGOjmC/CGWV/azk3h34u6TNj1s9p4XleEiW8yA3j+8k+z3mnv5V7yyREvWDKlkel8GxqhjEZJ+JXWTzKPWw==
+  version "8.2.4"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.4.tgz#20a98a39cf303d15129c2865a9ec37eda0031d04"
+  integrity sha512-kRFftRoExRVXZlwUuay9iC824qmXPcQQVzAjbCCgjpXnkdMCJYBu2gTwAaFBzv8ewND6O8xFb3aELmEkh9zTzg==
   dependencies:
     colorette "^1.2.1"
-    line-column "^1.0.2"
-    nanoid "^3.1.12"
+    nanoid "^3.1.20"
     source-map "^0.6.1"
 
 prelude-ls@^1.2.1:
@@ -7441,20 +6428,15 @@ prelude-ls@~1.1.2:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
   integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
-pretty-format@^26.5.2:
-  version "26.5.2"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.5.2.tgz#5d896acfdaa09210683d34b6dc0e6e21423cd3e1"
-  integrity sha512-VizyV669eqESlkOikKJI8Ryxl/kPpbdLwNdPs2GrbQs18MpySB5S0Yo0N7zkg2xTRiFq4CFw8ct5Vg4a0xP0og==
+pretty-format@^26.0.0, pretty-format@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93"
+  integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==
   dependencies:
-    "@jest/types" "^26.5.2"
+    "@jest/types" "^26.6.2"
     ansi-regex "^5.0.0"
     ansi-styles "^4.0.0"
-    react-is "^16.12.0"
-
-private@^0.1.8:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
-  integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
+    react-is "^17.0.1"
 
 process-nextick-args@~2.0.0:
   version "2.0.1"
@@ -7466,27 +6448,6 @@ progress@^2.0.0:
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
-project-name-generator@^2.1.7:
-  version "2.1.7"
-  resolved "https://registry.yarnpkg.com/project-name-generator/-/project-name-generator-2.1.7.tgz#504c68a2a843247aa3af493a226ecf78ce8beceb"
-  integrity sha512-kLGQGiyvkZsWtqhPhUs85UkSgmH5OnZJLNrtlqkK+GZPR0cybe8Nr9jG3bD52w2siH9EE3l/a9y56bn0YX5wYw==
-  dependencies:
-    commander "^2.15.1"
-    lodash "^4.17.10"
-
-promise-inflight@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
-  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
-
-promise-retry@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-1.1.1.tgz#6739e968e3051da20ce6497fb2b50f6911df3d6d"
-  integrity sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=
-  dependencies:
-    err-code "^1.0.0"
-    retry "^0.10.0"
-
 promise@^7.0.3, promise@^7.1.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
@@ -7495,12 +6456,12 @@ promise@^7.0.3, promise@^7.1.1:
     asap "~2.0.3"
 
 prompts@^2.0.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.3.2.tgz#480572d89ecf39566d2bd3fe2c9fccb7c4c0b068"
-  integrity sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.0.tgz#4aa5de0723a231d1ee9121c40fdf663df73f61d7"
+  integrity sha512-awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ==
   dependencies:
     kleur "^3.0.3"
-    sisteransi "^1.0.4"
+    sisteransi "^1.0.5"
 
 prop-types-exact@^1.2.0:
   version "1.2.0"
@@ -7525,14 +6486,6 @@ psl@^1.1.28:
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
   integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
 
-pump@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
-  integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
 pump@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
@@ -7541,15 +6494,6 @@ pump@^3.0.0:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
-pumpify@^1.3.3:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
-  integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
-  dependencies:
-    duplexify "^3.6.0"
-    inherits "^2.0.3"
-    pump "^2.0.0"
-
 punycode@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
@@ -7560,12 +6504,12 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-pvtsutils@^1.0.11:
-  version "1.0.14"
-  resolved "https://registry.yarnpkg.com/pvtsutils/-/pvtsutils-1.0.14.tgz#002a07d5a47b00aa9191889e450493390ebffefc"
-  integrity sha512-X9SBWQ9ceNAEEgLweoE7m7P6LDnZ3pZADBq7utQQV4pQ1vj7uQIAXaAQRCz/4nKLKQRT9ZrHOuxailKqBiztrg==
+pvtsutils@^1.0.11, pvtsutils@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/pvtsutils/-/pvtsutils-1.1.1.tgz#22c2d7689139d2c36d7ef3ac3d5e29bcd818d38a"
+  integrity sha512-Evbhe6L4Sxwu4SPLQ4LQZhgfWDQO3qa1lju9jM5cxsQp8vE10VipcSmo7hiJW48TmiHgVLgDtC2TL6/+ND+IVg==
   dependencies:
-    tslib "^2.0.1"
+    tslib "^2.0.3"
 
 pvutils@latest:
   version "1.0.17"
@@ -7585,10 +6529,10 @@ qrcode@^1.4.4:
     pngjs "^3.3.0"
     yargs "^13.2.4"
 
-qs@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.4.tgz#9090b290d1f91728d3c22e54843ca44aea5ab687"
-  integrity sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ==
+qs@^6.9.6:
+  version "6.9.6"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.6.tgz#26ed3c8243a431b2924aca84cc90471f35d5a0ee"
+  integrity sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ==
 
 qs@~6.5.2:
   version "6.5.2"
@@ -7600,10 +6544,10 @@ querystring@0.2.0:
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
   integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
-quick-lru@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
-  integrity sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=
+quick-lru@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
+  integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
 
 raf-schd@^2.1.0:
   version "2.1.2"
@@ -7630,20 +6574,10 @@ randexp@0.4.6:
     discontinuous-range "1.0.0"
     ret "~0.1.10"
 
-rc@1.2.8, rc@^1.2.8:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
-  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
-  dependencies:
-    deep-extend "^0.6.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
-
-re-resizable@^6.5.4:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/re-resizable/-/re-resizable-6.5.4.tgz#909a1e37f9d1a3afd356893a5779a030167be641"
-  integrity sha512-7T3L1lexB2zkZIDmzRJbwdq+xGFuRkrEVQIf5hBPnh7JuS9kG9Yc8XgIaxTWic1kU7jVlDgqzfId/gvmpBCjpA==
+re-resizable@^6.9.0:
+  version "6.9.0"
+  resolved "https://registry.yarnpkg.com/re-resizable/-/re-resizable-6.9.0.tgz#9c3059b389ced6ade602234cc5bb1e12d231cd47"
+  integrity sha512-3cUDG81ylyqI0Pdgle/RHwwRYq0ORZzsUaySOCO8IbEtNyaRtrIHYm/jMQ5pjcNiKCxR3vsSymIQZHwJq4gg2Q==
   dependencies:
     fast-memoize "^2.5.1"
 
@@ -7664,39 +6598,44 @@ react-beautiful-dnd@^4.0.1:
     reselect "^3.0.1"
 
 react-clientside-effect@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/react-clientside-effect/-/react-clientside-effect-1.2.2.tgz#6212fb0e07b204e714581dd51992603d1accc837"
-  integrity sha512-nRmoyxeok5PBO6ytPvSjKp9xwXg9xagoTK1mMjwnQxqM9Hd7MNPl+LS1bOSOe+CV2+4fnEquc7H/S8QD3q697A==
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/react-clientside-effect/-/react-clientside-effect-1.2.3.tgz#95c95f520addfb71743608b990bfe01eb002012b"
+  integrity sha512-96HOmjJjjemxZD4qMdaMWFl3d/3Dqm/MAXnThoP8+jQihevYs8VzooqYWlVEPmkp9tVIa06i67R7FF1qsuzUwQ==
   dependencies:
     "@babel/runtime" "^7.0.0"
 
-react-dom@^16.13.1:
-  version "16.13.1"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.1.tgz#c1bd37331a0486c078ee54c4740720993b2e0e7f"
-  integrity sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag==
+react-dom@^16.14.0:
+  version "16.14.0"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz#7ad838ec29a777fb3c75c3a190f661cf92ab8b89"
+  integrity sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
     prop-types "^15.6.2"
     scheduler "^0.19.1"
 
-react-focus-lock@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/react-focus-lock/-/react-focus-lock-2.4.1.tgz#e842cc93da736b5c5d331799012544295cbcee4f"
-  integrity sha512-c5ZP56KSpj9EAxzScTqQO7bQQNPltf/W1ZEBDqNDOV1XOIwvAyHX0O7db9ekiAtxyKgnqZjQlLppVg94fUeL9w==
+react-focus-lock@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/react-focus-lock/-/react-focus-lock-2.5.0.tgz#12e3a3940e897c26e2c2a0408cd25ea3c99b3709"
+  integrity sha512-XLxj6uTXgz0US8TmqNU2jMfnXwZG0mH2r/afQqvPEaX6nyEll5LHVcEXk2XDUQ34RVeLPkO/xK5x6c/qiuSq/A==
   dependencies:
     "@babel/runtime" "^7.0.0"
-    focus-lock "^0.7.0"
+    focus-lock "^0.8.1"
     prop-types "^15.6.2"
     react-clientside-effect "^1.2.2"
     use-callback-ref "^1.2.1"
     use-sidecar "^1.0.1"
 
-react-is@^16.12.0, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.6, react-is@^16.9.0:
+react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.6:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
+react-is@^17.0.1:
+  version "17.0.1"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339"
+  integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA==
+
 react-lifecycles-compat@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
@@ -7724,10 +6663,10 @@ react-redux@^5.0.6:
     react-is "^16.6.0"
     react-lifecycles-compat "^3.0.0"
 
-react-test-renderer@^16.0.0-0, react-test-renderer@^16.13.1:
-  version "16.13.1"
-  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.13.1.tgz#de25ea358d9012606de51e012d9742e7f0deabc1"
-  integrity sha512-Sn2VRyOK2YJJldOqoh8Tn/lWQ+ZiKhyZTPtaO0Q6yNj+QDbmRkVFap6pZPy3YQk8DScRDfyqm/KxKYP9gCMRiQ==
+react-test-renderer@^16.0.0-0, react-test-renderer@^16.14.0:
+  version "16.14.0"
+  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.14.0.tgz#e98360087348e260c56d4fe2315e970480c228ae"
+  integrity sha512-L8yPjqPE5CZO6rKsKXRO/rVPiaCOy0tQQJbC+UjPNlobl5mad59lvPjwFsQHTvL03caVDIVr9x9/OSgDe6I5Eg==
   dependencies:
     object-assign "^4.1.1"
     prop-types "^15.6.2"
@@ -7744,10 +6683,10 @@ react-transition-group@^4.4.1:
     loose-envify "^1.4.0"
     prop-types "^15.6.2"
 
-react@^16.13.1:
-  version "16.13.1"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e"
-  integrity sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==
+react@^16.14.0:
+  version "16.14.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d"
+  integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
@@ -7761,22 +6700,6 @@ read-pkg-up@^2.0.0:
     find-up "^2.0.0"
     read-pkg "^2.0.0"
 
-read-pkg-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
-  integrity sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=
-  dependencies:
-    find-up "^2.0.0"
-    read-pkg "^3.0.0"
-
-read-pkg-up@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978"
-  integrity sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==
-  dependencies:
-    find-up "^3.0.0"
-    read-pkg "^3.0.0"
-
 read-pkg-up@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
@@ -7795,15 +6718,6 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
-read-pkg@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
-  integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=
-  dependencies:
-    load-json-file "^4.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^3.0.0"
-
 read-pkg@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-4.0.1.tgz#963625378f3e1c4d48c85872b5a6ec7d5d093237"
@@ -7823,7 +6737,7 @@ read-pkg@^5.2.0:
     parse-json "^5.0.0"
     type-fest "^0.6.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.6, readable-stream@~2.3.6:
+readable-stream@^2.0.2:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -7854,27 +6768,20 @@ readdirp@^2.2.1:
     micromatch "^3.1.10"
     readable-stream "^2.0.2"
 
-readdirp@~3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.4.0.tgz#9fdccdf9e9155805449221ac645e8303ab5b9ada"
-  integrity sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==
+readdirp@~3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"
+  integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==
   dependencies:
     picomatch "^2.2.1"
 
-realpath-native@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.1.0.tgz#2003294fea23fb0672f2476ebe22fcf498a2d65c"
-  integrity sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==
+redent@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"
+  integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==
   dependencies:
-    util.promisify "^1.0.0"
-
-redent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/redent/-/redent-2.0.0.tgz#c1b2007b42d57eb1389079b3c8333639d5e1ccaa"
-  integrity sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=
-  dependencies:
-    indent-string "^3.0.0"
-    strip-indent "^2.0.0"
+    indent-string "^4.0.0"
+    strip-indent "^3.0.0"
 
 redux-thunk@^2.2.0:
   version "2.3.0"
@@ -7904,9 +6811,9 @@ regenerate-unicode-properties@^8.2.0:
     regenerate "^1.4.0"
 
 regenerate@^1.4.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.1.tgz#cad92ad8e6b591773485fbe05a485caf4f457e6f"
-  integrity sha512-j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A==
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
+  integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
 regenerator-runtime@^0.11.0:
   version "0.11.1"
@@ -7914,17 +6821,16 @@ regenerator-runtime@^0.11.0:
   integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
 regenerator-runtime@^0.13.4:
-  version "0.13.5"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697"
-  integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
+  integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==
 
 regenerator-transform@^0.14.2:
-  version "0.14.4"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz#5266857896518d1616a78a0479337a30ea974cc7"
-  integrity sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4"
+  integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==
   dependencies:
     "@babel/runtime" "^7.8.4"
-    private "^0.1.8"
 
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
@@ -7935,12 +6841,12 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     safe-regex "^1.1.0"
 
 regexp.prototype.flags@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"
-  integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26"
+  integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==
   dependencies:
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
 
 regexpp@^2.0.1:
   version "2.0.1"
@@ -7952,10 +6858,10 @@ regexpp@^3.0.0, regexpp@^3.1.0:
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
   integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==
 
-regexpu-core@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz#fcbf458c50431b0bb7b45d6967b8192d91f3d938"
-  integrity sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==
+regexpu-core@^4.7.1:
+  version "4.7.1"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6"
+  integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==
   dependencies:
     regenerate "^1.4.0"
     regenerate-unicode-properties "^8.2.0"
@@ -7964,75 +6870,40 @@ regexpu-core@^4.7.0:
     unicode-match-property-ecmascript "^1.0.4"
     unicode-match-property-value-ecmascript "^1.2.0"
 
-registry-auth-token@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.0.0.tgz#30e55961eec77379da551ea5c4cf43cbf03522be"
-  integrity sha512-lpQkHxd9UL6tb3k/aHAVfnVtn+Bcs9ob5InuFLLEDqSqeq+AljB8GZW9xY0x7F+xYwEcjKe07nyoxzEYz6yvkw==
-  dependencies:
-    rc "^1.2.8"
-    safe-buffer "^5.0.1"
-
 regjsgen@^0.5.1:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733"
   integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==
 
 regjsparser@^0.6.4:
-  version "0.6.4"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz#a769f8684308401a66e9b529d2436ff4d0666272"
-  integrity sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==
+  version "0.6.6"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.6.tgz#6d8c939d1a654f78859b08ddcc4aa777f3fa800a"
+  integrity sha512-jjyuCp+IEMIm3N1H1LLTJW1EISEJV9+5oHdEyrt43Pg9cDSb6rrLZei2cVWpl0xTjmmlpec/lEQGYgM7xfpGCQ==
   dependencies:
     jsesc "~0.5.0"
 
-remark-parse@^6.0.0:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-6.0.3.tgz#c99131052809da482108413f87b0ee7f52180a3a"
-  integrity sha512-QbDXWN4HfKTUC0hHa4teU463KclLAnwpn/FBn87j9cKYJWWawbiLgMfP2Q4XwhxxuuuOxHlw+pSN0OKuJwyVvg==
+remark-parse@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-9.0.0.tgz#4d20a299665880e4f4af5d90b7c7b8a935853640"
+  integrity sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==
   dependencies:
-    collapse-white-space "^1.0.2"
-    is-alphabetical "^1.0.0"
-    is-decimal "^1.0.0"
-    is-whitespace-character "^1.0.0"
-    is-word-character "^1.0.0"
-    markdown-escapes "^1.0.0"
-    parse-entities "^1.1.0"
-    repeat-string "^1.5.4"
-    state-toggle "^1.0.0"
-    trim "0.0.1"
-    trim-trailing-lines "^1.0.0"
-    unherit "^1.0.4"
-    unist-util-remove-position "^1.0.0"
-    vfile-location "^2.0.0"
-    xtend "^4.0.1"
+    mdast-util-from-markdown "^0.8.0"
 
-remark-stringify@^6.0.0:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-6.0.4.tgz#16ac229d4d1593249018663c7bddf28aafc4e088"
-  integrity sha512-eRWGdEPMVudijE/psbIDNcnJLRVx3xhfuEsTDGgH4GsFF91dVhw5nhmnBppafJ7+NWINW6C7ZwWbi30ImJzqWg==
+remark-stringify@^9.0.0:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-9.0.1.tgz#576d06e910548b0a7191a71f27b33f1218862894"
+  integrity sha512-mWmNg3ZtESvZS8fv5PTvaPckdL4iNlCHTt8/e/8oN08nArHRHjNZMKzA/YW3+p7/lYqIw4nx1XsjCBo/AxNChg==
   dependencies:
-    ccount "^1.0.0"
-    is-alphanumeric "^1.0.0"
-    is-decimal "^1.0.0"
-    is-whitespace-character "^1.0.0"
-    longest-streak "^2.0.1"
-    markdown-escapes "^1.0.0"
-    markdown-table "^1.1.0"
-    mdast-util-compact "^1.0.0"
-    parse-entities "^1.0.2"
-    repeat-string "^1.5.4"
-    state-toggle "^1.0.0"
-    stringify-entities "^1.0.1"
-    unherit "^1.0.4"
-    xtend "^4.0.1"
+    mdast-util-to-markdown "^0.6.0"
 
-remark@^10.0.1:
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/remark/-/remark-10.0.1.tgz#3058076dc41781bf505d8978c291485fe47667df"
-  integrity sha512-E6lMuoLIy2TyiokHprMjcWNJ5UxfGQjaMSMhV+f4idM625UjjK4j798+gPs5mfjzDE6vL0oFKVeZM6gZVSVrzQ==
+remark@^13.0.0:
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/remark/-/remark-13.0.0.tgz#d15d9bf71a402f40287ebe36067b66d54868e425"
+  integrity sha512-HDz1+IKGtOyWN+QgBiAT0kn+2s6ovOxHyPAFGKVE81VSzJ+mq7RwHFledEvB5F1p4iJvOah/LOKdFuzvRnNLCA==
   dependencies:
-    remark-parse "^6.0.0"
-    remark-stringify "^6.0.0"
-    unified "^7.0.0"
+    remark-parse "^9.0.0"
+    remark-stringify "^9.0.0"
+    unified "^9.1.0"
 
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
@@ -8044,16 +6915,11 @@ repeat-element@^1.1.2:
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
   integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
 
-repeat-string@^1.5.4, repeat-string@^1.6.1:
+repeat-string@^1.0.0, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
-replace-ext@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
-  integrity sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=
-
 request-promise-core@1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f"
@@ -8101,10 +6967,10 @@ require-directory@^2.1.1:
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
-require-main-filename@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
-  integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
+require-from-string@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
+  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
 
 require-main-filename@^2.0.0:
   version "2.0.0"
@@ -8128,11 +6994,6 @@ resolve-cwd@^3.0.0:
   dependencies:
     resolve-from "^5.0.0"
 
-resolve-from@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
-  integrity sha1-six699nWiBvItuZTM17rywoYh0g=
-
 resolve-from@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
@@ -8148,11 +7009,12 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.3.2, resolve@^1.8.1:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
-  integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
+resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.18.1:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
+  integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
   dependencies:
+    is-core-module "^2.1.0"
     path-parse "^1.0.6"
 
 restore-cursor@^3.1.0:
@@ -8168,10 +7030,10 @@ ret@~0.1.10:
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
   integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
-retry@^0.10.0:
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
-  integrity sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=
+reusify@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
 rfc4648@^1.4.0:
   version "1.4.0"
@@ -8185,38 +7047,13 @@ rimraf@2.6.3:
   dependencies:
     glob "^7.1.3"
 
-rimraf@^2.5.4, rimraf@^2.6.3, rimraf@^2.7.1:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
-  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
-  dependencies:
-    glob "^7.1.3"
-
-rimraf@^3.0.0:
+rimraf@^3.0.0, rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
   dependencies:
     glob "^7.1.3"
 
-rollup-plugin-terser@^5.1.1:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-5.3.0.tgz#9c0dd33d5771df9630cd027d6a2559187f65885e"
-  integrity sha512-XGMJihTIO3eIBsVGq7jiNYOdDMb3pVxuzY0uhOE/FM4x/u9nQgr3+McsjzqBn3QfHIpNSZmFnpoKAwHBEcsT7g==
-  dependencies:
-    "@babel/code-frame" "^7.5.5"
-    jest-worker "^24.9.0"
-    rollup-pluginutils "^2.8.2"
-    serialize-javascript "^2.1.2"
-    terser "^4.6.2"
-
-rollup-pluginutils@^2.8.2:
-  version "2.8.2"
-  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e"
-  integrity sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==
-  dependencies:
-    estree-walker "^0.6.1"
-
 rst-selector-parser@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz#81b230ea2fcc6066c89e3472de794285d9b03d91"
@@ -8235,28 +7072,19 @@ run-async@^2.4.0:
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
   integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
 
-run-queue@^1.0.0, run-queue@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
-  integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=
-  dependencies:
-    aproba "^1.1.1"
+run-parallel@^1.1.9:
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.10.tgz#60a51b2ae836636c81377df16cb107351bcd13ef"
+  integrity sha512-zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw==
 
-rxjs@^6.5.2:
-  version "6.5.5"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz#c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec"
-  integrity sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==
+rxjs@^6.5.2, rxjs@^6.6.0:
+  version "6.6.3"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552"
+  integrity sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==
   dependencies:
     tslib "^1.9.0"
 
-rxjs@^6.6.0:
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.0.tgz#af2901eedf02e3a83ffa7f886240ff9018bbec84"
-  integrity sha512-3HMA8z/Oz61DUHe+SdOiQyzIf4tOx5oQHmMir7IZEu6TMqCLHT4LRcmNaUS0NwOz8VLvmmBduMsoaUvMaIiqzg==
-  dependencies:
-    tslib "^1.9.0"
-
-safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
+safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -8273,7 +7101,7 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
-"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
@@ -8325,25 +7153,22 @@ scheduler@^0.19.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@6.3.0, semver@^6.0.0, semver@^6.1.2, semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-
 semver@7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-semver@^7.2.1, semver@^7.3.2:
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
-  integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
+semver@^6.0.0, semver@^6.1.2, semver@^6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-serialize-javascript@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
-  integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
+semver@^7.2.1, semver@^7.3.2:
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
+  integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
+  dependencies:
+    lru-cache "^6.0.0"
 
 set-blocking@^2.0.0:
   version "2.0.0"
@@ -8394,20 +7219,21 @@ shellwords@^0.1.1:
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
   integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
 
-side-channel@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz#df5d1abadb4e4bf4af1cd8852bf132d2f7876947"
-  integrity sha512-7rL9YlPHg7Ancea1S96Pa8/QWb4BtXL/TZvS6B8XFetGBeuhAsfmUspK6DokBeZ64+Kj9TCNRD/30pVz1BvQNA==
+side-channel@^1.0.2, side-channel@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
+  integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
   dependencies:
-    es-abstract "^1.17.0-next.1"
-    object-inspect "^1.7.0"
+    call-bind "^1.0.0"
+    get-intrinsic "^1.0.2"
+    object-inspect "^1.9.0"
 
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
   integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
 
-sisteransi@^1.0.4:
+sisteransi@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
   integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==
@@ -8431,10 +7257,14 @@ slice-ansi@^2.1.0:
     astral-regex "^1.0.0"
     is-fullwidth-code-point "^2.0.0"
 
-smart-buffer@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.1.0.tgz#91605c25d91652f4661ea69ccf45f1b331ca21ba"
-  integrity sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==
+slice-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
+  integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
+  dependencies:
+    ansi-styles "^4.0.0"
+    astral-regex "^2.0.0"
+    is-fullwidth-code-point "^3.0.0"
 
 snapdragon-node@^2.0.1:
   version "2.1.1"
@@ -8466,22 +7296,6 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
-socks-proxy-agent@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz#3c8991f3145b2799e70e11bd5fbc8b1963116386"
-  integrity sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==
-  dependencies:
-    agent-base "~4.2.1"
-    socks "~2.3.2"
-
-socks@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.3.3.tgz#01129f0a5d534d2b897712ed8aceab7ee65d78e3"
-  integrity sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==
-  dependencies:
-    ip "1.1.5"
-    smart-buffer "^4.1.0"
-
 source-map-resolve@^0.5.0:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
@@ -8493,7 +7307,7 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@^0.5.16, source-map-support@^0.5.6, source-map-support@~0.5.12:
+source-map-support@^0.5.16, source-map-support@^0.5.6:
   version "0.5.19"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
   integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
@@ -8548,9 +7362,9 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654"
-  integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65"
+  integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==
 
 specificity@^0.4.1:
   version "0.4.1"
@@ -8594,29 +7408,19 @@ sshpk@^1.7.0:
     safer-buffer "^2.0.2"
     tweetnacl "~0.14.0"
 
-ssri@^6.0.0, ssri@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
-  integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
-  dependencies:
-    figgy-pudding "^3.5.1"
-
 stack-utils@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8"
-  integrity sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==
-
-stack-utils@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.2.tgz#5cf48b4557becb4638d0bc4f21d23f5d19586593"
-  integrity sha512-0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.4.tgz#4b600971dcfc6aed0cbdf2a8268177cc916c87c8"
+  integrity sha512-IPDJfugEGbfizBwBZRZ3xpccMdRyP5lqsBWXGQWimVjua/ccLCeMOAVjlc1R7LxFjo5sEDhyNIXd8mo/AiDS9w==
   dependencies:
     escape-string-regexp "^2.0.0"
 
-state-toggle@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.3.tgz#e123b16a88e143139b09c6852221bc9815917dfe"
-  integrity sha512-d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ==
+stack-utils@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.3.tgz#cd5f030126ff116b78ccb3c027fe302713b61277"
+  integrity sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==
+  dependencies:
+    escape-string-regexp "^2.0.0"
 
 static-extend@^0.1.1:
   version "0.1.2"
@@ -8631,19 +7435,6 @@ stealthy-require@^1.1.1:
   resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
   integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
 
-stream-each@^1.1.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
-  integrity sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==
-  dependencies:
-    end-of-stream "^1.1.0"
-    stream-shift "^1.0.0"
-
-stream-shift@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
-  integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
-
 string-length@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz#4a973bf31ef77c4edbceadd6af2611996985f8a1"
@@ -8652,31 +7443,10 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-string-width@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.1.0.tgz#ba846d1daa97c3c596155308063e075ed1c99aff"
-  integrity sha512-NrX+1dVVh+6Y9dnQ19pR0pP4FiEIlUvdTGn8pw6CKTNq5sgib2nIhmUNT5TAmhWmvKr3WcxBcP3E8nWezuipuQ==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^5.2.0"
-
-string-width@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
-
-string-width@^2.0.0, string-width@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^4.0.0"
+string-natural-compare@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/string-natural-compare/-/string-natural-compare-3.0.1.tgz#7a42d58474454963759e8e8b7ae63d71c1e7fdf4"
+  integrity sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw==
 
 string-width@^3.0.0, string-width@^3.1.0:
   version "3.1.0"
@@ -8697,16 +7467,17 @@ string-width@^4.1.0, string-width@^4.2.0:
     strip-ansi "^6.0.0"
 
 string.prototype.matchall@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz#48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e"
-  integrity sha512-N/jp6O5fMf9os0JU3E72Qhf590RSRZU/ungsL/qJUYVTNv7hTG0P/dbPjxINVN9jpscu3nzYwKESU3P3RY5tOg==
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.3.tgz#24243399bc31b0a49d19e2b74171a15653ec996a"
+  integrity sha512-OBxYDA2ifZQ2e13cP82dWFMaCV9CGF8GzmN4fljBVw5O5wep0lu4gacm1OL6MjROoUnB8VbkWRThqkV2YFLNxw==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0"
+    es-abstract "^1.18.0-next.1"
     has-symbols "^1.0.1"
     internal-slot "^1.0.2"
     regexp.prototype.flags "^1.3.0"
-    side-channel "^1.0.2"
+    side-channel "^1.0.3"
 
 string.prototype.repeat@^0.2.0:
   version "0.2.0"
@@ -8714,47 +7485,29 @@ string.prototype.repeat@^0.2.0:
   integrity sha1-q6Nt4I3O5qWjN9SbLqHaGyj8Ds8=
 
 string.prototype.trim@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.1.tgz#141233dff32c82bfad80684d7e5f0869ee0fb782"
-  integrity sha512-MjGFEeqixw47dAMFMtgUro/I0+wNqZB5GKXGt1fFr24u3TzDXCPu7J9Buppzoe3r/LqkSDLDDJzE15RGWDGAVw==
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.3.tgz#d23a22fde01c1e6571a7fadcb9be11decd8061a7"
+  integrity sha512-16IL9pIBA5asNOSukPfxX2W68BaBvxyiRK16H3RA/lWW9BDosh+w7f+LhomPHpXJ82QEe7w7/rY/S1CV97raLg==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    function-bind "^1.1.1"
+    es-abstract "^1.18.0-next.1"
 
-string.prototype.trimend@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913"
-  integrity sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==
+string.prototype.trimend@^1.0.1, string.prototype.trimend@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz#a22bd53cca5c7cf44d7c9d5c732118873d6cd18b"
+  integrity sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.5"
 
-string.prototype.trimleft@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz#4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc"
-  integrity sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==
+string.prototype.trimstart@^1.0.1, string.prototype.trimstart@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz#9b4cb590e123bb36564401d59824298de50fd5aa"
+  integrity sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-    string.prototype.trimstart "^1.0.0"
-
-string.prototype.trimright@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz#c76f1cef30f21bbad8afeb8db1511496cfb0f2a3"
-  integrity sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-    string.prototype.trimend "^1.0.0"
-
-string.prototype.trimstart@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"
-  integrity sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
 
 string_decoder@^1.1.1:
   version "1.3.0"
@@ -8770,30 +7523,6 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-stringify-entities@^1.0.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-1.3.2.tgz#a98417e5471fd227b3e45d3db1861c11caf668f7"
-  integrity sha512-nrBAQClJAPN2p+uGCVJRPIPakKeKWZ9GtBCmormE7pWOSlHat7+x5A8gx85M7HM5Dt0BP3pP5RhVW77WdbJJ3A==
-  dependencies:
-    character-entities-html4 "^1.0.0"
-    character-entities-legacy "^1.0.0"
-    is-alphanumerical "^1.0.0"
-    is-hexadecimal "^1.0.0"
-
-strip-ansi@^3.0.0, strip-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
-  dependencies:
-    ansi-regex "^2.0.0"
-
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
-  dependencies:
-    ansi-regex "^3.0.0"
-
 strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
@@ -8828,42 +7557,34 @@ strip-final-newline@^2.0.0:
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
-strip-indent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
-  integrity sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=
+strip-indent@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
+  integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==
+  dependencies:
+    min-indent "^1.0.0"
 
-strip-json-comments@^3.0.1:
+strip-json-comments@^3.0.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
-strip-json-comments@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.0.tgz#7638d31422129ecf4457440009fba03f9f9ac180"
-  integrity sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w==
-
-strip-json-comments@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
-
 style-search@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902"
   integrity sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=
 
-stylelint-config-recommended@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-2.2.0.tgz#46ab139db4a0e7151fd5f94af155512886c96d3f"
-  integrity sha512-bZ+d4RiNEfmoR74KZtCKmsABdBJr4iXRiCso+6LtMJPw5rd/KnxUWTxht7TbafrTJK1YRjNgnN0iVZaJfc3xJA==
+stylelint-config-recommended@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-3.0.0.tgz#e0e547434016c5539fe2650afd58049a2fd1d657"
+  integrity sha512-F6yTRuc06xr1h5Qw/ykb2LuFynJ2IxkKfCMf+1xqPffkxh0S09Zc902XCffcsw/XMFq/OzQ1w54fLIDtmRNHnQ==
 
-stylelint-config-standard@^18.3.0:
-  version "18.3.0"
-  resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-18.3.0.tgz#a2a1b788d2cf876c013feaff8ae276117a1befa7"
-  integrity sha512-Tdc/TFeddjjy64LvjPau9SsfVRexmTFqUhnMBrzz07J4p2dVQtmpncRF/o8yZn8ugA3Ut43E6o1GtjX80TFytw==
+stylelint-config-standard@^20.0.0:
+  version "20.0.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-20.0.0.tgz#06135090c9e064befee3d594289f50e295b5e20d"
+  integrity sha512-IB2iFdzOTA/zS4jSVav6z+wGtin08qfj+YyExHB3LF9lnouQht//YyB0KZq9gGz5HNPkddHOzcY8HsUey6ZUlA==
   dependencies:
-    stylelint-config-recommended "^2.2.0"
+    stylelint-config-recommended "^3.0.0"
 
 stylelint-scss@^3.18.0:
   version "3.18.0"
@@ -8876,58 +7597,59 @@ stylelint-scss@^3.18.0:
     postcss-selector-parser "^6.0.2"
     postcss-value-parser "^4.1.0"
 
-stylelint@^9.10.1:
-  version "9.10.1"
-  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-9.10.1.tgz#5f0ee3701461dff1d68284e1386efe8f0677a75d"
-  integrity sha512-9UiHxZhOAHEgeQ7oLGwrwoDR8vclBKlSX7r4fH0iuu0SfPwFaLkb1c7Q2j1cqg9P7IDXeAV2TvQML/fRQzGBBQ==
+stylelint@^13.9.0:
+  version "13.9.0"
+  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-13.9.0.tgz#93921ee6e11d4556b9f31131f485dc813b68e32a"
+  integrity sha512-VVWH2oixOAxpWL1vH+V42ReCzBjW2AeqskSAbi8+3OjV1Xg3VZkmTcAqBZfRRvJeF4BvYuDLXebW3tIHxgZDEg==
   dependencies:
-    autoprefixer "^9.0.0"
+    "@stylelint/postcss-css-in-js" "^0.37.2"
+    "@stylelint/postcss-markdown" "^0.36.2"
+    autoprefixer "^9.8.6"
     balanced-match "^1.0.0"
-    chalk "^2.4.1"
-    cosmiconfig "^5.0.0"
-    debug "^4.0.0"
-    execall "^1.0.0"
-    file-entry-cache "^4.0.0"
-    get-stdin "^6.0.0"
+    chalk "^4.1.0"
+    cosmiconfig "^7.0.0"
+    debug "^4.3.1"
+    execall "^2.0.0"
+    fast-glob "^3.2.5"
+    fastest-levenshtein "^1.0.12"
+    file-entry-cache "^6.0.0"
+    get-stdin "^8.0.0"
     global-modules "^2.0.0"
-    globby "^9.0.0"
+    globby "^11.0.2"
     globjoin "^0.1.4"
-    html-tags "^2.0.0"
-    ignore "^5.0.4"
-    import-lazy "^3.1.0"
+    html-tags "^3.1.0"
+    ignore "^5.1.8"
+    import-lazy "^4.0.0"
     imurmurhash "^0.1.4"
-    known-css-properties "^0.11.0"
-    leven "^2.1.0"
-    lodash "^4.17.4"
-    log-symbols "^2.0.0"
-    mathml-tag-names "^2.0.1"
-    meow "^5.0.0"
-    micromatch "^3.1.10"
+    known-css-properties "^0.20.0"
+    lodash "^4.17.20"
+    log-symbols "^4.0.0"
+    mathml-tag-names "^2.1.3"
+    meow "^9.0.0"
+    micromatch "^4.0.2"
     normalize-selector "^0.2.0"
-    pify "^4.0.0"
-    postcss "^7.0.13"
+    postcss "^7.0.35"
     postcss-html "^0.36.0"
-    postcss-jsx "^0.36.0"
-    postcss-less "^3.1.0"
-    postcss-markdown "^0.36.0"
+    postcss-less "^3.1.4"
     postcss-media-query-parser "^0.2.3"
-    postcss-reporter "^6.0.0"
     postcss-resolve-nested-selector "^0.1.1"
-    postcss-safe-parser "^4.0.0"
-    postcss-sass "^0.3.5"
-    postcss-scss "^2.0.0"
-    postcss-selector-parser "^3.1.0"
+    postcss-safe-parser "^4.0.2"
+    postcss-sass "^0.4.4"
+    postcss-scss "^2.1.1"
+    postcss-selector-parser "^6.0.4"
     postcss-syntax "^0.36.2"
-    postcss-value-parser "^3.3.0"
-    resolve-from "^4.0.0"
-    signal-exit "^3.0.2"
-    slash "^2.0.0"
+    postcss-value-parser "^4.1.0"
+    resolve-from "^5.0.0"
+    slash "^3.0.0"
     specificity "^0.4.1"
-    string-width "^3.0.0"
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
     style-search "^0.1.0"
     sugarss "^2.0.0"
     svg-tags "^1.0.0"
-    table "^5.0.0"
+    table "^6.0.7"
+    v8-compile-cache "^2.2.0"
+    write-file-atomic "^3.0.3"
 
 sugarss@^2.0.0:
   version "2.0.0"
@@ -8936,13 +7658,6 @@ sugarss@^2.0.0:
   dependencies:
     postcss "^7.0.2"
 
-supports-color@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
-  integrity sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=
-  dependencies:
-    has-flag "^2.0.0"
-
 supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@@ -8957,20 +7672,13 @@ supports-color@^6.1.0:
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^7.0.0:
+supports-color@^7.0.0, supports-color@^7.1.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
   integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
   dependencies:
     has-flag "^4.0.0"
 
-supports-color@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
-  integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
-  dependencies:
-    has-flag "^4.0.0"
-
 supports-hyperlinks@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz#f663df252af5f37c5d49bbd7eeefa9e0b9e59e47"
@@ -8994,7 +7702,7 @@ symbol-tree@^3.2.4:
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
-table@^5.0.0, table@^5.2.3:
+table@^5.2.3:
   version "5.4.6"
   resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
   integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==
@@ -9004,6 +7712,16 @@ table@^5.0.0, table@^5.2.3:
     slice-ansi "^2.1.0"
     string-width "^3.0.0"
 
+table@^6.0.4, table@^6.0.7:
+  version "6.0.7"
+  resolved "https://registry.yarnpkg.com/table/-/table-6.0.7.tgz#e45897ffbcc1bcf9e8a87bf420f2c9e5a7a52a34"
+  integrity sha512-rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g==
+  dependencies:
+    ajv "^7.0.2"
+    lodash "^4.17.20"
+    slice-ansi "^4.0.0"
+    string-width "^4.2.0"
+
 tar-js@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/tar-js/-/tar-js-0.3.0.tgz#6949aabfb0ba18bb1562ae51a439fd0f30183a17"
@@ -9017,25 +7735,6 @@ terminal-link@^2.0.0:
     ansi-escapes "^4.2.1"
     supports-hyperlinks "^2.0.0"
 
-terser@^4.6.2:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.7.0.tgz#15852cf1a08e3256a80428e865a2fa893ffba006"
-  integrity sha512-Lfb0RiZcjRDXCC3OSHJpEkxJ9Qeqs6mp2v4jf2MHfy8vGERmVDuvjXdd/EnP5Deme5F2yBRBymKmKHCBg2echw==
-  dependencies:
-    commander "^2.20.0"
-    source-map "~0.6.1"
-    source-map-support "~0.5.12"
-
-test-exclude@^5.2.3:
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0"
-  integrity sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==
-  dependencies:
-    glob "^7.1.3"
-    minimatch "^3.0.4"
-    read-pkg-up "^4.0.0"
-    require-main-filename "^2.0.0"
-
 test-exclude@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
@@ -9050,7 +7749,7 @@ text-encoding-utf-8@^1.0.2:
   resolved "https://registry.yarnpkg.com/text-encoding-utf-8/-/text-encoding-utf-8-1.0.2.tgz#585b62197b0ae437e3c7b5d0af27ac1021e10d13"
   integrity sha512-8bw4MY9WjdsD2aMtO0OzOCY3pXGYNx2d2FfHRVUKkiCPDWjKuOlhLVASS+pD7VkLTVjW268LYJHwsnPFlBpbAg==
 
-text-table@0.2.0, text-table@^0.2.0:
+text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
@@ -9060,14 +7759,6 @@ throat@^5.0.0:
   resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b"
   integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==
 
-through2@^2.0.0:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
-  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
-  dependencies:
-    readable-stream "~2.3.6"
-    xtend "~4.0.1"
-
 through@^2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
@@ -9151,25 +7842,15 @@ tr46@^2.0.2:
   dependencies:
     punycode "^2.1.1"
 
-tree-kill@^1.2.1:
+tree-kill@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
   integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
 
-trim-newlines@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20"
-  integrity sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=
-
-trim-trailing-lines@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.3.tgz#7f0739881ff76657b7776e10874128004b625a94"
-  integrity sha512-4ku0mmjXifQcTVfYDfR5lpgV7zVqPg6zV9rdZmwOPqq0+Zq19xDqEgagqVbc4pOOShbncuAOIs59R3+3gcF3ZA==
-
-trim@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd"
-  integrity sha1-WFhUf2spB1fulczMZm+1AITEYN0=
+trim-newlines@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.0.tgz#79726304a6a898aa8373427298d54c2ee8b1cb30"
+  integrity sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA==
 
 trough@^1.0.0:
   version "1.0.5"
@@ -9187,24 +7868,19 @@ tsconfig-paths@^3.9.0:
     strip-bom "^3.0.0"
 
 tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
-  integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
+  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.0.tgz#18d13fc2dce04051e20f074cc8387fd8089ce4f3"
-  integrity sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==
-
-tslib@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.2.tgz#462295631185db44b21b1ea3615b63cd1c038242"
-  integrity sha512-wAH28hcEKwna96/UacuWaVspVLkg4x1aDM9JlzqaQTOFczCktkVAb5fmXChgandR1EraDPs2w8P+ozM+oafwxg==
+tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a"
+  integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==
 
 tsutils@^3.17.1:
-  version "3.17.1"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759"
-  integrity sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==
+  version "3.19.1"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.19.1.tgz#d8566e0c51c82f32f9c25a4d367cd62409a547a9"
+  integrity sha512-GEdoBf5XI324lu7ycad7s6laADfnAqCw6wLGI+knxvw9vsIYBaJfYdmeCEG3FMMUiSm3OGgNb+m6utsWf5h9Vw==
   dependencies:
     tslib "^1.8.1"
 
@@ -9244,6 +7920,11 @@ type-fest@^0.11.0:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"
   integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==
 
+type-fest@^0.18.0:
+  version "0.18.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f"
+  integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==
+
 type-fest@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
@@ -9261,28 +7942,15 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
-typedarray@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
-
-typescript@^3.9.5, typescript@^3.9.7:
-  version "3.9.7"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa"
-  integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==
+typescript@^4.1.3:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.3.tgz#519d582bd94cba0cf8934c7d8e8467e473f53bb7"
+  integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==
 
 ua-parser-js@^0.7.18:
-  version "0.7.21"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.21.tgz#853cf9ce93f642f67174273cc34565ae6f308777"
-  integrity sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==
-
-unherit@^1.0.4:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/unherit/-/unherit-1.1.3.tgz#6c9b503f2b41b262330c80e91c8614abdaa69c22"
-  integrity sha512-Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ==
-  dependencies:
-    inherits "^2.0.0"
-    xtend "^4.0.0"
+  version "0.7.23"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.23.tgz#704d67f951e13195fbcd3d78818577f5bc1d547b"
+  integrity sha512-m4hvMLxgGHXG3O3fQVAyyAQpZzDOvwnhOTjYz5Xmr7r/+LpkNy3vJXdVRWgd1TkAb7NGROZuSy96CrlNVjA7KA==
 
 unhomoglyph@^1.0.6:
   version "1.0.6"
@@ -9312,19 +7980,17 @@ unicode-property-aliases-ecmascript@^1.0.4:
   resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4"
   integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==
 
-unified@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/unified/-/unified-7.1.0.tgz#5032f1c1ee3364bd09da12e27fdd4a7553c7be13"
-  integrity sha512-lbk82UOIGuCEsZhPj8rNAkXSDXd6p0QLzIuSsCdxrqnqU56St4eyOB+AlXsVgVeRmetPTYydIuvFfpDIed8mqw==
+unified@^9.1.0:
+  version "9.2.0"
+  resolved "https://registry.yarnpkg.com/unified/-/unified-9.2.0.tgz#67a62c627c40589edebbf60f53edfd4d822027f8"
+  integrity sha512-vx2Z0vY+a3YoTj8+pttM3tiJHCwY5UFbYdiWrwBEbHmK8pvsPj2rtAX2BFfgXen8T39CJWblWRDT4L5WGXtDdg==
   dependencies:
-    "@types/unist" "^2.0.0"
-    "@types/vfile" "^3.0.0"
     bail "^1.0.0"
     extend "^3.0.0"
-    is-plain-obj "^1.1.0"
+    is-buffer "^2.0.0"
+    is-plain-obj "^2.0.0"
     trough "^1.0.0"
-    vfile "^3.0.0"
-    x-is-string "^0.1.0"
+    vfile "^4.0.0"
 
 union-value@^1.0.0:
   version "1.0.1"
@@ -9341,43 +8007,17 @@ uniq@^1.0.1:
   resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
   integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
 
-unique-filename@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
-  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
+unist-util-find-all-after@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz#fdfecd14c5b7aea5e9ef38d5e0d5f774eeb561f6"
+  integrity sha512-xaTC/AGZ0rIM2gM28YVRAFPIZpzbpDtU3dRmp7EXlNVA8ziQc4hY3H7BHXM1J49nEmiqc3svnqMReW+PGqbZKQ==
   dependencies:
-    unique-slug "^2.0.0"
+    unist-util-is "^4.0.0"
 
-unique-slug@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
-  integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
-  dependencies:
-    imurmurhash "^0.1.4"
-
-unist-util-find-all-after@^1.0.2:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/unist-util-find-all-after/-/unist-util-find-all-after-1.0.5.tgz#5751a8608834f41d117ad9c577770c5f2f1b2899"
-  integrity sha512-lWgIc3rrTMTlK1Y0hEuL+k+ApzFk78h+lsaa2gHf63Gp5Ww+mt11huDniuaoq1H+XMK2lIIjjPkncxXcDp3QDw==
-  dependencies:
-    unist-util-is "^3.0.0"
-
-unist-util-is@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-3.0.0.tgz#d9e84381c2468e82629e4a5be9d7d05a2dd324cd"
-  integrity sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A==
-
-unist-util-remove-position@^1.0.0:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-1.1.4.tgz#ec037348b6102c897703eee6d0294ca4755a2020"
-  integrity sha512-tLqd653ArxJIPnKII6LMZwH+mb5q+n/GtXQZo6S6csPRs5zB0u79Yw8ouR3wTw8wxvdJFhpP6Y7jorWdCgLO0A==
-  dependencies:
-    unist-util-visit "^1.1.0"
-
-unist-util-stringify-position@^1.0.0, unist-util-stringify-position@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz#3f37fcf351279dcbca7480ab5889bb8a832ee1c6"
-  integrity sha512-pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ==
+unist-util-is@^4.0.0:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.0.4.tgz#3e9e8de6af2eb0039a59f50c9b3e99698a924f50"
+  integrity sha512-3dF39j/u423v4BBQrk1AQ2Ve1FxY5W3JKwXxVFzBODQ6WEvccguhgp802qQLKSnxPODE6WuRZtV+ohlUg4meBA==
 
 unist-util-stringify-position@^2.0.0:
   version "2.0.3"
@@ -9386,20 +8026,6 @@ unist-util-stringify-position@^2.0.0:
   dependencies:
     "@types/unist" "^2.0.2"
 
-unist-util-visit-parents@^2.0.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-2.1.2.tgz#25e43e55312166f3348cae6743588781d112c1e9"
-  integrity sha512-DyN5vD4NE3aSeB+PXYNKxzGsfocxp6asDc2XXE3b0ekO2BaRUpBicbbUygfSvYfUz1IkmjFR1YF7dPklraMZ2g==
-  dependencies:
-    unist-util-is "^3.0.0"
-
-unist-util-visit@^1.1.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-1.4.1.tgz#4724aaa8486e6ee6e26d7ff3c8685960d560b1e3"
-  integrity sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==
-  dependencies:
-    unist-util-visit-parents "^2.0.0"
-
 unset-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
@@ -9413,26 +8039,10 @@ upath@^1.1.1:
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
   integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
 
-updates@^8.5.2:
-  version "8.5.3"
-  resolved "https://registry.yarnpkg.com/updates/-/updates-8.5.3.tgz#6397674fcfe9938deabbfa2f88dad717d756eebb"
-  integrity sha512-bREdpucNEtSULXu2PLfYmKnRD6E0lM16vbZNsgR39Ou7FqiUEyasA0o2Lrb3uHwZN3L2WhOjf+EjQl7NiOHhug==
-  dependencies:
-    chalk "2.4.2"
-    find-up "4.1.0"
-    hosted-git-info "3.0.0"
-    make-fetch-happen "5.0.0"
-    minimist "1.2.0"
-    rc "1.2.8"
-    registry-auth-token "4.0.0"
-    semver "6.3.0"
-    string-width "4.1.0"
-    text-table "0.2.0"
-
 uri-js@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
-  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
   dependencies:
     punycode "^2.1.0"
 
@@ -9450,16 +8060,16 @@ url@^0.11.0:
     querystring "0.2.0"
 
 use-callback-ref@^1.2.1:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/use-callback-ref/-/use-callback-ref-1.2.4.tgz#d86d1577bfd0b955b6e04aaf5971025f406bea3c"
-  integrity sha512-rXpsyvOnqdScyied4Uglsp14qzag1JIemLeTWGKbwpotWht57hbP78aNT+Q4wdFKQfQibbUX4fb6Qb4y11aVOQ==
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/use-callback-ref/-/use-callback-ref-1.2.5.tgz#6115ed242cfbaed5915499c0a9842ca2912f38a5"
+  integrity sha512-gN3vgMISAgacF7sqsLPByqoePooY3n2emTH59Ur5d/M8eg4WTWu1xp8i8DHjohftIyEx0S08RiYxbffr4j8Peg==
 
 use-sidecar@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/use-sidecar/-/use-sidecar-1.0.2.tgz#e72f582a75842f7de4ef8becd6235a4720ad8af6"
-  integrity sha512-287RZny6m5KNMTb/Kq9gmjafi7lQL0YHO1lYolU6+tY1h9+Z3uCtkJJ3OSOq3INwYf2hBryCcDh4520AhJibMA==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/use-sidecar/-/use-sidecar-1.0.4.tgz#38398c3723727f9f924bed2343dfa3db6aaaee46"
+  integrity sha512-A5ggIS3/qTdxCAlcy05anO2/oqXOfpmxnpRE1Jm+fHHtCvUvNSZDGqgOSAXPriBVAcw2fMFFkh5v5KqrFFhCMA==
   dependencies:
-    detect-node "^2.0.4"
+    detect-node-es "^1.0.0"
     tslib "^1.9.3"
 
 use@^3.1.0:
@@ -9467,40 +8077,30 @@ use@^3.1.0:
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
   integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
-util-deprecate@^1.0.1, util-deprecate@~1.0.1:
+util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
-util.promisify@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee"
-  integrity sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.2"
-    has-symbols "^1.0.1"
-    object.getownpropertydescriptors "^2.1.0"
-
 uuid@^3.3.2:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
 uuid@^8.3.0:
-  version "8.3.1"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31"
-  integrity sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
-v8-compile-cache@^2.0.3:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz#54bc3cdd43317bca91e35dcaf305b1a7237de745"
-  integrity sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==
+v8-compile-cache@^2.0.3, v8-compile-cache@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz#9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132"
+  integrity sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==
 
-v8-to-istanbul@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-5.0.1.tgz#0608f5b49a481458625edb058488607f25498ba5"
-  integrity sha512-mbDNjuDajqYe3TXFk5qxcQy8L1msXNE37WTlLoqqpBfRsimbNcrlhQlDPntmECEcUvdC+AQ8CyMMf6EUx1r74Q==
+v8-to-istanbul@^7.0.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.0.tgz#5b95cef45c0f83217ec79f8fc7ee1c8b486aee07"
+  integrity sha512-uXUVqNUCLa0AH1vuVxzi+MI4RfxEOKt9pBgKwHbgH7st8Kv2P1m+jvWNnektzBh5QShF3ODgKmUFCf38LnVz1g==
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.1"
     convert-source-map "^1.6.0"
@@ -9514,10 +8114,10 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
-velocity-animate@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/velocity-animate/-/velocity-animate-1.5.2.tgz#5a351d75fca2a92756f5c3867548b873f6c32105"
-  integrity sha512-m6EXlCAMetKztO1ppBhGU1/1MR3IiEevO6ESq6rcrSQ3Q77xYSW13jkfXW88o4xMrkXJhy/U7j4wFR/twMB0Eg==
+velocity-animate@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/velocity-animate/-/velocity-animate-2.0.6.tgz#1811ca14df7fbbef05740256f6cec0fd1b76575f"
+  integrity sha512-tU+/UtSo3GkIjEfk2KM4e24DvpgX0+FzfLr7XqNwm9BCvZUtbCHPq/AFutx/Mkp2bXlUS9EcX8yxu8XmzAv2Kw==
 
 verror@1.10.0:
   version "1.10.0"
@@ -9528,12 +8128,7 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vfile-location@^2.0.0:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-2.0.6.tgz#8a274f39411b8719ea5728802e10d9e0dff1519e"
-  integrity sha512-sSFdyCP3G6Ka0CEmN83A2YCMKIieHx0EDaj5IDP4g1pa5ZJ4FJDvpO0WODLxo4LUX4oe52gmSCK7Jw4SBghqxA==
-
-vfile-message@*:
+vfile-message@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a"
   integrity sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==
@@ -9541,22 +8136,15 @@ vfile-message@*:
     "@types/unist" "^2.0.0"
     unist-util-stringify-position "^2.0.0"
 
-vfile-message@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-1.1.1.tgz#5833ae078a1dfa2d96e9647886cd32993ab313e1"
-  integrity sha512-1WmsopSGhWt5laNir+633LszXvZ+Z/lxveBf6yhGsqnQIhlhzooZae7zV6YVM1Sdkw68dtAW3ow0pOdPANugvA==
-  dependencies:
-    unist-util-stringify-position "^1.1.1"
-
-vfile@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/vfile/-/vfile-3.0.1.tgz#47331d2abe3282424f4a4bb6acd20a44c4121803"
-  integrity sha512-y7Y3gH9BsUSdD4KzHsuMaCzRjglXN0W2EcMf0gpvu6+SbsGhMje7xDc8AEoeXy6mIwCKMI6BkjMsRjzQbhMEjQ==
+vfile@^4.0.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/vfile/-/vfile-4.2.1.tgz#03f1dce28fc625c625bc6514350fbdb00fa9e624"
+  integrity sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==
   dependencies:
+    "@types/unist" "^2.0.0"
     is-buffer "^2.0.0"
-    replace-ext "1.0.0"
-    unist-util-stringify-position "^1.0.0"
-    vfile-message "^1.0.0"
+    unist-util-stringify-position "^2.0.0"
+    vfile-message "^2.0.0"
 
 w3c-hr-time@^1.0.2:
   version "1.0.2"
@@ -9586,7 +8174,7 @@ walker@^1.0.7, walker@~1.0.5:
   dependencies:
     makeerror "1.0.x"
 
-webcrypto-core@^1.1.6:
+webcrypto-core@^1.1.8:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/webcrypto-core/-/webcrypto-core-1.1.8.tgz#91720c07f4f2edd181111b436647ea5a282af0a9"
   integrity sha512-hKnFXsqh0VloojNeTfrwFoRM4MnaWzH6vtXcaFcGjPEu+8HmBdQZnps3/2ikOFqS8bJN1RYr6mI2P/FJzyZnXg==
@@ -9620,9 +8208,9 @@ whatwg-encoding@^1.0.5:
     iconv-lite "0.4.24"
 
 whatwg-fetch@>=0.10.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb"
-  integrity sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q==
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.5.0.tgz#605a2cd0a7146e5db141e29d1c62ab84c0c4c868"
+  integrity sha512-jXkLtsR42xhXg7akoDKvKWE40eJeI+2KZqcp2h3NsOrRnDvtWX36KcKl30dy+hxECivdk2BVUHVNrPtoMBUx6A==
 
 whatwg-fetch@^0.9.0:
   version "0.9.0"
@@ -9635,24 +8223,24 @@ whatwg-mimetype@^2.3.0:
   integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
 
 whatwg-url@^8.0.0:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.3.0.tgz#d1e11e565334486cdb280d3101b9c3fd1c867582"
-  integrity sha512-BQRf/ej5Rp3+n7k0grQXZj9a1cHtsp4lqj01p59xBWFKdezR8sO37XnpafwNqiFac/v2Il12EIMjX/Y4VZtT8Q==
+  version "8.4.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.4.0.tgz#50fb9615b05469591d2b2bd6dfaed2942ed72837"
+  integrity sha512-vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw==
   dependencies:
     lodash.sortby "^4.7.0"
     tr46 "^2.0.2"
     webidl-conversions "^6.1.0"
 
 which-boxed-primitive@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.1.tgz#cbe8f838ebe91ba2471bb69e9edbda67ab5a5ec1"
-  integrity sha512-7BT4TwISdDGBgaemWU0N0OU7FeAEJ9Oo2P1PHRm/FCWoEi2VLWC9b6xvxAA3C/NMpxg3HXVgi0sMmGbNUbNepQ==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
+  integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
   dependencies:
-    is-bigint "^1.0.0"
-    is-boolean-object "^1.0.0"
-    is-number-object "^1.0.3"
-    is-string "^1.0.4"
-    is-symbol "^1.0.2"
+    is-bigint "^1.0.1"
+    is-boolean-object "^1.1.0"
+    is-number-object "^1.0.4"
+    is-string "^1.0.5"
+    is-symbol "^1.0.3"
 
 which-collection@^1.0.0:
   version "1.0.1"
@@ -9688,14 +8276,6 @@ word-wrap@^1.2.3, word-wrap@~1.2.3:
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
 
-wrap-ansi@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
-  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
-  dependencies:
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-
 wrap-ansi@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
@@ -9719,16 +8299,7 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-write-file-atomic@2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.1.tgz#d0b05463c188ae804396fd5ab2a370062af87529"
-  integrity sha512-TGHFeZEZMnv+gBFRfjAcxL5bPHrsGKtnb4qsFAws7/vlh+QfwAaySIw4AXP9ZskTTh5GWu3FLuJhsWVdiJPGvg==
-  dependencies:
-    graceful-fs "^4.1.11"
-    imurmurhash "^0.1.4"
-    signal-exit "^3.0.2"
-
-write-file-atomic@^3.0.0:
+write-file-atomic@^3.0.0, write-file-atomic@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
   integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
@@ -9746,14 +8317,9 @@ write@1.0.3:
     mkdirp "^0.5.1"
 
 ws@^7.2.3:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.3.1.tgz#d0547bf67f7ce4f12a72dfe31262c68d7dc551c8"
-  integrity sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==
-
-x-is-string@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/x-is-string/-/x-is-string-0.1.0.tgz#474b50865af3a49a9c4657f05acd145458f77d82"
-  integrity sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI=
+  version "7.4.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.2.tgz#782100048e54eb36fe9843363ab1c68672b261dd"
+  integrity sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA==
 
 xml-name-validator@^3.0.0:
   version "3.0.0"
@@ -9765,35 +8331,20 @@ xmlchars@^2.2.0:
   resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
   integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
 
-xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
-  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
+y18n@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4"
+  integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==
 
-"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
+yallist@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
-  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yallist@^3.0.2:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
-  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
-
-yargs-parser@^10.0.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
-  integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==
-  dependencies:
-    camelcase "^4.1.0"
-
-yargs-parser@^11.1.1:
-  version "11.1.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
-  integrity sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
+yaml@^1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e"
+  integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==
 
 yargs-parser@^13.1.2:
   version "13.1.2"
@@ -9811,25 +8362,12 @@ yargs-parser@^18.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs@^12.0.5:
-  version "12.0.5"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
-  integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
-  dependencies:
-    cliui "^4.0.0"
-    decamelize "^1.2.0"
-    find-up "^3.0.0"
-    get-caller-file "^1.0.1"
-    os-locale "^3.0.0"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^2.0.0"
-    which-module "^2.0.0"
-    y18n "^3.2.1 || ^4.0.0"
-    yargs-parser "^11.1.1"
+yargs-parser@^20.2.3:
+  version "20.2.4"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
+  integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
 
-yargs@^13.2.4:
+yargs@^13.2.4, yargs@^13.3.0:
   version "13.3.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
   integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
@@ -9862,6 +8400,11 @@ yargs@^15.4.1:
     y18n "^4.0.0"
     yargs-parser "^18.1.2"
 
+zwitch@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920"
+  integrity sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==
+
 zxcvbn@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/zxcvbn/-/zxcvbn-4.4.2.tgz#28ec17cf09743edcab056ddd8b1b06262cc73c30"